Merge pull request #110 from Mojacknong/fix_99/팜클럽-버그수정

[fix] 내 팜클럽 단일 조회 시 팜클럽id 추가 반환
Mojacknong · Aug 23, 2024 · f28f9cd · f28f9cd
2 parents 2704fca + f2d07df
commit f28f9cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.../java/com/modernfarmer/farmusspring/domain/farmclub/dto/res/GetMyFarmClubResponseDto.java b/.../java/com/modernfarmer/farmusspring/domain/farmclub/dto/res/GetMyFarmClubResponseDto.java
@@ -10,6 +10,7 @@
 
 @Builder
 public record GetMyFarmClubResponseDto(
+        Long farmClubId,
         String farmClubName,
         String farmClubImage,
         Long wholeMemberCount,
@@ -21,6 +22,7 @@ public record GetMyFarmClubResponseDto(
 
     public static GetMyFarmClubResponseDto of(GetMyFarmClubVo farmClubInfo, List<Step> steps, String advice) {
         return GetMyFarmClubResponseDto.builder()
+                .farmClubId(farmClubInfo.farmClubId())
                 .farmClubName(farmClubInfo.farmClubName())
                 .farmClubImage(farmClubInfo.farmClubImage())
                 .wholeMemberCount(farmClubInfo.wholeMemberCount())

diff --git a/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/vo/GetMyFarmClubVo.java b/src/main/java/com/modernfarmer/farmusspring/domain/farmclub/vo/GetMyFarmClubVo.java
@@ -8,7 +8,7 @@
 import java.time.temporal.ChronoUnit;
 
 public record GetMyFarmClubVo(
-
+        Long farmClubId,
         String farmClubName,
         String farmClubImage,
         String veggieInfoId,
@@ -18,6 +18,7 @@ public record GetMyFarmClubVo(
 ) {
     public static GetMyFarmClubVo of(BaseInfo baseInfo, Long wholeMemberCount, Integer currentStep,LocalDate dayRegister) {
         return new GetMyFarmClubVo(
+                baseInfo.farmClubId(),
                 baseInfo.farmClubName(),
                 baseInfo.farmClubImage(),
                 baseInfo.veggieInfoId(),
@@ -28,6 +29,7 @@ public static GetMyFarmClubVo of(BaseInfo baseInfo, Long wholeMemberCount, Integ
     }
 
     public record BaseInfo(
+            Long farmClubId,
             String farmClubName,
             String farmClubImage,
             String veggieInfoId
@@ -36,6 +38,7 @@ public record BaseInfo(
         @QueryProjection
         public BaseInfo(FarmClub farmClub) {
             this(
+                    farmClub.getId(),
                     farmClub.getName(),
                     farmClub.getVeggieImage(),
                     farmClub.getVeggieInfoId()