Merge pull request #114 from dnd-side-project/develop

[main <- develop]
dnd-side-project · Feb 14, 2024 · f34af1b · f34af1b
2 parents 9a92801 + 9fb31d9
commit f34af1b
Show file tree

Hide file tree

Showing 13 changed files with 94 additions and 135 deletions.
diff --git a/.gitignore b/.gitignore
@@ -201,4 +201,6 @@ gradle-app.setting
 # Java heap dump
 *.hprof
 
-# End of https://www.toptal.com/developers/gitignore/api/intellij+all,macos,windows,gradle,java
+# End of https://www.toptal.com/developers/gitignore/api/intellij+all,macos,windows,gradle,java
+
+src/main/resources/data.sql
diff --git a/src/main/java/com/dnd/reetplace/app/controller/BookmarkController.java b/src/main/java/com/dnd/reetplace/app/controller/BookmarkController.java
@@ -76,15 +76,7 @@ public BookmarkTypeInformationResponse getBookmarkTypeInformation(
     @GetMapping
     public ResponseEntity<Slice<BookmarkResponse>> searchBookmarks(
             @Parameter(hidden = true) @AuthenticationPrincipal MemberDetails memberDetails,
-            @Parameter(
-                    description = "<p>북마크 검색 종류. 목록은 다음과 같음</p>" +
-                                  "<ul>" +
-                                  "<li>ALL - 전체 조회</li>" +
-                                  "<li>WANT - 가보고 싶어요</li>" +
-                                  "<li>GONE - 다녀왔어요</li>" +
-                                  "</ul>",
-                    example = "ALL"
-            ) @RequestParam BookmarkSearchType searchType,
+            @Parameter(description = "조회할 북마크 종류") @RequestParam BookmarkSearchType searchType,
             @Parameter(
                     description = "페이지 번호 (0부터 시작합니다). 기본값은 0입니다.",
                     example = "0"
@@ -100,7 +92,7 @@ public ResponseEntity<Slice<BookmarkResponse>> searchBookmarks(
                                   "<li>LATEST - 최신순</li>" +
                                   "<li>POPULARITY - 인기순</li>" +
                                   "</ul>",
-                    example = "ALL"
+                    example = "LATEST"
             )
             @RequestParam(required = false, defaultValue = "LATEST") BookmarkSearchSort sort
     ) {
@@ -125,17 +117,7 @@ public ResponseEntity<Slice<BookmarkResponse>> searchBookmarks(
     @GetMapping("/all/summaries")
     public List<BookmarkResponse> searchAllBookmarkSummaries(
             @Parameter(hidden = true) @AuthenticationPrincipal MemberDetails memberDetails,
-            @Parameter(
-                    description = """
-                            <p>북마크 검색 종류. 목록은 다음과 같음</p>
-                            <ul>
-                                <li>ALL - 전체 조회</li>
-                                <li>WANT - 가보고 싶어요</li>
-                                <li>GONE - 다녀왔어요</li>
-                            </ul>
-                            """,
-                    example = "ALL"
-            ) @RequestParam BookmarkSearchType searchType
+            @Parameter(description = "검색할 북마크 종류") @RequestParam BookmarkSearchType searchType
     ) {
         List<BookmarkDto> bookmarkDtos = bookmarkService.searchAllBookmarks(memberDetails.getId(), searchType);
         return bookmarkDtos.stream()

diff --git a/src/main/java/com/dnd/reetplace/app/domain/Search.java b/src/main/java/com/dnd/reetplace/app/domain/Search.java
@@ -22,7 +22,7 @@ public class Search extends BaseTimeEntity {
     @Column(name = "search_id")
     private Long id;
 
-    @Column(nullable = false)
+    @Column(nullable = false, unique = true)
     private String query;
 
     @ManyToOne(fetch = FetchType.LAZY)
@@ -36,4 +36,8 @@ private Search(String query, Member member) {
         this.query = query;
         this.member = member;
     }
+
+    public void modifyUpdateAt() {
+        this.updatedAt = LocalDateTime.now();
+    }
 }
diff --git a/src/main/java/com/dnd/reetplace/app/dto/bookmark/request/BookmarkCreateRequest.java b/src/main/java/com/dnd/reetplace/app/dto/bookmark/request/BookmarkCreateRequest.java
@@ -22,12 +22,7 @@ public class BookmarkCreateRequest {
     @Schema(description = "장소 정보")
     private PlaceRequest place;
 
-    @Schema(description = "<p>북마크 종류. 목록은 다음과 같음</p>" +
-                          "<ul>" +
-                          "<li>WANT - 가보고 싶어요</li>" +
-                          "<li>GONE - 다녀왔어요</li>" +
-                          "</ul>",
-            example = "WANT")
+    @Schema(description = "북마크 종류")
     @NotNull
     private BookmarkType type;
 

diff --git a/src/main/java/com/dnd/reetplace/app/dto/bookmark/request/BookmarkUpdateRequest.java b/src/main/java/com/dnd/reetplace/app/dto/bookmark/request/BookmarkUpdateRequest.java
@@ -13,12 +13,7 @@
 @Getter
 public class BookmarkUpdateRequest {
 
-    @Schema(description = "<p>북마크 종류. 목록은 다음과 같음</p>" +
-            "<ul>" +
-            "<li>WANT - 가보고 싶어요</li>" +
-            "<li>GONE - 다녀왔어요</li>" +
-            "</ul>",
-            example = "WANT")
+    @Schema(description = "북마크 종류")
     @NotNull
     private BookmarkType type;
 

diff --git a/src/main/java/com/dnd/reetplace/app/dto/bookmark/response/BookmarkResponse.java b/src/main/java/com/dnd/reetplace/app/dto/bookmark/response/BookmarkResponse.java
@@ -23,14 +23,7 @@ public class BookmarkResponse {
     @Schema(description = "북마크 한 장소 정보")
     private PlaceResponse place;
 
-    @Schema(description = """
-            <p>북마크 종류. 목록은 다음과 같음</p>
-            <ul>
-            <li>WANT - 가보고 싶어요</li>
-            <li>GONE - 다녀왔어요</li>
-            </ul>
-            """,
-            example = "WANT")
+    @Schema(description = "북마크 종류")
     private BookmarkType type;
 
     @Schema(description = "썸네일 이미지 url", example = "https://t1.daumcdn.net/place/75B5CF9ACCF84162A7E13CB1FD4D5D43")

diff --git a/src/main/java/com/dnd/reetplace/app/dto/bookmark/response/BookmarkSummaryResponse.java b/src/main/java/com/dnd/reetplace/app/dto/bookmark/response/BookmarkSummaryResponse.java
@@ -18,14 +18,7 @@ public class BookmarkSummaryResponse {
     @Schema(description = "북마크 한 장소 정보")
     private PlaceSummaryResponse place;
 
-    @Schema(description = """
-            <p>북마크 종류. 목록은 다음과 같음</p>
-            <ul>
-                <li>WANT - 가보고 싶어요</li>
-                <li>GONE - 다녀왔어요</li>
-            </ul>
-            """,
-            example = "WANT")
+    @Schema(description = "북마크 종류")
     private BookmarkType type;
 
     public static BookmarkSummaryResponse from(BookmarkDto bookmarkDto) {

diff --git a/src/main/java/com/dnd/reetplace/app/dto/place/response/PlaceGetResponse.java b/src/main/java/com/dnd/reetplace/app/dto/place/response/PlaceGetResponse.java
@@ -121,13 +121,7 @@ public class PlaceGetResponse {
     @Schema(description = "경도", example = "126.93713158887188")
     private String lng;
 
-    @Schema(description = "<p>북마크 종류. 목록은 다음과 같음</p>" +
-            "<ul>" +
-            "<li>WANT - 가보고 싶어요</li>" +
-            "<li>GONE - 다녀왔어요</li>" +
-            "<li>북마크가 없을 시 null</li>" +
-            "</ul>",
-            example = "WANT")
+    @Schema(description = "북마크 종류")
     private BookmarkType type;
 
     @Schema(description = "북마크 고유 id값 (북마크 없을 시 null)", example = "1")

diff --git a/src/main/java/com/dnd/reetplace/app/dto/place/response/PlaceSearchResponse.java b/src/main/java/com/dnd/reetplace/app/dto/place/response/PlaceSearchResponse.java
@@ -28,83 +28,83 @@ public class PlaceSearchResponse {
     private String thumbnailImage;
 
     @Schema(description = "<p>카테고리 그룹 코드. 목록은 다음과 같음</p>" +
-            "<ul>" +
-            "<li>MT1 - 대형마트</li>" +
-            "<li>CS2 - 편의점</li>" +
-            "<li>PS3 - 어린이집, 유치원</li>" +
-            "<li>SC4 - 학교</li>" +
-            "<li>AC5 - 학원</li>" +
-            "<li>PK6 - 주차장</li>" +
-            "<li>OL7 - 주유소, 충전소</li>" +
-            "<li>SW8 - 지하철역</li>" +
-            "<li>BK9 - 은행</li>" +
-            "<li>CT1 - 문화시설</li>" +
-            "<li>AG2 - 중개업소</li>" +
-            "<li>PO3 - 공공기관</li>" +
-            "<li>AT4 - 관광명소</li>" +
-            "<li>AD5 - 숙박</li>" +
-            "<li>FD6 - 음식점</li>" +
-            "<li>CE7 - 카페</li>" +
-            "<li>HP8 - 병원</li>" +
-            "<li>PM9 - 약국</li>" +
-            "</ul>",
+                          "<ul>" +
+                          "<li>MT1 - 대형마트</li>" +
+                          "<li>CS2 - 편의점</li>" +
+                          "<li>PS3 - 어린이집, 유치원</li>" +
+                          "<li>SC4 - 학교</li>" +
+                          "<li>AC5 - 학원</li>" +
+                          "<li>PK6 - 주차장</li>" +
+                          "<li>OL7 - 주유소, 충전소</li>" +
+                          "<li>SW8 - 지하철역</li>" +
+                          "<li>BK9 - 은행</li>" +
+                          "<li>CT1 - 문화시설</li>" +
+                          "<li>AG2 - 중개업소</li>" +
+                          "<li>PO3 - 공공기관</li>" +
+                          "<li>AT4 - 관광명소</li>" +
+                          "<li>AD5 - 숙박</li>" +
+                          "<li>FD6 - 음식점</li>" +
+                          "<li>CE7 - 카페</li>" +
+                          "<li>HP8 - 병원</li>" +
+                          "<li>PM9 - 약국</li>" +
+                          "</ul>",
             example = "CE7")
     private PlaceCategoryGroupCode categoryGroupCode;
 
     @Schema(description = "카카오 내 카테고리 분류", example = "가정,생활 > 문구,사무용품")
     private String kakaoCategoryName;
 
     @Schema(description = "<p>카테고리. 목록은 다음과 같음</p>" +
-            "<ul>" +
-            "<li>FOOD - 식도락</li>" +
-            "<li>ACTIVITY - 액티비티</li>" +
-            "<li>PHOTO_BOOTH - 포토부스</li>" +
-            "<li>SHOPPING - 쇼핑</li>" +
-            "<li>CAFE - 카페</li>" +
-            "<li>CULTURE - 문화생활</li>" +
-            "</ul>",
+                          "<ul>" +
+                          "<li>FOOD - 식도락</li>" +
+                          "<li>ACTIVITY - 액티비티</li>" +
+                          "<li>PHOTO_BOOTH - 포토부스</li>" +
+                          "<li>SHOPPING - 쇼핑</li>" +
+                          "<li>CAFE - 카페</li>" +
+                          "<li>CULTURE - 문화생활</li>" +
+                          "</ul>",
             example = "ACTIVITY")
     private PlaceCategory category;
 
     @Schema(description = "<p>하위 카테고리. 목록은 다음과 같음</p>" +
-            "<ul>" +
-            "<li>KOREAN - 한식</li>" +
-            "<li>CHINESE - 중식</li>" +
-            "<li>JAPANESE - 일식</li>" +
-            "<li>WESTERN - 양식</li>" +
-            "<li>WORLD - 세계음식(멕시칸, 브라질, 아시아음식)</li>" +
-            "<li>COOKING_BAR - 호프,요리주점</li>" +
-            "<li>IZAKAYA - 일본식주점</li>" +
-            "<li>STREET_TENT_RESTAURANT - 포장마차</li>" +
-            "<li>WINE_BAR - 와인바</li>" +
-            "<li>COCKTAIL_BAR - 칵테일바</li>" +
-            "<li>BOWLING - 볼링장</li>" +
-            "<li>PC - 피시방</li>" +
-            "<li>BILLIARDS - 당구장</li>" +
-            "<li>KARAOKE - 노래방</li>" +
-            "<li>BOARD_GAME - 보드카페</li>" +
-            "<li>PARK - 공원</li>" +
-            "<li>ROLLER - 롤러장</li>" +
-            "<li>COIN_KARAOKE - 코인노래방</li>" +
-            "<li>LIFE_FOUR_CUT - 인생네컷</li>" +
-            "<li>PHOTO_SIGNATURE - 포토시그니처</li>" +
-            "<li>HARU_FILM - 하루필름</li>" +
-            "<li>SIHYUN_HADA - 시현하다 프레임</li>" +
-            "<li>MONO_MANSION - 모노맨션</li>" +
-            "<li>RGB_PHOTO - RGB 포토</li>" +
-            "<li>PHOTOISM - 포토이즘</li>" +
-            "<li>DEPARTMENT_STORE - 백화점</li>" +
-            "<li>MART - 마트</li>" +
-            "<li>MARKET - 시장</li>" +
-            "<li>CAFE - 카페</li>" +
-            "<li>BOOK - 북카페</li>" +
-            "<li>CARTOON - 만화카페</li>" +
-            "<li>DESERT - 디저트카페</li>" +
-            "<li>FRESH_FRUIT - 생과일전문점</li>" +
-            "<li>CINEMA - 영화관</li>" +
-            "<li>CAR_CINEMA - 자동차극장</li>" +
-            "<li>CONCERT - 공연장,연극극장</li>" +
-            "</ul>",
+                          "<ul>" +
+                          "<li>KOREAN - 한식</li>" +
+                          "<li>CHINESE - 중식</li>" +
+                          "<li>JAPANESE - 일식</li>" +
+                          "<li>WESTERN - 양식</li>" +
+                          "<li>WORLD - 세계음식(멕시칸, 브라질, 아시아음식)</li>" +
+                          "<li>COOKING_BAR - 호프,요리주점</li>" +
+                          "<li>IZAKAYA - 일본식주점</li>" +
+                          "<li>STREET_TENT_RESTAURANT - 포장마차</li>" +
+                          "<li>WINE_BAR - 와인바</li>" +
+                          "<li>COCKTAIL_BAR - 칵테일바</li>" +
+                          "<li>BOWLING - 볼링장</li>" +
+                          "<li>PC - 피시방</li>" +
+                          "<li>BILLIARDS - 당구장</li>" +
+                          "<li>KARAOKE - 노래방</li>" +
+                          "<li>BOARD_GAME - 보드카페</li>" +
+                          "<li>PARK - 공원</li>" +
+                          "<li>ROLLER - 롤러장</li>" +
+                          "<li>COIN_KARAOKE - 코인노래방</li>" +
+                          "<li>LIFE_FOUR_CUT - 인생네컷</li>" +
+                          "<li>PHOTO_SIGNATURE - 포토시그니처</li>" +
+                          "<li>HARU_FILM - 하루필름</li>" +
+                          "<li>SIHYUN_HADA - 시현하다 프레임</li>" +
+                          "<li>MONO_MANSION - 모노맨션</li>" +
+                          "<li>RGB_PHOTO - RGB 포토</li>" +
+                          "<li>PHOTOISM - 포토이즘</li>" +
+                          "<li>DEPARTMENT_STORE - 백화점</li>" +
+                          "<li>MART - 마트</li>" +
+                          "<li>MARKET - 시장</li>" +
+                          "<li>CAFE - 카페</li>" +
+                          "<li>BOOK - 북카페</li>" +
+                          "<li>CARTOON - 만화카페</li>" +
+                          "<li>DESERT - 디저트카페</li>" +
+                          "<li>FRESH_FRUIT - 생과일전문점</li>" +
+                          "<li>CINEMA - 영화관</li>" +
+                          "<li>CAR_CINEMA - 자동차극장</li>" +
+                          "<li>CONCERT - 공연장,연극극장</li>" +
+                          "</ul>",
             example = "ACTIVITY_BOARD_GAME")
     private PlaceSubCategory subCategory;
 
@@ -123,13 +123,7 @@ public class PlaceSearchResponse {
     @Schema(description = "경도", example = "126.93713158887188")
     private String lng;
 
-    @Schema(description = "<p>북마크 종류. 목록은 다음과 같음</p>" +
-            "<ul>" +
-            "<li>WANT - 가보고 싶어요</li>" +
-            "<li>GONE - 다녀왔어요</li>" +
-            "<li>북마크가 없을 시 null</li>" +
-            "</ul>",
-            example = "WANT")
+    @Schema(description = "북마크 종류")
     private BookmarkType type;
 
     @Schema(description = "북마크 고유 id값 (북마크 없을 시 null)", example = "1")

diff --git a/src/main/java/com/dnd/reetplace/app/dto/search/SearchDto.java b/src/main/java/com/dnd/reetplace/app/dto/search/SearchDto.java
@@ -18,7 +18,7 @@ public class SearchDto {
     private LocalDateTime createdAt;
 
     public static SearchDto from(Search entity) {
-        return of(MemberDto.from(entity.getMember()), entity.getId(), entity.getQuery(), entity.getCreatedAt());
+        return of(MemberDto.from(entity.getMember()), entity.getId(), entity.getQuery(), entity.getUpdatedAt());
     }
 
     public static SearchDto of(MemberDto member, Long id, String query, LocalDateTime createdAt) {

diff --git a/src/main/java/com/dnd/reetplace/app/repository/SearchRepository.java b/src/main/java/com/dnd/reetplace/app/repository/SearchRepository.java
@@ -13,7 +13,7 @@ public interface SearchRepository extends JpaRepository<Search, Long>, SearchRep
     @Query("select count(s.id) from Search s where s.member.id = :memberId and s.deletedAt is null")
     int countByMemberId(Long memberId);
 
-    @Query("select s from Search s join fetch s.member m where s.member.id = :memberId and s.deletedAt is null")
+    @Query("select s from Search s join fetch s.member m where s.member.id = :memberId and s.deletedAt is null order by s.updatedAt desc")
     List<Search> findByMemberIdAndDeletedAtIsNull(Long memberId);
 
     @Query("select s from Search s join fetch s.member m where s.id = :searchId and s.deletedAt is null")
@@ -22,4 +22,6 @@ public interface SearchRepository extends JpaRepository<Search, Long>, SearchRep
     @Modifying
     @Query("delete from Search s where s.member.id = :memberId and s.deletedAt is null")
     void deleteAllByMemberId(Long memberId);
+
+    Optional<Search> findByMemberIdAndQueryAndDeletedAtIsNull(Long memberId, String query);
 }
diff --git a/src/main/java/com/dnd/reetplace/app/service/PlaceService.java b/src/main/java/com/dnd/reetplace/app/service/PlaceService.java
@@ -89,7 +89,7 @@ public PlaceSearchListResponse searchPlace(HttpServletRequest httpServletRequest
         Member loginMember = findLoginMember(httpServletRequest);
         List<PlaceSearchResponse> placeSearchWithBookmark = this.updateSearchPlaceIsBookmark(loginMember, documents);
         if (loginMember != null) {
-            this.updateSearchHistory(loginMember, request.getQuery());
+            this.updateSearchHistory(loginMember, request.getQuery().trim());
         }
         return PlaceSearchListResponse.of(placeSearchWithBookmark, result.getMeta().getIsEnd());
     }
@@ -126,6 +126,11 @@ public void updateLikeCategory(Long memberId, LikeCategoryUpdateRequest request)
      * @param query
      */
     private void updateSearchHistory(Member loginMember, String query) {
+        Optional<Search> history = searchRepository.findByMemberIdAndQueryAndDeletedAtIsNull(loginMember.getId(), query);
+        if (history.isPresent()) {
+            history.get().modifyUpdateAt();
+            return;
+        }
         int searchHistoryCount = searchRepository.countByMemberId(loginMember.getId());
         // 검색기록 20개 초과 시 가장 오래된 검색기록 삭제
         if (searchHistoryCount >= SEARCH_HISTORY_MAX_COUNT) {

diff --git a/src/main/java/com/dnd/reetplace/app/type/BookmarkSearchType.java b/src/main/java/com/dnd/reetplace/app/type/BookmarkSearchType.java
@@ -4,7 +4,7 @@
 
 @Getter
 public enum BookmarkSearchType {
-    ALL, WANT, GONE;
+    ALL, WANT, DONE;
 
     public BookmarkType toBookmarkType() {
         return BookmarkType.valueOf(this.name());