[Academy 전반] 스케줄 중복 여부 확인 로직 수정 및 학원 데이터 무한스크롤 방식으로 수정

src/main/java/org/guzzing/studayserver/domain/academy/controller/AcademyController.java

@@ -1,18 +1,14 @@
 package org.guzzing.studayserver.domain.academy.controller;
 
 import jakarta.validation.Valid;
-import org.guzzing.studayserver.domain.academy.controller.dto.request.AcademiesByLocationRequest;
-import org.guzzing.studayserver.domain.academy.controller.dto.request.AcademiesByNameRequest;
-import org.guzzing.studayserver.domain.academy.controller.dto.request.AcademyFilterRequest;
-import org.guzzing.studayserver.domain.academy.controller.dto.response.AcademiesByLocationResponses;
-import org.guzzing.studayserver.domain.academy.controller.dto.response.AcademiesByNameResponses;
-import org.guzzing.studayserver.domain.academy.controller.dto.response.AcademyFilterResponses;
-import org.guzzing.studayserver.domain.academy.controller.dto.response.AcademyGetResponse;
-import org.guzzing.studayserver.domain.academy.controller.dto.response.LessonInfoToCreateDashboardResponses;
+import org.guzzing.studayserver.domain.academy.controller.dto.request.*;
+import org.guzzing.studayserver.domain.academy.controller.dto.response.*;
 import org.guzzing.studayserver.domain.academy.facade.AcademyFacade;
 import org.guzzing.studayserver.domain.academy.facade.dto.AcademiesByLocationFacadeResult;
+import org.guzzing.studayserver.domain.academy.facade.dto.AcademiesByLocationWithScrollFacadeResult;
 import org.guzzing.studayserver.domain.academy.service.AcademyService;
 import org.guzzing.studayserver.domain.academy.service.dto.result.AcademiesByNameResults;
+import org.guzzing.studayserver.domain.academy.service.dto.result.AcademiesFilterWithScrollResults;
 import org.guzzing.studayserver.domain.academy.service.dto.result.AcademyFilterResults;
 import org.guzzing.studayserver.domain.academy.service.dto.result.LessonInfoToCreateDashboardResults;
 import org.guzzing.studayserver.domain.auth.memberId.MemberId;
@@ -62,6 +58,20 @@ public ResponseEntity<AcademiesByLocationResponses> findByLocation(
                 .body(AcademiesByLocationResponses.from(response));
     }
 
