Merge remote-tracking branch 'origin/develop' into develop

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;
 

src/main/java/com/connect/accountApp/domain/user/application/port/in/command/GetMyPageCommand.java

@@ -14,15 +14,15 @@ 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) {
 
         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();
     }
 }

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());