From 1fda4f46d22e2ebb3d582419261a32920fcd75a1 Mon Sep 17 00:00:00 2001 From: yumzen Date: Tue, 24 Sep 2024 23:44:08 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[#249]=20fix:=20ApplyRes=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gongjakso/server/domain/apply/dto/response/ApplyRes.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 index c5c5b4aa..17f9aee1 100644 --- 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 @@ -28,7 +28,7 @@ public record ApplyRes( Long memberId, @NotNull - String name, + String memberName, String phone, @@ -76,7 +76,7 @@ public static ApplyRes of(Apply apply) { .teamId(apply.getTeam().getId()) .teamName(apply.getTeam().getTitle()) .memberId(apply.getMember().getId()) - .name(apply.getMember().getName()) + .memberName(apply.getMember().getName()) .phone(apply.getMember().getPhone()) .major(apply.getMember().getMajor()) .leaderName(apply.getTeam().getMember().getName()) From 052f728a524ac1950b9d3d4b438f9bdcea48cca5 Mon Sep 17 00:00:00 2001 From: yumzen Date: Tue, 24 Sep 2024 23:46:58 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[#249]=20fix:=20ApplyRes=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/apply/dto/response/ApplyRes.java | 16 ++++++++-------- .../apply/dto/response/SimpleApplyRes.java | 8 ++++---- 2 files changed, 12 insertions(+), 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 index 17f9aee1..e122f468 100644 --- 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 memberName, + 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()) - .memberName(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 index 2d955d26..b42cdc9f 100644 --- 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())