+    @GetMapping(
+            path = "/complexes-scroll",
+            produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<AcademiesByLocationWithScrollResponses> findByLocationWithScroll(
+            @ModelAttribute @Valid AcademyByLocationWithScrollRequest request,
+            @MemberId Long memberId
+    ) {
+        AcademiesByLocationWithScrollFacadeResult response = academyFacade.findByLocationWithScroll(
+                AcademyByLocationWithScrollRequest.to(request, memberId));
+
+        return ResponseEntity.status(HttpStatus.OK)
+                .body(AcademiesByLocationWithScrollResponses.from(response));
+    }
+
     @GetMapping(
             path = "/search",
             produces = MediaType.APPLICATION_JSON_VALUE)
@@ -89,6 +99,20 @@ public ResponseEntity<AcademyFilterResponses> filterAcademies(
                 .body(AcademyFilterResponses.from(academyFilterResults));
     }
 
+    @GetMapping(
+            path = "/filter-scroll",
+            produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<AcademiesFilterWithScrollResponses> filterAcademies(
+            @ModelAttribute @Valid AcademyFilterWithScrollRequest request,
+            @MemberId Long memberId
+    ) {
+        AcademiesFilterWithScrollResults academiesFilterWithScrollResults = academyService.filterAcademies(
+                AcademyFilterWithScrollRequest.to(request), memberId);
+
+        return ResponseEntity.status(HttpStatus.OK)
+                .body(AcademiesFilterWithScrollResponses.from(academiesFilterWithScrollResults));
+    }
+
     @GetMapping(
             path = "/{academyId}/lessons",
             produces = MediaType.APPLICATION_JSON_VALUE

src/main/java/org/guzzing/studayserver/domain/academy/controller/dto/request/AcademyByLocationWithScrollRequest.java

@@ -0,0 +1,29 @@
+package org.guzzing.studayserver.domain.academy.controller.dto.request;
+
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.PositiveOrZero;
+import org.guzzing.studayserver.domain.academy.facade.dto.AcademiesByLocationWithScrollFacadeParam;
+
+public record AcademyByLocationWithScrollRequest(
+        @NotNull(message = "Latitude cannot be null")
+        @DecimalMin(value = "-90", message = "Invalid latitude")
+        Double lat,
+
+        @NotNull(message = "Longitude cannot be null")
+        @DecimalMin(value = "-180", message = "Invalid longitude")
+        Double lng,
+
+        @PositiveOrZero
+        int pageNumber
+) {
+
+    public static AcademiesByLocationWithScrollFacadeParam to(AcademyByLocationWithScrollRequest request, Long memberId) {
+        return new AcademiesByLocationWithScrollFacadeParam(
+                request.lat,
+                request.lng,
+                memberId,
+                request.pageNumber
+        );
+    }
+}

src/main/java/org/guzzing/studayserver/domain/academy/controller/dto/request/AcademyFilterWithScrollRequest.java

@@ -0,0 +1,64 @@
+package org.guzzing.studayserver.domain.academy.controller.dto.request;
+
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotNull;
+import org.guzzing.studayserver.domain.academy.controller.dto.validation.ValidCategoryName;
+import org.guzzing.studayserver.domain.academy.service.dto.param.AcademyFilterWithScrollParam;
+
+import java.util.List;
+
+public record AcademyFilterWithScrollRequest(
+        @NotNull(message = "Latitude cannot be null")
+        @DecimalMin(value = "33.0", message = "Invalid latitude")
+        @DecimalMax(value = "38.0", message = "Invalid latitude")
+        Double lat,
+
+        @NotNull(message = "Longitude cannot be null")
+        @DecimalMin(value = "125.0", message = "Invalid longitude")
+        @DecimalMax(value = "130.0", message = "Invalid longitude")
+        Double lng,
+
+        @ValidCategoryName
+        List<String> categories,
+
+        Long desiredMinAmount,
+
+        Long desiredMaxAmount,
+
+        int pageNumber
+) {
+
+    @AssertTrue(message = "최소 희망 금액이 최대 희망 금액보다 클 수 없습니다.")
+    private boolean isValidDesiredAmount() {
+        if (desiredMinAmount != null && desiredMaxAmount != null) {
+            return isPositiveAmount() && isBiggerThanMinAmount();
+        }
+        return true;
+    }
+
+    private boolean isPositiveAmount() {
+        return desiredMinAmount >= 0 && desiredMaxAmount >= 0;
+    }
+
+    private boolean isBiggerThanMinAmount() {
+        return desiredMaxAmount >= desiredMinAmount;
+    }
+
+    @AssertTrue(message = "pageNumber는 0보타 커야 합니다.")
+    private boolean isValidPageNumber() {
+        return pageNumber >= 0;
+    }
+
+    public static AcademyFilterWithScrollParam to(AcademyFilterWithScrollRequest request) {
+        return new AcademyFilterWithScrollParam(
+                request.lat,
+                request.lng,
+                request.categories(),
+                request.desiredMinAmount,
+                request.desiredMaxAmount,
+                request.pageNumber
+        );
+    }
+}

src/main/java/org/guzzing/studayserver/domain/academy/controller/dto/response/AcademiesByLocationWithScrollResponses.java

@@ -0,0 +1,57 @@
+package org.guzzing.studayserver.domain.academy.controller.dto.response;
+
+import org.guzzing.studayserver.domain.academy.facade.dto.AcademiesByLocationWithScrollFacadeResult;
+
+import java.util.List;
+
+public record AcademiesByLocationWithScrollResponses (
+        List<AcademyByLocationWithScrollResponse> academiesByLocationResponse,
+        String sido,
+        String sigungu,
+        String upmyeondong,
+        boolean hasNext
+) {
+
+    public static AcademiesByLocationWithScrollResponses from(AcademiesByLocationWithScrollFacadeResult academiesByLocationResult) {
+        return new AcademiesByLocationWithScrollResponses(
+                academiesByLocationResult.academiesByLocationResults()
+                        .stream()
+                        .map(academiesByLocationFacadeResult ->
+                                AcademyByLocationWithScrollResponse.from(
+                                academiesByLocationFacadeResult))
+                        .toList(),
+                academiesByLocationResult.sido(),
+                academiesByLocationResult.sigungu(),
+                academiesByLocationResult.upmyeondong(),
+                academiesByLocationResult.hasNext()
+        );
+    }
+
+    public record AcademyByLocationWithScrollResponse(
+            Long academyId,
+            String academyName,
+            String address,
+            String contact,
+            List<String> categories,
+            Double latitude,
+            Double longitude,
+            String shuttleAvailable,
+            boolean isLiked
+    ) {
+
+        public static AcademyByLocationWithScrollResponse from(
+                AcademiesByLocationWithScrollFacadeResult.AcademyByLocationWithScrollFacadeResult result) {
+            return new AcademyByLocationWithScrollResponse(
+                    result.academyId(),
+                    result.academyName(),
+                    result.address(),
+                    result.contact(),
+                    result.categories(),
+                    result.latitude(),
+                    result.longitude(),
+                    result.shuttleAvailable(),
+                    result.isLiked()
+            );
+        }
+    }
+}

src/main/java/org/guzzing/studayserver/domain/academy/controller/dto/response/AcademiesFilterWithScrollResponses.java

@@ -0,0 +1,48 @@
+package org.guzzing.studayserver.domain.academy.controller.dto.response;
+
+import org.guzzing.studayserver.domain.academy.service.dto.result.AcademiesFilterWithScrollResults;
+
+
+import java.util.List;
+
+public record AcademiesFilterWithScrollResponses (
+        List<AcademyFilterWithScrollResponse> AcademiesFilterWithScrollResponses,
+        boolean hasNext
+){
+    public static AcademiesFilterWithScrollResponses from (AcademiesFilterWithScrollResults academiesFilterWithScrollResults) {
+        return new AcademiesFilterWithScrollResponses(
+                academiesFilterWithScrollResults.academiesFilterWithScrollResults()
+                        .stream()
+                        .map(academyFilterWithScrollResult -> AcademyFilterWithScrollResponse.from(academyFilterWithScrollResult))
+                        .toList(),
+                academiesFilterWithScrollResults.hasNext()
+        );
+    }
+
+    public record AcademyFilterWithScrollResponse(
+            Long academyId,
+            String academyName,
+            String address,
+            String contact,
+            List<String> categories,
+            Double latitude,
+            Double longitude,
+            String shuttleAvailable,
+            boolean isLiked
+    ) {
+
+        public static AcademyFilterWithScrollResponse from(AcademiesFilterWithScrollResults.AcademyFilterWithScrollResult academyFilterWithScrollResult) {
+            return new AcademyFilterWithScrollResponse(
+                    academyFilterWithScrollResult.academyId(),
+                    academyFilterWithScrollResult.academyName(),
+                    academyFilterWithScrollResult.fullAddress(),
+                    academyFilterWithScrollResult.contact(),
+                    academyFilterWithScrollResult.categories(),
+                    academyFilterWithScrollResult.latitude(),
+                    academyFilterWithScrollResult.longitude(),
+                    academyFilterWithScrollResult.shuttleAvailable(),
+                    academyFilterWithScrollResult.isLiked()
+            );
+        }
+    }
+}

src/main/java/org/guzzing/studayserver/domain/academy/facade/AcademyFacade.java

@@ -2,8 +2,11 @@
 
 import org.guzzing.studayserver.domain.academy.facade.dto.AcademiesByLocationFacadeParam;
 import org.guzzing.studayserver.domain.academy.facade.dto.AcademiesByLocationFacadeResult;
+import org.guzzing.studayserver.domain.academy.facade.dto.AcademiesByLocationWithScrollFacadeParam;
+import org.guzzing.studayserver.domain.academy.facade.dto.AcademiesByLocationWithScrollFacadeResult;
 import org.guzzing.studayserver.domain.academy.service.AcademyService;
 import org.guzzing.studayserver.domain.academy.service.dto.result.AcademiesByLocationResults;
+import org.guzzing.studayserver.domain.academy.service.dto.result.AcademiesByLocationWithScrollResults;
 import org.guzzing.studayserver.domain.academy.util.GeometryUtil;
 import org.guzzing.studayserver.domain.region.service.RegionService;
 import org.guzzing.studayserver.domain.region.service.dto.location.RegionResult;
@@ -32,4 +35,17 @@ public AcademiesByLocationFacadeResult findByLocation(AcademiesByLocationFacadeP
         return AcademiesByLocationFacadeResult.from(academiesByLocation, regionContainingPoint);
     }
 
+
+    public AcademiesByLocationWithScrollFacadeResult findByLocationWithScroll(AcademiesByLocationWithScrollFacadeParam param) {
+        AcademiesByLocationWithScrollResults academiesByLocationWithScroll = academyService.findAcademiesByLocationWithScroll(
+                AcademiesByLocationWithScrollFacadeParam.to(param));
+
+        RegionResult regionContainingPoint = regionService.findRegionContainingPoint(
+                GeometryUtil.createPoint(
+                        param.lat(),
+                        param.lng()));
+
+        return AcademiesByLocationWithScrollFacadeResult.from(academiesByLocationWithScroll, regionContainingPoint);
+    }
+
 }

src/main/java/org/guzzing/studayserver/domain/academy/facade/dto/AcademiesByLocationWithScrollFacadeParam.java

@@ -0,0 +1,22 @@
+package org.guzzing.studayserver.domain.academy.facade.dto;
+
+import org.guzzing.studayserver.domain.academy.service.dto.param.AcademiesByLocationWithScrollParam;
+
+public record AcademiesByLocationWithScrollFacadeParam(
+        Double lat,
+        Double lng,
+        Long memberId,
+        int pageNumber
+
+) {
+
+    public static AcademiesByLocationWithScrollParam to(AcademiesByLocationWithScrollFacadeParam param) {
+        return new AcademiesByLocationWithScrollParam(
+                param.lat,
+                param.lng,
+                param.memberId,
+                param.pageNumber
+        );
+    }
+}
+

src/main/java/org/guzzing/studayserver/domain/academy/facade/dto/AcademiesByLocationWithScrollFacadeResult.java

@@ -0,0 +1,63 @@
+package org.guzzing.studayserver.domain.academy.facade.dto;
+
+import org.guzzing.studayserver.domain.academy.service.dto.result.AcademiesByLocationWithScrollResults;
+import org.guzzing.studayserver.domain.region.service.dto.location.RegionResult;
+import java.util.List;
+
+public record AcademiesByLocationWithScrollFacadeResult(
+        List<AcademyByLocationWithScrollFacadeResult> academiesByLocationResults,
+        String sido,
+        String sigungu,
+        String upmyeondong,
+        boolean hasNext
+) {
+
+    public static AcademiesByLocationWithScrollFacadeResult from(
+            AcademiesByLocationWithScrollResults academiesByLocationResults,
+            RegionResult regionResult) {
+        return new AcademiesByLocationWithScrollFacadeResult(
+                academiesByLocationResults
+                        .academiesByLocationResults()
+                        .stream()
+                        .map(academyByLocationResult ->
+                                AcademyByLocationWithScrollFacadeResult.from(academyByLocationResult))
+                        .toList(),
+                regionResult.sido(),
+                regionResult.sigungu(),
+                regionResult.upmyeondong(),
+                academiesByLocationResults.hasNext()
+        );
+    }
+
+    public record AcademyByLocationWithScrollFacadeResult(
+            Long academyId,
+            String academyName,
+            String address,
+            String contact,
+            List<String> categories,
+            Double latitude,
+            Double longitude,
+            String shuttleAvailable,
+            boolean isLiked
+    ) {
+
+        public static AcademyByLocationWithScrollFacadeResult from(
+                AcademiesByLocationWithScrollResults.AcademiesByLocationResultWithScroll result) {
+            return new AcademyByLocationWithScrollFacadeResult(
+                    result.academyId(),
+                    result.academyName(),
+                    result.address(),
+                    result.contact(),
+                    result.categories(),
+                    result.latitude(),
+                    result.longitude(),
+                    result.shuttleAvailable(),
+                    result.isLiked()
+            );
+        }
+
+    }
+}
+
+
+