Skip to content

[Release] payroll summary null 에러 해결 #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hyunzzii merged 1 commit into from
Jun 10, 2025
Merged

[Release] payroll summary null 에러 해결 #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/src/main/java/com/mangoboss/app/api/facade/payroll/BossPayrollFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public TransferSummaryResponse getPayrollSummary(final Long storeId, final Long
LocalDate today = LocalDate.now(clock);
List<PayrollEntity> payrolls = payrollService.getPayrolls(storeId, targetMonth);
if (payrolls.isEmpty()) {
return TransferSummaryResponse.of(TransferSummaryStateForResponse.NOT_YET, today.withDayOfMonth(payrollSetting.getTransferDate()));
return TransferSummaryResponse.of(TransferSummaryStateForResponse.NOT_YET, payrollSetting.getTransferDate(),today);
}
boolean allPending = payrolls.stream().allMatch(p ->
p.getTransferState().equals(TransferState.PENDING)
Expand Down
13 changes: 13 additions & 0 deletions app/src/main/java/com/mangoboss/app/dto/payroll/response/TransferSummaryResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@ public record TransferSummaryResponse(
LocalDate transferDate,
TransferSummaryStateForResponse isTransferred
) {
public static TransferSummaryResponse of(final TransferSummaryStateForResponse state, final Integer transferDate, final LocalDate today) {
if( transferDate == null) {
return TransferSummaryResponse.builder()
.transferDate(null)
.isTransferred(state)
.build();
}
return TransferSummaryResponse.builder()
.transferDate(today.withDayOfMonth(transferDate))
.isTransferred(state)
.build();
}

public static TransferSummaryResponse of(final TransferSummaryStateForResponse state, final LocalDate transferDate) {
return TransferSummaryResponse.builder()
.transferDate(transferDate)
Expand Down