Merge pull request #38 from SW-DiffLens/feat#35

[FEAT#35] 기존 기능 버그 일부 수정

Author: ggamnunq

src/main/java/DiffLens/back_end/domain/members/controller/AuthController.java

@@ -59,7 +59,7 @@ public ApiResponse<AuthResponseDTO.LoginDto> localLogin(@RequestBody @Valid Auth
     }
 
     @PostMapping("/login/google")
-    @Operation(summary = "로그인 ( 구글 )",
+    @Operation(summary = "로그인 ( 구글 )", hidden = true,
                 description = """
                             
                             ## 개요

src/main/java/DiffLens/back_end/domain/panel/repository/PanelRepository.java

@@ -50,6 +50,41 @@ public interface PanelRepository extends JpaRepository<Panel, String> {
         """)
     List<PanelWithRawDataDTO> findPanelsWithRawDataByIds(@Param("ids") List<String> ids);
 
+    @Query("""
+    SELECT new DiffLens.back_end.domain.panel.repository.projection.PanelWithRawDataDTO(
+        p.id,
+        p.gender,
+        p.age,
+        p.ageGroup,
+        p.birthYear,
+        p.residence,
+        p.maritalStatus,
+        p.childrenCount,
+        p.familySize,
+        p.education,
+        p.occupation,
+        p.job,
+        p.personalIncome,
+        p.householdIncome,
+        p.electronicDevices,
+        p.phoneBrand,
+        p.phoneModel,
+        p.carOwnership,
+        p.carBrand,
+        p.carModel,
+        p.smokingExperience,
+        p.cigaretteBrands,
+        p.eCigarette,
+        p.drinkingExperience,
+        p.profileSummary,
+        p.hashTags,
+        p.rawData
+    )
+    FROM Panel p
+    WHERE p.id IN :ids
+    """)
+    Page<PanelWithRawDataDTO> findPanelsWithRawDataByIdsInPage(@Param("ids") List<String> ids, Pageable pageable);
+
     @Query(
             """
             SELECT p FROM Panel p

src/main/java/DiffLens/back_end/domain/search/controller/SearchController.java

@@ -22,17 +22,18 @@ public class SearchController {
     private final SearchHistoryService searchHistoryService;
 
     @PostMapping
-    @Operation(summary = "자연어 검색 ( 부분개발, 테스트 전 )",
+    @Operation(summary = "자연어 검색 ( ai 연동 전 )",
                 description = """
 
                 ## 개요
                 자연어 검색 API 입니다.
                 
                 ## request body
                 - 검색 모드와 필터 항목들은 노션에 정리하여 올리겠습니다.
+                - 필터에는 Filter Code 를 넣어주세요. ex) 101, 203, 305 ...
                 
                 ## 응답
-                검색 결과에 개별응답은 포함하지 않았습니다. 개별 API를 조회해야 합니다.
+                검색 결과에 개별응답은 포함하지 않았습니다. 개별 응답 데이터 API를 조회해야 합니다.
 
                 """)
     public ApiResponse<SearchResponseDTO.SearchResult> naturalLanguage(@RequestBody @Valid SearchRequestDTO.NaturalLanguage request) {
@@ -41,14 +42,14 @@ public ApiResponse<SearchResponseDTO.SearchResult> naturalLanguage(@RequestBody
     }
 
     @PostMapping("/refine")
-    @Operation(summary = "기존 검색 결과 기반 재검색 ( 미구현 )")
+    @Operation(summary = "기존 검색 결과 기반 재검색 ( 미구현 )", description = "아직 구현 전이지만 아마 자연어 검색과 같은 형태로 반환될 듯 싶습니다.")
     public ApiResponse<SearchResponseDTO.SearchResult> refine(@RequestBody @Valid SearchRequestDTO.ExistingSearchResult request) {
         SearchResponseDTO.SearchResult result = new SearchResponseDTO.SearchResult(); // 임시 result
         return ApiResponse.onSuccess(result);
     }
 
     @GetMapping("/{searchId}/each-responses")
-    @Operation(summary = "개별 응답 데이터 ( 테스트 전 )",
+    @Operation(summary = "개별 응답 데이터 ( 완료 )",
                 description = """
                 
                 ## 개요
@@ -70,7 +71,7 @@ public ApiResponse<SearchResponseDTO.EachResponses> eachResponses(@PathVariable(
     }
 
     @GetMapping("/recommended")
-    @Operation(summary = "맞춤 검색 추천 ( 미구현 )")
+    @Operation(summary = "맞춤 검색 추천 ( 미구현 )", description = "요청 형태 확정 후 구현하겠습니다.")
     public ApiResponse<Void> refine(@RequestBody @Valid SearchRequestDTO.SearchFilters request) {
         return ApiResponse.onSuccess(null);
     }

src/main/java/DiffLens/back_end/domain/search/dto/SearchRequestDTO.java

@@ -19,7 +19,7 @@ public static class NaturalLanguage{
         @NotNull
         private QuestionMode mode;
         @NotNull
-        private SearchFilters filters;
+        private List<Long> filters;
     }
 
     // 기존 검색 결과 기반 재검색
@@ -38,8 +38,8 @@ public static class ExistingSearchResult{
     @Getter
     @Setter
     public static class SearchFilters{
-        private Integer count;
-        private String gender;
+//        private Integer count;
+//        private String gender;
         private List<Long> filters; // age_group:TWENTY
 //        private Respondent respondent;
 //        @JsonProperty(value = "age_group")

src/main/java/DiffLens/back_end/domain/search/dto/SearchResponseDTO.java

@@ -1,7 +1,6 @@
 package DiffLens.back_end.domain.search.dto;
 
-import DiffLens.back_end.domain.panel.entity.Panel;
-import DiffLens.back_end.domain.rawData.dto.PanelDTO;
+import DiffLens.back_end.domain.panel.repository.projection.PanelWithRawDataDTO;
 import DiffLens.back_end.global.dto.ResponsePageDTO;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
@@ -96,13 +95,13 @@ public static class ResponseValues{
         @JsonProperty("concordance_rate")
         private String concordanceRate; // 일치율
 
-        public static ResponseValues fromPanelDTO(Panel panel, String concordanceRate) {
+        public static ResponseValues fromPanelDTO(PanelWithRawDataDTO panel, String concordanceRate) {
             return ResponseValues.builder()
                     .respondentId(panel.getId())
                     .gender(panel.getGender().getDisplayValue())
-                    .age("TODO : 나이 넣기") // TODO : Panel에 나이 생기면 넣기
+                    .age(panel.getAge() != null ? panel.getAge().toString() : null)
                     .residence(panel.getResidence())
-                    .personalIncome("TODO : 개인소득 넣기") // TODO : Panel에 개인소득 생기면 넣기
+                    .personalIncome(panel.getPersonalIncome())
                     .concordanceRate(concordanceRate)
                     .build();
         }

src/main/java/DiffLens/back_end/domain/search/enums/filters/Gender.java

@@ -11,7 +11,7 @@ public enum Gender {
 
     MALE(1L, "남성", "남성"),
     FEMALE(2L, "여성", "여성"),
-    NONE(3L, "알수없음", null)
+    NONE(3L, "기타", null)
 
     ;
 

src/main/java/DiffLens/back_end/domain/search/enums/filters/MartialStatus.java

@@ -13,7 +13,7 @@ public enum MartialStatus {
     MARRIED(2L, "기혼", "기혼"),
     DIVORCE(3L, "이혼", "이혼"),
     DEATH(4L, "사별", "사별"),
-    NONE(5L, "알수없음", null)
+    NONE(5L, "기타", null)
 
     ;
 

src/main/java/DiffLens/back_end/domain/search/service/implement/NaturalSearchService.java

@@ -55,7 +55,7 @@ public SearchResponseDTO.SearchResult search(SearchRequestDTO.NaturalLanguage re
                 FastPanelRequestDTO.FastNaturalSearch.builder()
                         .question(request.getQuestion())
                         .mode(request.getMode().getKr())
-                        .filters(new FastPanelRequestDTO.FastNaturalSearch.FastSearchFilters())
+                        .filters(new FastPanelRequestDTO.FastSearchFilters())
                         .build()
         );
 //        FastNaturalSearchResponseDTO.SearchResult response = new FastNaturalSearchResponseDTO.SearchResult();

src/main/java/DiffLens/back_end/domain/search/service/implement/SearchHistoryServiceImpl.java

@@ -1,7 +1,7 @@
 package DiffLens.back_end.domain.search.service.implement;
 
+import DiffLens.back_end.domain.panel.repository.projection.PanelWithRawDataDTO;
 import DiffLens.back_end.global.fastapi.dto.response.FastNaturalSearchResponseDTO;
-import DiffLens.back_end.domain.panel.entity.Panel;
 import DiffLens.back_end.domain.rawData.service.RawDataService;
 import DiffLens.back_end.domain.search.dto.SearchRequestDTO;
 import DiffLens.back_end.domain.search.dto.SearchResponseDTO;
@@ -34,7 +34,7 @@ public class SearchHistoryServiceImpl implements SearchHistoryService {
     private final RawDataService rawDataService;
     private final FilterService filterService;
 
-    private final List<String> keys = List.of("응답자ID", "성별", "나이", "거주지", "월소득", "일치율");
+    private final List<String> keys = List.of("응답자ID-respondent_id", "성별-gender", "나이-age", "거주지-residence", "월소득-personal_income", "일치율-concordance_rate");
 
     @Override
     public SearchHistory makeSearchHistory(SearchRequestDTO.NaturalLanguage request, FastNaturalSearchResponseDTO.SearchResult fastApiResponse) {
@@ -51,7 +51,7 @@ public SearchHistory makeSearchHistory(SearchRequestDTO.NaturalLanguage request,
         );
 
         // SearchFilter 생성
-        SearchFilter searchFilter = filterService.makeFilter(request.getFilters().getFilters(), searchHistory);
+        SearchFilter searchFilter = filterService.makeFilter(request.getFilters(), searchHistory);
         // SearchHistory의 Filter를 지정
         searchHistory.setFilter(searchFilter);
 
@@ -92,7 +92,7 @@ public SearchResponseDTO.EachResponses getEachResponses(Long searchHistoryId, In
         Pageable pageable = PageRequest.of(pageNum - 1, size);
 
         // PanelId 목록을 이용해서 Panel 조회
-        Page<Panel> panelDtoList = searchPanelService.getPanelDtoList(panelIds, pageable);
+        Page<PanelWithRawDataDTO> panelDtoList = searchPanelService.getPanelDtoList(panelIds, pageable);
 
         // 페이지 범위 초과 검사 추가
         if (pageNum > panelDtoList.getTotalPages() && panelDtoList.getTotalPages() > 0) {

src/main/java/DiffLens/back_end/domain/search/service/implement/SearchPanelServiceImpl.java

@@ -1,7 +1,7 @@
 package DiffLens.back_end.domain.search.service.implement;
 
-import DiffLens.back_end.domain.panel.entity.Panel;
 import DiffLens.back_end.domain.panel.repository.PanelRepository;
+import DiffLens.back_end.domain.panel.repository.projection.PanelWithRawDataDTO;
 import DiffLens.back_end.domain.search.service.interfaces.SearchPanelService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -17,8 +17,8 @@ public class SearchPanelServiceImpl implements SearchPanelService {
     private final PanelRepository panelRepository;
 
     @Override
-    public Page<Panel> getPanelDtoList(List<String> panelIds, Pageable pageable) {
-        return panelRepository.findByIdIn(panelIds, pageable);
+    public Page<PanelWithRawDataDTO> getPanelDtoList(List<String> panelIds, Pageable pageable) {
+        return panelRepository.findPanelsWithRawDataByIdsInPage(panelIds, pageable);
     }
 
 }