Skip to content

Commit

Permalink
Merge pull request #99 from ehBeak/feat/fix-date
Browse files Browse the repository at this point in the history
Feat/fix date
  • Loading branch information
ehBeak authored Dec 5, 2023
2 parents f3ed87f + 09856d8 commit a9a3784
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down

0 comments on commit a9a3784

Please sign in to comment.