Feat: 검색어 교정 response 타입 변경

potenday-23 · Jun 2, 2024 · 6600972 · 6600972
1 parent d66b0e7
commit 6600972
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/src/main/java/project/backend/domain/culturalevent/controller/CulturalEventController.java b/src/main/java/project/backend/domain/culturalevent/controller/CulturalEventController.java
@@ -7,6 +7,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import project.backend.domain.culturalevent.dto.CulturalEventDetailListDto;
 import project.backend.domain.culturalevent.dto.CulturalEventListDto;
 import project.backend.domain.culturalevent.dto.CulturalEventRetrieveDto;
 import project.backend.domain.culturalevent.dto.CulturalEventSearchListDto;
@@ -47,7 +48,7 @@ public class CulturalEventController {
                     "`latitude` : 입력시 추천순 정렬에 반경 50km 이내 문화생활 적용\n" +
                     "`longitude` : 입력시 추천순 정렬에 반경 50km 이내 문화생활 적용")
     @GetMapping
-    public ResponseEntity getCulturalEventList(
+    public ResponseEntity<CulturalEventDetailListDto> getCulturalEventList(
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "10") int size,
             @RequestParam(required = false) String ordering,
@@ -65,15 +66,26 @@ public ResponseEntity getCulturalEventList(
             culturalEventSearchKeywordService.createCulturalEventSearchKeyword(member, keyword);
         }
 
-        // Get Cultural Event
-        List<CulturalEvent> culturalEventList = culturalEventService.getCulturalEventList(page, size, categories, ordering, isOpened, latitude, longitude, keyword);
+        // Get Cultural Event List Dto
+        List<CulturalEvent> culturalEventList = culturalEventService
+                .getCulturalEventList(page, size, categories, ordering, isOpened, latitude, longitude, keyword);
         List<CulturalEventListDto> culturalEventResponseDtoList = culturalEventMapper
                 .culturalEventToCulturalEventListDtos(culturalEventList);
         culturalEventResponseDtoList.forEach(dto -> {
             dto.setIsOpened();
             dto.setIsLiked(member);
         });
-        return ResponseEntity.status(HttpStatus.OK).body(culturalEventResponseDtoList);
+
+        // Get Cultural Event Detail List
+        CulturalEventDetailListDto culturalEventDetailListDto = CulturalEventDetailListDto
+                .builder()
+                .searchKeyword(keyword)
+                .resultKeyword(keyword)
+                .isKeywordSame(true)
+                .culturalEvents(culturalEventResponseDtoList)
+                .build();
+
+        return ResponseEntity.status(HttpStatus.OK).body(culturalEventDetailListDto);
     }
 
     @ApiOperation(value = "문화생활 검색 리스트 조회")

diff --git a/src/main/java/project/backend/domain/culturalevent/dto/CulturalEventDetailListDto.java b/src/main/java/project/backend/domain/culturalevent/dto/CulturalEventDetailListDto.java
@@ -0,0 +1,17 @@
+package project.backend.domain.culturalevent.dto;
+
+import lombok.*;
+
+import java.util.List;
+
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CulturalEventDetailListDto {
+    private String searchKeyword;
+    private String resultKeyword;
+    private Boolean isKeywordSame;
+    private List<CulturalEventListDto> culturalEvents;
+}