Merge branch 'develop' into refactor/PRODUCT-186

# Conflicts:
#	src/main/java/eatda/service/store/CheerService.java
#	src/main/java/eatda/service/story/StoryService.java
#	src/test/java/eatda/controller/BaseControllerTest.java
#	src/test/java/eatda/controller/story/StoryControllerTest.java
#	src/test/java/eatda/document/BaseDocumentTest.java
#	src/test/java/eatda/document/story/StoryDocumentTest.java
#	src/test/java/eatda/service/BaseServiceTest.java

Author: leegwichan

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

@@ -2,6 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import eatda.domain.store.Store;
+import eatda.domain.store.StoreCategory;
+import java.util.Map;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record StoreSearchResult(
@@ -17,6 +20,17 @@ public record StoreSearchResult(
         @JsonProperty("x") double longitude
 ) {
 
+    private static final Map<String, StoreCategory> PREFIX_TO_CATEGORY = Map.of(
+            "음식점 > 한식", StoreCategory.KOREAN,
+            "음식점 > 중식", StoreCategory.CHINESE,
+            "음식점 > 일식", StoreCategory.JAPANESE,
+            "음식점 > 양식", StoreCategory.WESTERN,
+            "음식점 > 카페", StoreCategory.CAFE,
+            "음식점 > 간식 > 제과,베이커리", StoreCategory.BAKERY,
+            "음식점 > 술집", StoreCategory.PUB,
+            "음식점 > 패스트푸드", StoreCategory.FAST_FOOD
+    );
+
     public boolean isFoodStore() {
         return "FD6".equals(categoryGroupCode);
     }
@@ -27,4 +41,31 @@ public boolean isInSeoul() {
         }
         return lotNumberAddress.trim().startsWith("서울");
     }
+
+    public StoreCategory getStoreCategory() {
+        if (categoryName == null) {
+            return StoreCategory.OTHER;
+        }
+
+        return PREFIX_TO_CATEGORY.entrySet()
+                .stream()
+                .filter(entry -> categoryName.startsWith(entry.getKey()))
+                .map(Map.Entry::getValue)
+                .findFirst()
+                .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();
+    }
 }

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

@@ -0,0 +1,24 @@
+package eatda.controller.article;
+
+import eatda.service.article.ArticleService;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@Controller
+@RequiredArgsConstructor
+public class ArticleController {
+
+    private final ArticleService articleService;
+
+    @GetMapping("/api/articles")
+    public ResponseEntity<ArticlesResponse> getArticles(@RequestParam(defaultValue = "3") @Min(1) @Max(50) int size) {
+        return ResponseEntity.status(HttpStatus.OK)
+                .body(articleService.getAllArticles(size));
+    }
+}

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

@@ -0,0 +1,9 @@
+package eatda.controller.article;
+
+public record ArticleResponse(
+        String title,
+        String subtitle,
+        String articleUrl,
+        String imageUrl
+) {
+}

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

@@ -0,0 +1,8 @@
+package eatda.controller.article;
+
+import java.util.List;
+
+public record ArticlesResponse(
+        List<ArticleResponse> articles
+) {
+}

src/main/java/eatda/controller/store/CheerController.java

@@ -1,20 +1,34 @@
 package eatda.controller.store;
 
+import eatda.controller.web.auth.LoginMember;
 import eatda.service.store.CheerService;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 @RestController
 @RequiredArgsConstructor
 public class CheerController {
 
     private final CheerService cheerService;
 
+    @PostMapping("/api/cheer")
+    public ResponseEntity<CheerResponse> registerCheer(@RequestPart("request") CheerRegisterRequest request,
+                                                       @RequestPart(value = "image", required = false) MultipartFile image,
+                                                       LoginMember member) {
+        CheerResponse response = cheerService.registerCheer(request, image, member.id());
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .body(response);
+    }
+
     @GetMapping("/api/cheer")
     public ResponseEntity<CheersResponse> getCheers(@RequestParam @Min(1) @Max(50) int size) {
         CheersResponse response = cheerService.getCheers(size);

src/main/java/eatda/controller/store/CheerRegisterRequest.java

@@ -0,0 +1,8 @@
+package eatda.controller.store;
+
+public record CheerRegisterRequest(
+        String storeKakaoId,
+        String storeName,
+        String description
+) {
+}

src/main/java/eatda/controller/store/CheerResponse.java

@@ -0,0 +1,21 @@
+package eatda.controller.store;
+
+import eatda.domain.store.Cheer;
+import eatda.domain.store.Store;
+
+public record CheerResponse(
+        long storeId,
+        long cheerId,
+        String imageUrl,
+        String cheerDescription
+) {
+
+    public CheerResponse(Cheer cheer, String imageUrl, Store store) {
+        this(
+                store.getId(),
+                cheer.getId(),
+                imageUrl,
+                cheer.getDescription()
+        );
+    }
+}

src/main/java/eatda/controller/story/FilteredSearchResult.java

@@ -1,10 +1,12 @@
 package eatda.controller.story;
 
+import eatda.domain.store.StoreCategory;
+
 public record FilteredSearchResult(
         String kakaoId,
         String name,
         String roadAddress,
         String lotNumberAddress,
-        String category
+        StoreCategory category
 ) {
 }

src/main/java/eatda/controller/story/StoryController.java

@@ -22,13 +22,13 @@ public class StoryController {
     private final StoryService storyService;
 
     @PostMapping("/api/stories")
-    public ResponseEntity<Void> registerStory(
+    public ResponseEntity<StoryRegisterResponse> registerStory(
             @RequestPart("request") StoryRegisterRequest request,
             @RequestPart("image") MultipartFile image,
             LoginMember member
     ) {
-        storyService.registerStory(request, image, member.id());
-        return ResponseEntity.status(HttpStatus.CREATED).build();
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .body(storyService.registerStory(request, image, member.id()));
     }
 
     @GetMapping("api/stories")

src/main/java/eatda/controller/story/StoryRegisterResponse.java

@@ -0,0 +1,6 @@
+package eatda.controller.story;
+
+public record StoryRegisterResponse(
+        long storyId
+) {
+}