Merge pull request #137 from Mojacknong/fix_136/채소-리스트-API

[fix] 채소 리스트 조회 시 userFarmCludId -> farmCludId 변경
Mojacknong · Sep 26, 2024 · 4dac360 · 4dac360
2 parents 5f67749 + 1154d8c
commit 4dac360
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...ernfarmer/farmusspring/domain/myveggiegarden/dto/response/SelectMyVeggieListResponse.java b/...ernfarmer/farmusspring/domain/myveggiegarden/dto/response/SelectMyVeggieListResponse.java
@@ -15,7 +15,7 @@ public class SelectMyVeggieListResponse {
    // List<SelectMyVeggieListDto> simpleMyVeggieList;
    public Long myVeggieId;
    public String nickname;
-   public int userFarmClubId;
+   public Long farmClubId;
 
 
 }
diff --git a/...va/com/modernfarmer/farmusspring/domain/myveggiegarden/service/MyVeggieGardenService.java b/...va/com/modernfarmer/farmusspring/domain/myveggiegarden/service/MyVeggieGardenService.java
@@ -60,7 +60,7 @@ public BaseResponseDto<List<SelectMyVeggieListResponse>> selectMyVeggieList(Long
 
     public List<SelectMyVeggieListResponse> processSimpleVeggieData(List<MyVeggie> myVeggieList){
         return myVeggieList.stream()
-                .map(myVeggie -> SelectMyVeggieListResponse.of(myVeggie.getId(),myVeggie.getNickname(), checkFarmClubAffiliation(myVeggie)))
+                .map(myVeggie -> SelectMyVeggieListResponse.of(myVeggie.getId(),myVeggie.getNickname(), checkFarmClubAffiliationAndFarmClubId(myVeggie)))
                 .toList();
     }
 
@@ -83,7 +83,7 @@ public BaseResponseDto<SelectMyVeggieProfileResponse> selectMyVeggieProfile(Long
                         myVeggie.getVeggieImage(),
                         DateManager.parsingDotDate(myVeggie.getBirth()),
                         DateManager.calculateDay(myVeggie.getBirth(), new Date()),
-                        checkFarmClubAffiliation(myVeggie),
+                        checkFarmClubAffiliationAndCurrentStop(myVeggie),
                         veggieInfo.getSteps().size()
                         ));
     }
@@ -113,12 +113,18 @@ public void successFarming(SuccessFarmingRequestDto requestDto, MultipartFile im
         myVeggieHelper.deleteMyVeggie(requestDto.myVeggieId());
     }
 
-    public int checkFarmClubAffiliation(MyVeggie myVeggie){
+    public int checkFarmClubAffiliationAndCurrentStop(MyVeggie myVeggie){
         if(myVeggie.getUserFarmClub() == null || myVeggie.getUserFarmClub().isComplete())
             return -1;
         return myVeggie.getUserFarmClub().getCurrentStep();
     }
 
+    public Long checkFarmClubAffiliationAndFarmClubId(MyVeggie myVeggie){
+        if(myVeggie.getUserFarmClub() == null || myVeggie.getUserFarmClub().isComplete())
+            return (long) -1;
+        return myVeggie.getUserFarmClub().getFarmClub().getId();
+    }
+
 
     public MyVeggie selectMyVeggieAndFarmClub(Long myVeggieId){
         return myVeggieRepository.findMyVeggieAndFarmClub(myVeggieId);