Hotfix/activitiy detail gunwoong (#141)

* feature: flyway

* hotfix: activity detail

Author: gunwoong1630

src/main/java/sevenstar/marineleisure/activity/controller/ActivityController.java

@@ -2,6 +2,7 @@
 
 import static sevenstar.marineleisure.global.exception.enums.ActivityErrorCode.*;
 
+import java.math.BigDecimal;
 import java.util.Map;
 
 import org.springframework.http.ResponseEntity;
@@ -41,7 +42,7 @@ public ResponseEntity<BaseResponse<Map<String, ActivitySummaryResponse>>> getAct
     @GetMapping("/{activity}/detail")
     public ResponseEntity<BaseResponse<ActivityDetailResponse>> getActivityDetail(@PathVariable ActivityCategory activity, @ModelAttribute ActivityDetailRequest activityDetailRequest) {
         try {
-            return BaseResponse.success(activityService.getActivityDetail(activity, activityDetailRequest.latitude(), activityDetailRequest.longitude()));
+            return BaseResponse.success(activityService.getActivityDetail(activity, new BigDecimal(activityDetailRequest.latitude()), new BigDecimal(activityDetailRequest.longitude())));
         } catch (RuntimeException e) {
             return BaseResponse.error(INVALID_ACTIVITY);
         }

src/main/java/sevenstar/marineleisure/activity/dto/request/ActivityDetailRequest.java

@@ -1,11 +1,10 @@
 package sevenstar.marineleisure.activity.dto.request;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 
 public record ActivityDetailRequest(
-    BigDecimal latitude,
-    BigDecimal longitude,
-    LocalDate date
+    Float latitude,
+	Float longitude,
+    LocalDate time
 ) {
 }

src/main/java/sevenstar/marineleisure/activity/service/ActivityService.java

@@ -136,4 +136,6 @@ Optional<Fishing> findTopByCreatedAtGreaterThanEqualAndCreatedAtLessThanOrderByT
 
 	Optional<Fishing> findFishingBySpotIdAndForecastDateAndTimePeriod(Long spotId, LocalDate forecastDate,
 		TimePeriod timePeriod);
+
+	Optional<Fishing> findBySpotIdAndForecastDateAndTimePeriod(Long spotId, LocalDate forecastDate, TimePeriod timePeriod);
 }

src/main/java/sevenstar/marineleisure/forecast/repository/FishingRepository.java

@@ -13,6 +13,7 @@
 import jakarta.transaction.Transactional;
 import sevenstar.marineleisure.forecast.domain.Fishing;
 import sevenstar.marineleisure.forecast.domain.Mudflat;
+import sevenstar.marineleisure.global.enums.TimePeriod;
 import sevenstar.marineleisure.spot.repository.ActivityRepository;
 
 public interface MudflatRepository extends ActivityRepository<Mudflat, Long> {
@@ -92,4 +93,6 @@ Optional<Mudflat> findFirstBySpotIdAndCreatedAtGreaterThanEqualAndCreatedAtLessT
 
 	Optional<Mudflat> findBySpotIdAndCreatedAtBeforeOrderByCreatedAtDesc(Long spotId, LocalDateTime createdAtBefore);
 
+	Optional<Mudflat> findBySpotIdAndForecastDate(Long spotId, LocalDate forecastDate);
+
 }

src/main/java/sevenstar/marineleisure/forecast/repository/MudflatRepository.java

@@ -11,8 +11,10 @@
 import org.springframework.data.repository.query.Param;
 
 import jakarta.transaction.Transactional;
+import sevenstar.marineleisure.forecast.domain.Fishing;
 import sevenstar.marineleisure.forecast.domain.Scuba;
 import sevenstar.marineleisure.forecast.domain.Surfing;
+import sevenstar.marineleisure.global.enums.TimePeriod;
 import sevenstar.marineleisure.spot.repository.ActivityRepository;
 
 public interface ScubaRepository extends ActivityRepository<Scuba, Long> {
@@ -93,4 +95,6 @@ Optional<Scuba> findFirstBySpotIdAndCreatedAtGreaterThanEqualAndCreatedAtLessTha
 		Long spotId,
 		LocalDateTime startDateTime,
 		LocalDateTime endDateTime);
+
+	Optional<Scuba> findBySpotIdAndForecastDateAndTimePeriod(Long spotId, LocalDate forecastDate, TimePeriod timePeriod);
 }

src/main/java/sevenstar/marineleisure/forecast/repository/ScubaRepository.java

@@ -12,6 +12,7 @@
 import jakarta.transaction.Transactional;
 import sevenstar.marineleisure.forecast.domain.Fishing;
 import sevenstar.marineleisure.forecast.domain.Surfing;
+import sevenstar.marineleisure.global.enums.TimePeriod;
 import sevenstar.marineleisure.spot.repository.ActivityRepository;
 
 public interface SurfingRepository extends ActivityRepository<Surfing, Long> {
@@ -92,4 +93,6 @@ Optional<Surfing> findFirstBySpotIdAndCreatedAtGreaterThanEqualAndCreatedAtLessT
 	Optional<Surfing> findBySpotIdAndCreatedAtBeforeOrderByCreatedAtDesc(Long spotId, LocalDateTime createdAtBefore);
 
 	Optional<Surfing> findBySpotIdOrderByCreatedAt(Long spotId);
+
+	Optional<Surfing> findBySpotIdAndForecastDateAndTimePeriod(Long spotId, LocalDate forecastDate, TimePeriod timePeriod);
 }

src/main/java/sevenstar/marineleisure/forecast/repository/SurfingRepository.java

@@ -186,4 +186,13 @@ ORDER BY ST_Distance_Sphere(os.geo_point, ST_SRID(POINT(:longitude, :latitude),
 """,nativeQuery = true)
 	Optional<OutdoorSpot> findNearFishingSpot(@Param("latitude") double latitude,
 		@Param("longitude") double longitude);
+
+	@Query(value = """
+		SELECT * FROM outdoor_spots os
+		WHERE os.category = :category
+		ORDER BY ST_Distance_Sphere(os.geo_point, ST_SRID(POINT(:longitude, :latitude), 4326)) ASC 
+		LIMIT 1;
+""",nativeQuery = true)
+	Optional<OutdoorSpot> findNearSpot(@Param("latitude") double latitude,
+		@Param("longitude") double longitude,@Param("category") String category);
 }