Merge branch 'develop' into feat/PRODUCT-197

leegwichan · leegwichan · commit d886c556f9ff · 2025-07-28T20:11:20.000+09:00
# Conflicts:
#	src/main/java/eatda/service/store/StoreService.java
#	src/test/java/eatda/controller/store/StoreControllerTest.java
#	src/test/java/eatda/document/store/StoreDocumentTest.java
#	src/test/java/eatda/service/store/StoreServiceTest.java
diff --git a/src/main/java/eatda/client/map/StoreSearchResult.java b/src/main/java/eatda/client/map/StoreSearchResult.java
@@ -26,9 +26,7 @@ public record StoreSearchResult(
             "음식점 > 일식", StoreCategory.JAPANESE,
             "음식점 > 양식", StoreCategory.WESTERN,
             "음식점 > 카페", StoreCategory.CAFE,
-            "음식점 > 간식 > 제과,베이커리", StoreCategory.BAKERY,
-            "음식점 > 술집", StoreCategory.PUB,
-            "음식점 > 패스트푸드", StoreCategory.FAST_FOOD
+            "음식점 > 간식 > 제과,베이커리", StoreCategory.CAFE
     );
 
     public boolean isFoodStore() {
diff --git a/src/main/java/eatda/controller/store/StoreController.java b/src/main/java/eatda/controller/store/StoreController.java
@@ -27,6 +27,12 @@ public ResponseEntity<StoresResponse> getStores(@RequestParam @Min(1) @Max(50) i
         return ResponseEntity.ok(storeService.getStores(size));
     }
 
+    @GetMapping("/api/shops/{storeId}")
+    public ResponseEntity<StoreResponse> getStore(@PathVariable long storeId) {
+        StoreResponse response = storeService.getStore(storeId);
+        return ResponseEntity.ok(response);
+    }
+
     @GetMapping("/api/shop/search")
     public ResponseEntity<StoreSearchResponses> searchStore(@RequestParam String query, LoginMember member) {
         StoreSearchResponses response = storeService.searchStores(query);
diff --git a/src/main/java/eatda/controller/store/StoreResponse.java b/src/main/java/eatda/controller/store/StoreResponse.java
@@ -0,0 +1,26 @@
+package eatda.controller.store;
+
+import eatda.domain.store.Store;
+
+public record StoreResponse(
+        long id,
+        String kakaoId,
+        String name,
+        String district,
+        String neighborhood,
+        String category,
+        String placeUrl
+) {
+
+    public StoreResponse(Store store) {
+        this(
+                store.getId(),
+                store.getKakaoId(),
+                store.getName(),
+                store.getAddressDistrict(),
+                store.getAddressNeighborhood(),
+                store.getCategory().getCategoryName(),
+                store.getPlaceUrl()
+        );
+    }
+}
diff --git a/src/main/java/eatda/controller/story/StoryRegisterRequest.java b/src/main/java/eatda/controller/story/StoryRegisterRequest.java
@@ -1,7 +1,7 @@
 package eatda.controller.story;
 
 public record StoryRegisterRequest(
-        String query,
+        String storeName,
         String storeKakaoId,
         String description
 ) {
diff --git a/src/main/java/eatda/domain/store/StoreCategory.java b/src/main/java/eatda/domain/store/StoreCategory.java
@@ -13,9 +13,6 @@ public enum StoreCategory {
     JAPANESE("일식"),
     WESTERN("양식"),
     CAFE("카페"),
-    BAKERY("베이커리"),
-    PUB("술집"),
-    FAST_FOOD("패스트푸드"),
     OTHER("기타");
 
     private final String categoryName;
@@ -33,13 +30,4 @@ public static StoreCategory from(String value) {
                 .findFirst()
                 .orElseThrow(() -> new BusinessException(BusinessErrorCode.INVALID_STORE_CATEGORY));
     }
-
-    public static boolean isValid(String value) {
-        try {
-            from(value);
-            return true;
-        } catch (BusinessException e) {
-            return false;
-        }
-    }
 }
diff --git a/src/main/java/eatda/service/store/StoreService.java b/src/main/java/eatda/service/store/StoreService.java
@@ -7,6 +7,7 @@
 import eatda.client.map.StoreSearchResult;
 import eatda.controller.store.ImagesResponse;
 import eatda.controller.store.StorePreviewResponse;
+import eatda.controller.store.StoreResponse;
 import eatda.controller.store.StoreSearchResponses;
 import eatda.controller.store.StoresResponse;
 import eatda.domain.store.Store;
@@ -29,13 +30,9 @@ public class StoreService {
     private final CheerRepository cheerRepository;
     private final ImageStorage imageStorage;
 
-    public ImagesResponse getStoreImages(long storeId) {
+    public StoreResponse getStore(long storeId) {
         Store store = storeRepository.getById(storeId);
-        List<String> imageUrls = cheerRepository.findAllImageKey(store)
-                .stream()
-                .map(imageStorage::getPreSignedUrl)
-                .toList();
-        return new ImagesResponse(imageUrls);
+        return new StoreResponse(store);
     }
 
     // TODO : N+1 문제 해결
@@ -46,6 +43,15 @@ public StoresResponse getStores(int size) {
                 .collect(collectingAndThen(toList(), StoresResponse::new));
     }
 
+    public ImagesResponse getStoreImages(long storeId) {
+        Store store = storeRepository.getById(storeId);
+        List<String> imageUrls = cheerRepository.findAllImageKey(store)
+                .stream()
+                .map(imageStorage::getPreSignedUrl)
+                .toList();
+        return new ImagesResponse(imageUrls);
+    }
+
     private Optional<String> getStoreImageUrl(Store store) {
         return cheerRepository.findRecentImageKey(store)
                 .map(imageStorage::getPreSignedUrl);
diff --git a/src/main/java/eatda/service/story/StoryService.java b/src/main/java/eatda/service/story/StoryService.java
@@ -40,7 +40,7 @@ public class StoryService {
     @Transactional
     public StoryRegisterResponse registerStory(StoryRegisterRequest request, MultipartFile imageFile, Long memberId) {
         Member member = memberRepository.getById(memberId);
-        List<StoreSearchResult> searchResponses = mapClient.searchShops(request.query());
+        List<StoreSearchResult> searchResponses = mapClient.searchShops(request.storeName());
         FilteredSearchResult matchedStore = filteredSearchResponse(searchResponses, request.storeKakaoId());
         ImageKey imageKey = imageStorage.upload(new Image(ImageDomain.STORY, imageFile));
 
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
@@ -43,7 +43,7 @@ jwt:
 cors:
   origin:
     - "http://localhost:3000"
-    - "https://api-dev.eatda.net"
+    - "https://dev.eatda.net"
 
 oauth:
   client-id: ${OAUTH_CLIENT_ID}
diff --git a/src/test/java/eatda/controller/store/StoreControllerTest.java b/src/test/java/eatda/controller/store/StoreControllerTest.java
@@ -13,38 +13,28 @@
 class StoreControllerTest extends BaseControllerTest {
 
     @Nested
-    class GetStoreImages {
+    class GetStore {
 
         @Test
-        void 음식점_이미지들을_조회한다() {
+        void 음식점_정보를_조회한다() {
             Member member = memberGenerator.generate("111");
             Store store = storeGenerator.generate("농민백암순대", "서울 강남구 대치동 896-33");
-            cheerGenerator.generateCommon(member, store, "image-key-1");
-            cheerGenerator.generateCommon(member, store, "image-key-2");
-            cheerGenerator.generateCommon(member, store, "image-key-3");
+            cheerGenerator.generateCommon(member, store, "image-key");
 
-            ImagesResponse response = given()
+            StoreResponse response = given()
+                    .pathParam("storeId", store.getId())
                     .when()
-                    .get("/api/shops/{storeId}/images", store.getId())
+                    .get("/api/shops/{storeId}")
                     .then()
                     .statusCode(200)
-                    .extract().as(ImagesResponse.class);
+                    .extract().as(StoreResponse.class);
 
-            assertThat(response.imageUrls()).hasSize(3);
-        }
-
-        @Test
-        void 음식점_이미지가_없다면_빈_리스트를_반환한다() {
-            Store store = storeGenerator.generate("농민백암순대", "서울 강남구 대치동 896-33");
-
-            ImagesResponse response = given()
-                    .when()
-                    .get("/api/shops/{storeId}/images", store.getId())
-                    .then()
-                    .statusCode(200)
-                    .extract().as(ImagesResponse.class);
-
-            assertThat(response.imageUrls()).isEmpty();
+            assertAll(
+                    () -> assertThat(response.id()).isEqualTo(store.getId()),
+                    () -> assertThat(response.name()).isEqualTo(store.getName()),
+                    () -> assertThat(response.district()).isEqualTo("강남구"),
+                    () -> assertThat(response.neighborhood()).isEqualTo("대치동")
+            );
         }
     }
 
@@ -79,6 +69,42 @@ class GetStores {
         }
     }
 
+    @Nested
+    class GetStoreImages {
+
+        @Test
+        void 음식점_이미지들을_조회한다() {
+            Member member = memberGenerator.generate("111");
+            Store store = storeGenerator.generate("농민백암순대", "서울 강남구 대치동 896-33");
+            cheerGenerator.generateCommon(member, store, "image-key-1");
+            cheerGenerator.generateCommon(member, store, "image-key-2");
+            cheerGenerator.generateCommon(member, store, "image-key-3");
+
+            ImagesResponse response = given()
+                    .when()
+                    .get("/api/shops/{storeId}/images", store.getId())
+                    .then()
+                    .statusCode(200)
+                    .extract().as(ImagesResponse.class);
+
+            assertThat(response.imageUrls()).hasSize(3);
+        }
+
+        @Test
+        void 음식점_이미지가_없다면_빈_리스트를_반환한다() {
+            Store store = storeGenerator.generate("농민백암순대", "서울 강남구 대치동 896-33");
+
+            ImagesResponse response = given()
+                    .when()
+                    .get("/api/shops/{storeId}/images", store.getId())
+                    .then()
+                    .statusCode(200)
+                    .extract().as(ImagesResponse.class);
+
+            assertThat(response.imageUrls()).isEmpty();
+        }
+    }
+
     @Nested
     class SearchStores {
 
diff --git a/src/test/java/eatda/document/store/CheerDocumentTest.java b/src/test/java/eatda/document/store/CheerDocumentTest.java
@@ -39,9 +39,25 @@ public class CheerDocumentTest extends BaseDocumentTest {
     @Nested
     class RegisterCheer {
 
+        private static final String REQUEST_DESCRIPTION_MARKDOWN = """
+                - 요청 형식 : multipart/form-data
+                - 요청 field
+                  - `image` : 응원 이미지 (선택, 최대 5MB, 허용 타입 : image/jpg, image/jpeg, image/png
+                  - `request` : 응원 등록 요청 정보 (필수, 허용 타입 : application/json)
+                - request body 예시
+                    ```json
+                    {
+                        "storeKakaoId": "123", // 가게 카카오 ID
+                        "storeName": "농민백암순대 본점", // 가게 이름
+                        "description": "너무 맛있어요! 준환님 추천 맛집!" // 응원 내용
+                    }
+                    ```
+                """;
+
         RestDocsRequest requestDocument = request()
                 .tag(Tag.STORE_API)
                 .summary("응원 등록")
+                .description(REQUEST_DESCRIPTION_MARKDOWN)
                 .requestHeader(
                         headerWithName("Authorization").description("인증 토큰")
                 ).multipartField(
diff --git a/src/test/java/eatda/document/store/StoreDocumentTest.java b/src/test/java/eatda/document/store/StoreDocumentTest.java
diff --git a/src/test/java/eatda/document/story/StoryDocumentTest.java b/src/test/java/eatda/document/story/StoryDocumentTest.java
diff --git a/src/test/java/eatda/service/store/StoreServiceTest.java b/src/test/java/eatda/service/store/StoreServiceTest.java
diff --git a/src/test/java/eatda/service/story/StoryServiceTest.java b/src/test/java/eatda/service/story/StoryServiceTest.java
