From 529599d40a65fa8cfe2814d47fd3d55238005bad Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Wed, 2 Jul 2025 16:08:31 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=9E=84=EA=B0=80=ED=98=84=ED=99=A9=20>?= =?UTF-8?q?=20=EC=9D=80=ED=96=89=EC=9E=90=EB=8F=99=EC=9D=B4=EC=B2=B4=20?= =?UTF-8?q?=EB=82=B4=EC=97=AD=20=ED=83=AD=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/GetMonthlyInputStatusDao.java | 4 +- .../GetMonthlyInputStatusMapper.java | 5 +- .../UpdateMonthlyInputStatusMapper.java | 1 + .../GetBankAutoTransferExpenseDao.java | 19 + .../GetBankAutoTransferExpenseMapper.java | 12 + .../GetBankAutoTransferExpenseController.java | 24 + .../GetBankAutoTransferExpenseReqVO.java | 13 + .../GetBankAutoTransferExpenseResVO.java | 13 + .../GetBankAutoTransferExpensePortIn.java | 9 + .../GetBankAutoTransferExpensePortOut.java | 9 + .../GetBankAutoTransferExpenseService.java | 20 + .../domain/GetBankAutoTransferExpense.java | 23 + .../domain/GetBankAutoTransferExpenseCmd.java | 14 + .../domain/GetBankAutoTransferIncome.java | 1 + .../RemoveBankAutoTransfersDao.java | 41 + .../RemoveBankAutoTransfersMapper.java | 11 + .../RemoveBankAutoTransfersController.java | 40 + .../model/RemoveBankAutoTransfersReqVO.java | 19 + .../model/RemoveBankAutoTransfersResVO.java | 14 + .../ports/RemoveBankAutoTransfersPortIn.java | 7 + .../ports/RemoveBankAutoTransfersPortOut.java | 7 + .../RemoveBankAutoTransfersService.java | 31 + .../domain/RemoveBankAutoTransfersInCmd.java | 16 + .../domain/RemoveBankAutoTransfersOutCmd.java | 16 + .../SaveBankAutoTransferExpenseDao.java | 42 + .../SaveBankAutoTransferExpenseMapper.java | 10 + ...SaveBankAutoTransferExpenseController.java | 51 + .../SaveBankAutoTransferExpenseReqVO.java | 25 + .../SaveBankAutoTransferExpenseResVO.java | 14 + .../SaveBankAutoTransferExpenseValidator.java | 63 + .../SaveBankAutoTransferExpensePortIn.java | 7 + .../SaveBankAutoTransferExpensePortOut.java | 7 + .../SaveBankAutoTransferExpenseService.java | 45 + .../SaveBankAutoTransferExpenseInCmd.java | 24 + .../SaveBankAutoTransferExpenseOutCmd.java | 28 + .../SaveBankAutoTransferIncomeController.java | 45 +- .../SaveBankAutoTransferIncomeReqVO.java | 2 +- .../SaveBankAutoTransferIncomeValidator.java | 80 +- .../SaveBankAutoTransferIncomeService.java | 2 +- .../SaveBankAutoTransferIncomeInCmd.java | 2 +- .../SaveBankAutoTransferIncomeOutCmd.java | 2 +- .../persistence/RemoveForestProductsDao.java | 28 +- .../RemoveForestProductsMapper.java | 2 +- .../GetBankAutoTransferExpenseMapper.xml | 23 + .../RemoveBankAutoTransfersMapper.xml | 25 + .../household/RemoveForestProductsMapper.xml | 4 +- .../SaveBankAutoTransferExpenseMapper.xml | 60 + .../SaveBankAutoTransferIncomeMapper.xml | 2 + .../UpdateMonthlyInputStatusMapper.xml | 41 +- .../modal-bank-auto-transfer-expense.html | 273 ++++ .../modal-bank-auto-transfer-income.html | 27 +- .../households/tab/bank-auto-transfer.html | 60 +- .../households/tab/forest-product.html | 32 +- .../templates/households/{seq}-backup.html | 1303 ----------------- .../resources/templates/households/{seq}.html | 5 +- 55 files changed, 1288 insertions(+), 1415 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/persistence/GetBankAutoTransferExpenseDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/persistence/GetBankAutoTransferExpenseMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/web/GetBankAutoTransferExpenseController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/web/model/GetBankAutoTransferExpenseReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/web/model/GetBankAutoTransferExpenseResVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/GetBankAutoTransferExpensePortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/GetBankAutoTransferExpensePortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/application/GetBankAutoTransferExpenseService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/application/domain/GetBankAutoTransferExpense.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/application/domain/GetBankAutoTransferExpenseCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/persistence/RemoveBankAutoTransfersDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/persistence/RemoveBankAutoTransfersMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/web/RemoveBankAutoTransfersController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/web/model/RemoveBankAutoTransfersReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/web/model/RemoveBankAutoTransfersResVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/RemoveBankAutoTransfersPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/RemoveBankAutoTransfersPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/application/RemoveBankAutoTransfersService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/application/domain/RemoveBankAutoTransfersInCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/application/domain/RemoveBankAutoTransfersOutCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/persistence/SaveBankAutoTransferExpenseDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/persistence/SaveBankAutoTransferExpenseMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/SaveBankAutoTransferExpenseController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/model/SaveBankAutoTransferExpenseReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/model/SaveBankAutoTransferExpenseResVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/validator/SaveBankAutoTransferExpenseValidator.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/SaveBankAutoTransferExpensePortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/SaveBankAutoTransferExpensePortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/SaveBankAutoTransferExpenseService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/domain/SaveBankAutoTransferExpenseInCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/domain/SaveBankAutoTransferExpenseOutCmd.java create mode 100644 admin/src/main/resources/mappers/household/GetBankAutoTransferExpenseMapper.xml create mode 100644 admin/src/main/resources/mappers/household/RemoveBankAutoTransfersMapper.xml create mode 100644 admin/src/main/resources/mappers/household/SaveBankAutoTransferExpenseMapper.xml create mode 100644 admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-expense.html delete mode 100644 admin/src/main/resources/templates/households/{seq}-backup.html diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/adapters/persistence/GetMonthlyInputStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/adapters/persistence/GetMonthlyInputStatusDao.java index 7684ba65..732171ea 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/adapters/persistence/GetMonthlyInputStatusDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/adapters/persistence/GetMonthlyInputStatusDao.java @@ -10,8 +10,10 @@ import org.springframework.stereotype.Repository; @Repository @RequiredArgsConstructor class GetMonthlyInputStatusDao implements GetMonthlyInputStatusPortOut { + private final GetMonthlyInputStatusMapper mapper; + @Override public Optional operate(GetMonthlyInputStatusCmd cmd) { - return Optional.empty(); + return mapper.getMonthlyInputStatus(cmd); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/adapters/persistence/GetMonthlyInputStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/adapters/persistence/GetMonthlyInputStatusMapper.java index e3e8dce1..5d0ab0fe 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/adapters/persistence/GetMonthlyInputStatusMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/adapters/persistence/GetMonthlyInputStatusMapper.java @@ -2,7 +2,10 @@ package app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputSta import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; +import java.util.Optional; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface GetMonthlyInputStatusMapper { - GetMonthlyInputStatus getMonthlyInputStatus(GetMonthlyInputStatusCmd cmd); + Optional getMonthlyInputStatus(GetMonthlyInputStatusCmd cmd); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusMapper.java index e64c9c32..47990c58 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusMapper.java @@ -7,4 +7,5 @@ import org.apache.ibatis.annotations.Mapper; public interface UpdateMonthlyInputStatusMapper { void updateForestProductStatus(UpdateForestProductStatusCmd cmd); void updateBankInputStatus(UpdateForestProductStatusCmd cmd); + void updateBankOutputStatus(UpdateForestProductStatusCmd cmd); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/persistence/GetBankAutoTransferExpenseDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/persistence/GetBankAutoTransferExpenseDao.java new file mode 100644 index 00000000..646c3c5c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/persistence/GetBankAutoTransferExpenseDao.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.adapters.persistence; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpense; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpenseCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.GetBankAutoTransferExpensePortOut; +import java.util.Optional; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetBankAutoTransferExpenseDao implements GetBankAutoTransferExpensePortOut { + private final GetBankAutoTransferExpenseMapper mapper; + + @Override + public Optional operate(GetBankAutoTransferExpenseCmd cmd) { + return mapper.getBankAutoTransferExpense(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/persistence/GetBankAutoTransferExpenseMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/persistence/GetBankAutoTransferExpenseMapper.java new file mode 100644 index 00000000..5774b777 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/persistence/GetBankAutoTransferExpenseMapper.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.adapters.persistence; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpense; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpenseCmd; +import java.util.Optional; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface GetBankAutoTransferExpenseMapper { + Optional getBankAutoTransferExpense( + GetBankAutoTransferExpenseCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/web/GetBankAutoTransferExpenseController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/web/GetBankAutoTransferExpenseController.java new file mode 100644 index 00000000..8357be36 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/web/GetBankAutoTransferExpenseController.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.adapters.web; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.GetBankAutoTransferExpensePortIn; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpenseCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.adapters.web.model.GetBankAutoTransferExpenseReqVO; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.adapters.web.model.GetBankAutoTransferExpenseResVO; + +@RestController +@RequiredArgsConstructor +class GetBankAutoTransferExpenseController { + private final GetBankAutoTransferExpensePortIn portIn; + + @GetMapping(path = "/api/household/bankAutoTransferExpense/{id}") + ResponseEntity operate(@PathVariable Long id) { + return ResponseEntity.status(HttpStatus.OK).body( + portIn.operate(new GetBankAutoTransferExpenseCmd(id)).orElse(null)); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/web/model/GetBankAutoTransferExpenseReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/web/model/GetBankAutoTransferExpenseReqVO.java new file mode 100644 index 00000000..a18fd810 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/web/model/GetBankAutoTransferExpenseReqVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetBankAutoTransferExpenseReqVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/web/model/GetBankAutoTransferExpenseResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/web/model/GetBankAutoTransferExpenseResVO.java new file mode 100644 index 00000000..0a4735f6 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/adapters/web/model/GetBankAutoTransferExpenseResVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetBankAutoTransferExpenseResVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/GetBankAutoTransferExpensePortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/GetBankAutoTransferExpensePortIn.java new file mode 100644 index 00000000..f3127945 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/GetBankAutoTransferExpensePortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports; + +import java.util.Optional; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpense; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpenseCmd; + +public interface GetBankAutoTransferExpensePortIn { + Optional operate(GetBankAutoTransferExpenseCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/GetBankAutoTransferExpensePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/GetBankAutoTransferExpensePortOut.java new file mode 100644 index 00000000..19a2fb2b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/GetBankAutoTransferExpensePortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports; + +import java.util.Optional; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpense; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpenseCmd; + +public interface GetBankAutoTransferExpensePortOut { + Optional operate(GetBankAutoTransferExpenseCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/application/GetBankAutoTransferExpenseService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/application/GetBankAutoTransferExpenseService.java new file mode 100644 index 00000000..5fcb9162 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/application/GetBankAutoTransferExpenseService.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpense; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpenseCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.GetBankAutoTransferExpensePortIn; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.GetBankAutoTransferExpensePortOut; +import java.util.Optional; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetBankAutoTransferExpenseService implements GetBankAutoTransferExpensePortIn { + private final GetBankAutoTransferExpensePortOut portOut; + + @Override + public Optional operate(GetBankAutoTransferExpenseCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/application/domain/GetBankAutoTransferExpense.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/application/domain/GetBankAutoTransferExpense.java new file mode 100644 index 00000000..c556deeb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/application/domain/GetBankAutoTransferExpense.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetBankAutoTransferExpense { + private Long id; + private Long householdSeq; + private String expenseCode; + private String transferCategoryCode; + private String transferCategory; + private String sourcePurpose; + private String count; + private String unitCode; + private String unit; + private Long price; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/application/domain/GetBankAutoTransferExpenseCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/application/domain/GetBankAutoTransferExpenseCmd.java new file mode 100644 index 00000000..4d680f23 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferExpense/ports/application/domain/GetBankAutoTransferExpenseCmd.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetBankAutoTransferExpenseCmd { + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/domain/GetBankAutoTransferIncome.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/domain/GetBankAutoTransferIncome.java index 928b982c..f90da336 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/domain/GetBankAutoTransferIncome.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/domain/GetBankAutoTransferIncome.java @@ -17,6 +17,7 @@ public class GetBankAutoTransferIncome { private String expenseCode; private String transferCategoryCode; private String transferCategory; + private String sourcePurpose; private String count; private String unitCode; private String unit; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/persistence/RemoveBankAutoTransfersDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/persistence/RemoveBankAutoTransfersDao.java new file mode 100644 index 00000000..53b16701 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/persistence/RemoveBankAutoTransfersDao.java @@ -0,0 +1,41 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.adapters.persistence; + +import app.module.admin.config.application.enums.MonthlyInputStatusType; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.adapters.persistence.UpdateMonthlyInputStatusMapper; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application.domain.UpdateForestProductStatusCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersOutCmd; +import app.module.core.config.application.annotation.DeleteCommand; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersInCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.RemoveBankAutoTransfersPortOut; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +@Repository +@RequiredArgsConstructor +class RemoveBankAutoTransfersDao implements RemoveBankAutoTransfersPortOut { + private final RemoveBankAutoTransfersMapper removeBankAutoTransfersMapper; + private final UpdateMonthlyInputStatusMapper updateMonthlyInputStatusMapper; + + @Override + @DeleteCommand + @Transactional + public void operate(RemoveBankAutoTransfersOutCmd outCmd) { + // 삭제 + removeBankAutoTransfersMapper.remove(outCmd); + + if (!removeBankAutoTransfersMapper.existsBankAutoTransfer(outCmd.getMonthlyInputStatusId())) { + // 수입내역 모두 삭제되었을 경우 입력상태 미등록으로 update + if (outCmd.getRemoveType().equals("INCOME")) { + updateMonthlyInputStatusMapper.updateBankInputStatus( + new UpdateForestProductStatusCmd(outCmd.getMonthlyInputStatusId(), + MonthlyInputStatusType.NONE.name())); + } else { + // 지출내역 모두 삭제되었을 경우 입력상태 미등록으로 update + updateMonthlyInputStatusMapper.updateBankOutputStatus( + new UpdateForestProductStatusCmd(outCmd.getMonthlyInputStatusId(), + MonthlyInputStatusType.NONE.name())); + } + } + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/persistence/RemoveBankAutoTransfersMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/persistence/RemoveBankAutoTransfersMapper.java new file mode 100644 index 00000000..c6827ca7 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/persistence/RemoveBankAutoTransfersMapper.java @@ -0,0 +1,11 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.adapters.persistence; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersInCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersOutCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RemoveBankAutoTransfersMapper { + void remove(RemoveBankAutoTransfersOutCmd cmd); + boolean existsBankAutoTransfer(Long monthlyInputStatusId); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/web/RemoveBankAutoTransfersController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/web/RemoveBankAutoTransfersController.java new file mode 100644 index 00000000..6d66dc9c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/web/RemoveBankAutoTransfersController.java @@ -0,0 +1,40 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.adapters.web; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.RemoveBankAutoTransfersPortIn; +import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersInCmd; +import app.module.core.config.application.util.MessageUtil; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.BindingResult; +import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.adapters.web.model.RemoveBankAutoTransfersReqVO; +import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.adapters.web.model.RemoveBankAutoTransfersResVO; + +@RestController +@RequiredArgsConstructor +class RemoveBankAutoTransfersController { + private final RemoveBankAutoTransfersPortIn portIn; + private final MessageUtil messageUtil; + + @DeleteMapping(path = "/api/household/bank/delete") + ResponseEntity operate(@Valid @RequestBody RemoveBankAutoTransfersReqVO reqVO, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(bindingResult); + } + + portIn.operate( + new RemoveBankAutoTransfersInCmd( + reqVO.getHouseholdSeq(), + reqVO.getRecordMonth(), + reqVO.getRemoveType(), + reqVO.getRemoveIds())); + + return ResponseEntity.status(HttpStatus.OK).body(new RemoveBankAutoTransfersResVO( + messageUtil.getMessage("operation.common.remove.done"))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/web/model/RemoveBankAutoTransfersReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/web/model/RemoveBankAutoTransfersReqVO.java new file mode 100644 index 00000000..32c7561f --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/web/model/RemoveBankAutoTransfersReqVO.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.adapters.web.model; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@EqualsAndHashCode +public class RemoveBankAutoTransfersReqVO { + private Long householdSeq; + private String recordMonth; + private String removeType; + private List removeIds; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/web/model/RemoveBankAutoTransfersResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/web/model/RemoveBankAutoTransfersResVO.java new file mode 100644 index 00000000..0649fe41 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/adapters/web/model/RemoveBankAutoTransfersResVO.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class RemoveBankAutoTransfersResVO { + private String message; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/RemoveBankAutoTransfersPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/RemoveBankAutoTransfersPortIn.java new file mode 100644 index 00000000..eeb370aa --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/RemoveBankAutoTransfersPortIn.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersInCmd; + +public interface RemoveBankAutoTransfersPortIn { + void operate(RemoveBankAutoTransfersInCmd inCmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/RemoveBankAutoTransfersPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/RemoveBankAutoTransfersPortOut.java new file mode 100644 index 00000000..37142d89 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/RemoveBankAutoTransfersPortOut.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersOutCmd; + +public interface RemoveBankAutoTransfersPortOut { + void operate(RemoveBankAutoTransfersOutCmd outCmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/application/RemoveBankAutoTransfersService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/application/RemoveBankAutoTransfersService.java new file mode 100644 index 00000000..cb675864 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/application/RemoveBankAutoTransfersService.java @@ -0,0 +1,31 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application; + +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersOutCmd; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersInCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.RemoveBankAutoTransfersPortIn; +import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.RemoveBankAutoTransfersPortOut; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class RemoveBankAutoTransfersService implements RemoveBankAutoTransfersPortIn { + private final GetMonthlyInputStatusPortIn getMonthlyInputStatusPortIn; + private final RemoveBankAutoTransfersPortOut portOut; + + @Override + public void operate(RemoveBankAutoTransfersInCmd inCmd) { + GetMonthlyInputStatus monthlyInputStatus = + getMonthlyInputStatusPortIn + .operate(new GetMonthlyInputStatusCmd(inCmd.getHouseholdSeq(), inCmd.getRecordMonth())) + .orElseThrow(() -> new IllegalStateException("입력 상태 정보가 존재하지 않습니다.")); + + portOut.operate(new RemoveBankAutoTransfersOutCmd( + monthlyInputStatus.getId(), + inCmd.getRemoveType(), + inCmd.getRemoveIds())); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/application/domain/RemoveBankAutoTransfersInCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/application/domain/RemoveBankAutoTransfersInCmd.java new file mode 100644 index 00000000..fd0c48f9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/application/domain/RemoveBankAutoTransfersInCmd.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class RemoveBankAutoTransfersInCmd { + private Long householdSeq; + private String recordMonth; + private String removeType; + private List removeIds; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/application/domain/RemoveBankAutoTransfersOutCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/application/domain/RemoveBankAutoTransfersOutCmd.java new file mode 100644 index 00000000..3c171b09 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/removeBankAutoTranfers/ports/application/domain/RemoveBankAutoTransfersOutCmd.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class RemoveBankAutoTransfersOutCmd extends AuditCommand { + private Long monthlyInputStatusId; + private String removeType; + private List removeIds; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/persistence/SaveBankAutoTransferExpenseDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/persistence/SaveBankAutoTransferExpenseDao.java new file mode 100644 index 00000000..7b7d0e9e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/persistence/SaveBankAutoTransferExpenseDao.java @@ -0,0 +1,42 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.persistence; + +import app.module.admin.config.application.enums.MonthlyInputStatusType; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.adapters.persistence.UpdateMonthlyInputStatusMapper; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application.domain.UpdateForestProductStatusCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.SaveBankAutoTransferExpensePortOut; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain.SaveBankAutoTransferExpenseOutCmd; +import app.module.core.config.application.util.AuditUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +@Repository +@RequiredArgsConstructor +class SaveBankAutoTransferExpenseDao implements SaveBankAutoTransferExpensePortOut { + + private final SaveBankAutoTransferExpenseMapper saveBankAutoTransferExpenseMapper; + private final UpdateMonthlyInputStatusMapper updateMonthlyInputStatusMapper; + + @Override + @Transactional + public void operate(SaveBankAutoTransferExpenseOutCmd outCmd) { + if (outCmd.getBankAutoTransferId() == null) { + // 등록 상태가 "REGISTERED"가 아닐 경우 "REGISTERED"로 update + if (!MonthlyInputStatusType.REGISTERED.name().equals( + outCmd.getBankAutoTransferOutputStatus())) { + updateMonthlyInputStatusMapper.updateBankOutputStatus( + new UpdateForestProductStatusCmd( + outCmd.getMonthlyInputStatusId(), + MonthlyInputStatusType.REGISTERED.name())); + } + + // 은행자동이체(지출) 등록 + saveBankAutoTransferExpenseMapper.createBankAutoTransferExpense( + AuditUtil.create(outCmd)); + } else { + // 은행자동이체(지출) update + saveBankAutoTransferExpenseMapper.updateBankAutoTransferExpense( + AuditUtil.update(outCmd)); + } + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/persistence/SaveBankAutoTransferExpenseMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/persistence/SaveBankAutoTransferExpenseMapper.java new file mode 100644 index 00000000..83474bb4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/persistence/SaveBankAutoTransferExpenseMapper.java @@ -0,0 +1,10 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.persistence; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain.SaveBankAutoTransferExpenseOutCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SaveBankAutoTransferExpenseMapper { + void createBankAutoTransferExpense(SaveBankAutoTransferExpenseOutCmd cmd); + void updateBankAutoTransferExpense(SaveBankAutoTransferExpenseOutCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/SaveBankAutoTransferExpenseController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/SaveBankAutoTransferExpenseController.java new file mode 100644 index 00000000..d2d7f4a7 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/SaveBankAutoTransferExpenseController.java @@ -0,0 +1,51 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.SaveBankAutoTransferExpensePortIn; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain.SaveBankAutoTransferExpenseInCmd; +import app.module.core.config.application.util.MessageUtil; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.BindingResult; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web.model.SaveBankAutoTransferExpenseReqVO; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web.model.SaveBankAutoTransferExpenseResVO; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web.validator.SaveBankAutoTransferExpenseValidator; + +@RestController +@RequiredArgsConstructor +class SaveBankAutoTransferExpenseController { + private final SaveBankAutoTransferExpenseValidator validator; + private final SaveBankAutoTransferExpensePortIn portIn; + private final MessageUtil messageUtil; + + @PostMapping(path = "/api/household/bank/expense/save") + ResponseEntity operate(@Valid @RequestBody SaveBankAutoTransferExpenseReqVO reqVO, + BindingResult bindingResult) { + validator.validate(reqVO, bindingResult); + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + portIn.operate( + new SaveBankAutoTransferExpenseInCmd( + reqVO.getBankAutoTransferId(), + reqVO.getHouseholdSeq(), + reqVO.getRecordMonth(), + reqVO.getExpenseCode(), + reqVO.getTransferCategoryCode(), + reqVO.getTransferCategory(), + reqVO.getSourcePurpose(), + reqVO.getCount(), + reqVO.getUnitCode(), + reqVO.getUnit(), + reqVO.getPrice())); + + return ResponseEntity.status(HttpStatus.OK).body(new SaveBankAutoTransferExpenseResVO( + messageUtil.getMessage("operation.common.save.done"))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/model/SaveBankAutoTransferExpenseReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/model/SaveBankAutoTransferExpenseReqVO.java new file mode 100644 index 00000000..e154ed89 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/model/SaveBankAutoTransferExpenseReqVO.java @@ -0,0 +1,25 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@EqualsAndHashCode +public class SaveBankAutoTransferExpenseReqVO { + private Long bankAutoTransferId; + private Long householdSeq; + private String recordMonth; + private String expenseCode; + private String transferCategoryCode; + private String transferCategory; + private String sourcePurpose; + private String count; + private String unitCode; + private String unit; + private Long price; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/model/SaveBankAutoTransferExpenseResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/model/SaveBankAutoTransferExpenseResVO.java new file mode 100644 index 00000000..bf12beee --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/model/SaveBankAutoTransferExpenseResVO.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class SaveBankAutoTransferExpenseResVO { + private String message; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/validator/SaveBankAutoTransferExpenseValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/validator/SaveBankAutoTransferExpenseValidator.java new file mode 100644 index 00000000..23b7c2c8 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/adapters/web/validator/SaveBankAutoTransferExpenseValidator.java @@ -0,0 +1,63 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web.validator; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web.model.SaveBankAutoTransferExpenseReqVO; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import org.springframework.validation.Errors; +import org.springframework.validation.Validator; + +@Component +public class SaveBankAutoTransferExpenseValidator implements Validator { + + @Override + public boolean supports(Class clazz) { + return SaveBankAutoTransferExpenseReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + SaveBankAutoTransferExpenseReqVO vo = (SaveBankAutoTransferExpenseReqVO) target; + + // 지출의 종류 null 체크 + if (!StringUtils.hasText(vo.getTransferCategoryCode())) { + errors.rejectValue("transferCategoryCode", "error.transferCategoryCode", + "지출의 종류를 선택해주세요."); + return; + } + + // 지출의 종류 직접입력일 때 unll 체크 + if (vo.getTransferCategoryCode().equals("code.bank.output.self") && !StringUtils.hasText( + vo.getTransferCategory())) { + errors.rejectValue("transferCategory", "error.transferCategory", + "지출의 종류를 입력해주세요."); + return; + } + + // 수량 입력 O, 단위 선택 X + if (StringUtils.hasText(vo.getCount()) && !StringUtils.hasText(vo.getUnitCode())) { + errors.rejectValue("unitCode", "error.unitCode", + "단위를 선택해주세요."); + return; + } + + // 수량 입력 X, 단위 선택 O + if (StringUtils.hasText(vo.getUnitCode()) && !StringUtils.hasText(vo.getCount())) { + errors.rejectValue("count", "error.count", + "수량을 입력해주세요."); + return; + } + + // 단위 직접입력 선택 후 직접입력 input null 일 경우 + if (vo.getUnitCode().equals("code.count.unit.self") && !StringUtils.hasText(vo.getUnit())) { + errors.rejectValue("unit", "error.unit", + "직접입력 단위를 입력해주세요."); + return; + } + + // 현금 + if (vo.getPrice() == null) { + errors.rejectValue("price", "error.price", + "현금(원)을 입력해주세요."); + } + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/SaveBankAutoTransferExpensePortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/SaveBankAutoTransferExpensePortIn.java new file mode 100644 index 00000000..7b88a1db --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/SaveBankAutoTransferExpensePortIn.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain.SaveBankAutoTransferExpenseInCmd; + +public interface SaveBankAutoTransferExpensePortIn { + void operate(SaveBankAutoTransferExpenseInCmd inCmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/SaveBankAutoTransferExpensePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/SaveBankAutoTransferExpensePortOut.java new file mode 100644 index 00000000..ea8fe5ba --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/SaveBankAutoTransferExpensePortOut.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain.SaveBankAutoTransferExpenseOutCmd; + +public interface SaveBankAutoTransferExpensePortOut { + void operate(SaveBankAutoTransferExpenseOutCmd outCmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/SaveBankAutoTransferExpenseService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/SaveBankAutoTransferExpenseService.java new file mode 100644 index 00000000..432b0860 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/SaveBankAutoTransferExpenseService.java @@ -0,0 +1,45 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application; + +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.SaveBankAutoTransferExpensePortIn; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.SaveBankAutoTransferExpensePortOut; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain.SaveBankAutoTransferExpenseInCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain.SaveBankAutoTransferExpenseOutCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class SaveBankAutoTransferExpenseService implements SaveBankAutoTransferExpensePortIn { + + private final SaveBankAutoTransferExpensePortOut portOut; + private final GetMonthlyInputStatusPortIn getMonthlyInputStatusPortIn; + + @Override + public void operate(SaveBankAutoTransferExpenseInCmd inCmd) { + + // 월별 등록상태 조회 + GetMonthlyInputStatus monthlyInputStatus = getMonthlyInputStatusPortIn + .operate(new GetMonthlyInputStatusCmd(inCmd.getHouseholdSeq(), inCmd.getRecordMonth())) + .orElse(null); + + portOut.operate(new SaveBankAutoTransferExpenseOutCmd( + inCmd.getBankAutoTransferId(), + inCmd.getHouseholdSeq(), + inCmd.getRecordMonth(), + inCmd.getExpenseCode(), + inCmd.getTransferCategoryCode(), + inCmd.getTransferCategory(), + inCmd.getSourcePurpose(), + inCmd.getCount(), + inCmd.getUnitCode(), + inCmd.getUnit(), + inCmd.getPrice(), + "code.bank.output", // 지출 type code + "2", // 지출 유형 2 고정 + monthlyInputStatus.getId(), + monthlyInputStatus.getBankAutoTransferOutputStatus())); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/domain/SaveBankAutoTransferExpenseInCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/domain/SaveBankAutoTransferExpenseInCmd.java new file mode 100644 index 00000000..fe6c066e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/domain/SaveBankAutoTransferExpenseInCmd.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class SaveBankAutoTransferExpenseInCmd { + private Long bankAutoTransferId; + private Long householdSeq; + private String recordMonth; + private String expenseCode; + private String transferCategoryCode; + private String transferCategory; + private String sourcePurpose; + private String count; + private String unitCode; + private String unit; + private Long price; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/domain/SaveBankAutoTransferExpenseOutCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/domain/SaveBankAutoTransferExpenseOutCmd.java new file mode 100644 index 00000000..f1c5c096 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferExpense/ports/application/domain/SaveBankAutoTransferExpenseOutCmd.java @@ -0,0 +1,28 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class SaveBankAutoTransferExpenseOutCmd extends AuditCommand { + private Long bankAutoTransferId; + private Long householdSeq; + private String recordMonth; + private String expenseCode; + private String transferCategoryCode; + private String transferCategory; + private String sourcePurpose; + private String count; + private String unitCode; + private String unit; + private Long price; + private String transferType; + private String category; + private Long monthlyInputStatusId; + private String bankAutoTransferOutputStatus; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/SaveBankAutoTransferIncomeController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/SaveBankAutoTransferIncomeController.java index 4a1e863d..6fb37b5f 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/SaveBankAutoTransferIncomeController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/SaveBankAutoTransferIncomeController.java @@ -1,5 +1,7 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.SaveBankAutoTransferIncomePortIn; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.application.domain.SaveBankAutoTransferIncomeInCmd; import app.module.core.config.application.util.MessageUtil; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -16,19 +18,36 @@ import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTrans @RestController @RequiredArgsConstructor class SaveBankAutoTransferIncomeController { - private final SaveBankAutoTransferIncomeValidator validator; - private final MessageUtil messageUtil; + private final SaveBankAutoTransferIncomeValidator validator; + private final SaveBankAutoTransferIncomePortIn portIn; + private final MessageUtil messageUtil; - @PostMapping(path = "/api/household/bank/income/save") - ResponseEntity operate( - @Valid @RequestBody SaveBankAutoTransferIncomeReqVO reqVO, BindingResult bindingResult) { - validator.validate(reqVO, bindingResult); - if (bindingResult.hasErrors()) { - return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) - .body(bindingResult.getFieldErrors()); + @PostMapping(path = "/api/household/bank/income/save") + ResponseEntity operate(@Valid @RequestBody SaveBankAutoTransferIncomeReqVO reqVO, + BindingResult bindingResult) { + validator.validate(reqVO, bindingResult); + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + portIn.operate( + new SaveBankAutoTransferIncomeInCmd( + reqVO.getBankAutoTransferId(), + reqVO.getHouseholdSeq(), + reqVO.getRecordMonth(), + reqVO.getCropCode(), + reqVO.getIncomeCode(), + reqVO.getExpenseCode(), + reqVO.getTransferCategoryCode(), + reqVO.getTransferCategory(), + reqVO.getSourcePurpose(), + reqVO.getCount(), + reqVO.getUnitCode(), + reqVO.getUnit(), + reqVO.getPrice())); + + return ResponseEntity.status(HttpStatus.OK).body(new SaveBankAutoTransferIncomeResVO( + messageUtil.getMessage("operation.common.save.done"))); } - - return ResponseEntity.status(HttpStatus.OK) - .body(new SaveBankAutoTransferIncomeResVO(messageUtil.getMessage("operation.common.save.done"))); - } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/model/SaveBankAutoTransferIncomeReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/model/SaveBankAutoTransferIncomeReqVO.java index fea66726..a214d8bd 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/model/SaveBankAutoTransferIncomeReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/model/SaveBankAutoTransferIncomeReqVO.java @@ -22,5 +22,5 @@ public class SaveBankAutoTransferIncomeReqVO { private String count; private String unitCode; private String unit; - private String price; + private Long price; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/validator/SaveBankAutoTransferIncomeValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/validator/SaveBankAutoTransferIncomeValidator.java index 2af7242c..ed09ab19 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/validator/SaveBankAutoTransferIncomeValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/web/validator/SaveBankAutoTransferIncomeValidator.java @@ -9,32 +9,64 @@ import org.springframework.validation.Validator; @Component public class SaveBankAutoTransferIncomeValidator implements Validator { - @Override - public boolean supports(Class clazz) { - return SaveBankAutoTransferIncomeReqVO.class.equals(clazz); - } - - @Override - public void validate(Object target, Errors errors) { - SaveBankAutoTransferIncomeReqVO vo = (SaveBankAutoTransferIncomeReqVO) target; - - if(!StringUtils.hasText(vo.getTransferCategoryCode())) { - errors.rejectValue("transferCategoryCode", "error.transferCategoryCode", "수입의 종류를 선택해주세요."); - return; + @Override + public boolean supports(Class clazz) { + return SaveBankAutoTransferIncomeReqVO.class.equals(clazz); } - // 수입의 종류가 특정 코드가 아닐 때만 대상 체크 - if (!vo.getTransferCategoryCode().equals("code.bank.input.10") && - !vo.getTransferCategoryCode().equals("code.bank.input.12") && - !vo.getTransferCategoryCode().equals("code.bank.input.13") && - !StringUtils.hasText(vo.getTransferCategory())) { - errors.rejectValue("transferCategory", "error.transferCategory", "대상을 입력해주세요."); - return; - } + @Override + public void validate(Object target, Errors errors) { + SaveBankAutoTransferIncomeReqVO vo = (SaveBankAutoTransferIncomeReqVO) target; - // 현금 - if(!StringUtils.hasText(vo.getPrice())) { - errors.rejectValue("price", "error.price", "현금(원)을 입력해주세요."); + // 수입의 종류 null 체크 + if (!StringUtils.hasText(vo.getTransferCategoryCode())) { + errors.rejectValue("transferCategoryCode", "error.transferCategoryCode", + "수입의 종류를 선택해주세요."); + return; + } + + // 수입의 종류가 특정 코드가 아닐 때만 대상 체크 + if (!vo.getTransferCategoryCode().equals("code.bank.input.10") + && !vo.getTransferCategoryCode().equals("code.bank.input.12") + && !vo.getTransferCategoryCode().equals("code.bank.input.13") + && !StringUtils.hasText(vo.getTransferCategory())) { + errors.rejectValue("transferCategory", "error.transferCategory", + "대상을 입력해주세요."); + return; + } + + // 수입의 종류 직접입력일 때 unll 체크 + if(vo.getTransferCategoryCode().equals("code.bank.input.self") + && !StringUtils.hasText(vo.getTransferCategory())) { + errors.rejectValue("transferCategory", "error.transferCategory", + "수입의 종류를 입력해주세요."); + } + + // 수량 입력 O, 단위 선택 X + if (StringUtils.hasText(vo.getCount()) && !StringUtils.hasText(vo.getUnitCode())) { + errors.rejectValue("unitCode", "error.unitCode", + "단위를 선택해주세요."); + return; + } + + // 수량 입력 X, 단위 선택 O + if (StringUtils.hasText(vo.getUnitCode()) && !StringUtils.hasText(vo.getCount())) { + errors.rejectValue("count", "error.count", + "수량을 입력해주세요."); + return; + } + + // 단위 직접입력 선택 후 직접입력 input null 일 경우 + if (vo.getUnitCode().equals("code.count.unit.self") && !StringUtils.hasText(vo.getUnit())) { + errors.rejectValue("unit", "error.unit", + "직접입력 단위를 입력해주세요."); + return; + } + + // 현금 + if (vo.getPrice() == null) { + errors.rejectValue("price", "error.price", + "현금(원)을 입력해주세요."); + } } - } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/SaveBankAutoTransferIncomeService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/SaveBankAutoTransferIncomeService.java index 08ac26e2..e690d351 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/SaveBankAutoTransferIncomeService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/SaveBankAutoTransferIncomeService.java @@ -40,7 +40,7 @@ class SaveBankAutoTransferIncomeService implements SaveBankAutoTransferIncomePor inCmd.getUnit(), inCmd.getPrice(), "code.bank.input", // 수입 type code - "1", // 수입 유형 1 + "1", // 수입 유형 1 고정 monthlyInputStatus.getId(), monthlyInputStatus.getBankAutoTransferInputStatus() )); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/domain/SaveBankAutoTransferIncomeInCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/domain/SaveBankAutoTransferIncomeInCmd.java index 2cf4d594..6c1b8bdf 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/domain/SaveBankAutoTransferIncomeInCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/domain/SaveBankAutoTransferIncomeInCmd.java @@ -22,5 +22,5 @@ public class SaveBankAutoTransferIncomeInCmd { private String count; private String unitCode; private String unit; - private String price; + private Long price; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/domain/SaveBankAutoTransferIncomeOutCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/domain/SaveBankAutoTransferIncomeOutCmd.java index 126fc2f1..4ed490ae 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/domain/SaveBankAutoTransferIncomeOutCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/ports/application/domain/SaveBankAutoTransferIncomeOutCmd.java @@ -22,7 +22,7 @@ public class SaveBankAutoTransferIncomeOutCmd extends AuditCommand { private String count; private String unitCode; private String unit; - private String price; + private Long price; private String transferType; private String category; private Long monthlyInputStatusId; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/persistence/RemoveForestProductsDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/persistence/RemoveForestProductsDao.java index b7bb6694..abae219b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/persistence/RemoveForestProductsDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/persistence/RemoveForestProductsDao.java @@ -13,21 +13,21 @@ import org.springframework.transaction.annotation.Transactional; @Repository @RequiredArgsConstructor class RemoveForestProductsDao implements RemoveForestProductsPortOut { - private final RemoveForestProductsMapper removeForestProductsMapper; - private final UpdateMonthlyInputStatusMapper updateMonthlyInputStatusMapper; + private final RemoveForestProductsMapper removeForestProductsMapper; + private final UpdateMonthlyInputStatusMapper updateMonthlyInputStatusMapper; - @Override - @DeleteCommand - @Transactional - public void operate(RemoveForestProductsCmd cmd) { - // 임산물 현황 삭제 - removeForestProductsMapper.removeForestProducts(cmd); + @Override + @DeleteCommand + @Transactional + public void operate(RemoveForestProductsCmd cmd) { + // 임산물 현황 삭제 + removeForestProductsMapper.remove(cmd); - // 임산물 모두 삭제됐을 경우 입력상태 미등록으로 update - if (!removeForestProductsMapper.existsForestProduct(cmd.getMonthlyInputStatusId())) { - updateMonthlyInputStatusMapper.updateForestProductStatus( - new UpdateForestProductStatusCmd(cmd.getMonthlyInputStatusId(), - MonthlyInputStatusType.NONE.name())); + // 임산물 모두 삭제됐을 경우 입력상태 미등록으로 update + if (!removeForestProductsMapper.existsForestProduct(cmd.getMonthlyInputStatusId())) { + updateMonthlyInputStatusMapper.updateForestProductStatus( + new UpdateForestProductStatusCmd(cmd.getMonthlyInputStatusId(), + MonthlyInputStatusType.NONE.name())); + } } - } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/persistence/RemoveForestProductsMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/persistence/RemoveForestProductsMapper.java index 1117241a..70af9d72 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/persistence/RemoveForestProductsMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/persistence/RemoveForestProductsMapper.java @@ -5,6 +5,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface RemoveForestProductsMapper { - void removeForestProducts(RemoveForestProductsCmd cmd); + void remove(RemoveForestProductsCmd cmd); boolean existsForestProduct(Long monthlyInputStatusId); } diff --git a/admin/src/main/resources/mappers/household/GetBankAutoTransferExpenseMapper.xml b/admin/src/main/resources/mappers/household/GetBankAutoTransferExpenseMapper.xml new file mode 100644 index 00000000..ccf61c19 --- /dev/null +++ b/admin/src/main/resources/mappers/household/GetBankAutoTransferExpenseMapper.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/RemoveBankAutoTransfersMapper.xml b/admin/src/main/resources/mappers/household/RemoveBankAutoTransfersMapper.xml new file mode 100644 index 00000000..d82dc549 --- /dev/null +++ b/admin/src/main/resources/mappers/household/RemoveBankAutoTransfersMapper.xml @@ -0,0 +1,25 @@ + + + + + /* remove : 은행자동이체내역 삭제*/ + UPDATE bank_auto_transfer + SET + WHERE id IN + + #{id} + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/RemoveForestProductsMapper.xml b/admin/src/main/resources/mappers/household/RemoveForestProductsMapper.xml index 83329571..3325a1a4 100644 --- a/admin/src/main/resources/mappers/household/RemoveForestProductsMapper.xml +++ b/admin/src/main/resources/mappers/household/RemoveForestProductsMapper.xml @@ -3,8 +3,8 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > - - /* removeForestProducts : 임산물현황 삭제*/ + + /* remove : 임산물현황 삭제*/ UPDATE forest_product SET WHERE id IN diff --git a/admin/src/main/resources/mappers/household/SaveBankAutoTransferExpenseMapper.xml b/admin/src/main/resources/mappers/household/SaveBankAutoTransferExpenseMapper.xml new file mode 100644 index 00000000..031d304f --- /dev/null +++ b/admin/src/main/resources/mappers/household/SaveBankAutoTransferExpenseMapper.xml @@ -0,0 +1,60 @@ + + + + + /* createBankAutoTransferExpense : 은행자동이체(지출) 등록 */ + INSERT INTO bank_auto_transfer + ( + household_seq, + month, + expense_code, + transfer_category_code, + transfer_category, + source_purpose, + count, + unit_code, + unit, + price, + transfer_type, + monthly_input_status_id, + category, + + ) + VALUES + ( + #{householdSeq}, + #{recordMonth}, + #{expenseCode}, + #{transferCategoryCode}, + #{transferCategory}, + #{sourcePurpose}, + #{count}, + #{unitCode}, + #{unit}, + #{price}, + #{transferType}, + #{monthlyInputStatusId}, + #{category}, + + ) + + + + /* updateBankAutoTransferExpense : 은행자동이체(지출) 수정 */ + UPDATE bank_auto_transfer + SET + household_seq = #{householdSeq}, + expense_code = #{expenseCode}, + transfer_category_code = #{transferCategoryCode}, + transfer_category = #{transferCategory}, + source_purpose = #{sourcePurpose}, + count = #{count}, + unit_code = #{unitCode}, + unit = #{unit}, + price = #{price}, + + WHERE id = #{bankAutoTransferId} + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/SaveBankAutoTransferIncomeMapper.xml b/admin/src/main/resources/mappers/household/SaveBankAutoTransferIncomeMapper.xml index 458d41e5..85f4c772 100644 --- a/admin/src/main/resources/mappers/household/SaveBankAutoTransferIncomeMapper.xml +++ b/admin/src/main/resources/mappers/household/SaveBankAutoTransferIncomeMapper.xml @@ -36,6 +36,7 @@ #{sourcePurpose}, #{count}, #{unitCode}, + #{unit}, #{price}, #{transferType}, #{monthlyInputStatusId}, @@ -57,6 +58,7 @@ source_purpose = #{sourcePurpose}, count = #{count}, unit_code = #{unitCode}, + unit = #{unit}, price = #{price}, WHERE id = #{bankAutoTransferId} diff --git a/admin/src/main/resources/mappers/household/UpdateMonthlyInputStatusMapper.xml b/admin/src/main/resources/mappers/household/UpdateMonthlyInputStatusMapper.xml index b1b08ea9..9032cf58 100644 --- a/admin/src/main/resources/mappers/household/UpdateMonthlyInputStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/UpdateMonthlyInputStatusMapper.xml @@ -3,21 +3,30 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > - - /* updateForestProductStatus : 임산물현황 입력상태 수정 */ - UPDATE monthly_input_status - SET forest_product_status = #{status}, - - WHERE is_deleted = false - AND id = #{id} - + + /* updateForestProductStatus : 임산물현황 입력상태 수정 */ + UPDATE monthly_input_status + SET forest_product_status = #{status}, + + WHERE is_deleted = false + AND id = #{id} + - - /* updateBankInputStatus : 은행자동이체(수입) 입력상태 수정 */ - UPDATE monthly_input_status - SET bank_auto_transfer_input_status = #{status}, - - WHERE is_deleted = false - AND id = #{id} - + + /* updateBankInputStatus : 은행자동이체(수입) 입력상태 수정 */ + UPDATE monthly_input_status + SET bank_auto_transfer_input_status = #{status}, + + WHERE is_deleted = false + AND id = #{id} + + + + /* updateBankOutputStatus : 은행자동이체(지출) 입력상태 수정 */ + UPDATE monthly_input_status + SET bank_auto_transfer_output_status = #{status}, + + WHERE is_deleted = false + AND id = #{id} + \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-expense.html b/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-expense.html new file mode 100644 index 00000000..a26775bb --- /dev/null +++ b/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-expense.html @@ -0,0 +1,273 @@ + + + +
+ +
+ + + + + + + +
+ + + + + + + + +
+ \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-income.html b/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-income.html index 1260a8a9..c3ee339f 100644 --- a/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-income.html +++ b/admin/src/main/resources/templates/households/modal/modal-bank-auto-transfer-income.html @@ -66,7 +66,7 @@
- +
@@ -76,7 +76,7 @@
- +
@@ -210,8 +210,8 @@ form.transferCategoryCode.value = data.transferCategoryCode ?? ''; // transferCategory 분기 처리 - setTransferCategory(data.transferCategoryCode, data.transferCategory); - toggleSelfInput(form.unitCode.value, '#unit'); + setTransferCategory(form, data.transferCategoryCode, data.transferCategory); + toggleSelfInput(form.unitCode.value, form.unit); } @@ -222,7 +222,6 @@ if (!form) return; const skipInputs = [ - 'bankAutoTransferId', 'householdSeq', 'recordMonth' ]; @@ -325,11 +324,11 @@ } // 분기 처리 유틸 - const setTransferCategory = (code, value) => { - const selfInput = document.querySelector('#transferCategorySelf'); - const targetInput = document.querySelector('#transferCategoryTarget'); + const setTransferCategory = (form, code, value) => { + const selfInput = form.querySelector('.transfer-category-self'); + const targetInput = form.querySelector('.transfer-category-target'); - const isSelf = code === 'code.bank.input.self'; + const isSelf = code.endsWith('.self'); if (isSelf) { selfInput.value = value ?? ''; @@ -339,12 +338,11 @@ targetInput.value = value ?? ''; } - toggleSelfInput(code, '#transferCategorySelf'); - toggleTargetInput(code, '#transferCategoryTarget'); + toggleSelfInput(code, selfInput); + toggleTargetInput(code, targetInput); }; - const toggleSelfInput = (code, inputSelector) => { - const el = document.querySelector(inputSelector); + const toggleSelfInput = (code, el) => { const wrapper = el.closest('.self-input'); const isSelf = code.endsWith('.self'); @@ -353,8 +351,7 @@ if (!isSelf) el.value = ''; }; - const toggleTargetInput = (code, inputSelector) => { - const el = document.querySelector(inputSelector); + const toggleTargetInput = (code, el) => { const wrapper = el.closest('.target-input'); const needTarget = !['code.bank.input.10', 'code.bank.input.12', 'code.bank.input.13', 'code.bank.input.self', ''].includes(code); diff --git a/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html b/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html index df7a2d3b..7879b84c 100644 --- a/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html +++ b/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html @@ -12,7 +12,7 @@

수입 (0건)

- -
@@ -118,7 +118,7 @@
@@ -155,11 +155,11 @@
- ${ifNullHyphen(item.categoryText)} + ${ifNullHyphen(item.categoryText)} ${ifNullHyphen(item.sourcePurpose)} ${ifNullHyphen(item.count)} ${ifNullHyphen(item.unitText)} @@ -170,6 +170,54 @@ tbody.append(tmpl); } + + // 은행자동이체내역 삭제 Confirm + const removeBankConfirm = (el) => { + const section = el.closest('section'); + const checkedInputs = section.querySelectorAll('input[name="removeIds"]:checked'); + const checkedIds = Array.from(checkedInputs).map(input => Number(input.value)); + + const removeType = el.dataset.removeType; + const removeTypeText = el.dataset.removeType === 'INCOME' ? '수입' : '지출'; + + if(checkedIds.length <= 0) { + alert(`은행자동이체내역(${removeTypeText})을 선택해주세요.`); + return; + } + + etUI.dialog.confirm({ + title: '삭제 안내', + message: '선택하신 내용을 삭제하시겠습니까?
삭제한 항목은 복구할 수 없습니다.', + positiveCallback: function () { + removeBank(checkedIds, removeType, removeTypeText); + }, + }); + } + + // 은행자동이체내역 삭제 + const removeBank = (checkedIds, removeType, removeTypeText) => { + const f = document.reqForm; + + ajaxUtil._ajaxMethod( + '/api/household/bank/delete', + JSON.stringify({ + householdSeq: f.householdSeq.value, + recordMonth: f.recordMonth.value, + removeType: removeType, + removeIds: checkedIds + }), + () => { // 성공 + alert(`은행자동이체내역(${removeTypeText})이 삭제되었습니다.`); + getBankAutoTransfer(); + }, + function (code, rstData) { + if(code == 422) alert(rstData.responseText); + if(code == 400) alert(rstData.responseJSON.message); + }, + 'delete', + 'json', + ); + }
\ No newline at end of file diff --git a/admin/src/main/resources/templates/households/tab/forest-product.html b/admin/src/main/resources/templates/households/tab/forest-product.html index 7d54dc4c..c748f60a 100644 --- a/admin/src/main/resources/templates/households/tab/forest-product.html +++ b/admin/src/main/resources/templates/households/tab/forest-product.html @@ -22,7 +22,7 @@ - - - - - - -
-
-
- - - - - -
- -
-
- -
-
- -
-
-
-
    -
  • -

    작성완료

    - 6건 -
  • -
  • -

    미작성

    - 6건 -
  • -
  • -

    미완료

    - 6건 -
  • -
  • -

    대기

    - 6건 -
  • -
  • -

    완료율

    - 56.12% -
  • -
-
- - - - - - - - - - - - - - - - -
입력날짜완료상태수입노동투입지출동력사용시간임업 자가소비량농업 자가소비량
-
-
- - - -
- -
-
-
-
-

-
-
- - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
주생산물부생산물
선택지번지목읍면동가능면적(평)재배작물명면적(평)수확량단위판매량단위수확량단위판매량단위
-
-
-
- -
-
-
- -
-
-

수입 (0건)

-
-
- - -
-
-
- - - - - - - - - - - - - - - - -
선택재배형태수입의 종류대상수입원수량단위현금(원)
-
- - -
-
-

지출 (0건)

-
-
- - -
-
-
- - - - - - - - - - - - - - -
선택지출의 종류용도수량단위현금(원)
-
-
-
-
- -
-
-
-
-

-
-
- - -
-
-
- - - - - - - - - - - - - - -
선택방문일관리분야내용최종 수정자답례품 전달
-
-
-
-
-
- -
-
-
- -
-
- - -
-
-
-
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index be8568c4..f13b09fa 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -187,8 +187,11 @@ - + + + +