[feat] 식당 세부 조회 시 좋아요 테이블 없는 경우 404 나오는 에러 수정 (#108)

* [fix] add distinct keyworkd in method

* [fix] fix hearts to be initialized as an empty list

* [fix] fix controller to get userId as a parameter

* [fix] fix logic related with isLiked field in response

src/main/java/org/hankki/hankkiserver/api/store/controller/StoreController.java

@@ -21,9 +21,10 @@ public class StoreController {
     private final StoreQueryService storeQueryService;
     private final HeartCommandService heartCommandService;
 
-    @GetMapping("/stores/{id}")
-    public HankkiResponse<StoreGetResponse> getStore(@PathVariable final Long id) {
-        return HankkiResponse.success(CommonSuccessCode.OK, storeQueryService.getStoreInformation(id));
+    @GetMapping("/stores/{storeId}")
+    public HankkiResponse<StoreGetResponse> getStore(@PathVariable final Long storeId,
+                                                     @UserId final Long userId) {
+        return HankkiResponse.success(CommonSuccessCode.OK, storeQueryService.getStoreInformation(storeId, userId));
     }
 
     @GetMapping("/stores/{id}/thumbnail")

src/main/java/org/hankki/hankkiserver/api/store/service/StoreQueryService.java

@@ -34,12 +34,12 @@ public StoreThumbnailResponse getStoreThumbnail(final Long id) {
     }
 
     @Transactional(readOnly = true)
-    public StoreGetResponse getStoreInformation(final Long id) {
+    public StoreGetResponse getStoreInformation(final Long storeId, final Long userId) {
 
-        Store store = storeFinder.findByIdWithHeartAndIsDeletedFalse(id);
+        Store store = storeFinder.findByIdWithHeartAndIsDeletedFalse(storeId);
 
         return StoreGetResponse.of(store,
-                isLiked(id, store),
+                isLiked(userId, store),
                 getImageUrlsFromStore(store),
                 getMenus(store));
     }
@@ -72,11 +72,11 @@ private List<MenuResponse> getMenus(final Store store) {
         return menuFinder.findAllByStore(store).stream().map(MenuResponse::of).toList();
     }
 
-    private boolean isLiked(final Long id, final Store store) {
-        return store.getHearts().stream().anyMatch(heart -> isLiked(id, heart));
+    private boolean isLiked(final Long userId, final Store store) {
+        return store.getHearts().stream().anyMatch(heart -> hasSameUserId(userId, heart));
     }
 
-    private static boolean isLiked(final Long id, final Heart heart) {
+    private boolean hasSameUserId(final Long id, final Heart heart) {
         return heart.getUser().getId().equals(id);
     }
 

src/main/java/org/hankki/hankkiserver/domain/store/model/Store.java

@@ -24,7 +24,7 @@ public class Store extends BaseTimeEntity {
     private Long id;
 
     @OneToMany(mappedBy = "store")
-    private List<Heart> hearts;
+    private List<Heart> hearts = new ArrayList<>();
 
     @Embedded
     private Point point;

src/main/java/org/hankki/hankkiserver/domain/store/repository/StoreRepository.java

@@ -10,7 +10,7 @@ public interface StoreRepository extends JpaRepository<Store, Long> {
     @Query("select s from Store s where s.id = :id and s.isDeleted = false")
     Optional<Store> findByIdAndIsDeletedIsFalse(Long id);
 
-    @Query("select s from Store s join fetch s.hearts where s.id = :id and s.isDeleted = false")
+    @Query("select distinct s from Store s left join fetch s.hearts where s.id = :id and s.isDeleted = false")
     Optional<Store> findByIdWithHeartAndIsDeletedFalse(Long id);
 
     @Query("select s from Store s where s.point.latitude = :latitude and s.point.longitude = :longitude")