[fix] DTO,VO 관련 네이밍, 패키징 통일

src/main/java/com/modernfarmer/farmusspring/domain/farmclub/dto/res/CreateFarmClubResponseDto.java

@@ -1,9 +1,14 @@
 package com.modernfarmer.farmusspring.domain.farmclub.dto.res;
 
+import lombok.Builder;
+
+@Builder
 public record CreateFarmClubResponseDto (
         Long farmClubId
 ){
     public static CreateFarmClubResponseDto of(Long farmClubId) {
-        return new CreateFarmClubResponseDto(farmClubId);
+        return CreateFarmClubResponseDto.builder()
+                .farmClubId(farmClubId)
+                .build();
     }
 }

src/main/java/com/modernfarmer/farmusspring/domain/farmclub/dto/res/GetFarmClubResponseDto.java

@@ -1,9 +1,11 @@
 package com.modernfarmer.farmusspring.domain.farmclub.dto.res;
 
 import com.modernfarmer.farmusspring.domain.farmclub.entity.FarmClub;
+import lombok.Builder;
 
 import java.util.List;
 
+@Builder
 public record GetFarmClubResponseDto (
         Long farmClubId,
         String farmClubName,
@@ -16,16 +18,16 @@ public record GetFarmClubResponseDto (
         List<String> help
 ){
     public static GetFarmClubResponseDto of(FarmClub farmClub, int currentMemberCount, List<String> help) {
-        return new GetFarmClubResponseDto(
-                farmClub.getId(),
-                farmClub.getName(),
-                farmClub.getDescription(),
-                farmClub.getVeggieName(),
-                farmClub.getVeggieImage(),
-                farmClub.getStartedAt().toString(),
-                farmClub.getMaxUser(),
-                currentMemberCount,
-                help
-        );
+        return GetFarmClubResponseDto.builder()
+                .farmClubId(farmClub.getId())
+                .farmClubName(farmClub.getName())
+                .farmClubDescription(farmClub.getDescription())
+                .veggieName(farmClub.getVeggieName())
+                .veggieImage(farmClub.getVeggieImage())
+                .startedAt(String.valueOf(farmClub.getStartedAt()))
+                .maxMemberCount(farmClub.getMaxUser())
+                .currentMemberCount(currentMemberCount)
+                .help(help)
+                .build();
     }
 }

src/main/java/com/modernfarmer/farmusspring/domain/farmclub/dto/res/GetMyFarmClubListResponseDto.java

@@ -2,15 +2,22 @@
 
 import com.modernfarmer.farmusspring.domain.farmclub.entity.FarmClub;
 import com.querydsl.core.annotations.QueryProjection;
+import lombok.Builder;
 
+@Builder
 public record GetMyFarmClubListResponseDto(
         Long farmClubId,
         String farmClubImage,
         String farmClubName,
         String veggieName
 ) {
     public static GetMyFarmClubListResponseDto of(Long farmClubId, String farmClubImage, String farmClubName, String veggieName) {
-        return new GetMyFarmClubListResponseDto(farmClubId, farmClubImage, farmClubName, veggieName);
+        return GetMyFarmClubListResponseDto.builder()
+                .farmClubId(farmClubId)
+                .farmClubImage(farmClubImage)
+                .farmClubName(farmClubName)
+                .veggieName(veggieName)
+                .build();
     }
 
     @QueryProjection

src/main/java/com/modernfarmer/farmusspring/domain/farmclub/dto/res/GetMyFarmClubResponseDto.java

@@ -1,12 +1,14 @@
 package com.modernfarmer.farmusspring.domain.farmclub.dto.res;
 
-import com.modernfarmer.farmusspring.domain.farmclub.vo.GetMissionPostListWithStepCountsAndImages;
+import com.modernfarmer.farmusspring.domain.farmclub.vo.GetMissionPostListWithStepCountsAndImagesVo;
 import com.modernfarmer.farmusspring.domain.farmclub.vo.GetMyFarmClubVo;
 import com.modernfarmer.farmusspring.domain.veggieinfo.vo.StepVo;
+import lombok.Builder;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@Builder
 public record GetMyFarmClubResponseDto(
         String farmClubName,
         String farmClubImage,
@@ -17,16 +19,17 @@ public record GetMyFarmClubResponseDto(
 ) {
 
     public static GetMyFarmClubResponseDto of(GetMyFarmClubVo farmClubInfo, List<Step> steps, String advice) {
-        return new GetMyFarmClubResponseDto(
-                farmClubInfo.farmClubName(),
-                farmClubInfo.farmClubImage(),
-                farmClubInfo.wholeMemberCount(),
-                steps,
-                advice,
-                farmClubInfo.daySinceStart());
+        return GetMyFarmClubResponseDto.builder()
+                .farmClubName(farmClubInfo.farmClubName())
+                .farmClubImage(farmClubInfo.farmClubImage())
+                .wholeMemberCount(farmClubInfo.wholeMemberCount())
+                .steps(steps)
+                .advice(advice)
+                .daysSinceStart(farmClubInfo.daySinceStart())
+                .build();
     }
 
-    public static List<Step> createSteps(List<StepVo> stepVoList, List<GetMissionPostListWithStepCountsAndImages> missionList) {
+    public static List<Step> createSteps(List<StepVo> stepVoList, List<GetMissionPostListWithStepCountsAndImagesVo> missionList) {
         List<Step> steps = new ArrayList<>();
         for (int i = 0; i < stepVoList.size(); i++) {
             Step step = new Step(

src/main/java/com/modernfarmer/farmusspring/domain/farmclub/dto/res/RegisterFarmClubResponseDto.java

@@ -1,9 +1,14 @@
 package com.modernfarmer.farmusspring.domain.farmclub.dto.res;
 
+import lombok.Builder;
+
+@Builder
 public record RegisterFarmClubResponseDto (
         Long userFarmClubId
 ){
     public static RegisterFarmClubResponseDto of(Long userFarmClubId) {
-        return new RegisterFarmClubResponseDto(userFarmClubId);
+        return RegisterFarmClubResponseDto.builder()
+                .userFarmClubId(userFarmClubId)
+                .build();
     }
 }

src/main/java/com/modernfarmer/farmusspring/domain/farmclub/repository/MissionPostRepositoryCustom.java

@@ -1,11 +1,11 @@
 package com.modernfarmer.farmusspring.domain.farmclub.repository;
 
 
-import com.modernfarmer.farmusspring.domain.farmclub.vo.GetMissionPostListWithStepCountsAndImages;
+import com.modernfarmer.farmusspring.domain.farmclub.vo.GetMissionPostListWithStepCountsAndImagesVo;
 
 import java.util.List;
 
 public interface MissionPostRepositoryCustom {
 
-    List<GetMissionPostListWithStepCountsAndImages> getMissionPostStepNumAndImage(Long farmClubId);
+    List<GetMissionPostListWithStepCountsAndImagesVo> getMissionPostStepNumAndImage(Long farmClubId);
 }

src/main/java/com/modernfarmer/farmusspring/domain/farmclub/repository/MissionPostRepositoryImpl.java

@@ -1,8 +1,8 @@
 package com.modernfarmer.farmusspring.domain.farmclub.repository;
 
 
-import com.modernfarmer.farmusspring.domain.farmclub.vo.GetMissionPostListWithStepCountsAndImages;
-import com.modernfarmer.farmusspring.domain.farmclub.vo.QGetMissionPostListWithStepCountsAndImages;
+import com.modernfarmer.farmusspring.domain.farmclub.vo.GetMissionPostListWithStepCountsAndImagesVo;
+import com.modernfarmer.farmusspring.domain.farmclub.vo.QGetMissionPostListWithStepCountsAndImagesVo;
 import com.querydsl.core.group.GroupBy;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import jakarta.persistence.EntityManager;
@@ -20,7 +20,7 @@ public class MissionPostRepositoryImpl implements MissionPostRepositoryCustom {
     private EntityManager em;
 
     @Override
-    public List<GetMissionPostListWithStepCountsAndImages> getMissionPostStepNumAndImage(Long farmClubId) {
+    public List<GetMissionPostListWithStepCountsAndImagesVo> getMissionPostStepNumAndImage(Long farmClubId) {
         JPAQueryFactory queryFactory = new JPAQueryFactory(em);
 
         return queryFactory
@@ -30,7 +30,7 @@ public List<GetMissionPostListWithStepCountsAndImages> getMissionPostStepNumAndI
                 .where(farmClub.id.eq(farmClubId))
                 .transform(
                         GroupBy.groupBy(missionPost.stepNum)
-                                .list(new QGetMissionPostListWithStepCountsAndImages(
+                                .list(new QGetMissionPostListWithStepCountsAndImagesVo(
                                         missionPost.stepNum.count(),
                                         GroupBy.list(missionPost.image)
                                 ))

src/main/java/com/modernfarmer/farmusspring/domain/farmclub/service/FarmClubService.java

@@ -8,10 +8,10 @@
 import com.modernfarmer.farmusspring.domain.farmclub.helper.FarmClubHelper;
 import com.modernfarmer.farmusspring.domain.farmclub.repository.FarmClubRepository;
 import com.modernfarmer.farmusspring.domain.farmclub.repository.MissionPostRepository;
-import com.modernfarmer.farmusspring.domain.farmclub.vo.GetMissionPostListWithStepCountsAndImages;
+import com.modernfarmer.farmusspring.domain.farmclub.vo.GetMissionPostListWithStepCountsAndImagesVo;
 import com.modernfarmer.farmusspring.domain.farmclub.vo.GetMyFarmClubVo;
 import com.modernfarmer.farmusspring.domain.myveggiegarden.entity.MyVeggie;
-import com.modernfarmer.farmusspring.domain.veggieinfo.dto.res.CreateFarmClubVo;
+import com.modernfarmer.farmusspring.domain.veggieinfo.vo.CreateFarmClubVo;
 import com.modernfarmer.farmusspring.domain.veggieinfo.helper.VeggieInfoHelper;
 import com.modernfarmer.farmusspring.domain.veggieinfo.vo.StepVo;
 import lombok.RequiredArgsConstructor;
@@ -75,7 +75,7 @@ public GetMyFarmClubResponseDto getMyFarmClub(Long userId, Long farmClubId) {
         String veggieInfoId = farmClubInfo.veggieInfoId();
         List<StepVo> stepList = veggieInfoHelper.getStepList(veggieInfoId);
         String randomTip = getRandomTip(stepList);
-        List<GetMissionPostListWithStepCountsAndImages> missionList =
+        List<GetMissionPostListWithStepCountsAndImagesVo> missionList =
                 missionPostRepository.getMissionPostStepNumAndImage(farmClubId);
 
         return GetMyFarmClubResponseDto.of(farmClubInfo, GetMyFarmClubResponseDto.createSteps(stepList, missionList), randomTip);

src/main/java/com/modernfarmer/farmusspring/domain/farmclub/vo/GetMissionPostListWithStepCountsAndImages.java → src/main/java/com/modernfarmer/farmusspring/domain/farmclub/vo/GetMissionPostListWithStepCountsAndImagesVo.java

@@ -1,15 +1,14 @@
 package com.modernfarmer.farmusspring.domain.farmclub.vo;
 
-import com.modernfarmer.farmusspring.domain.farmclub.entity.MissionPost;
 import com.querydsl.core.annotations.QueryProjection;
 
 import java.util.List;
 
-public record GetMissionPostListWithStepCountsAndImages(
+public record GetMissionPostListWithStepCountsAndImagesVo(
         Long count,
         List<String> images
 ) {
     @QueryProjection
-    public GetMissionPostListWithStepCountsAndImages {
+    public GetMissionPostListWithStepCountsAndImagesVo {
     }
 }

src/main/java/com/modernfarmer/farmusspring/domain/veggieinfo/helper/VeggieInfoHelper.java

@@ -1,6 +1,6 @@
 package com.modernfarmer.farmusspring.domain.veggieinfo.helper;
 
-import com.modernfarmer.farmusspring.domain.veggieinfo.dto.res.CreateFarmClubVo;
+import com.modernfarmer.farmusspring.domain.veggieinfo.vo.CreateFarmClubVo;
 import com.modernfarmer.farmusspring.domain.veggieinfo.entity.VeggieInfo;
 import com.modernfarmer.farmusspring.domain.veggieinfo.exception.custom.VeggieInfoNotFoundException;
 import com.modernfarmer.farmusspring.domain.veggieinfo.repository.VeggieInfoRepository;

src/main/java/com/modernfarmer/farmusspring/domain/veggieinfo/repository/CustomVeggieInfoRepository.java

@@ -1,14 +1,14 @@
 package com.modernfarmer.farmusspring.domain.veggieinfo.repository;
 
-import com.modernfarmer.farmusspring.domain.veggieinfo.dto.res.CreateFarmClubVo;
-import com.modernfarmer.farmusspring.domain.veggieinfo.dto.res.InfoForRegister;
+import com.modernfarmer.farmusspring.domain.veggieinfo.vo.CreateFarmClubVo;
+import com.modernfarmer.farmusspring.domain.veggieinfo.vo.InfoForRegisterVo;
 import com.modernfarmer.farmusspring.domain.veggieinfo.vo.StepVo;
 
 import java.util.List;
 
 public interface CustomVeggieInfoRepository {
 
-    List<InfoForRegister> getVeggieInfoListForRegister();
+    List<InfoForRegisterVo> getVeggieInfoListForRegister();
     CreateFarmClubVo getVeggieInfoForCreateFarmClub(String veggieInfoId);
     List<StepVo> getVeggieInfoStepList(String veggieInfoId);
 }

src/main/java/com/modernfarmer/farmusspring/domain/veggieinfo/repository/VeggieInfoRepositoryImpl.java

@@ -1,8 +1,8 @@
 package com.modernfarmer.farmusspring.domain.veggieinfo.repository;
 
 
-import com.modernfarmer.farmusspring.domain.veggieinfo.dto.res.CreateFarmClubVo;
-import com.modernfarmer.farmusspring.domain.veggieinfo.dto.res.InfoForRegister;
+import com.modernfarmer.farmusspring.domain.veggieinfo.vo.CreateFarmClubVo;
+import com.modernfarmer.farmusspring.domain.veggieinfo.vo.InfoForRegisterVo;
 import com.modernfarmer.farmusspring.domain.veggieinfo.vo.StepVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -19,7 +19,7 @@ public class VeggieInfoRepositoryImpl implements CustomVeggieInfoRepository{
     private final MongoTemplate mongoTemplate;
 
     @Override
-    public List<InfoForRegister> getVeggieInfoListForRegister() {
+    public List<InfoForRegisterVo> getVeggieInfoListForRegister() {
         // Query to get all name, difficulty, veggieImage, period from veggieInfo collection
         // and return as List<InfoForRegister>
         Query query = new Query();
@@ -30,7 +30,7 @@ public List<InfoForRegister> getVeggieInfoListForRegister() {
                 .include("veggieImage")
                 .include("period");
 
-        return mongoTemplate.find(query, InfoForRegister.class, "veggie_info");
+        return mongoTemplate.find(query, InfoForRegisterVo.class, "veggie_info");
     }
 
     @Override

src/main/java/com/modernfarmer/farmusspring/domain/veggieinfo/service/VeggieInfoService.java

@@ -1,6 +1,6 @@
 package com.modernfarmer.farmusspring.domain.veggieinfo.service;
 
-import com.modernfarmer.farmusspring.domain.veggieinfo.dto.res.InfoForRegister;
+import com.modernfarmer.farmusspring.domain.veggieinfo.vo.InfoForRegisterVo;
 import com.modernfarmer.farmusspring.domain.veggieinfo.entity.VeggieInfo;
 import com.modernfarmer.farmusspring.domain.veggieinfo.repository.VeggieInfoRepository;
 import lombok.RequiredArgsConstructor;
@@ -15,7 +15,7 @@ public class VeggieInfoService {
 
     private final VeggieInfoRepository veggieInfoRepository;
 
-    public List<InfoForRegister> getVeggieInfoListForRegister() {
+    public List<InfoForRegisterVo> getVeggieInfoListForRegister() {
         // Get all veggie info list for register
         return veggieInfoRepository.getVeggieInfoListForRegister();
     }

src/main/java/com/modernfarmer/farmusspring/domain/veggieinfo/dto/res/CreateFarmClubVo.java → src/main/java/com/modernfarmer/farmusspring/domain/veggieinfo/vo/CreateFarmClubVo.java

@@ -1,4 +1,4 @@
-package com.modernfarmer.farmusspring.domain.veggieinfo.dto.res;
+package com.modernfarmer.farmusspring.domain.veggieinfo.vo;
 
 public record CreateFarmClubVo(
     String _id,

src/main/java/com/modernfarmer/farmusspring/domain/veggieinfo/vo/InfoForRegisterVo.java

@@ -0,0 +1,13 @@
+package com.modernfarmer.farmusspring.domain.veggieinfo.vo;
+
+import com.modernfarmer.farmusspring.domain.veggieinfo.enums.Difficulty;
+
+
+public record InfoForRegisterVo(
+    String _id,
+    String name,
+    Difficulty difficulty,
+    String veggieImage,
+    String period
+){
+}