반경 내 주차장 조회 기능 구현

src/main/java/com/example/parking/api/parking/ParkingController.java

@@ -2,10 +2,12 @@
 
 import com.example.parking.application.parking.ParkingService;
 import com.example.parking.application.parking.dto.ParkingLotsResponse;
+import com.example.parking.application.parking.dto.ParkingQueryRequest;
 import com.example.parking.application.parking.dto.ParkingSearchConditionRequest;
+import com.example.parking.config.argumentresolver.parking.ParkingMemberId;
+import com.example.parking.config.argumentresolver.parking.ParkingQuery;
 import com.example.parking.config.argumentresolver.parking.ParkingSearchCondition;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -18,10 +20,12 @@ public class ParkingController {
 
     @GetMapping("/parkings")
     public ResponseEntity<ParkingLotsResponse> find(
-            @ParkingSearchCondition ParkingSearchConditionRequest parkingSearchConditionRequest) {
-//        ParkingLotsResponse parkingLots = parkingService.findParkingLots(parkingQueryRequest,1L);
-//        return ResponseEntity.ok(parkingLots);
-//        @ParkingQuery ParkingQueryRequest parkingQueryRequest,
-        return ResponseEntity.status(HttpStatus.OK).build();
+            @ParkingQuery ParkingQueryRequest parkingQueryRequest,
+            @ParkingSearchCondition ParkingSearchConditionRequest parkingSearchConditionRequest,
+            @ParkingMemberId Long parkingMemberId
+    ) {
+        ParkingLotsResponse parkingLots = parkingService.findParkingLots(parkingQueryRequest,
+                parkingSearchConditionRequest, parkingMemberId);
+        return ResponseEntity.ok(parkingLots);
     }
 }

src/main/java/com/example/parking/application/parking/ParkingService.java

@@ -33,9 +33,9 @@ public class ParkingService {
 
     @Transactional(readOnly = true)
     public ParkingLotsResponse findParkingLots(ParkingQueryRequest parkingQueryRequest,
-                                               ParkingSearchConditionRequest parkingSearchConditionRequest) {
+                                               ParkingSearchConditionRequest parkingSearchConditionRequest,
+                                               Long memberId) {
         Location destination = Location.of(parkingQueryRequest.getLongitude(), parkingQueryRequest.getLatitude());
-        Long memberId = parkingSearchConditionRequest.getMemberId();
         FilterCondition filterCondition = toFilterCondition(parkingSearchConditionRequest);
 
         List<Favorite> favorites = findMemberFavorites(memberId);

src/main/java/com/example/parking/application/parking/dto/ParkingSearchConditionRequest.java

@@ -19,28 +19,25 @@ public class ParkingSearchConditionRequest {
     private final List<String> payTypes;
     private final Integer hours;
     private final String priority;
-    private final Long memberId;
 
     public ParkingSearchConditionRequest(List<String> operationTypes, List<String> parkingTypes, List<String> feeTypes,
-                                         List<String> payTypes, int hours, String priority, Long memberId) {
+                                         List<String> payTypes, int hours, String priority) {
         this.operationTypes = operationTypes;
         this.parkingTypes = parkingTypes;
         this.feeTypes = feeTypes;
         this.payTypes = payTypes;
         this.hours = hours;
         this.priority = priority;
-        this.memberId = memberId;
     }
 
-    public static ParkingSearchConditionRequest base(Long memberId) {
+    public static ParkingSearchConditionRequest base() {
         return new ParkingSearchConditionRequest(
                 OperationType.getAllValues(),
                 ParkingType.getAllValues(),
                 FeeType.getAllValues(),
                 PayType.getAllValues(),
                 BASE_HOURS,
-                RECOMMEND_ORDER_CONDITION,
-                memberId
+                RECOMMEND_ORDER_CONDITION
         );
     }
 }

src/main/java/com/example/parking/config/WebMvcConfig.java

@@ -1,6 +1,7 @@
 package com.example.parking.config;
 
 import com.example.parking.config.argumentresolver.AuthArgumentResolver;
+import com.example.parking.config.argumentresolver.parking.ParkingMemberIdArgumentResolver;
 import com.example.parking.config.argumentresolver.parking.ParkingQueryArgumentResolver;
 import com.example.parking.config.argumentresolver.parking.ParkingSearchConditionArgumentResolver;
 import com.example.parking.external.config.interceptor.AuthInterceptor;
@@ -19,6 +20,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
     private final AuthArgumentResolver authArgumentResolver;
     private final ParkingQueryArgumentResolver parkingQueryArgumentResolver;
     private final ParkingSearchConditionArgumentResolver parkingSearchConditionArgumentResolver;
+    private final ParkingMemberIdArgumentResolver parkingMemberIdArgumentResolver;
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
@@ -36,5 +38,6 @@ public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers)
         resolvers.add(authArgumentResolver);
         resolvers.add(parkingQueryArgumentResolver);
         resolvers.add(parkingSearchConditionArgumentResolver);
+        resolvers.add(parkingMemberIdArgumentResolver);
     }
 }

src/main/java/com/example/parking/config/argumentresolver/parking/ParkingMemberId.java

@@ -0,0 +1,11 @@
+package com.example.parking.config.argumentresolver.parking;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ParkingMemberId {
+}

src/main/java/com/example/parking/config/argumentresolver/parking/ParkingMemberIdArgumentResolver.java

@@ -0,0 +1,22 @@
+package com.example.parking.config.argumentresolver.parking;
+
+import org.springframework.core.MethodParameter;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+
+@Component
+public class ParkingMemberIdArgumentResolver implements HandlerMethodArgumentResolver {
+    @Override
+    public boolean supportsParameter(MethodParameter parameter) {
+        return parameter.hasParameterAnnotation(ParkingMemberId.class);
+    }
+
+    @Override
+    public Long resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
+                                NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
+        return Long.parseLong(webRequest.getParameter("JSESSIONID"));
+    }
+}

src/main/java/com/example/parking/config/argumentresolver/parking/ParkingSearchConditionArgumentResolver.java

@@ -28,10 +28,9 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m
         String[] payTypes = webRequest.getParameterValues("payTypes");
         Integer hours = Integer.parseInt(webRequest.getParameter("hours"));
         String priority = webRequest.getParameter("priority");
-        Long memberId = Long.parseLong(webRequest.getParameter("JSESSIONID"));
 
         if (containsNull(operationTypes, parkingTypes, feeTypes, payTypes, hours)) {
-            return ParkingSearchConditionRequest.base(memberId);
+            return ParkingSearchConditionRequest.base();
         }
 
         return new ParkingSearchConditionRequest(
@@ -40,8 +39,7 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m
                 toCollection(feeTypes),
                 toCollection(payTypes),
                 hours,
-                priority,
-                memberId
+                priority
         );
     }