Merge pull request #251 from Gongjakso/feat/apply

fix: applyRes 데이터 변경
Gongjakso · Sep 24, 2024 · cd6b9c8 · cd6b9c8
2 parents 76d1342 + 052f728
commit cd6b9c8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/main/java/com/gongjakso/server/domain/apply/dto/response/ApplyRes.java b/src/main/java/com/gongjakso/server/domain/apply/dto/response/ApplyRes.java
@@ -25,14 +25,14 @@ public record ApplyRes(
         Long teamId,
 
         @NotNull
-        Long memberId,
+        Long applicantId,
 
         @NotNull
-        String name,
+        String applicantName,
 
-        String phone,
+        String applicantPhone,
 
-        String major,
+        String applicantMajor,
 
         @Nullable
         Long portfolioId,
@@ -75,10 +75,10 @@ public static ApplyRes of(Apply apply) {
                 .id(apply.getId())
                 .teamId(apply.getTeam().getId())
                 .teamName(apply.getTeam().getTitle())
-                .memberId(apply.getMember().getId())
-                .name(apply.getMember().getName())
-                .phone(apply.getMember().getPhone())
-                .major(apply.getMember().getMajor())
+                .applicantId(apply.getMember().getId())
+                .applicantName(apply.getMember().getName())
+                .applicantPhone(apply.getMember().getPhone())
+                .applicantMajor(apply.getMember().getMajor())
                 .leaderName(apply.getTeam().getMember().getName())
                 .portfolioId(apply.getPortfolioInfo().getPortfolio() != null ? apply.getPortfolioInfo().getPortfolio().getId() : null)
                 .portfolioName(apply.getPortfolioInfo().getPortfolio() != null ? apply.getPortfolioInfo().getPortfolio().getPortfolioName() : null)

diff --git a/src/main/java/com/gongjakso/server/domain/apply/dto/response/SimpleApplyRes.java b/src/main/java/com/gongjakso/server/domain/apply/dto/response/SimpleApplyRes.java
@@ -18,8 +18,8 @@ public record SimpleApplyRes(
         Long teamId,
 
         @NotNull
-        Long memberId,
-        String memberName,
+        Long applicantId,
+        String applicantName,
         Long portfolioId,
         String portfolioName,
         String status,
@@ -30,8 +30,8 @@ public static SimpleApplyRes of(Apply apply){
         return SimpleApplyRes.builder()
                 .id(apply.getId())
                 .teamId(apply.getTeam().getId())
-                .memberId(apply.getMember().getId())
-                .memberName(apply.getMember().getName())
+                .applicantId(apply.getMember().getId())
+                .applicantName(apply.getMember().getName())
                 .portfolioId(apply.getPortfolioInfo().getPortfolio() != null ? apply.getPortfolioInfo().getPortfolio().getId() : null)
                 .portfolioName(apply.getPortfolioInfo().getPortfolio() != null ? apply.getPortfolioInfo().getPortfolio().getPortfolioName() : null)
                 .status(apply.getStatus().name())