Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ public record ClubFeeInfoResponse(
@Schema(description = "회비 금액", example = "3만원", requiredMode = REQUIRED)
String amount,

@Schema(description = "은행명", example = "국민은행", requiredMode = REQUIRED)
String bank,
@Schema(description = "은행 고유 ID", example = "1", requiredMode = REQUIRED)
Integer bankId,

@Schema(description = "계좌번호", example = "123-456-7890", requiredMode = REQUIRED)
String accountNumber,
Expand All @@ -26,10 +26,10 @@ public record ClubFeeInfoResponse(
@JsonFormat(pattern = "yyyy.MM.dd")
LocalDate deadLine
) {
public static ClubFeeInfoResponse from(Club club) {
public static ClubFeeInfoResponse of(Club club, Integer bankId) {
return new ClubFeeInfoResponse(
club.getFeeAmount(),
club.getFeeBank(),
bankId,
club.getFeeAccountNumber(),
club.getFeeAccountHolder(),
club.getFeeDeadline()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ public ClubFeeInfoResponse applyClub(Integer clubId, Integer userId, ClubApplyRe
user.getName()
));

return ClubFeeInfoResponse.from(club);
Integer bankId = resolveBankId(club.getFeeBank());
return ClubFeeInfoResponse.of(club, bankId);
}

private void validateFeePaymentImage(Club club, String feePaymentImageUrl) {
Expand Down Expand Up @@ -324,7 +325,15 @@ private Page<ClubApply> findApplicationsByRecruitmentPeriod(

public ClubFeeInfoResponse getFeeInfo(Integer clubId) {
Club club = clubRepository.getById(clubId);
return ClubFeeInfoResponse.from(club);
Integer bankId = resolveBankId(club.getFeeBank());
return ClubFeeInfoResponse.of(club, bankId);
}

private Integer resolveBankId(String bankName) {
if (!StringUtils.hasText(bankName)) {
return null;
}
return bankRepository.getByName(bankName).getId();
}

@Transactional
Expand All @@ -344,6 +353,6 @@ public ClubFeeInfoResponse replaceFeeInfo(Integer clubId, Integer userId, ClubFe
request.deadLine()
);

return ClubFeeInfoResponse.from(club);
return ClubFeeInfoResponse.of(club, request.bankId());
}
}