Merge branch 'develop' into feat/PRODUCT-238

Author: leegwichan

src/main/java/eatda/client/map/MapClientStoreSearchResult.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import eatda.domain.store.Store;
+import eatda.domain.store.District;
 import eatda.domain.store.StoreCategory;
 import eatda.domain.store.StoreSearchResult;
 import java.util.Map;
@@ -29,6 +29,7 @@ public record MapClientStoreSearchResult(
             "음식점 > 카페", StoreCategory.CAFE,
             "음식점 > 간식 > 제과,베이커리", StoreCategory.CAFE
     );
+    private static final District DEFAULT_DISTRICT = District.ETC;
 
     public boolean isFoodStore() {
         return "FD6".equals(categoryGroupCode);
@@ -54,18 +55,15 @@ public StoreCategory getStoreCategory() {
                 .orElse(StoreCategory.OTHER);
     }
 
-    public Store toStore() {
-        return Store.builder()
-                .kakaoId(kakaoId)
-                .category(getStoreCategory())
-                .phoneNumber(phoneNumber)
-                .name(name)
-                .placeUrl(placeUrl)
-                .roadAddress(roadAddress)
-                .lotNumberAddress(lotNumberAddress)
-                .latitude(latitude)
-                .longitude(longitude)
-                .build();
+    public District getDistrict() {
+        if (lotNumberAddress == null || lotNumberAddress.isBlank()) {
+            return DEFAULT_DISTRICT;
+        }
+        String[] addressParts = lotNumberAddress.split(" ");
+        if (addressParts.length < 2) {
+            return DEFAULT_DISTRICT;
+        }
+        return District.fromName(addressParts[1]);
     }
 
     public StoreSearchResult toDomain() {
@@ -77,6 +75,7 @@ public StoreSearchResult toDomain() {
                 placeUrl,
                 lotNumberAddress,
                 roadAddress,
+                getDistrict(),
                 latitude,
                 longitude
         );

src/main/java/eatda/controller/article/ArticleController.java

@@ -11,11 +11,15 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-@Table(name = "cheer_tag")
+@Table(
+        name = "cheer_tag",
+        uniqueConstraints = @UniqueConstraint(name = "uk_cheer_tag_cheer_id_name", columnNames = {"cheer_id", "name"})
+)
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)

src/main/java/eatda/controller/article/ArticleResponse.java

@@ -5,28 +5,30 @@
 @Getter
 public enum CheerTagName {
 
-    OLD_STORE_MOOD(CheerTagCategory.MOOD),
-    ENERGETIC(CheerTagCategory.MOOD),
-    GOOD_FOR_DATING(CheerTagCategory.MOOD),
-    QUIET(CheerTagCategory.MOOD),
-    GOOD_FOR_DRINKING(CheerTagCategory.MOOD),
-    INSTAGRAMMABLE(CheerTagCategory.MOOD),
-    GOOD_FOR_FAMILY(CheerTagCategory.MOOD),
-    YOUTUBE_FAMOUS(CheerTagCategory.MOOD),
+    OLD_STORE_MOOD(CheerTagCategory.MOOD, "노포 감성"),
+    ENERGETIC(CheerTagCategory.MOOD, "활기찬"),
+    GOOD_FOR_DATING(CheerTagCategory.MOOD, "데이트하기좋은"),
+    QUIET(CheerTagCategory.MOOD, "조용한"),
+    GOOD_FOR_DRINKING(CheerTagCategory.MOOD, "술 땡기는"),
+    INSTAGRAMMABLE(CheerTagCategory.MOOD, "인스타 감성"),
+    GOOD_FOR_FAMILY(CheerTagCategory.MOOD, "부모님과 가기 좋은"),
+    YOUTUBE_FAMOUS(CheerTagCategory.MOOD, "유튜버 맛집"),
 
-    GROUP_RESERVATION(CheerTagCategory.PRACTICAL),
-    LARGE_PARKING(CheerTagCategory.PRACTICAL),
-    CLEAN_RESTROOM(CheerTagCategory.PRACTICAL),
-    PET_FRIENDLY(CheerTagCategory.PRACTICAL),
-    LATE_NIGHT(CheerTagCategory.PRACTICAL),
-    NEAR_SUBWAY(CheerTagCategory.PRACTICAL),
-    MANY_NEARBY_ATTRACTIONS(CheerTagCategory.PRACTICAL);
+    GROUP_RESERVATION(CheerTagCategory.PRACTICAL, "단체 예약"),
+    LARGE_PARKING(CheerTagCategory.PRACTICAL, "넓은 주차장"),
+    CLEAN_RESTROOM(CheerTagCategory.PRACTICAL, "깔끔한 화장실"),
+    PET_FRIENDLY(CheerTagCategory.PRACTICAL, "반려동물 동반 가능"),
+    LATE_NIGHT(CheerTagCategory.PRACTICAL, "늦게까지 영업"),
+    NEAR_SUBWAY(CheerTagCategory.PRACTICAL, "지하철과 가까운"),
+    MANY_NEARBY_ATTRACTIONS(CheerTagCategory.PRACTICAL, "주변에 놀거리가 많은"),
     ;
 
     private final CheerTagCategory type;
+    private final String displayName;
 
-    CheerTagName(CheerTagCategory type) {
+    CheerTagName(CheerTagCategory type, String displayName) {
         this.type = type;
+        this.displayName = displayName;
     }
 
     public enum CheerTagCategory {

src/main/java/eatda/controller/article/ArticlesResponse.java

@@ -9,7 +9,7 @@ public class CheerTagNames {
 
     private static final int MAX_CHEER_TAGS_PER_TYPE = 2;
 
-    private List<CheerTagName> cheerTagNames;
+    private final List<CheerTagName> cheerTagNames;
 
     public CheerTagNames(List<CheerTagName> cheerTagNames) {
         validate(cheerTagNames);
@@ -20,7 +20,7 @@ private void validate(List<CheerTagName> cheerTagNames) {
         if (isDuplicated(cheerTagNames)) {
             throw new BusinessException(BusinessErrorCode.CHEER_TAGS_DUPLICATED);
         }
-        if (countMaxCountByType(cheerTagNames) > MAX_CHEER_TAGS_PER_TYPE) {
+        if (maxCountByType(cheerTagNames) > MAX_CHEER_TAGS_PER_TYPE) {
             throw new BusinessException(BusinessErrorCode.EXCEED_CHEER_TAGS_PER_TYPE);
         }
     }
@@ -32,7 +32,7 @@ private boolean isDuplicated(List<CheerTagName> cheerTagNames) {
         return distinctCount != cheerTagNames.size();
     }
 
-    private long countMaxCountByType(List<CheerTagName> cheerTagNames) {
+    private long maxCountByType(List<CheerTagName> cheerTagNames) {
         return cheerTagNames.stream()
                 .collect(Collectors.groupingBy(CheerTagName::getType, Collectors.counting()))
                 .values()

src/main/java/eatda/domain/article/Article.java

@@ -0,0 +1,52 @@
+package eatda.domain.store;
+
+import java.util.Arrays;
+import lombok.Getter;
+
+@Getter
+public enum District {
+
+    GANGNAM("강남구"),
+    GANGDONG("강동구"),
+    GANGBUK("강북구"),
+    GANGSEO("강서구"),
+    GWANAK("관악구"),
+    GWANGJIN("광진구"),
+    GURO("구로구"),
+    GEUMCHEON("금천구"),
+    NOWON("노원구"),
+    DOBONG("도봉구"),
+    DONGDAEMUN("동대문구"),
+    DONGJAK("동작구"),
+    MAPO("마포구"),
+    SEODAEMUN("서대문구"),
+    SEOCHO("서초구"),
+    SEONGDONG("성동구"),
+    SEONGBUK("성북구"),
+    SONGPA("송파구"),
+    YANGCHEON("양천구"),
+    YEONGDEUNGPO("영등포구"),
+    YONGSAN("용산구"),
+    EUNPYEONG("은평구"),
+    JONGNO("종로구"),
+    JUNG("중구"),
+    JUNGNANG("중랑구"),
+    ETC("기타"),
+    ;
+
+    private final String name;
+
+    District(String name) {
+        this.name = name;
+    }
+
+    public static District fromName(String name) {
+        if (name == null || name.isEmpty()) {
+            return ETC;
+        }
+        return Arrays.stream(District.values())
+                .filter(district -> district.name.equals(name.trim()))
+                .findFirst()
+                .orElse(ETC);
+    }
+}

src/main/java/eatda/domain/cheer/CheerTag.java

@@ -47,6 +47,10 @@ public class Store extends AuditingEntity {
     @Column(name = "lot_number_address", nullable = false)
     private String lotNumberAddress;
 
+    @Enumerated(EnumType.STRING)
+    @Column(name = "district", nullable = false, length = 31)
+    private District district;
+
     @Embedded
     private Coordinates coordinates;
 
@@ -58,6 +62,7 @@ private Store(String kakaoId,
                   String placeUrl,
                   String roadAddress,
                   String lotNumberAddress,
+                  District district,
                   Double latitude,
                   Double longitude) {
         this.kakaoId = kakaoId;
@@ -66,16 +71,13 @@ private Store(String kakaoId,
         this.name = name;
         this.placeUrl = placeUrl;
         this.roadAddress = roadAddress;
+        this.district = district;
         this.lotNumberAddress = lotNumberAddress;
         this.coordinates = new Coordinates(latitude, longitude);
     }
 
     public String getAddressDistrict() {
-        String[] addressParts = lotNumberAddress.split(" ");
-        if (addressParts.length < 2) {
-            return "";
-        }
-        return addressParts[1];
+        return district.getName();
     }
 
     public String getAddressNeighborhood() {