Merge branch 'week11' into week11

kakao-tech-campus-2nd-step3 · Nov 12, 2024 · ebde855 · ebde855
2 parents 16dc494 + 5cdf259
commit ebde855
Show file tree

Hide file tree

Showing 13 changed files with 190 additions and 29 deletions.
diff --git a/src/main/java/com/gamsa/activity/controller/ActivityController.java b/src/main/java/com/gamsa/activity/controller/ActivityController.java
@@ -3,12 +3,18 @@
 import com.gamsa.activity.constant.Category;
 import com.gamsa.activity.dto.ActivityDetailResponse;
 import com.gamsa.activity.dto.ActivityFilterRequest;
+import com.gamsa.activity.dto.ActivityFindDistanceOrderRequest;
 import com.gamsa.activity.dto.ActivityFindSliceResponse;
 import com.gamsa.activity.service.ActivityService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 @RequiredArgsConstructor
 @RestController
@@ -25,9 +31,10 @@ public Slice<ActivityFindSliceResponse> findSlice(
         @RequestParam(defaultValue = "false") boolean teenPossibleOnly,
         @RequestParam(defaultValue = "false") boolean beforeDeadlineOnly,
         @RequestParam(required = false) String keyword,
+        @RequestBody(required = false) ActivityFindDistanceOrderRequest distanceOrderRequest,
         Pageable pageable) {
 
-        ActivityFilterRequest request = ActivityFilterRequest.builder()
+        ActivityFilterRequest filterRequest = ActivityFilterRequest.builder()
             .category(Category.fromValuesForSlice(category))
             .sidoGunguCode(sidoGunguCode)
             .sidoCode(sidoCode)
@@ -36,7 +43,7 @@ public Slice<ActivityFindSliceResponse> findSlice(
             .keyword(keyword)
             .build();
 
-        return activityService.findSlice(request, pageable);
+        return activityService.findSlice(filterRequest, distanceOrderRequest, pageable);
     }
 
     @GetMapping("{activity-id}")

diff --git a/src/main/java/com/gamsa/activity/dto/ActivityFindDistanceOrderRequest.java b/src/main/java/com/gamsa/activity/dto/ActivityFindDistanceOrderRequest.java
@@ -0,0 +1,17 @@
+package com.gamsa.activity.dto;
+
+import java.math.BigDecimal;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@Builder
+@RequiredArgsConstructor
+public class ActivityFindDistanceOrderRequest {
+
+    private final BigDecimal latitude;
+    private final BigDecimal longitude;
+    private final int distanceKm;
+
+}
diff --git a/src/main/java/com/gamsa/activity/entity/ActivityJpaEntity.java b/src/main/java/com/gamsa/activity/entity/ActivityJpaEntity.java
@@ -4,11 +4,23 @@
 import com.gamsa.activity.constant.CategoryConverter;
 import com.gamsa.activity.domain.Activity;
 import com.gamsa.common.entity.BaseEntity;
-import jakarta.persistence.*;
-import lombok.*;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Getter
 @Builder

diff --git a/src/main/java/com/gamsa/activity/entity/DistrictJpaEntity.java b/src/main/java/com/gamsa/activity/entity/DistrictJpaEntity.java
@@ -6,9 +6,12 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-import lombok.*;
-
 import java.math.BigDecimal;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Getter
 @Builder

diff --git a/src/main/java/com/gamsa/activity/repository/ActivityCustomRepository.java b/src/main/java/com/gamsa/activity/repository/ActivityCustomRepository.java
@@ -1,6 +1,7 @@
 package com.gamsa.activity.repository;
 
 import com.gamsa.activity.dto.ActivityFilterRequest;
+import com.gamsa.activity.dto.ActivityFindDistanceOrderRequest;
 import com.gamsa.activity.entity.ActivityJpaEntity;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
@@ -9,4 +10,8 @@ public interface ActivityCustomRepository {
 
     Slice<ActivityJpaEntity> findSlice(ActivityFilterRequest request, Pageable pageable);
 
+    Slice<ActivityJpaEntity> findSliceDistanceOrder(
+        ActivityFilterRequest filterRequest,
+        ActivityFindDistanceOrderRequest distanceOrderRequest,
+        Pageable pageable);
 }
diff --git a/src/main/java/com/gamsa/activity/repository/ActivityCustomRepositoryImpl.java b/src/main/java/com/gamsa/activity/repository/ActivityCustomRepositoryImpl.java
@@ -3,14 +3,19 @@
 import static com.gamsa.activity.entity.QActivityJpaEntity.activityJpaEntity;
 
 import com.gamsa.activity.dto.ActivityFilterRequest;
+import com.gamsa.activity.dto.ActivityFindDistanceOrderRequest;
 import com.gamsa.activity.entity.ActivityJpaEntity;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Order;
 import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberTemplate;
 import com.querydsl.core.types.dsl.PathBuilder;
 import com.querydsl.jpa.impl.JPAQueryFactory;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
@@ -37,6 +42,45 @@ public Slice<ActivityJpaEntity> findSlice(ActivityFilterRequest request, Pageabl
         return checkLastPage(pageable, results);
     }
 
+    @Override
+    public Slice<ActivityJpaEntity> findSliceDistanceOrder(
+        ActivityFilterRequest filterRequest,
+        ActivityFindDistanceOrderRequest distanceOrderRequest,
+        Pageable pageable) {
+
+        final double EARTH_RADIUS_KM = 6371.0;      // 지구 반지름 (km)
+        final BigDecimal latitude = distanceOrderRequest.getLatitude();
+        final BigDecimal longitude = distanceOrderRequest.getLongitude();
+        final int distanceKm = distanceOrderRequest.getDistanceKm();
+
+        BooleanBuilder filterBuilder = ActivityFilterBuilder.createFilter(filterRequest);
+
+        // 하버사인 공식 구현
+        NumberTemplate<Double> distanceExpression = Expressions.numberTemplate(Double.class,
+            "({0} * acos(cos(radians({1})) * cos(radians({2})) * cos(radians({3}) - radians({4})) + sin(radians({1})) * sin(radians({2}))))",
+            EARTH_RADIUS_KM,
+            latitude,
+            activityJpaEntity.latitude,
+            longitude,
+            activityJpaEntity.longitude
+        );
+
+        List<ActivityJpaEntity> results = jpaQueryFactory
+            .select(activityJpaEntity, distanceExpression.as("distance"))
+            .from(activityJpaEntity)
+            .where(filterBuilder.and(distanceExpression.loe(distanceKm)))
+            .orderBy(distanceExpression.asc())
+            .orderBy(activityJpaEntity.actId.asc())
+            .offset(pageable.getOffset())
+            .limit(pageable.getPageSize() + 1)
+            .fetch()
+            .stream()
+            .map(v -> v.get(activityJpaEntity))
+            .collect(Collectors.toList());
+
+        return checkLastPage(pageable, results);
+    }
+
     // 무한스크롤 처리
     private Slice<ActivityJpaEntity> checkLastPage(Pageable pageable,
         List<ActivityJpaEntity> results) {

diff --git a/src/main/java/com/gamsa/activity/repository/ActivityRepository.java b/src/main/java/com/gamsa/activity/repository/ActivityRepository.java
@@ -2,6 +2,7 @@
 
 import com.gamsa.activity.domain.Activity;
 import com.gamsa.activity.dto.ActivityFilterRequest;
+import com.gamsa.activity.dto.ActivityFindDistanceOrderRequest;
 import java.util.Optional;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
@@ -10,7 +11,12 @@ public interface ActivityRepository {
 
     void save(Activity activity);
 
-    Slice<Activity> findSlice(ActivityFilterRequest request, Pageable pageable);
+    Slice<Activity> findSlice(ActivityFilterRequest filterRequest, Pageable pageable);
+
+    Slice<Activity> findSliceDistanceOrder(
+        ActivityFilterRequest filterRequest,
+        ActivityFindDistanceOrderRequest distanceOrderRequest,
+        Pageable pageable);
 
     Optional<Activity> findById(Long activityId);
 }
diff --git a/src/main/java/com/gamsa/activity/repository/ActivityRepositoryImpl.java b/src/main/java/com/gamsa/activity/repository/ActivityRepositoryImpl.java
@@ -2,6 +2,7 @@
 
 import com.gamsa.activity.domain.Activity;
 import com.gamsa.activity.dto.ActivityFilterRequest;
+import com.gamsa.activity.dto.ActivityFindDistanceOrderRequest;
 import com.gamsa.activity.entity.ActivityJpaEntity;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
@@ -26,6 +27,16 @@ public Slice<Activity> findSlice(ActivityFilterRequest request, Pageable pageabl
             .map(ActivityJpaEntity::toModel);
     }
 
+    @Override
+    public Slice<Activity> findSliceDistanceOrder(
+        ActivityFilterRequest filterRequest,
+        ActivityFindDistanceOrderRequest distanceOrderRequest,
+        Pageable pageable) {
+        return activityJpaRepository.findSliceDistanceOrder(filterRequest, distanceOrderRequest,
+                pageable)
+            .map(ActivityJpaEntity::toModel);
+    }
+
     @Override
     public Optional<Activity> findById(Long activityId) {
         return activityJpaRepository.findById(activityId)

diff --git a/src/main/java/com/gamsa/activity/service/ActivityService.java b/src/main/java/com/gamsa/activity/service/ActivityService.java
@@ -6,22 +6,23 @@
 import com.gamsa.activity.domain.Institute;
 import com.gamsa.activity.dto.ActivityDetailResponse;
 import com.gamsa.activity.dto.ActivityFilterRequest;
+import com.gamsa.activity.dto.ActivityFindDistanceOrderRequest;
 import com.gamsa.activity.dto.ActivityFindSliceResponse;
 import com.gamsa.activity.dto.ActivitySaveRequest;
 import com.gamsa.activity.exception.ActivityException;
 import com.gamsa.activity.repository.ActivityRepository;
 import com.gamsa.review.domain.Question;
+import com.gamsa.review.dto.QuestionResponse;
 import com.gamsa.review.service.QuestionService;
 import com.gamsa.review.service.ReviewService;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
-
 @RequiredArgsConstructor
 @Service
 public class ActivityService {
@@ -34,9 +35,19 @@ public void save(ActivitySaveRequest saveRequest, Institute institute, District
         activityRepository.save(saveRequest.toModel(institute, district));
     }
 
-    public Slice<ActivityFindSliceResponse> findSlice(ActivityFilterRequest request,
-                                                      Pageable pageable) {
-        Slice<Activity> activities = activityRepository.findSlice(request, pageable);
+    public Slice<ActivityFindSliceResponse> findSlice(ActivityFilterRequest filterRequest,
+        ActivityFindDistanceOrderRequest distanceOrderRequest,
+        Pageable pageable) {
+
+        Slice<Activity> activities;
+        // 가까운순 정렬
+        if (pageable.getSort().toString().contains("distance")) {
+            activities = activityRepository
+                .findSliceDistanceOrder(filterRequest, distanceOrderRequest, pageable);
+        } else {
+            activities = activityRepository.findSlice(filterRequest, pageable);
+        }
+
         return activities.map(ActivityFindSliceResponse::from);
     }