[fix] resolve conflict

Team-Hankki · Jul 15, 2024 · aa0ff0e · aa0ff0e
1 parent f975bbc
commit aa0ff0e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/main/java/org/hankki/hankkiserver/api/favorite/service/FavoriteFinder.java b/src/main/java/org/hankki/hankkiserver/api/favorite/service/FavoriteFinder.java
@@ -25,8 +25,4 @@ public List<Favorite> findAllByIds(final List<Long> ids) {
   public List<Favorite> findAllByUserId(final Long userId) {
     return favoriteRepository.findByUserIdOrderByCreatedAtDesc(userId);
   }
-
-  public List<Favorite> findAllByUserId(final Long id) {
-    return favoriteRepository.findAllByUserId(id);
-  }
-}
+}
diff --git a/...ava/org/hankki/hankkiserver/api/favorite/service/response/FavoriteWithStatusResponse.java b/...ava/org/hankki/hankkiserver/api/favorite/service/response/FavoriteWithStatusResponse.java
@@ -15,7 +15,7 @@ public static FavoriteWithStatusResponse of(Favorite favorite, boolean isReporte
     return new FavoriteWithStatusResponse(
         favorite.getId(),
         favorite.getName(),
-        favorite.getImage_url(),
+        favorite.getImageUrl(),
         FavoriteResponseUtil.getDetail(favorite.getDetail()),
         isReported);
   }