Merge pull request #85 from ConnectCo/feat/list-inquiry-api

[FIX] 이벤트, 쿠폰 조회 API 수정

Author: hig1002

src/main/java/com/connectCo/config/security/SecurityConstant.java

@@ -11,12 +11,11 @@ public class SecurityConstant {
     public static final String[] PUBLIC_URLS = {
         "/auth/login", "/auth/refresh",
         "/stores/*/detail", "/organizations/*/detail",
-        "/coupons/*/detail", "/coupons/store/*", "/coupons",
-        "/events/*/detail",
+        "/coupons/*/detail", "/coupons/store/*", "/coupons/list", "/coupons/search",
+        "/events/*/detail", "/events/organization/*", "/events/list", "/events/search",
         "/v3/**", "/swagger-ui/**",
         "/test/**",
         "/ws/**", "members/fcm-token",
-        "/events/search", "/coupons/search"
     };
 
     // 로그인 필요 API

src/main/java/com/connectCo/domain/coupon/controller/CouponController.java

@@ -132,7 +132,7 @@ public BaseResponse<CouponPagingResponse<CouponSummaryInquiryResponse>> inquiryC
     }
 
     @Operation(summary = "쿠폰 목록 조회 API", description = "비로그인 시도 가능(비로그인 시 현재 위치 기준)")
-    @GetMapping
+    @GetMapping("/list")
     @Parameters(value = {
         @Parameter(name = "type", description = "쿠폰 조회 타입(생성순, 거리순, 신청마감일 임박순)"),
         @Parameter(name = "latitude", description = "위도, 비로그인 시 필수"),

src/main/java/com/connectCo/domain/coupon/dto/response/CouponSummaryInquiryResponse.java

@@ -23,4 +23,10 @@ public class CouponSummaryInquiryResponse {
 
     @Schema(description = "쿠폰 썸네일 URL", example = "thumbnail-url")
     private String thumbnail;
+
+    @Schema(description = "위도", example = "36.123")
+    private Double latitude;
+
+    @Schema(description = "경도", example = "127.111")
+    private Double longitude;
 }

src/main/java/com/connectCo/domain/coupon/mapper/CouponMapper.java

@@ -1,5 +1,6 @@
 package com.connectCo.domain.coupon.mapper;
 
+import com.connectCo.domain.address.entity.Address;
 import com.connectCo.domain.coupon.dto.request.CouponCreateRequest;
 import com.connectCo.domain.coupon.dto.response.CouponDetailInquiryResponse;
 import com.connectCo.domain.coupon.dto.response.CouponPagingResponse;
@@ -12,6 +13,8 @@
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Component;
 
+import java.util.Optional;
+
 @Component
 public class CouponMapper {
 
@@ -59,12 +62,16 @@ public CouponSummaryInquiryResponse toCouponSummaryInquiryResponse(Coupon coupon
                 .map(CouponImage::getUrl)
                 .orElse(null);
 
+        Address address = coupon.getStore().getAddress();
+
         return CouponSummaryInquiryResponse.builder()
                 .id(coupon.getId())
                 .name(coupon.getStore().getName())
                 .title(coupon.getName())
                 .expiredAt(coupon.getExpiredAt())
                 .thumbnail(thumbnail)
+                .latitude(Optional.ofNullable(address).map(Address::getLatitude).orElse(null))
+                .longitude(Optional.ofNullable(address).map(Address::getLongitude).orElse(null))
                 .build();
     }
 

src/main/java/com/connectCo/domain/event/controller/EventController.java

@@ -136,7 +136,7 @@ public BaseResponse<EventPagingResponse<EventSummaryInquiryResponse>> inquiryEve
         @Parameter(name = "page", description = "페이지 번호(0부터 시작)"),
         @Parameter(name = "size", description = "한 페이지 당 이벤트 개수"),
     })
-    @GetMapping
+    @GetMapping("/list")
     public BaseResponse<EventPagingResponse<EventSummaryInquiryResponse>> inquiryEvents(
         @AuthenticationPrincipal PrincipalDetails principal,
         @RequestParam EventSearchType type,

src/main/java/com/connectCo/domain/event/dto/response/EventLocationInquiryResponse.java

@@ -24,4 +24,9 @@ public class EventSummaryInquiryResponse {
     @Schema(description = "이벤트 썸네일 URL", example = "thumbnail-url")
     private String thumbnail;
 
+    @Schema(description = "위도", example = "36.123")
+    private Double latitude;
+
+    @Schema(description = "경도", example = "127.111")
+    private Double longitude;
 }

src/main/java/com/connectCo/domain/event/dto/response/EventSummaryInquiryResponse.java

@@ -1,11 +1,9 @@
 package com.connectCo.domain.event.mapper;
 
 import com.connectCo.domain.event.entity.EventLike;
-import com.connectCo.domain.member.entity.Member;
 import com.connectCo.domain.address.entity.Address;
 import com.connectCo.domain.event.dto.request.EventCreateRequest;
 import com.connectCo.domain.event.dto.response.EventDetailInquiryResponse;
-import com.connectCo.domain.event.dto.response.EventLocationInquiryResponse;
 import com.connectCo.domain.event.dto.response.EventPagingResponse;
 import com.connectCo.domain.event.dto.response.EventSummaryInquiryResponse;
 import com.connectCo.domain.event.entity.Event;
@@ -100,22 +98,8 @@ public EventSummaryInquiryResponse toEventSummaryInquiryResponse(Event event) {
             .title(event.getName())
             .expiredAt(event.getExpiredAt())
             .thumbnail(event.getThumbnail())
-            .build();
-    }
-
-    public EventLocationInquiryResponse toEventLocationInquiryResponse(Object[] eventWithDistance) {
-        Event event = (Event) eventWithDistance[0];
-        Double distance = (Double) eventWithDistance[1];
-        return EventLocationInquiryResponse.builder()
-            .eventId(event.getId())
-            .organizationName(event.getOrganization().getName())
-            .name(event.getName())
-            .startAt(event.getStartAt())
-            .endAt(event.getEndAt())
-            .thumbnail(event.getThumbnail())
             .latitude(event.getAddress().getLatitude())
             .longitude(event.getAddress().getLongitude())
-            .distance(distance)
             .build();
     }