Merge branch 'develop' into feat/PRODUCT-257

Author: leegwichan

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

@@ -12,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+@Validated
 @RestController
 @RequiredArgsConstructor
 public class CheerController {

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

@@ -10,11 +10,13 @@
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+@Validated
 @RestController
 @RequiredArgsConstructor
 public class StoreController {
@@ -42,6 +44,12 @@ public ResponseEntity<StoreResponse> getStore(@PathVariable long storeId) {
         return ResponseEntity.ok(response);
     }
 
+    @GetMapping("/api/shops/cheered-member")
+    public ResponseEntity<StoresInMemberResponse> getStoresByCheeredMember(LoginMember member) {
+        StoresInMemberResponse response = storeService.getStoresByCheeredMember(member.id());
+        return ResponseEntity.ok(response);
+    }
+
     @GetMapping("/api/shop/search")
     public ResponseEntity<StoreSearchResponses> searchStore(@RequestParam String query, LoginMember member) {
         List<StoreSearchResult> storeSearchResults = storeSearchService.searchStores(query);

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

@@ -0,0 +1,21 @@
+package eatda.controller.store;
+
+import eatda.domain.store.Store;
+
+public record StoreInMemberResponse(
+        long id,
+        String name,
+        String district,
+        String neighborhood,
+        long cheerCount
+) {
+    public StoreInMemberResponse(Store store, int cheerCount) {
+        this(
+                store.getId(),
+                store.getName(),
+                store.getAddressDistrict(),
+                store.getAddressNeighborhood(),
+                cheerCount
+        );
+    }
+}

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

@@ -0,0 +1,6 @@
+package eatda.controller.store;
+
+import java.util.List;
+
+public record StoresInMemberResponse(List<StoreInMemberResponse> stores) {
+}

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

@@ -0,0 +1,6 @@
+package eatda.controller.story;
+
+import java.util.List;
+
+public record StoriesInMemberResponse(List<StoryInMemberResponse> stories) {
+}

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

@@ -12,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,6 +21,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+@Validated
 @RestController
 @RequiredArgsConstructor
 public class StoryController {
@@ -54,6 +56,17 @@ public ResponseEntity<StoryResponse> getStory(@PathVariable long storyId) {
                 .body(storyService.getStory(storyId));
     }
 
+    @GetMapping("/api/stories/member")
+    public ResponseEntity<StoriesInMemberResponse> getStoriesByMemberId(
+            @RequestParam(defaultValue = "0") @Min(0) int page,
+            @RequestParam(defaultValue = "5") @Min(1) @Max(50) int size,
+            LoginMember member
+    ) {
+        StoriesInMemberResponse response = storyService.getPagedStoryByMemberId(member.id(), page, size);
+        return ResponseEntity.status(HttpStatus.OK)
+                .body(response);
+    }
+
     @GetMapping("/api/stories/kakao/{kakaoId}")
     public ResponseEntity<StoriesDetailResponse> getStoriesByKakaoId(
             @PathVariable String kakaoId,

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

@@ -0,0 +1,14 @@
+package eatda.controller.story;
+
+import eatda.domain.story.Story;
+
+public record StoryInMemberResponse(
+        Long id,
+        String imageUrl,
+        String storeName
+) {
+
+    public StoryInMemberResponse(Story story, String imageUrl) {
+        this(story.getId(), imageUrl, story.getStoreName());
+    }
+}

src/main/java/eatda/repository/cheer/CheerRepository.java

@@ -34,5 +34,7 @@ public interface CheerRepository extends JpaRepository<Cheer, Long> {
 
     int countByMember(Member member);
 
+    int countByStore(Store store);
+
     boolean existsByMemberAndStoreKakaoId(Member member, String storeKakaoId);
 }

src/main/java/eatda/repository/store/StoreRepository.java

@@ -8,6 +8,7 @@
 import java.util.Optional;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 public interface StoreRepository extends JpaRepository<Store, Long> {
 
@@ -22,4 +23,12 @@ default Store getById(Long id) {
     List<Store> findAllByOrderByCreatedAtDesc(Pageable pageable);
 
     List<Store> findAllByCategoryOrderByCreatedAtDesc(StoreCategory category, Pageable pageable);
+
+    @Query("""
+            SELECT s FROM Store s
+                JOIN Cheer c ON s.id = c.store.id
+                WHERE c.member.id = :memberId
+                ORDER BY c.createdAt DESC
+            """)
+    List<Store> findAllByCheeredMemberId(long memberId);
 }

src/main/java/eatda/repository/story/StoryRepository.java

@@ -3,11 +3,15 @@
 import eatda.domain.story.Story;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface StoryRepository extends JpaRepository<Story, Long> {
 
     Page<Story> findAllByOrderByCreatedAtDesc(Pageable pageable);
 
+    Page<Story> findAllByMemberIdOrderByCreatedAtDesc(Long memberId, Pageable pageable);
+
+    @EntityGraph(attributePaths = {"member"})
     Page<Story> findAllByStoreKakaoIdOrderByCreatedAtDesc(String storeKakaoId, Pageable pageable);
 }