From ffac402fa959a9a402826f1aea43985d9658d574 Mon Sep 17 00:00:00 2001 From: hyunzzii Date: Tue, 10 Jun 2025 12:00:32 +0900 Subject: [PATCH] =?UTF-8?q?hotfix:=20payroll=20summary=20null=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/api/facade/payroll/BossPayrollFacade.java | 2 +- .../payroll/response/TransferSummaryResponse.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/mangoboss/app/api/facade/payroll/BossPayrollFacade.java b/app/src/main/java/com/mangoboss/app/api/facade/payroll/BossPayrollFacade.java index 888785ee..00d683f5 100644 --- a/app/src/main/java/com/mangoboss/app/api/facade/payroll/BossPayrollFacade.java +++ b/app/src/main/java/com/mangoboss/app/api/facade/payroll/BossPayrollFacade.java @@ -164,7 +164,7 @@ public TransferSummaryResponse getPayrollSummary(final Long storeId, final Long LocalDate today = LocalDate.now(clock); List 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) diff --git a/app/src/main/java/com/mangoboss/app/dto/payroll/response/TransferSummaryResponse.java b/app/src/main/java/com/mangoboss/app/dto/payroll/response/TransferSummaryResponse.java index 4e0602e0..bc4aa7f5 100644 --- a/app/src/main/java/com/mangoboss/app/dto/payroll/response/TransferSummaryResponse.java +++ b/app/src/main/java/com/mangoboss/app/dto/payroll/response/TransferSummaryResponse.java @@ -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)