From 31db550503bc18f8222502216bc4f657b4829db9 Mon Sep 17 00:00:00 2001 From: eunhee Date: Wed, 6 Dec 2023 08:22:53 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat=20:=20=EC=88=98=EC=A0=95=20=EB=82=B4?= =?UTF-8?q?=EC=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/adapter/in/web/response/GetMyPageResponse.java | 2 +- .../user/application/port/in/command/GetMyPageCommand.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/connect/accountApp/domain/user/adapter/in/web/response/GetMyPageResponse.java b/src/main/java/com/connect/accountApp/domain/user/adapter/in/web/response/GetMyPageResponse.java index c865701..b5efd85 100644 --- a/src/main/java/com/connect/accountApp/domain/user/adapter/in/web/response/GetMyPageResponse.java +++ b/src/main/java/com/connect/accountApp/domain/user/adapter/in/web/response/GetMyPageResponse.java @@ -20,7 +20,7 @@ public class GetMyPageResponse { @JsonProperty("user_settlement_ratio") private Integer userSettlementRatio; @JsonProperty("household_settlement_date") - private LocalDate householdSettlementDate; + private Integer householdSettlementDate; @JsonProperty("household_budget_amount") private BigDecimal householdBudgetAmount; diff --git a/src/main/java/com/connect/accountApp/domain/user/application/port/in/command/GetMyPageCommand.java b/src/main/java/com/connect/accountApp/domain/user/application/port/in/command/GetMyPageCommand.java index 7ade125..4131ce4 100644 --- a/src/main/java/com/connect/accountApp/domain/user/application/port/in/command/GetMyPageCommand.java +++ b/src/main/java/com/connect/accountApp/domain/user/application/port/in/command/GetMyPageCommand.java @@ -14,7 +14,7 @@ public class GetMyPageCommand { private String userImageUrl; private String userNickname; private Integer userSettlementRatio; - private LocalDate householdSettlementDate; + private Integer householdSettlementDate; private BigDecimal householdBudgetAmount; public GetMyPageCommand(User user) { @@ -22,7 +22,7 @@ public GetMyPageCommand(User user) { this.userImageUrl = user.getUserImgUrl(); this.userNickname = user.getUserNickname(); this.userSettlementRatio = user.getUserRatio(); - this.householdSettlementDate = user.getHousehold().getHouseholdSettlementDate(); + this.householdSettlementDate = user.getHousehold().getHouseholdSettlementDayOfMonth(); this.householdBudgetAmount = user.getHousehold().getHouseholdBudget(); } } From 09856d89862f5be70af78a240d7b70ff906185bd Mon Sep 17 00:00:00 2001 From: eunhee Date: Wed, 6 Dec 2023 08:31:40 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EA=B3=84=EC=A2=8C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/application/service/UpdateUserAccountService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/connect/accountApp/domain/user/application/service/UpdateUserAccountService.java b/src/main/java/com/connect/accountApp/domain/user/application/service/UpdateUserAccountService.java index 0e0d950..7e36359 100644 --- a/src/main/java/com/connect/accountApp/domain/user/application/service/UpdateUserAccountService.java +++ b/src/main/java/com/connect/accountApp/domain/user/application/service/UpdateUserAccountService.java @@ -20,7 +20,7 @@ public class UpdateUserAccountService implements UpdateUserAccountUseCase { public void updateUserAccount(String userEmail, UpdateUserAccountRequest request) { // user 가져옴 계좌 수정하고 저장 - User user = getUserPort.findUser(userEmail); + User user = getUserPort.findUserWithHousehold(userEmail); Bank userBank = Bank.valueOf(request.getAccountBank()); user.updateUserAccount(userBank, request.getAccountNumber());