♻️ change return type

woowacourse-teams · Jan 6, 2025 · 05d9f95 · 05d9f95
1 parent 00195da
commit 05d9f95
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/backend/src/main/java/net/pengcook/recipe/controller/RecipeController.java b/backend/src/main/java/net/pengcook/recipe/controller/RecipeController.java
@@ -7,7 +7,6 @@
 import net.pengcook.authentication.resolver.LoginUser;
 import net.pengcook.recipe.dto.PageRecipeRequest;
 import net.pengcook.recipe.dto.RecipeDescriptionResponse;
-import net.pengcook.recipe.dto.RecipeHomeResponse;
 import net.pengcook.recipe.dto.RecipeHomeWithMineResponse;
 import net.pengcook.recipe.dto.RecipeHomeWithMineResponseV1;
 import net.pengcook.recipe.dto.RecipeRequest;
@@ -63,7 +62,7 @@ public List<RecipeHomeWithMineResponseV1> readLikeRecipesV1(@LoginUser UserInfo
     }
 
     @GetMapping("/follows")
-    public List<RecipeHomeResponse> readFollowRecipes(
+    public List<RecipeHomeWithMineResponseV1> readFollowRecipes(
             @LoginUser UserInfo userInfo,
             @ModelAttribute @Valid PageRecipeRequest pageRecipeRequest
     ) {

diff --git a/backend/src/main/java/net/pengcook/recipe/service/RecipeService.java b/backend/src/main/java/net/pengcook/recipe/service/RecipeService.java
@@ -148,7 +148,8 @@ public List<RecipeHomeWithMineResponseV1> readLikeRecipesV1(UserInfo userInfo) {
     }
 
     @Transactional(readOnly = true)
-    public List<RecipeHomeResponse> readFollowRecipes(UserInfo userInfo, PageRecipeRequest pageRecipeRequest) {
+    public List<RecipeHomeWithMineResponseV1> readFollowRecipes(UserInfo userInfo,
+                                                                PageRecipeRequest pageRecipeRequest) {
         List<UserFollow> followings = userFollowRepository.findAllByFollowerId(userInfo.getId());
         List<Long> followeeIds = followings.stream()
                 .map(userFollow -> userFollow.getFollowee().getId())
@@ -163,7 +164,8 @@ public List<RecipeHomeResponse> readFollowRecipes(UserInfo userInfo, PageRecipeR
                 .toList();
 
         return recipeRepository.findRecipeDataV1(recipeIds).stream()
-                .sorted(Comparator.comparing(RecipeHomeResponse::recipeId).reversed())
+                .map(recipeHomeResponse -> new RecipeHomeWithMineResponseV1(userInfo, recipeHomeResponse))
+                .sorted(Comparator.comparing(RecipeHomeWithMineResponseV1::recipeId).reversed())
                 .toList();
     }
 

diff --git a/backend/src/test/java/net/pengcook/recipe/controller/RecipeControllerTest.java b/backend/src/test/java/net/pengcook/recipe/controller/RecipeControllerTest.java
@@ -18,13 +18,12 @@
 import net.pengcook.RestDocsSetting;
 import net.pengcook.authentication.annotation.WithLoginUser;
 import net.pengcook.authentication.annotation.WithLoginUserTest;
+import net.pengcook.category.dto.CategoryResponse;
 import net.pengcook.ingredient.domain.Requirement;
 import net.pengcook.ingredient.dto.IngredientCreateRequest;
-import net.pengcook.recipe.dto.AuthorResponse;
-import net.pengcook.category.dto.CategoryResponse;
 import net.pengcook.ingredient.dto.IngredientResponse;
+import net.pengcook.recipe.dto.AuthorResponse;
 import net.pengcook.recipe.dto.RecipeDescriptionResponse;
-import net.pengcook.recipe.dto.RecipeHomeResponse;
 import net.pengcook.recipe.dto.RecipeHomeWithMineResponse;
 import net.pengcook.recipe.dto.RecipeHomeWithMineResponseV1;
 import net.pengcook.recipe.dto.RecipeRequest;
@@ -271,13 +270,15 @@ void readFollowRecipes() {
                                 fieldWithPath("[]").description("레시피 목록"),
                                 fieldWithPath("[].recipeId").description("레시피 아이디"),
                                 fieldWithPath("[].title").description("레시피 제목"),
-                                fieldWithPath("[].authorId").description("작성자 아이디"),
-                                fieldWithPath("[].authorName").description("작성자 이름"),
-                                fieldWithPath("[].authorImage").description("작성자 이미지"),
+                                fieldWithPath("[].author").description("작성자 정보"),
+                                fieldWithPath("[].author.authorId").description("작성자 아이디"),
+                                fieldWithPath("[].author.authorName").description("작성자 이름"),
+                                fieldWithPath("[].author.authorImage").description("작성자 이미지"),
                                 fieldWithPath("[].thumbnail").description("썸네일 이미지"),
                                 fieldWithPath("[].likeCount").description("좋아요 수"),
                                 fieldWithPath("[].commentCount").description("댓글 수"),
-                                fieldWithPath("[].createdAt").description("레시피 생성일시")
+                                fieldWithPath("[].createdAt").description("레시피 생성일시"),
+                                fieldWithPath("[].mine").description("조회자 작성 여부")
                         )))
                 .queryParam("pageNumber", 0)
                 .queryParam("pageSize", 5)
@@ -287,7 +288,7 @@ void readFollowRecipes() {
                 .body("size()", is(3))
                 .extract()
                 .jsonPath()
-                .getList(".", RecipeHomeResponse.class);
+                .getList(".", RecipeHomeWithMineResponseV1.class);
     }
 
 

diff --git a/backend/src/test/java/net/pengcook/recipe/service/RecipeServiceTest.java b/backend/src/test/java/net/pengcook/recipe/service/RecipeServiceTest.java
@@ -10,7 +10,6 @@
 import net.pengcook.ingredient.dto.IngredientCreateRequest;
 import net.pengcook.recipe.domain.Recipe;
 import net.pengcook.recipe.dto.PageRecipeRequest;
-import net.pengcook.recipe.dto.RecipeHomeResponse;
 import net.pengcook.recipe.dto.RecipeHomeWithMineResponseV1;
 import net.pengcook.recipe.dto.RecipeRequest;
 import net.pengcook.recipe.dto.RecipeResponse;
@@ -85,11 +84,11 @@ void readFollowRecipes() {
         UserInfo userInfo = new UserInfo(1L, "[email protected]");
         PageRecipeRequest pageRecipeRequest = new PageRecipeRequest(0, 10, null, null, null);
 
-        List<RecipeHomeResponse> actual = recipeService.readFollowRecipes(userInfo, pageRecipeRequest);
+        List<RecipeHomeWithMineResponseV1> actual = recipeService.readFollowRecipes(userInfo, pageRecipeRequest);
 
         assertAll(
                 () -> assertThat(actual).hasSize(3),
-                () -> assertThat(actual).extracting("authorId").containsOnly(4L),
+                () -> assertThat(actual).extracting("author.authorId").containsOnly(4L),
                 () -> assertThat(actual).extracting("recipeId")
                         .containsExactly(18L, 17L, 16L)
         );