From d2b7145ecfbed66e1adb3b6cd488f81f6cc0a42a Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Thu, 17 Jul 2025 16:23:46 +0900 Subject: [PATCH 1/7] =?UTF-8?q?[BO]=20=EC=A1=B0=EC=82=AC=EC=9B=90=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=ED=83=AD=20=EB=98=90=EC=88=98=EC=A0=95..?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/main/resources/templates/researcher/detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 95505c9b..6545b94a 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -77,7 +77,7 @@
-
+
From 5cab8796c03c6dd61cd84021c026e7a1dbf9fc3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Thu, 17 Jul 2025 16:39:18 +0900 Subject: [PATCH 2/7] =?UTF-8?q?[FindBugs]=20CRLF=5FINJECTION=5FLOGS=20=20-?= =?UTF-8?q?=20SafeLogger=20=EC=B6=94=EA=B0=80=20=EB=98=90=EB=8A=94=20log.d?= =?UTF-8?q?ebug=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/batch/BatchLogRunner.java | 11 ++-- .../security/AdminAuthSuccessEvent.java | 8 +-- .../web/UpdateSmsAutoStatusController.java | 5 +- .../application/CreateHouseholdService.java | 9 ++-- .../web/GetHouseholdsExcelController.java | 9 ++-- .../ExcelUploadCreateHouseholdDao.java | 9 ++-- .../web/CreateDailyRecordController.java | 4 -- .../adapters/persistence/RemoveDailyDao.java | 11 ++-- .../adapters/web/RemoveDailyController.java | 9 ++-- .../persistence/SaveDailyExpenseDao.java | 11 ++-- .../web/SaveDailyExpenseController.java | 3 -- .../persistence/SaveDailyFarmingDao.java | 22 ++++---- .../web/SaveDailyFarmingController.java | 3 -- .../persistence/SaveDailyForestryDao.java | 11 ++-- .../web/SaveDailyForestryController.java | 3 -- .../persistence/SaveDailyIncomeDao.java | 12 +++-- .../web/SaveDailyIncomeController.java | 3 -- .../persistence/SaveDailyPowerDao.java | 11 ++-- .../web/SaveDailyPowerController.java | 3 -- .../persistence/SaveDailyWorkDao.java | 10 ++-- .../adapters/web/SaveDailyWorkController.java | 3 -- .../persistence/UpdateDailyNoneDao.java | 9 ++-- .../web/UpdateDailyNoneController.java | 4 +- .../application/logging/SafeLogger.java | 50 +++++++++++++++++++ 24 files changed, 147 insertions(+), 86 deletions(-) create mode 100644 core/src/main/java/app/module/core/config/application/logging/SafeLogger.java diff --git a/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java b/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java index 7b5ffb8f..61dffdd6 100644 --- a/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java +++ b/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java @@ -2,20 +2,23 @@ package app.module.admin.config.application.batch; import app.module.admin.usecase.batchLog.ports.BatchLogPortIn; import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; +import app.module.core.config.application.logging.SafeLogger; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor -@Slf4j public class BatchLogRunner { + SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(BatchLogRunner.class)); + private final BatchLogPortIn batchLogPortIn; public void run(BatchLogType batchType, Runnable action) { // 이미 실행 중인지 확인 if (batchLogPortIn.exists(batchType)) { - log.warn("[{}] 배치가 이미 실행 중 입니다.", batchType.name()); + safeLogger.warn("[{}] 배치가 이미 실행 중 입니다.", batchType.name()); return; } @@ -29,7 +32,7 @@ public class BatchLogRunner { } catch (Exception e) { // 실패 처리 batchLogPortIn.update(logId, "FAIL", e.getMessage()); - log.error("[{}] 배치 실패: {}", batchType.name(), e.getMessage(), e); + safeLogger.error("[{}] 배치 실패: {}", batchType.name(), e.getMessage(), e); } } } diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java index bd3dee3a..3bec1599 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java @@ -12,8 +12,10 @@ import jakarta.servlet.http.HttpServletRequest; import java.time.LocalDateTime; import java.util.Objects; +import app.module.core.config.application.logging.SafeLogger; + +import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.event.EventListener; import org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent; @@ -25,8 +27,8 @@ import org.springframework.web.context.request.ServletRequestAttributes; @Component @RequiredArgsConstructor -@Slf4j public class AdminAuthSuccessEvent { + SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(AdminAuthSuccessEvent.class)); private final MessageUtil messageUtil; private final AdminViewPortIn adminViewPortIn; @@ -85,6 +87,6 @@ public class AdminAuthSuccessEvent { public void handleAuthenticationFailureEvent(AbstractAuthenticationFailureEvent event) { Exception e = event.getException(); Authentication authentication = event.getAuthentication(); - log.warn("Unsuccessful authentication result: {}", authentication, e); + safeLogger.warn("Unsuccessful authentication result: {}", authentication, e); } } diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/web/UpdateSmsAutoStatusController.java b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/web/UpdateSmsAutoStatusController.java index c3e3e384..129f3e0a 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/web/UpdateSmsAutoStatusController.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/web/UpdateSmsAutoStatusController.java @@ -5,7 +5,6 @@ import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application. import app.module.core.config.application.util.MessageUtil; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PatchMapping; @@ -15,11 +14,10 @@ import org.springframework.validation.BindingResult; import app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web.model.UpdateSmsAutoStatusReqVO; import app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web.model.UpdateSmsAutoStatusResVO; -@Slf4j @RestController @RequiredArgsConstructor class UpdateSmsAutoStatusController { - private final UpdateSmsAutoStatusPortIn portIn; + private final UpdateSmsAutoStatusPortIn portIn; private final MessageUtil messageUtil; @PatchMapping(path = "/api/smsAutoStatus/update") @@ -35,7 +33,6 @@ class UpdateSmsAutoStatusController { portIn.operate(new UpdateSmsAutoStatusCmd(reqVO.getActive())); } catch (Exception e) { // update 실패 - log.info(e.getMessage()); throw new RuntimeException(e); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/CreateHouseholdService.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/CreateHouseholdService.java index 38dd6dc9..863ed058 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/CreateHouseholdService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/CreateHouseholdService.java @@ -8,18 +8,20 @@ import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdP import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn; +import app.module.core.config.application.logging.SafeLogger; + +import org.slf4j.LoggerFactory; import java.util.List; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -@Slf4j @Service @RequiredArgsConstructor class CreateHouseholdService implements CreateHouseholdPortIn { + SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(CreateHouseholdService.class)); private final CreateHouseholdPortOut portOut; private final BCryptPasswordEncoder passwordEncoder; @@ -72,8 +74,7 @@ class CreateHouseholdService implements CreateHouseholdPortIn { autoSchedulesPortIn.operate(); } catch (Exception e) { - log.info(e.getMessage()); - throw e; + safeLogger.error("Exception: {}", e.getMessage(), e); } } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java index 1f726588..39b3c9f7 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java @@ -20,8 +20,10 @@ import java.util.List; import java.util.Map; import app.module.core.config.application.util.DailyUtil; +import app.module.core.config.application.logging.SafeLogger; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + +import org.slf4j.LoggerFactory; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.IndexedColors; import org.springframework.data.domain.Page; @@ -34,8 +36,9 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@Slf4j class GetHouseholdsExcelController { + SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(GetHouseholdsExcelController.class)); + private final GetHouseholdsStatusPortIn getHouseholdsStatusPortIn; private final GetHouseholdsExcelPortIn getHouseholdsExcelPortIn; private final DailyUtil dailyUtil; @@ -120,7 +123,7 @@ class GetHouseholdsExcelController { }; if (result == null) { - log.warn("[엑셀 다운로드 실패] 템플릿 타입 '{}' 에 대한 처리 결과가 null입니다.", reqVO.getTemplateType()); + safeLogger.warn("[엑셀 다운로드 실패] 템플릿 타입 '{}' 에 대한 처리 결과가 null입니다.", reqVO.getTemplateType()); return ResponseEntity.badRequest().build(); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java index 6541cde1..0ef73c4c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java @@ -15,8 +15,10 @@ import app.module.admin.usecase.researcher.adpaters.persistence.ResearcherMapper import app.module.core.config.application.util.AuditUtil; import app.module.core.usecase.uicode.list.adapters.persistence.UICodeListMapper; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; +import app.module.core.config.application.logging.SafeLogger; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + +import org.slf4j.LoggerFactory; import org.apache.poi.ss.usermodel.*; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Repository; @@ -29,10 +31,11 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; -@Slf4j @Repository @RequiredArgsConstructor class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut { + SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(ExcelUploadCreateHouseholdDao.class)); + private final CreateHouseholdMapper createHouseholdMapper; private final CheckHouseholdNumMapper checkHouseholdNumMapper; private final UICodeListMapper uiCodeListMapper; @@ -122,7 +125,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut } } else { errorList.add(getCellValue(row.getCell(0))); - log.warn("[ EXCEL 누락 ] 임가번호={} 핸드폰번호={}",getCellValue(row.getCell(0)),getCellValue(row.getCell(3))); + safeLogger.warn("[ EXCEL 누락 ] 임가번호={} 핸드폰번호={}", getCellValue(row.getCell(0)),getCellValue(row.getCell(3))); } } workbook.close(); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyRecord/adapters/web/CreateDailyRecordController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyRecord/adapters/web/CreateDailyRecordController.java index 8be4e3fb..026863b9 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyRecord/adapters/web/CreateDailyRecordController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyRecord/adapters/web/CreateDailyRecordController.java @@ -5,12 +5,10 @@ import app.module.core.usecase.daily.record.adapters.web.model.CreateDailyRecord import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -@Slf4j @RestController @RequiredArgsConstructor public class CreateDailyRecordController { @@ -27,7 +25,6 @@ public class CreateDailyRecordController { formVO.setTodayNone("Y"); DailyUIReqVO reqVO = new DailyUIReqVO(formVO.getRecordMonth(), formVO.getDayGroupNo(), formVO.getHouseholdSeq()); - log.debug("reqVO: {}", reqVO); DailyRecordDto detail = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq()); formVO.setRecordMonth(reqVO.getSearchMonth()); @@ -36,7 +33,6 @@ public class CreateDailyRecordController { formVO.setEndDate(detail.getEndDate()); formVO.setFarming(detail.isFarmingOpen()); formVO.setHouseholdSeq(reqVO.getHouseholdSeq()); - log.debug("formVO: {}", formVO); dailyRecordPortIn.create(formVO); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java index 669da223..ffb06c1f 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java @@ -4,21 +4,24 @@ import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.Remo import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.application.domain.RemoveDailyCmd; import app.module.core.config.application.annotation.UpdateCommand; import app.module.core.config.application.enums.DailySort; +import app.module.core.config.application.logging.SafeLogger; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; -@Slf4j @Repository @RequiredArgsConstructor public class RemoveDailyDao implements RemoveDailyPortOut { + SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(RemoveDailyDao.class)); + private final RemoveDailyMapper mapper; @UpdateCommand @Override public void operate(RemoveDailyCmd command) { if (command.getCurrentStep() != null) { - log.error("[RemoveDaily] cmd: {}", command); + safeLogger.error("[RemoveDaily] cmd: {}", command); if (DailySort.INCOME.equals(command.getCurrentStep())) { mapper.removeDailyIncome(command); @@ -37,7 +40,7 @@ public class RemoveDailyDao implements RemoveDailyPortOut { } } else { - log.error("[RemoveDaily] Current step is null. cmd: {}", command); + safeLogger.error("[RemoveDaily] Current step is null. cmd: {}", command); } } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/web/RemoveDailyController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/web/RemoveDailyController.java index b4691dfb..2dc47d3e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/web/RemoveDailyController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/web/RemoveDailyController.java @@ -2,23 +2,26 @@ package app.module.admin.usecase.household.tab.dailyRecord.removeDaily.adapters. import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.adapters.web.modal.RemoveDailyReqVO; import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.RemoveDailyPortIn; +import app.module.core.config.application.logging.SafeLogger; + +import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; 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; -@Slf4j @RestController @RequiredArgsConstructor class RemoveDailyController { + SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(RemoveDailyController.class)); + private final RemoveDailyPortIn removeDailyNonePortIn; @PostMapping(path = "/api/household/daily/remove") ResponseEntity remove(@RequestBody RemoveDailyReqVO reqVO) { - log.debug("reqVO: {}", reqVO); + safeLogger.debug("reqVO: {}", reqVO); if (!reqVO.getSelectedIds().isEmpty()) { removeDailyNonePortIn.operate(reqVO); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseDao.java index be157920..305f9bfb 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseDao.java @@ -5,14 +5,17 @@ import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.GetDailyExpenseCmd; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.SaveDailyExpenseCmd; import app.module.core.config.application.annotation.CreateCommand; +import app.module.core.config.application.logging.SafeLogger; + +import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -@Slf4j @Service @RequiredArgsConstructor public class SaveDailyExpenseDao implements SaveDailyExpensePortOut { + SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(SaveDailyExpenseDao.class)); + private final SaveDailyExpenseMapper dailyExpenseMapper; @Override @@ -28,11 +31,11 @@ public class SaveDailyExpenseDao implements SaveDailyExpensePortOut { if (existCount == 0) { dailyExpenseMapper.createDailyExpense(command); - log.debug("[CreateDailyExpense] command={}", command); + safeLogger.debug("[CreateDailyExpense] command={}", command); } else { dailyExpenseMapper.updateDailyExpense(command); - log.debug("[UpdateDailyExpense] command={}", command); + safeLogger.debug("[UpdateDailyExpense] command={}", command); } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/SaveDailyExpenseController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/SaveDailyExpenseController.java index 9eae6c30..8da1cae8 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/SaveDailyExpenseController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/SaveDailyExpenseController.java @@ -10,13 +10,11 @@ import app.module.core.usecase.daily.record.adapters.persistence.model.DailyReco import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; -@Slf4j @RestController @RequiredArgsConstructor @RequestMapping(path = "/api/household/daily/expense") @@ -64,7 +62,6 @@ public class SaveDailyExpenseController { formVO.setSearchMonth(dailyRecord.getRecordMonth()); formVO.setGroupNo(dailyRecord.getGroupNo()); formVO.setDailyId(dailyRecord.getId()); - log.debug("formVO: {}", formVO); dailyExpensePortIn.create(formVO); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingDao.java index 15d00e63..d410c87f 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingDao.java @@ -1,39 +1,41 @@ package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence; -import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.SaveDailyFarmingMapper; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.SaveDailyFarmingPortOut; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.GetDailyFarmingCmd; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.SaveDailyFarmingCmd; import app.module.core.config.application.annotation.CreateCommand; +import app.module.core.config.application.logging.SafeLogger; + +import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -@Slf4j @Service @RequiredArgsConstructor public class SaveDailyFarmingDao implements SaveDailyFarmingPortOut { - private final SaveDailyFarmingMapper DailyFarmingMapper; + SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(SaveDailyFarmingDao.class)); + + private final SaveDailyFarmingMapper dailyFarmingMapper; @Override public GetDailyFarmingDto detail(GetDailyFarmingCmd command) { - return DailyFarmingMapper.getDailyFarming(command); + return dailyFarmingMapper.getDailyFarming(command); } @CreateCommand @Override public void create(GetDailyFarmingCmd findCmd, SaveDailyFarmingCmd command) { - Integer existCount = DailyFarmingMapper.getRecordExistCount(findCmd); + Integer existCount = dailyFarmingMapper.getRecordExistCount(findCmd); if (existCount == 0) { - DailyFarmingMapper.createDailyFarming(command); + dailyFarmingMapper.createDailyFarming(command); - log.debug("[CreateDailyFarming] command={}", command); + safeLogger.debug("[CreateDailyFarming] command={}", command); } else { - DailyFarmingMapper.updateDailyFarming(command); + dailyFarmingMapper.updateDailyFarming(command); - log.debug("[UpdateDailyFarming] command={}", command); + safeLogger.debug("[UpdateDailyFarming] command={}", command); } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/SaveDailyFarmingController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/SaveDailyFarmingController.java index 0dbc290d..d81d7db4 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/SaveDailyFarmingController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/SaveDailyFarmingController.java @@ -10,13 +10,11 @@ import app.module.core.usecase.daily.record.adapters.persistence.model.DailyReco import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; -@Slf4j @RestController @RequiredArgsConstructor @RequestMapping(path = "/api/household/daily/farming") @@ -64,7 +62,6 @@ public class SaveDailyFarmingController { formVO.setSearchMonth(dailyRecord.getRecordMonth()); formVO.setGroupNo(dailyRecord.getGroupNo()); formVO.setDailyId(dailyRecord.getId()); - log.debug("formVO: {}", formVO); DailyFarmingPortIn.create(formVO); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryDao.java index ca54c0f4..ff25623e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryDao.java @@ -5,14 +5,17 @@ import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.port import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.GetDailyForestryCmd; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.SaveDailyForestryCmd; import app.module.core.config.application.annotation.CreateCommand; +import app.module.core.config.application.logging.SafeLogger; + +import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -@Slf4j @Service @RequiredArgsConstructor public class SaveDailyForestryDao implements SaveDailyForestryPortOut { + SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(SaveDailyForestryDao.class)); + private final SaveDailyForestryMapper dailyForestryMapper; @Override @@ -28,11 +31,11 @@ public class SaveDailyForestryDao implements SaveDailyForestryPortOut { if (existCount == 0) { dailyForestryMapper.createDailyForestry(command); - log.debug("[CreateDailyForestry] command={}", command); + safeLogger.debug("[CreateDailyForestry] command={}", command); } else { dailyForestryMapper.updateDailyForestry(command); - log.debug("[UpdateDailyForestry] command={}", command); + safeLogger.debug("[UpdateDailyForestry] command={}", command); } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/SaveDailyForestryController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/SaveDailyForestryController.java index 71d59875..68b8c3c3 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/SaveDailyForestryController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/SaveDailyForestryController.java @@ -10,13 +10,11 @@ import app.module.core.usecase.daily.record.adapters.persistence.model.DailyReco import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; -@Slf4j @RestController @RequiredArgsConstructor @RequestMapping(path = "/api/household/daily/forestry") @@ -64,7 +62,6 @@ public class SaveDailyForestryController { formVO.setSearchMonth(dailyRecord.getRecordMonth()); formVO.setGroupNo(dailyRecord.getGroupNo()); formVO.setDailyId(dailyRecord.getId()); - log.debug("formVO: {}", formVO); dailyForestryPortIn.create(formVO); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java index ed6948d1..ee456e33 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java @@ -5,15 +5,17 @@ import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports. import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.GetDailyIncomeCmd; import app.module.core.config.application.annotation.CreateCommand; -import app.module.core.config.application.annotation.UpdateCommand; +import app.module.core.config.application.logging.SafeLogger; + +import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -@Slf4j @Service @RequiredArgsConstructor public class SaveDailyIncomeDao implements SaveDailyIncomePortOut { + SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(SaveDailyIncomeDao.class)); + private final SaveDailyIncomeMapper dailyIncomeMapper; @Override @@ -29,11 +31,11 @@ public class SaveDailyIncomeDao implements SaveDailyIncomePortOut { if (existCount == 0) { dailyIncomeMapper.createDailyIncome(command); - log.debug("[CreateDailyIncome] command={}", command); + safeLogger.debug("[CreateDailyIncome] command={}", command); } else { dailyIncomeMapper.updateDailyIncome(command); - log.debug("[UpdateDailyIncome] command={}", command); + safeLogger.debug("[UpdateDailyIncome] command={}", command); } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java index 30412897..f7396964 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java @@ -10,13 +10,11 @@ import app.module.core.usecase.daily.record.adapters.persistence.model.DailyReco import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; -@Slf4j @RestController @RequiredArgsConstructor @RequestMapping(path = "/api/household/daily/income") @@ -64,7 +62,6 @@ public class SaveDailyIncomeController { formVO.setSearchMonth(dailyRecord.getRecordMonth()); formVO.setGroupNo(dailyRecord.getGroupNo()); formVO.setDailyId(dailyRecord.getId()); - log.debug("formVO: {}", formVO); dailyIncomePortIn.create(formVO); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/SaveDailyPowerDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/SaveDailyPowerDao.java index 615bc870..47243873 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/SaveDailyPowerDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/SaveDailyPowerDao.java @@ -5,14 +5,17 @@ import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.S import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.GetDailyPowerCmd; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.SaveDailyPowerCmd; import app.module.core.config.application.annotation.CreateCommand; +import app.module.core.config.application.logging.SafeLogger; + +import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -@Slf4j @Service @RequiredArgsConstructor public class SaveDailyPowerDao implements SaveDailyPowerPortOut { + SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(SaveDailyPowerDao.class)); + private final SaveDailyPowerMapper dailyPowerMapper; @Override @@ -28,11 +31,11 @@ public class SaveDailyPowerDao implements SaveDailyPowerPortOut { if (existCount == 0) { dailyPowerMapper.createDailyPower(command); - log.debug("[CreateDailyPower] command={}", command); + safeLogger.debug("[CreateDailyPower] command={}", command); } else { dailyPowerMapper.updateDailyPower(command); - log.debug("[UpdateDailyPower] command={}", command); + safeLogger.debug("[UpdateDailyPower] command={}", command); } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/SaveDailyPowerController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/SaveDailyPowerController.java index 280f0311..88ea73e5 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/SaveDailyPowerController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/SaveDailyPowerController.java @@ -10,13 +10,11 @@ import app.module.core.usecase.daily.record.adapters.persistence.model.DailyReco import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; -@Slf4j @RestController @RequiredArgsConstructor @RequestMapping(path = "/api/household/daily/power") @@ -64,7 +62,6 @@ public class SaveDailyPowerController { formVO.setSearchMonth(dailyRecord.getRecordMonth()); formVO.setGroupNo(dailyRecord.getGroupNo()); formVO.setDailyId(dailyRecord.getId()); - log.debug("formVO: {}", formVO); dailyPowerPortIn.create(formVO); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkDao.java index a6af3580..051ab691 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkDao.java @@ -5,7 +5,9 @@ import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.ap import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.SaveDailyWorkCmd; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.SaveDailyWorkPortOut; import app.module.core.config.application.annotation.CreateCommand; -import app.module.core.config.application.annotation.UpdateCommand; +import app.module.core.config.application.logging.SafeLogger; + +import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -14,6 +16,8 @@ import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor public class SaveDailyWorkDao implements SaveDailyWorkPortOut { + SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(SaveDailyWorkDao.class)); + private final SaveDailyWorkMapper dailyWorkMapper; @Override @@ -29,11 +33,11 @@ public class SaveDailyWorkDao implements SaveDailyWorkPortOut { if (existCount == 0) { dailyWorkMapper.createDailyWork(command); - log.debug("[CreateDailyWork] command={}", command); + safeLogger.debug("[CreateDailyWork] command={}", command); } else { dailyWorkMapper.updateDailyWork(command); - log.debug("[UpdateDailyWork] command={}", command); + safeLogger.debug("[UpdateDailyWork] command={}", command); } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/SaveDailyWorkController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/SaveDailyWorkController.java index 47b0a340..b3ea099b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/SaveDailyWorkController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/SaveDailyWorkController.java @@ -10,13 +10,11 @@ import app.module.core.usecase.daily.record.adapters.persistence.model.DailyReco import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; -@Slf4j @RestController @RequiredArgsConstructor @RequestMapping(path = "/api/household/daily/work") @@ -64,7 +62,6 @@ public class SaveDailyWorkController { formVO.setSearchMonth(dailyRecord.getRecordMonth()); formVO.setGroupNo(dailyRecord.getGroupNo()); formVO.setDailyId(dailyRecord.getId()); - log.debug("formVO: {}", formVO); dailyWorkPortIn.create(formVO); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java index 46d5ccd1..3f15b1b7 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java @@ -5,15 +5,18 @@ import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports. import app.module.core.config.application.annotation.UpdateCommand; import app.module.core.config.application.enums.DailySort; import app.module.core.config.application.enums.DailyTargetStatus; +import app.module.core.config.application.logging.SafeLogger; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; -@Slf4j @Repository @RequiredArgsConstructor class UpdateDailyNoneDao implements UpdateDailyNonePortOut { + SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(UpdateDailyNoneDao.class)); + private final UpdateDailyNoneMapper mapper; private final DailyRecordPortIn dailyRecordPortIn; @@ -43,7 +46,7 @@ class UpdateDailyNoneDao implements UpdateDailyNonePortOut { dailyRecordPortIn.updateByStatus(command.getSearchMonth(), command.getGroupNo(), command.getHouseholdSeq(), command.getCurrentStep().name(), command.getCurrentStatus().name()); } else { - log.error("[UpdateDailyNone] Current step is null. cmd: {}", command); + safeLogger.error("[UpdateDailyNone] Current step is null. cmd: {}", command); } } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/web/UpdateDailyNoneController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/web/UpdateDailyNoneController.java index 1ca788d5..dfb3fae8 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/web/UpdateDailyNoneController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/web/UpdateDailyNoneController.java @@ -2,15 +2,14 @@ package app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.adapt import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.adapters.web.modal.UpdateDailyNoneReqVO; import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.UpdateDailyNonePortIn; + import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; 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; -@Slf4j @RestController @RequiredArgsConstructor class UpdateDailyNoneController { @@ -18,7 +17,6 @@ class UpdateDailyNoneController { @PostMapping(path = "/api/household/daily/today-none") ResponseEntity create(@RequestBody UpdateDailyNoneReqVO formVO) { - log.debug("formVO: {}", formVO); updateDailyNonePortIn.create(formVO); diff --git a/core/src/main/java/app/module/core/config/application/logging/SafeLogger.java b/core/src/main/java/app/module/core/config/application/logging/SafeLogger.java new file mode 100644 index 00000000..7964e775 --- /dev/null +++ b/core/src/main/java/app/module/core/config/application/logging/SafeLogger.java @@ -0,0 +1,50 @@ +package app.module.core.config.application.logging; + +import org.slf4j.Logger; +import org.springframework.security.core.Authentication; + +public class SafeLogger { + private final Logger logger; + public SafeLogger(Logger logger) { this.logger = logger; } + + // 가변 인자 지원 및 CRLF 이스케이프 처리 유틸리티 + private Object sanitizeForLog(Object arg) { + if (arg == null) return null; + String str = arg.toString(); + return str.replace("\n", "\\n").replace("\r", "\\r"); + } + + public void info(String msg, Object... args) { + Object[] safeArgs = new Object[args.length]; + for (int i = 0; i < args.length; i++) { + safeArgs[i] = sanitizeForLog(args[i]); + } + logger.info(msg, safeArgs); + } + + public void error(String msg, Object... args) { + Object[] safeArgs = new Object[args.length]; + for (int i = 0; i < args.length; i++) { + safeArgs[i] = sanitizeForLog(args[i]); + } + logger.error(msg, safeArgs); + } + + public void warn(String msg, Object... args) { + Object[] safeArgs = new Object[args.length]; + for (int i = 0; i < args.length; i++) { + safeArgs[i] = sanitizeForLog(args[i]); + } + logger.warn(msg, safeArgs); + } + + public void debug(String msg, Object... args) { + Object[] safeArgs = new Object[args.length]; + for (int i = 0; i < args.length; i++) { + safeArgs[i] = sanitizeForLog(args[i]); + } + logger.debug(msg, safeArgs); + } + + +} \ No newline at end of file From ef24ae0a6fb1c1ddcf6d279e4b0c9e7fa558b5c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Thu, 17 Jul 2025 16:53:19 +0900 Subject: [PATCH 3/7] =?UTF-8?q?[FindBugs]=20CRLF=5FINJECTION=5FLOGS=20=20-?= =?UTF-8?q?=20SafeLogger=20=EC=B6=94=EA=B0=80=20=EB=98=90=EB=8A=94=20log.d?= =?UTF-8?q?ebug=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/app/module/mms/adapters/persistence/MMSDao.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java b/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java index 25a9b065..6b33ae6e 100644 --- a/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java +++ b/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java @@ -3,13 +3,11 @@ package app.module.mms.adapters.persistence; import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd; import app.module.mms.ports.MMSPortOut; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; import java.util.Optional; -@Slf4j @Repository @RequiredArgsConstructor public class MMSDao implements MMSPortOut { @@ -23,7 +21,6 @@ public class MMSDao implements MMSPortOut { return Optional.of(true); } catch (Exception e) { - log.error(e.getMessage()); throw new RuntimeException("문자 자동 발송 생성 중 오류: " + e.getMessage(), e); } From 61a9e6a7099863427ee06042cb61f27eb44615ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Thu, 17 Jul 2025 16:55:17 +0900 Subject: [PATCH 4/7] =?UTF-8?q?gitignore=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index 542b46ab..e10f67db 100644 --- a/.gitignore +++ b/.gitignore @@ -39,7 +39,4 @@ META-INF .jpd *.log -front/src/main/resources/static/kri_appimg.png -front/src/main/resources/static/kri_favicon.ico -front/src/main/resources/static/manifest.json front/web/WEB-INF/web.xml From a9af5c0baa48c8549456e2503980e3bb48b521ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Thu, 17 Jul 2025 16:56:03 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=EA=B0=81=20=EB=AA=A8=EB=93=88=EC=9D=98=20?= =?UTF-8?q?=EB=82=B4=EB=B6=80=20=EA=B5=AC=EC=A1=B0(=ED=97=A5=EC=82=AC?= =?UTF-8?q?=EA=B3=A0=EB=82=A0=20=EC=95=84=ED=82=A4=ED=85=8D=EC=B2=98=20?= =?UTF-8?q?=EC=98=88=EC=8B=9C)=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 287b1ef1..27bddca8 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,11 @@ Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. ``` +## 프로젝트 개요 + +본 프로젝트는 **헥사고날 아키텍처(Ports & Adapters)** 기반의 Spring Boot 멀티모듈 시스템입니다. +도메인 로직과 외부 시스템(웹, DB, 파일 등)을 명확히 분리하여 유지보수성과 확장성을 극대화하였습니다. + ## Prerequisites * JDK 17+ @@ -43,14 +48,6 @@ recycle 은 `core` 모듈을 기반으로 한 `admin`, `front`, `api` 어플리 | |-- pom.xml | |-- src | `-- target -|-- api # API 모듈 (JWT 토큰 기반 인증) -| |-- pom.xml -| |-- src -| `-- target -|-- aws # AWS 서비스 전략(strategy) 모듈 -| |-- pom.xml -| |-- src -| `-- target |-- core # 공통 모듈 | |-- pom.xml | |-- src @@ -60,6 +57,7 @@ recycle 은 `core` 모듈을 기반으로 한 `admin`, `front`, `api` 어플리 | |-- src | `-- target `-- pom.xml +`-- README.md ``` ⚡ AWS S3 업로드를 이용하지 않는다면, pom.xml 에서 `aws`모듈 관련 내용을 삭제하면 된다. @@ -72,6 +70,26 @@ recycle 의 demo 가 궁금하다면 아래 URL 에서 확인 해주세요. - `recycle-api` - https://recycle-api.etribe.co.kr/swagger-ui/index.html - `recycle-front` - https://recycle-front.etribe.co.kr/ 계정정보 (generalUser/generalUser1@#$) +### 각 모듈의 내부 구조(헥사고날 아키텍처 예시) + +``` +usecase/ + └── daily/ + └── expense/ + ├── ports/ + │ ├── application/ + │ │ └── DailyExpenseService.java + │ ├── DailyExpensePortIn.java + │ └── DailyExpensePortOut.java + └── adapters/ + ├── persistence/ + │ └── DailyExpenseDao.java + └── web/ + └── DailyExpenseController.java +``` +- **ports/**: 도메인 서비스 및 인터페이스(Port) +- **adapters/**: 외부 시스템(웹, DB 등) 연결 어댑터 + ## VM Options From 071a520efc2bf63d490aa03992c409a76cdb3342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Thu, 17 Jul 2025 17:29:09 +0900 Subject: [PATCH 6/7] =?UTF-8?q?[FindBugs]=20CRLF=5FINJECTION=5FLOGS=20=20-?= =?UTF-8?q?=20SafeLogger=20=EC=B6=94=EA=B0=80=20[PMD]=20UnusedImports=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/persistence/DailyExpenseDao.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseDao.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseDao.java index 2ae4f728..0d3069d9 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseDao.java @@ -1,26 +1,23 @@ package app.module.front.usecase.daily.expense.adapters.persistence; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.config.application.util.SftpFileDeleteUtil; -import app.module.core.usecase.file.updateFile.adapters.persistence.UpdateFileMapper; import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto; import app.module.front.usecase.daily.expense.ports.DailyExpensePortOut; import app.module.front.usecase.daily.expense.ports.application.domain.CreateDailyExpenseCmd; import app.module.front.usecase.daily.expense.ports.application.domain.GetDailyExpenseCmd; import app.module.front.usecase.daily.expense.ports.application.domain.RemoveDailyExpenseCmd; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.SftpException; +import app.module.core.config.application.logging.SafeLogger; + +import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Repository; import java.util.List; -@Slf4j @Repository @RequiredArgsConstructor public class DailyExpenseDao implements DailyExpensePortOut { + SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(DailyExpenseDao.class)); + private final DailyExpenseMapper mapper; @Override @@ -39,11 +36,11 @@ public class DailyExpenseDao implements DailyExpensePortOut { if (existCount == 0) { mapper.createDailyExpense(command); - log.debug("[CreateDailyExpense] record={}", command); + safeLogger.debug("[CreateDailyExpense] record={}", command); } else { mapper.updateDailyExpense(command); - log.debug("[UpdateDailyExpense] record={}", command); + safeLogger.debug("[UpdateDailyExpense] record={}", command); } } @@ -54,7 +51,7 @@ public class DailyExpenseDao implements DailyExpensePortOut { mapper.removeDailyExpense(command); mapper.removeDailyExpenseReceipt(command); - log.debug("[RemoveDailyExpense] record={}", command); + safeLogger.debug("[RemoveDailyExpense] record={}", command); } } } From 5c132528f5dfaf0bc987f2206b07d99fbaf6472d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Fri, 18 Jul 2025 09:13:25 +0900 Subject: [PATCH 7/7] =?UTF-8?q?[PMD]=20UnusedImports=20-=20import=EB=AC=B8?= =?UTF-8?q?=20=EC=B5=9C=EC=A0=81=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/module/admin/AdminApplication.java | 1 - .../web/interceptor/AdminURIInterceptor.java | 3 +- .../adapters/web/mvc/AdminWebMvcConfig.java | 9 +++--- .../application/aop/RoleUpdateAspect.java | 10 +++---- .../application/batch/BatchLogRunner.java | 1 - .../security/AdminAuthFailEvent.java | 6 ++-- .../security/AdminAuthSuccessEvent.java | 17 +++++------ .../security/AdminDetailsService.java | 11 +++---- .../security/AdminSecurityConfig.java | 9 +++--- .../application/security/AdminUser.java | 3 +- .../config/application/util/AdminUtil.java | 4 +-- .../config/application/util/DateUiUtil.java | 3 +- .../application/util/model/ExcelSheetDto.java | 4 +-- .../adapters/web/AdminExcelController.java | 7 +++-- .../adapters/web/AdminRemoveController.java | 3 +- .../adapters/web/RemoveAdminsController.java | 6 ---- .../adapters/web/model/RemoveAdminsReqVO.java | 4 +-- .../web/AdminCreateGetController.java | 1 - .../web/AdminCreatePostController.java | 13 ++------ .../web/AdminUpdateGetController.java | 5 ++-- .../web/AdminUpdatePostController.java | 11 ------- .../web/model/AdminCreateBindingVO.java | 1 - .../web/model/AdminUpdateBindingVO.java | 3 +- .../web/validator/AdminCreateValidator.java | 4 +-- .../web/validator/AdminUpdateValidator.java | 4 +-- .../adapters/persistence/BatchLogDao.java | 3 +- .../ports/application/domain/BatchLog.java | 3 +- .../ports/application/domain/BatchLogCmd.java | 3 +- .../web/CreateNoticeUIController.java | 1 - .../adapters/web/model/CreateNoticeReqVO.java | 1 - .../web/model/CreateNoticeUIReqVO.java | 6 ---- .../ports/application/GetNoticeService.java | 1 - .../adapters/web/GetNoticesController.java | 3 -- .../web/UpdateNoticeUIController.java | 9 ------ .../sms/getSmsUI/GetSmsController.java | 2 +- .../persistence/GetSuggestionDao.java | 7 +++-- .../persistence/GetSuggestionMapper.java | 3 +- .../ports/GetSuggestionPortIn.java | 3 +- .../ports/GetSuggestionPortOut.java | 3 +- .../application/GetSuggestionService.java | 9 +++--- .../GetSuggestionUIController.java | 2 +- .../persistence/GetSuggestionsDao.java | 9 +++--- .../persistence/GetSuggestionsMapper.java | 3 +- .../web/GetSuggestionsController.java | 5 ++-- .../application/GetSuggestionsService.java | 6 ++-- .../GetSuggestionsUIController.java | 3 +- .../chart/adapters/persistence/ChartDao.java | 6 ---- .../adapters/persistence/ChartMapper.java | 7 +---- .../adapters/persistence/model/ChartDto.java | 1 + .../persistence/model/DashboardExcelDto.java | 3 +- .../adapters/web/ChartApiController.java | 21 +++++++------ .../dashboard/chart/ports/ChartPortOut.java | 1 - .../ports/applilcation/ChartService.java | 1 - .../persistence/GetSmsAutoStatusDao.java | 8 ++--- .../persistence/GetSmsAutoStatusMapper.java | 3 +- .../ports/GetSmsAutoStatusPortIn.java | 1 + .../ports/GetSmsAutoStatusPortOut.java | 1 + .../application/GetSmsAutoStatusService.java | 3 +- .../application/domain/GetSmsAutoStatus.java | 3 +- .../persistence/UpdateSmsAutoStatusDao.java | 5 ++-- .../web/UpdateSmsAutoStatusController.java | 6 ++-- .../web/model/UpdateSmsAutoStatusReqVO.java | 1 - .../UpdateSmsAutoStatusService.java | 4 +-- .../domain/UpdateSmsAutoStatusCmd.java | 1 - .../web/EditorImageUploadController.java | 3 +- .../web/GetExcelMultiSheetController.java | 11 ++++--- .../home/adapters/web/HomeController.java | 4 +-- .../persistence/CheckHouseholdNumDao.java | 7 +++-- .../persistence/CheckHouseholdNumMapper.java | 3 +- .../web/CheckHouseholdNumController.java | 1 - .../ports/CheckHouseholdNumPortIn.java | 3 +- .../ports/CheckHouseholdNumPortOut.java | 3 +- .../application/CheckHouseholdNumService.java | 9 +++--- .../persistence/CreateHouseholdDao.java | 7 ++--- .../web/CreateHouseholdController.java | 7 ++--- .../web/model/CreateHouseholdReqVO.java | 8 +---- .../application/CreateHouseholdService.java | 6 ++-- .../domain/CreateHouseholdHasRoleCmd.java | 3 +- .../domain/CreateHouseholdOutCmd.java | 3 +- .../CreateResearcherHasHouseholdCmd.java | 1 - .../web/CreateHouseholdUIController.java | 2 +- .../CreateResearcherMappingDao.java | 4 +-- .../CreateResearcherMappingController.java | 6 ++-- .../model/CreateResearcherMappingReqVO.java | 4 +-- .../model/CreateResearcherMappingResVO.java | 3 +- .../CreateResearcherMappingService.java | 4 +-- .../domain/CreateResearcherMappingCmd.java | 3 +- .../domain/DeleteResearcherMappingCmd.java | 3 +- .../persistence/GetHouseholdsExcelDao.java | 5 ++-- .../persistence/GetHouseholdsExcelMapper.java | 2 +- .../web/GetHouseholdsExcelController.java | 21 +++++++------ .../GetHouseholdsExcelService.java | 7 +++-- .../domain/GetHouseholdsExcelCmd.java | 3 +- .../ExcelUploadCreateHouseholdDao.java | 7 ++--- .../persistence/GetHouseholdStatusDao.java | 11 ++++--- .../persistence/GetHouseholdStatusMapper.java | 4 +-- .../ports/GetHouseholdStatusPortIn.java | 2 +- .../ports/GetHouseholdStatusPortOut.java | 2 +- .../GetHouseholdStatusService.java | 10 +++---- .../web/GetHouseholdStatusUIController.java | 2 +- .../persistence/GetHouseholdsStatusDao.java | 9 +++--- .../GetHouseholdsStatusMapper.java | 3 +- .../GetHouseholdsStatusService.java | 6 ++-- .../domain/GetHouseholdsStatus.java | 1 - .../persistence/GetPopupResearchersDao.java | 9 +++--- .../GetPopupResearchersMapper.java | 3 +- .../web/GetPopupResearchersController.java | 6 ++-- .../GetPopupResearchersService.java | 6 ++-- .../GetRegionMainCodesController.java | 7 ++--- .../persistence/GetMonthlyInputStatusDao.java | 7 +++-- .../GetMonthlyInputStatusMapper.java | 3 +- .../ports/GetMonthlyInputStatusPortIn.java | 3 +- .../ports/GetMonthlyInputStatusPortOut.java | 3 +- .../GetMonthlyInputStatusService.java | 9 +++--- .../UpdateMonthlyInputStatusDao.java | 4 +-- .../UpdateMonthlyInputStatusService.java | 4 +-- .../domain/UpdateForestProductStatusCmd.java | 1 - .../GetBankAutoTransferExpenseDao.java | 7 +++-- .../GetBankAutoTransferExpenseMapper.java | 3 +- .../GetBankAutoTransferExpenseController.java | 4 +-- .../GetBankAutoTransferExpensePortIn.java | 3 +- .../GetBankAutoTransferExpensePortOut.java | 3 +- .../GetBankAutoTransferExpenseService.java | 9 +++--- .../GetBankAutoTransferIncomeDao.java | 7 +++-- .../GetBankAutoTransferIncomeMapper.java | 3 +- .../GetBankAutoTransferIncomePortIn.java | 3 +- .../GetBankAutoTransferIncomePortOut.java | 3 +- .../GetBankAutoTransferIncomeService.java | 9 +++--- .../GetBankAutoTransferRecordsDao.java | 4 +-- .../GetBankAutoTransferRecordsMapper.java | 3 +- .../GetBankAutoTransferRecordsService.java | 6 ++-- .../domain/GetBankAutoTransferRecords.java | 3 +- .../RemoveBankAutoTransfersDao.java | 3 +- .../RemoveBankAutoTransfersController.java | 6 ++-- .../model/RemoveBankAutoTransfersReqVO.java | 4 +-- .../RemoveBankAutoTransfersService.java | 6 ++-- .../domain/RemoveBankAutoTransfersInCmd.java | 3 +- .../domain/RemoveBankAutoTransfersOutCmd.java | 3 +- ...SaveBankAutoTransferExpenseController.java | 8 ++--- .../SaveBankAutoTransferExpenseReqVO.java | 1 - .../SaveBankAutoTransferExpenseOutCmd.java | 1 - .../SaveBankAutoTransferIncomeDao.java | 4 +-- .../SaveBankAutoTransferIncomeController.java | 8 ++--- .../SaveBankAutoTransferIncomeService.java | 6 ++-- .../SaveBankAutoTransferIncomeOutCmd.java | 1 - .../web/CreateDailyRecordController.java | 4 ++- .../GetDailyRecordStatusDetailDao.java | 22 ++++---------- .../GetDailyRecordStatusDetailMapper.java | 12 ++------ .../GetDailyRecordStatusDetailController.java | 23 +++++--------- .../GetDailyRecordStatusDetailResVO.java | 3 +- .../GetDailyRecordStatusDetailPortIn.java | 5 ++-- .../GetDailyRecordStatusDetailPortOut.java | 5 ++-- .../GetDailyRecordStatusDetailService.java | 9 +++--- .../domain/GetDailyExpenseRecords.java | 2 -- .../domain/GetDailyFarmingRecords.java | 3 -- .../domain/GetDailyForestryRecords.java | 3 -- .../domain/GetDailyIncomeRecords.java | 3 -- .../domain/GetDailyPowerRecords.java | 3 -- .../domain/GetDailyRecordStatusDetail.java | 3 +- .../domain/GetDailyWorkRecords.java | 2 -- .../persistence/GetDailyRecordsCountDao.java | 7 +++-- .../GetDailyRecordsCountMapper.java | 3 +- .../ports/GetDailyRecordsCountPortIn.java | 3 +- .../ports/GetDailyRecordsCountPortOut.java | 3 +- .../GetDailyRecordsCountService.java | 9 +++--- .../persistence/GetDailyRecordsStatusDao.java | 3 +- .../GetDailyRecordsStatusMapper.java | 3 +- .../web/GetDailyRecordsStatusController.java | 3 +- .../web/model/GetDailyRecordsStatusResVO.java | 3 +- .../ports/GetDailyRecordsStatusPortIn.java | 1 + .../ports/GetDailyRecordsStatusPortOut.java | 1 + .../GetDailyRecordsStatusService.java | 9 +++--- .../adapters/persistence/RemoveDailyDao.java | 1 - .../adapters/web/RemoveDailyController.java | 3 +- .../ports/application/RemoveDailyService.java | 1 - .../application/domain/RemoveDailyCmd.java | 1 - .../persistence/SaveDailyExpenseDao.java | 3 +- .../persistence/SaveDailyFarmingDao.java | 3 +- .../web/model/SaveDailyFarmingReqVO.java | 1 - .../application/SaveDailyFarmingService.java | 3 -- .../persistence/SaveDailyForestryDao.java | 3 +- .../web/model/SaveDailyForestryReqVO.java | 1 - .../persistence/SaveDailyIncomeDao.java | 5 ++-- .../persistence/SaveDailyIncomeMapper.java | 2 +- .../web/SaveDailyIncomeController.java | 2 +- .../web/model/DailyIncomeUIReqVO.java | 1 - .../ports/SaveDailyIncomePortIn.java | 2 +- .../ports/SaveDailyIncomePortOut.java | 2 +- .../application/SaveDailyIncomeService.java | 5 ++-- .../persistence/SaveDailyPowerDao.java | 3 +- .../web/model/SaveDailyPowerReqVO.java | 1 - .../validator/SaveDailyPowerValidator.java | 2 -- .../persistence/SaveDailyWorkDao.java | 5 ++-- .../persistence/modal/GetDailyWorkDto.java | 1 - .../persistence/UpdateDailyNoneDao.java | 1 - .../web/UpdateDailyNoneController.java | 1 - .../application/UpdateDailyNoneService.java | 1 - .../GetForestProductStatusDao.java | 7 +++-- .../GetForestProductStatusMapper.java | 3 +- .../ports/GetForestProductStatusPortIn.java | 3 +- .../ports/GetForestProductStatusPortOut.java | 3 +- .../GetForestProductStatusService.java | 9 +++--- .../GetForestProductsStatusDao.java | 3 +- .../GetForestProductsStatusMapper.java | 3 +- .../domain/GetForestProductsStatusResult.java | 3 +- .../persistence/RemoveForestProductsDao.java | 4 +-- .../web/RemoveForestProductsController.java | 6 ++-- .../web/model/RemoveForestProductsReqVO.java | 4 +-- .../RemoveForestProductsService.java | 4 +-- .../domain/RemoveForestProductsCmd.java | 3 +- .../web/SaveForestProductController.java | 8 ++--- .../web/model/SaveForestProductReqVO.java | 2 -- .../domain/SaveForestProductCmd.java | 1 - .../UpdateForestProductNoneDao.java | 4 +-- .../UpdateForestProductNoneController.java | 5 ++-- .../model/UpdateForestProductNoneReqVO.java | 1 - .../ports/UpdateForestProductNonePortOut.java | 1 - .../UpdateForestProductNoneService.java | 6 ++-- .../UpdateMonthlyForestProductStatusCmd.java | 1 - .../persistence/GetHouseholdVisitInfoDao.java | 7 +++-- .../GetHouseholdVisitInfoMapper.java | 3 +- .../web/GetHouseholdVisitInfoController.java | 5 ++-- .../ports/GetHouseholdVisitInfoPortIn.java | 3 +- .../ports/GetHouseholdVisitInfoPortOut.java | 3 +- .../GetHouseholdVisitInfoService.java | 9 +++--- .../domain/GetHouseholdVisitInfo.java | 4 +-- .../GetHouseholdVisitInfosDao.java | 7 +++-- .../GetHouseholdVisitInfosMapper.java | 3 +- .../web/GetHouseholdVisitInfosController.java | 3 +- .../ports/GetHouseholdVisitInfosPortIn.java | 1 + .../ports/GetHouseholdVisitInfosPortOut.java | 1 + .../GetHouseholdVisitInfosService.java | 9 +++--- .../RemoveHouseholdVisitInfosDao.java | 4 +-- .../RemoveHouseholdVisitInfosController.java | 6 ++-- .../model/RemoveHouseholdVisitInfosReqVO.java | 4 +-- .../RemoveHouseholdVisitInfosService.java | 4 +-- .../domain/RemoveHouseholdVisitInfosCmd.java | 4 +-- .../SaveHouseholdVisitInfoDao.java | 4 +-- .../SaveHouseholdVisitInfoMapper.java | 3 +- .../web/SaveHouseholdVisitInfoController.java | 8 ++--- .../model/SaveHouseholdVisitInfoReqVO.java | 5 ++-- .../SaveHouseholdVisitInfoValidator.java | 3 +- .../SaveHouseholdVisitInfoService.java | 4 +-- .../domain/SaveHouseholdVisitInfoCmd.java | 3 +- .../persistence/UpdateHouseholdDao.java | 2 +- .../web/UpdateHouseholdController.java | 8 ++--- .../web/model/UpdateHouseholdReqVO.java | 1 - .../application/UpdateHouseholdService.java | 6 ++-- .../UpdateHouseholdStatusUIController.java | 2 +- .../web/OperationLogListExcelController.java | 5 ++-- .../adpaters/persistence/ResearcherDao.java | 1 - .../model/ResearchersHouseholdVisitDto.java | 1 - .../adpaters/web/ResearcherApiController.java | 30 +++++++------------ .../adpaters/web/ResearcherController.java | 6 ++-- .../web/model/HouseholdSearchReqVO.java | 1 - .../web/model/ResearchersDetailUIReqVO.java | 2 -- .../web/model/ResearchersListReqVO.java | 1 - .../model/ResearchersVisitDetailReqVO.java | 1 - .../persistence/AutoSchedulesDao.java | 3 +- .../application/AutoSchedulesService.java | 7 +++-- .../GetIncompleteHouseholdsDao.java | 3 +- .../GetIncompleteHouseholdsMapper.java | 3 +- .../ports/GetIncompleteHouseholdsPortIn.java | 1 + .../ports/GetIncompleteHouseholdsPortOut.java | 1 + .../GetIncompleteHouseholdsService.java | 9 +++--- .../save/adapters/web/UICodeSaveVO.java | 6 +--- .../adapters/web/UICodeViewController.java | 3 +- .../adapter/web/web/URISaveBindingVO.java | 3 +- .../adapter/web/web/URISaveController.java | 3 +- .../sort/adapter/web/URISortController.java | 5 ++-- .../adapter/web/URITopTierController.java | 3 +- .../uri/toptier/adapter/web/URITreeVO.java | 3 +- .../uri/view/adapter/web/URIBindingVO.java | 3 +- .../view/adapter/web/URIViewController.java | 3 +- .../mms/adapters/persistence/MMSDao.java | 2 +- .../mms/ports/application/MMSService.java | 2 +- .../templates/communication/sms.html | 2 +- admin/src/main/resources/templates/home.html | 1 - .../templates/layout/layout-error.html | 2 +- .../java/app/module/admin/EnableJsonUTF8.java | 7 ++--- .../initData/InitAdminUserRoleTestData.java | 1 - .../security/AdminAuthFailHandlerTest.java | 9 +++--- .../security/AdminDetailsServiceTest.java | 9 +++--- .../dao/AdminCreateUpdateDaoTest.java | 10 ------- .../persistence/component/AuditCommand.java | 3 +- .../persistence/component/AuditEntity.java | 3 +- .../adapters/persistence/entity/Admin.java | 3 +- .../persistence/entity/AdminHasRole.java | 6 +--- .../persistence/entity/FrontUser.java | 3 +- .../persistence/entity/Household.java | 1 - .../persistence/entity/LoggedInUser.java | 7 ++--- .../persistence/entity/PersistentLogins.java | 3 +- .../adapters/persistence/entity/Role.java | 3 +- .../adapters/persistence/entity/UICode.java | 1 - .../adapters/persistence/entity/URI.java | 7 ++--- .../persistence/entity/UploadFile.java | 6 +--- .../persistence/entity/UriHasRole.java | 6 +--- .../persistence/initData/InitAdminData.java | 1 - .../persistence/initData/InitRoleData.java | 9 ++---- .../initData/InitUriAdminData.java | 5 ++-- .../initData/InitUriFrontData.java | 10 ++----- .../initData/InitUserRoleData.java | 3 +- .../helper/RemoveAllAdminURIMapper.java | 3 +- .../helper/RemoveAllFrontURIMapper.java | 3 +- .../persistence/repository/RoleRepo.java | 3 +- .../web/advice/GlobalControllerAdvice.java | 3 +- .../interceptor/AuditFieldInterceptor.java | 7 +++-- .../interceptor/URIAuthorizeInterceptor.java | 3 +- .../web/interceptor/model/URITopTierVO.java | 3 +- .../adapters/web/rest/error/RestErrorVO.java | 3 +- .../web/rest/response/RestResponse.java | 3 +- .../web/security/domain/CoreRole.java | 3 +- .../CustomAuthenticationEntryPoint.java | 3 +- .../application/aop/XssEscapeAspect.java | 3 +- .../component/YamlPropertySourceFactory.java | 7 +++-- .../CustomLocalDateTimeSerializer.java | 1 + .../StringToLocalDateTimeConverter.java | 3 +- .../application/enums/AcceptableFileType.java | 3 +- .../application/enums/FileUploadType.java | 3 +- .../application/logging/SafeLogger.java | 1 - .../application/util/AESEncryptUtil.java | 18 +++++------ .../config/application/util/CoreUtil.java | 5 ++-- .../config/application/util/ExcelUtil.java | 15 +++++----- .../config/application/util/ImageUtil.java | 6 ++-- .../ports/ExcelSaveAdminPortIn.java | 1 + .../application/ExcelSaveAdminService.java | 1 - .../adapters/persistence/GetAdminsDao.java | 13 ++++---- .../adapters/persistence/GetAdminsMapper.java | 4 +-- .../persistence/model/GetAdminsDto.java | 3 +- .../ports/application/domain/GetAdmins.java | 5 ++-- .../domain/GetAdminsPrivilege.java | 3 +- .../application/domain/GetAdminsRole.java | 5 ++-- .../adapters/persistence/RemoveAdminDao.java | 3 +- .../persistence/model/RemoveAdminParam.java | 4 +-- .../ports/application/RemoveAdminService.java | 3 +- .../adapters/persistence/SaveAdminDao.java | 1 - .../model/DeleteAdminHasRoleParam.java | 1 - .../model/SaveAdminHasRoleParam.java | 2 -- .../ports/application/SaveAdminService.java | 3 +- .../application/domain/SaveAdminCmd.java | 4 +-- .../AdminUpdateAccountLockDao.java | 4 +-- .../persistence/AdminUpdateLoginFailDao.java | 3 +- .../model/AdminUpdateAccountLockParam.java | 4 +-- .../model/AdminUpdateLoginFailParam.java | 4 +-- .../adapters/persistence/AdminViewDao.java | 3 +- .../adapters/persistence/AdminViewMapper.java | 4 +-- .../persistence/model/AdminViewDto.java | 5 ++-- .../admin/view/ports/AdminViewPortIn.java | 1 + .../admin/view/ports/AdminViewPortOut.java | 1 + .../ports/application/AdminViewService.java | 3 +- .../ports/application/domain/AdminView.java | 6 ++-- .../application/domain/PrivilegeView.java | 5 ++-- .../ports/application/domain/RoleView.java | 7 +++-- .../adapter/web/RefreshCacheController.java | 3 +- .../daily/record/ports/DailyRecordPortIn.java | 1 - .../ports/application/DailyRecordService.java | 3 -- .../createCell/ports/CreateCellPortIn.java | 14 ++------- .../ports/application/CreateCellService.java | 5 ++-- .../adapters/persistence/CreateFileDao.java | 3 +- .../adapters/web/CreateFileController.java | 3 +- .../adapters/web/model/CreateFileReqVO.java | 6 +--- .../createFile/ports/CreateFilePortIn.java | 1 + .../createFile/ports/CreateFilePortOut.java | 1 + .../ports/application/CreateFileService.java | 3 +- .../adapters/persistence/GetFileDao.java | 3 +- .../adapters/persistence/GetFileMapper.java | 3 +- .../file/getFile/ports/GetFilePortIn.java | 1 + .../file/getFile/ports/GetFilePortOut.java | 1 + .../ports/application/GetFileService.java | 3 +- .../ports/application/domain/GetFile.java | 5 ++-- .../ports/SaveToStoragePortIn.java | 3 +- .../application/SaveToStorageService.java | 15 ++++------ .../strategy/FileUploadStrategy.java | 3 +- .../LocalStorageFileUploadStrategy.java | 11 +++---- .../SftpStorageFileUploadStrategy.java | 5 ---- .../adapters/persistence/UpdateFileDao.java | 11 ------- .../domain/UpdateUploadFileParam.java | 1 - .../application/domain/UploadFileDto.java | 7 +++-- .../application/port/in/FileUrlService.java | 5 ++-- .../adapters/web/GetAttachmentController.java | 16 +++++----- .../adapters/persistence/GetHouseholdDao.java | 3 +- .../persistence/GetHouseholdMapper.java | 3 +- .../ports/GetHouseholdPortIn.java | 3 +- .../ports/GetHouseholdPortOut.java | 3 +- .../application/GetHouseholdService.java | 9 +++--- .../application/domain/GetHousehold.java | 9 ++---- .../application/port/in/ImageCropPortIn.java | 3 +- .../application/port/in/ImageCropService.java | 11 +++---- .../persistence/LoggedInUserSaveDao.java | 2 +- .../persistence/OperationLogListDao.java | 3 +- .../persistence/OperationLogMapper.java | 5 ++-- .../domain/OperationLogElement.java | 3 +- .../persistence/PrivilegeListDao.java | 5 ++-- .../persistence/PrivilegeListMapper.java | 3 +- .../persistence/model/PrivilegeListDto.java | 4 +-- .../list/ports/PrivilegeListPortIn.java | 1 + .../list/ports/PrivilegeListPortOut.java | 1 + .../application/PrivilegeListService.java | 3 +- .../application/domain/PrivilegeElement.java | 3 +- .../domain/PrivilegeRemoveOutCmd.java | 1 - .../PrivilegeNextOrderNoMapper.java | 3 +- .../persistence/PrivilegeSaveMapper.java | 1 - .../persistence/PrivilegeSaveRepo.java | 4 +-- .../application/PrivilegeSaveService.java | 3 +- .../sort/ports/PrivilegeSortPortIn.java | 1 + .../application/PrivilegeSortService.java | 5 ++-- .../persistence/PrivilegeViewMapper.java | 3 +- .../application/domain/PrivilegeView.java | 3 +- .../adapters/persistence/RoleListDao.java | 8 ++--- .../adapters/persistence/RoleListMapper.java | 3 +- .../persistence/model/RoleListDto.java | 3 +- .../role/list/ports/RoleListPortIn.java | 1 + .../role/list/ports/RoleListPortOut.java | 1 + .../ports/application/RoleListService.java | 5 ++-- .../ports/application/domain/RoleElement.java | 5 ++-- .../persistence/RoleNextOrderNoMapper.java | 3 +- .../adapters/persistence/RoleSaveDao.java | 7 ++--- .../model/RoleHasPrivilegeDeleteParam.java | 2 -- .../model/RoleHasPrivilegeSaveParam.java | 4 +-- .../role/save/ports/RoleSavePortIn.java | 1 + .../role/save/ports/RoleSavePortOut.java | 1 + .../ports/application/RoleSaveService.java | 5 ++-- .../role/sort/ports/RoleSortPortIn.java | 1 + .../ports/application/RoleSortService.java | 5 ++-- .../adapters/persistence/RoleViewDao.java | 8 +---- .../adapters/persistence/RoleViewMapper.java | 5 ++-- .../persistence/model/RoleViewDto.java | 4 +-- .../ports/application/domain/RoleView.java | 5 ++-- .../adapters/persistence/UICodeListDao.java | 4 +-- .../persistence/UICodeListMapper.java | 3 +- .../uicode/list/ports/UICodeListPortIn.java | 1 + .../uicode/list/ports/UICodeListPortOut.java | 1 + .../ports/application/UICodeListService.java | 3 +- .../domain/UICodeRemoveOutCmd.java | 1 - .../persistence/UICodeMaxOrderNoDao.java | 3 +- .../persistence/UICodeMaxOrderNoMapper.java | 3 +- .../persistence/model/DeleteUICodeParam.java | 3 +- .../adapters/web/UICodeSortController.java | 5 ++-- .../uicode/sort/ports/UICodeSortPortIn.java | 1 + .../ports/application/UICodeSortService.java | 5 ++-- .../persistence/UICodeTopTierDao.java | 7 +++-- .../persistence/UICodeTopTierMapper.java | 3 +- .../application/domain/UICodeTopTier.java | 3 +- .../persistence/UICodeViewMapper.java | 3 +- .../uicode/view/ports/UICodeViewPortIn.java | 1 + .../ports/application/UICodeViewService.java | 3 +- .../uri/ancestry/ports/URIAncestryPortIn.java | 1 + .../ports/application/URIAncestryService.java | 5 ++-- .../URICurrentMatchingService.java | 7 +++-- .../domain/URICurrentMatching.java | 3 +- .../adapters/persistence/GetUrisDao.java | 7 ++--- .../adapters/persistence/GetUrisMapper.java | 4 +-- .../persistence/model/GetRolesDto.java | 4 +-- .../persistence/model/GetUrisDto.java | 2 -- .../uri/getUris/ports/GetUrisPortIn.java | 1 + .../uri/getUris/ports/GetUrisPortOut.java | 1 + .../ports/application/GetUrisService.java | 3 +- .../ports/application/domain/URIElement.java | 3 +- .../adapters/persistence/URIRemoveDao.java | 3 +- .../persistence/model/URIRemoveParam.java | 3 +- .../persistence/URIMaxOrderNoMapper.java | 3 +- .../save/adapters/persistence/URISaveDao.java | 15 ++++------ .../adapters/persistence/UriSaveMapper.java | 3 +- .../model/UriHasRoleDeleteParam.java | 3 +- .../model/UriHasRoleSaveParam.java | 6 ++-- .../usecase/uri/save/ports/URISavePortIn.java | 3 +- .../ports/application/URISaveService.java | 7 +++-- .../application/domain/URISaveCommand.java | 3 +- .../sort/adapters/persistence/URISortDao.java | 7 +++-- .../adapters/persistence/URISortRepo.java | 1 - .../persistence/model/URISortParam.java | 5 ++-- .../usecase/uri/sort/ports/URISortPortIn.java | 1 + .../uri/sort/ports/URISortPortOut.java | 1 + .../ports/application/URISortService.java | 3 +- .../adapters/persistence/URIMapper.java | 3 +- .../adapters/persistence/URITopTierDao.java | 5 ++-- .../ports/application/domain/URITopTier.java | 3 +- .../usecase/uri/view/ports/URIViewPortIn.java | 1 + .../ports/application/URIViewService.java | 5 ++-- .../ports/application/domain/URIView.java | 3 +- .../adapters/persistence/CreateUserDao.java | 6 ++-- .../model/SaveFrontUserHasRoleParam.java | 5 ++-- .../createUser/ports/CreateUserPortIn.java | 1 + .../createUser/ports/CreateUserPortOut.java | 1 + .../ports/application/CreateUserService.java | 3 +- .../ports/application/domain/CreateUser.java | 3 +- .../application/domain/CreateUserCmd.java | 3 +- .../adapters/persistence/FindUserDao.java | 7 +++-- .../adapters/persistence/FindUserMapper.java | 3 +- .../persistence/model/FindUserDto.java | 3 +- .../user/findUser/ports/FindUserPortIn.java | 1 + .../user/findUser/ports/FindUserPortOut.java | 1 + .../ports/application/FindUserService.java | 3 +- .../application/domain/FindProfileImages.java | 6 +--- .../ports/application/domain/FindUser.java | 5 ++-- .../application/domain/FindUserRole.java | 3 +- .../adapters/persistence/GetRolesDao.java | 5 ++-- .../adapters/persistence/GetRolesMapper.java | 3 +- .../user/getRoles/ports/GetRolesPortIn.java | 1 + .../user/getRoles/ports/GetRolesPortOut.java | 1 + .../ports/application/GetRolesService.java | 3 +- .../ports/application/domain/GetRoles.java | 3 +- .../adapters/persistence/GetUsersDao.java | 5 ++-- .../adapters/persistence/GetUsersMapper.java | 5 ++-- .../persistence/model/GetUsersDto.java | 3 +- .../ports/application/domain/GetUsers.java | 5 ++-- .../application/domain/GetUsersPrivilege.java | 6 +--- .../application/domain/GetUsersRole.java | 7 ++--- .../persistence/UpdateFrontUserDao.java | 3 +- .../persistence/UpdateFrontUserMapper.java | 1 - .../UpdateFrontUserHasUploadFileParam.java | 5 ++-- .../model/UpdateFrontUserParam.java | 3 +- .../application/UpdateFrontUserService.java | 5 ++-- .../domain/UpdateFrontUserInCmd.java | 3 +- .../domain/UpdateFrontUserOutCmd.java | 7 +++-- .../adapters/persistence/UpdateUserDao.java | 3 +- .../model/UpdateFrontUserByAdminParam.java | 3 +- .../model/UpdateFrontUserHasRoleParam.java | 5 ++-- .../application/domain/UpdateUserCmd.java | 3 +- .../persistence/GetUserPrivilegeDao.java | 3 +- .../persistence/GetUserPrivilegeMapper.java | 3 +- .../ports/GetUserPrivilegePortIn.java | 1 + .../ports/GetUserPrivilegePortOut.java | 1 + .../application/GetUserPrivilegeService.java | 3 +- .../application/domain/GetUserPrivilege.java | 3 +- .../persistence/GetUserPrivilegesDao.java | 3 +- .../persistence/GetUserPrivilegesMapper.java | 3 +- .../ports/GetUserPrivilegesPortIn.java | 1 + .../ports/GetUserPrivilegesPortOut.java | 1 + .../application/GetUserPrivilegesService.java | 3 +- .../domain/RemoveUserPrivilegeCmd.java | 1 - .../persistence/SaveUserPrivilegeDao.java | 3 +- .../persistence/SaveUserPrivilegeMapper.java | 3 +- .../ports/SaveUserPrivilegePortIn.java | 1 + .../ports/SaveUserPrivilegePortOut.java | 1 + .../application/SaveUserPrivilegeService.java | 3 +- .../persistence/SortUserPrivilegeDao.java | 2 -- .../model/SortUserPrivilegeParam.java | 1 - .../application/SortUserPrivilegeService.java | 2 +- .../domain/SortUserPrivilegeCmd.java | 3 +- .../adapters/persistence/GetUserRoleDao.java | 3 +- .../persistence/GetUserRoleMapper.java | 3 +- .../getUserRole/ports/GetUserRolePortIn.java | 1 + .../getUserRole/ports/GetUserRolePortOut.java | 1 + .../ports/application/GetUserRoleService.java | 3 +- .../ports/application/domain/GetUserRole.java | 7 ++--- .../adapters/persistence/GetUserRolesDao.java | 5 ++-- .../persistence/GetUserRolesMapper.java | 3 +- .../ports/GetUserRolesPortIn.java | 1 + .../ports/GetUserRolesPortOut.java | 1 + .../application/GetUserRolesService.java | 3 +- .../application/domain/GetUserRoles.java | 3 +- .../application/domain/RemoveUserRoleCmd.java | 1 - .../adapters/persistence/SaveUserRoleDao.java | 5 ++-- .../persistence/SaveUserRoleMapper.java | 3 +- .../model/RoleHasPrivilegeDeleteParam.java | 1 - .../model/RoleHasPrivilegeSaveParam.java | 4 +-- .../ports/SaveUserRolePortIn.java | 1 + .../ports/SaveUserRolePortOut.java | 1 + .../application/SaveUserRoleService.java | 3 +- .../application/domain/SaveUserRoleCmd.java | 3 +- .../adapters/persistence/SortUserRoleDao.java | 2 -- .../persistence/SortUserRoleRepo.java | 1 - .../application/SortUserRoleService.java | 2 +- .../application/domain/SortUserRoleCmd.java | 3 +- .../core/common/util/AESEncryptUtilTest.java | 12 -------- .../front/config/FrontWebMvcConfig.java | 9 +++--- .../web/interceptor/FrontURIInterceptor.java | 3 +- .../security/FrontDetailService.java | 14 ++++----- .../security/FrontHouseholdUser.java | 3 +- .../security/FrontSecurityConfig.java | 8 ++--- .../application/security/FrontUser.java | 3 +- .../persistence/RecordCalendarDao.java | 6 ++-- .../calendar/ports/RecordCalendarPortIn.java | 1 - .../calendar/ports/RecordCalendarPortOut.java | 2 +- .../application/RecordCalendarService.java | 6 ++-- .../application/domain/RecordCalendarCmd.java | 4 ++- .../adapters/persistence/DailyExpenseDao.java | 5 ++-- .../adapters/web/DailyExpenseController.java | 4 +-- .../web/DailyExpenseUIController.java | 6 ++-- .../expense/ports/DailyExpensePortOut.java | 2 -- .../persistence/DailyFarmingMapper.java | 2 -- .../model/DailyFarmingMonthDto.java | 1 - .../adapters/web/DailyFarmingController.java | 4 +-- .../web/DailyFarmingUIController.java | 6 ++-- .../farming/ports/DailyFarmingPortIn.java | 2 -- .../farming/ports/DailyFarmingPortOut.java | 2 -- .../persistence/DailyForestryMapper.java | 2 -- .../model/DailyForestryMonthDto.java | 1 - .../adapters/web/DailyForestryController.java | 4 +-- .../web/DailyForestryUIController.java | 6 ++-- .../forestry/ports/DailyForestryPortOut.java | 2 -- .../persistence/DailyIncomeMapper.java | 2 +- .../adapters/web/DailyIncomeController.java | 4 +-- .../adapters/web/DailyIncomeUIController.java | 6 ++-- .../adapters/web/model/DailyInputType.java | 3 -- .../web/model/RemoveDailyIncomeReqVO.java | 4 ++- .../persistence/DailyPowerMapper.java | 5 +--- .../adapters/web/DailyPowerController.java | 4 +-- .../adapters/web/DailyPowerUIController.java | 6 ++-- .../validator/CreateDailyPowerValidator.java | 1 - .../daily/power/ports/DailyPowerPortOut.java | 3 -- .../adapters/web/DailyReceiptController.java | 7 +++-- .../web/model/CreateReceiptHasFileReqVO.java | 7 +++-- .../model/CreateReceiptUploadFileReqVO.java | 6 ++-- .../adapters/web/model/ReceiptItem.java | 4 ++- .../adapters/web/DailyRecordController.java | 8 ++--- .../adapters/web/DailyRecordUIController.java | 6 ++-- .../adapters/web/DailyStatusUIController.java | 10 ++----- .../web/model/DailyStatusUIReqVO.java | 7 ----- .../adapters/persistence/DailyWorkMapper.java | 5 +--- .../adapters/web/DailyWorkController.java | 2 +- .../adapters/web/DailyWorkUIController.java | 8 ++--- .../daily/work/ports/DailyWorkPortIn.java | 3 -- .../web/EditorImageUploadController.java | 3 +- .../model/CreateForestProductDto.java | 1 - .../web/CreateBankInputController.java | 4 --- .../web/GetBankInputUIController.java | 2 -- .../model/CreateBankInputProductReqVO.java | 2 -- .../web/GetBankOutputUIController.java | 5 ---- .../adapters/web/GetBanksUIController.java | 4 --- .../model/CreateForestProductDto.java | 1 - .../domain/CreateForestProductCmd.java | 2 -- .../application/domain/GetForestProduct.java | 1 - .../model/GetForestProductsDto.java | 1 - .../application/domain/GetForestProducts.java | 1 - .../model/GetMonthlyForestProductsDto.java | 1 - .../domain/GetMonthlyForestProducts.java | 1 - .../model/UpdateForestProductDto.java | 1 - .../domain/UpdateForestProductCmd.java | 2 -- .../adapters/web/CreateMonthlyController.java | 4 +-- .../web/CreateMonthlyUIController.java | 5 ++-- .../web/model/CreateMonthlyProductReqVO.java | 2 -- .../adapters/web/GetMonthlysUIController.java | 2 +- .../persistence/GetUserFrontMapper.java | 2 -- .../InsertTermAgreementMapper.java | 3 -- .../InsertTermAgreementService.java | 3 -- .../web/model/GetUserPasswordReqVO.java | 4 ++- .../adapters/web/UpdateUserController.java | 1 - .../menu/adapters/web/MenuController.java | 1 - 640 files changed, 1245 insertions(+), 1344 deletions(-) diff --git a/admin/src/main/java/app/module/admin/AdminApplication.java b/admin/src/main/java/app/module/admin/AdminApplication.java index 93a99cb7..d50f82f3 100644 --- a/admin/src/main/java/app/module/admin/AdminApplication.java +++ b/admin/src/main/java/app/module/admin/AdminApplication.java @@ -1,6 +1,5 @@ package app.module.admin; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; diff --git a/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java b/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java index 81288652..f0b525a1 100644 --- a/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java +++ b/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java @@ -12,7 +12,6 @@ import app.module.core.usecase.uri.toptier.ports.URITopTierPortIn; import app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -21,6 +20,8 @@ import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; +import java.util.stream.Collectors; + @Component @RequiredArgsConstructor @Slf4j diff --git a/admin/src/main/java/app/module/admin/config/adapters/web/mvc/AdminWebMvcConfig.java b/admin/src/main/java/app/module/admin/config/adapters/web/mvc/AdminWebMvcConfig.java index e4b379c8..e63fb2b1 100644 --- a/admin/src/main/java/app/module/admin/config/adapters/web/mvc/AdminWebMvcConfig.java +++ b/admin/src/main/java/app/module/admin/config/adapters/web/mvc/AdminWebMvcConfig.java @@ -3,10 +3,6 @@ package app.module.admin.config.adapters.web.mvc; import app.module.admin.config.adapters.web.interceptor.AdminURIInterceptor; import app.module.core.config.adapters.web.interceptor.URIAuthorizeInterceptor; import app.module.core.config.application.enums.PublicAccess; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -20,6 +16,11 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.i18n.CookieLocaleResolver; import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; +import java.util.stream.Collectors; + @Configuration @RequiredArgsConstructor public class AdminWebMvcConfig implements WebMvcConfigurer { diff --git a/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java b/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java index 084c4a73..f54a3dfa 100644 --- a/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java +++ b/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java @@ -1,6 +1,5 @@ package app.module.admin.config.application.aop; -import app.module.core.config.adapters.web.security.domain.CoreRole; import app.module.core.config.application.enums.AppType; import app.module.core.config.application.enums.OperationLogType; import app.module.core.config.application.util.CommonUtil; @@ -9,10 +8,6 @@ import app.module.core.usecase.admin.view.ports.application.domain.AdminView; import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn; import jakarta.servlet.http.HttpServletRequest; -import java.lang.reflect.Method; -import java.util.Collections; -import java.util.List; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -21,6 +16,11 @@ import org.aspectj.lang.reflect.MethodSignature; import org.springframework.stereotype.Component; import org.thymeleaf.util.StringUtils; +import java.lang.reflect.Method; +import java.util.Collections; +import java.util.List; +import java.util.Optional; + @Aspect @Component @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java b/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java index 61dffdd6..71e2ceb3 100644 --- a/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java +++ b/admin/src/main/java/app/module/admin/config/application/batch/BatchLogRunner.java @@ -4,7 +4,6 @@ import app.module.admin.usecase.batchLog.ports.BatchLogPortIn; import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; import app.module.core.config.application.logging.SafeLogger; import lombok.RequiredArgsConstructor; - import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java index 124ac72f..7e892c83 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthFailEvent.java @@ -10,9 +10,6 @@ import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.operationlog.save.application.domain.OperationLogSaveCommand; import app.module.core.usecase.operationlog.save.application.port.in.OperationLogSavePortIn; import jakarta.servlet.http.HttpServletRequest; - -import java.util.Objects; -import java.util.Optional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -23,6 +20,9 @@ import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; +import java.util.Objects; +import java.util.Optional; + @Component @RequiredArgsConstructor @Slf4j diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java index 3bec1599..dd088046 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java @@ -1,21 +1,17 @@ package app.module.admin.config.application.security; -import app.module.core.usecase.loggedinuser.save.ports.LoggedInUserSavePortIn; -import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserIdSaveCmd; -import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd; import app.module.core.config.application.enums.AppType; +import app.module.core.config.application.logging.SafeLogger; import app.module.core.config.application.util.CommonUtil; import app.module.core.config.application.util.MessageUtil; import app.module.core.usecase.admin.status.ports.AdminUpdateLoginFailPortIn; import app.module.core.usecase.admin.view.ports.AdminViewPortIn; +import app.module.core.usecase.loggedinuser.save.ports.LoggedInUserSavePortIn; +import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserIdSaveCmd; +import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd; import jakarta.servlet.http.HttpServletRequest; -import java.time.LocalDateTime; -import java.util.Objects; - -import app.module.core.config.application.logging.SafeLogger; - -import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.event.EventListener; import org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent; @@ -25,6 +21,9 @@ import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; +import java.time.LocalDateTime; +import java.util.Objects; + @Component @RequiredArgsConstructor public class AdminAuthSuccessEvent { diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java index cc375c65..7416ad56 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java @@ -4,11 +4,6 @@ import app.module.core.config.adapters.web.security.domain.CorePrivilege; import app.module.core.config.adapters.web.security.domain.CoreRole; import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.admin.view.ports.application.domain.AdminView; -import java.time.LocalDateTime; -import java.util.Collection; -import java.util.Optional; -import java.util.stream.Collectors; -import java.util.stream.Stream; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.GrantedAuthority; @@ -19,6 +14,12 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; +import java.util.Collection; +import java.util.Optional; +import java.util.stream.Collectors; +import java.util.stream.Stream; + @Service @RequiredArgsConstructor public class AdminDetailsService implements UserDetailsService { diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminSecurityConfig.java b/admin/src/main/java/app/module/admin/config/application/security/AdminSecurityConfig.java index 8a3e6acd..f08f23e9 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminSecurityConfig.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminSecurityConfig.java @@ -1,10 +1,6 @@ package app.module.admin.config.application.security; import app.module.core.config.application.enums.PublicAccess; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; -import javax.sql.DataSource; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.servlet.ServletListenerRegistrationBean; @@ -21,11 +17,14 @@ import org.springframework.security.core.session.SessionRegistryImpl; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.rememberme.JdbcTokenRepositoryImpl; - import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository; import org.springframework.security.web.session.HttpSessionEventPublisher; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; +import javax.sql.DataSource; +import java.util.Arrays; +import java.util.List; + @Configuration @EnableWebSecurity @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java b/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java index ee18560c..c3879eaf 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java @@ -1,11 +1,12 @@ package app.module.admin.config.application.security; -import java.util.Collection; import lombok.Getter; import lombok.Setter; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.User; +import java.util.Collection; + @Getter @Setter public class AdminUser extends User { diff --git a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java index 5a477137..413db18b 100644 --- a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java +++ b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java @@ -2,12 +2,12 @@ package app.module.admin.config.application.util; import app.module.admin.config.application.security.AdminUser; import app.module.core.config.adapters.web.interceptor.model.URITopTierVO; -import java.util.List; import org.springframework.security.core.Authentication; -import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; +import java.util.List; + @Component public class AdminUtil { diff --git a/admin/src/main/java/app/module/admin/config/application/util/DateUiUtil.java b/admin/src/main/java/app/module/admin/config/application/util/DateUiUtil.java index 30f26251..a5c8e25f 100644 --- a/admin/src/main/java/app/module/admin/config/application/util/DateUiUtil.java +++ b/admin/src/main/java/app/module/admin/config/application/util/DateUiUtil.java @@ -2,12 +2,13 @@ package app.module.admin.config.application.util; import app.module.admin.config.application.util.model.DayRange; import app.module.admin.config.application.util.model.MonthOption; +import org.springframework.stereotype.Component; + import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import org.springframework.stereotype.Component; @Component public class DateUiUtil { diff --git a/admin/src/main/java/app/module/admin/config/application/util/model/ExcelSheetDto.java b/admin/src/main/java/app/module/admin/config/application/util/model/ExcelSheetDto.java index d9cbbad9..78ede302 100644 --- a/admin/src/main/java/app/module/admin/config/application/util/model/ExcelSheetDto.java +++ b/admin/src/main/java/app/module/admin/config/application/util/model/ExcelSheetDto.java @@ -3,10 +3,10 @@ package app.module.admin.config.application.util.model; import lombok.Getter; import lombok.Setter; import org.apache.poi.ss.usermodel.IndexedColors; -import java.util.List; -import java.util.Set; +import java.util.List; import java.util.Map; +import java.util.Set; @Getter @Setter diff --git a/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/AdminExcelController.java b/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/AdminExcelController.java index c579bee5..05b77f1e 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/AdminExcelController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/AdminExcelController.java @@ -7,9 +7,6 @@ import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdmin import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdminsCmd; import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdminsRole; import jakarta.servlet.http.HttpServletResponse; -import java.time.format.DateTimeFormatter; -import java.util.Optional; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.ss.usermodel.Row; @@ -23,6 +20,10 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; +import java.time.format.DateTimeFormatter; +import java.util.Optional; +import java.util.stream.Collectors; + @Controller @RequiredArgsConstructor class AdminExcelController { diff --git a/admin/src/main/java/app/module/admin/usecase/admin/removeAdmins/adapters/web/AdminRemoveController.java b/admin/src/main/java/app/module/admin/usecase/admin/removeAdmins/adapters/web/AdminRemoveController.java index 444d049e..578e1d9f 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/removeAdmins/adapters/web/AdminRemoveController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/removeAdmins/adapters/web/AdminRemoveController.java @@ -2,7 +2,6 @@ package app.module.admin.usecase.admin.removeAdmins.adapters.web; import app.module.core.config.application.util.MessageUtil; import app.module.core.usecase.admin.removeAdmin.ports.RemoveAdminPortIn; -import java.util.List; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Controller; @@ -10,6 +9,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import java.util.List; + @Controller @RequiredArgsConstructor class AdminRemoveController { diff --git a/admin/src/main/java/app/module/admin/usecase/admin/removeAdmins/adapters/web/RemoveAdminsController.java b/admin/src/main/java/app/module/admin/usecase/admin/removeAdmins/adapters/web/RemoveAdminsController.java index 6b095837..17208793 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/removeAdmins/adapters/web/RemoveAdminsController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/removeAdmins/adapters/web/RemoveAdminsController.java @@ -1,21 +1,15 @@ package app.module.admin.usecase.admin.removeAdmins.adapters.web; import app.module.admin.usecase.admin.removeAdmins.adapters.web.model.RemoveAdminsReqVO; -import app.module.core.config.application.util.MessageUtil; import app.module.core.usecase.admin.removeAdmin.ports.RemoveAdminPortIn; import jakarta.validation.Valid; -import java.util.List; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/admin/removeAdmins/adapters/web/model/RemoveAdminsReqVO.java b/admin/src/main/java/app/module/admin/usecase/admin/removeAdmins/adapters/web/model/RemoveAdminsReqVO.java index bf9f564e..b60d9107 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/removeAdmins/adapters/web/model/RemoveAdminsReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/removeAdmins/adapters/web/model/RemoveAdminsReqVO.java @@ -1,12 +1,12 @@ package app.module.admin.usecase.admin.removeAdmins.adapters.web.model; -import java.util.List; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreateGetController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreateGetController.java index f2bf0764..0702cecb 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreateGetController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreateGetController.java @@ -8,7 +8,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; @Controller @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java index b3e3e5ca..5572a0b7 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java @@ -2,22 +2,15 @@ package app.module.admin.usecase.admin.saveAdmin.adapters.web; import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminCreateBindingVO; import app.module.admin.usecase.admin.saveAdmin.adapters.web.validator.AdminCreateValidator; -import app.module.core.config.application.enums.AppType; -import app.module.core.config.application.util.MessageUtil; import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn; -import app.module.core.usecase.role.list.ports.RoleListPortIn; -import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; -import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.validation.BindingResult; -import org.springframework.validation.ObjectError; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; @Slf4j @RestController diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java index a85cf7fe..064bbdd2 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java @@ -2,7 +2,6 @@ package app.module.admin.usecase.admin.saveAdmin.adapters.web; import app.module.admin.usecase.admin.getAdmins.adapters.web.model.AdminListFilterVO; import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminUpdateBindingVO; -import app.module.core.config.adapters.web.security.domain.CoreRole; import app.module.core.config.application.component.ListPageableInfo; import app.module.core.config.application.enums.AppType; import app.module.core.config.application.util.MessageUtil; @@ -10,8 +9,6 @@ import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.admin.view.ports.application.domain.AdminView; import app.module.core.usecase.role.list.ports.RoleListPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; -import java.util.NoSuchElementException; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -19,6 +16,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; +import java.util.NoSuchElementException; + @Controller @RequiredArgsConstructor class AdminUpdateGetController { diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java index b3289ea4..9ef46f70 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java @@ -2,25 +2,14 @@ package app.module.admin.usecase.admin.saveAdmin.adapters.web; import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminUpdateBindingVO; import app.module.admin.usecase.admin.saveAdmin.adapters.web.validator.AdminUpdateValidator; -import app.module.core.config.application.enums.AppType; -import app.module.core.config.application.util.MessageUtil; import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn; -import app.module.core.usecase.role.list.ports.RoleListPortIn; -import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; -import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; - -import java.util.stream.Collectors; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java index 712c56bc..713239e2 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java @@ -1,6 +1,5 @@ package app.module.admin.usecase.admin.saveAdmin.adapters.web.model; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java index 0f112fc6..34476d20 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java @@ -1,11 +1,12 @@ package app.module.admin.usecase.admin.saveAdmin.adapters.web.model; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java index f06a393a..f17e5422 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java @@ -1,14 +1,14 @@ package app.module.admin.usecase.admin.saveAdmin.adapters.web.validator; import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminCreateBindingVO; -import java.util.Optional; - import app.module.core.config.constants.CommonConstants; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import org.springframework.validation.Errors; import org.springframework.validation.Validator; +import java.util.Optional; + @Component public class AdminCreateValidator implements Validator { diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java index 2f1f0e60..5397924c 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java @@ -1,12 +1,12 @@ package app.module.admin.usecase.admin.saveAdmin.adapters.web.validator; import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminUpdateBindingVO; -import java.util.Optional; import org.springframework.stereotype.Component; import org.springframework.validation.Errors; -import org.springframework.validation.ValidationUtils; import org.springframework.validation.Validator; +import java.util.Optional; + @Component public class AdminUpdateValidator implements Validator { diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java index 0388b1f6..6615ac8a 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/adapters/persistence/BatchLogDao.java @@ -3,10 +3,11 @@ package app.module.admin.usecase.batchLog.adapters.persistence; import app.module.admin.usecase.batchLog.ports.BatchLogPortOut; import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogCmd; import app.module.admin.usecase.batchLog.ports.application.domain.BatchLogType; -import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.time.LocalDateTime; + @Repository @RequiredArgsConstructor class BatchLogDao implements BatchLogPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLog.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLog.java index fc4d1d75..2f607f0b 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLog.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLog.java @@ -1,11 +1,12 @@ package app.module.admin.usecase.batchLog.ports.application.domain; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java index 5074fe5b..12899498 100644 --- a/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/batchLog/ports/application/domain/BatchLogCmd.java @@ -1,11 +1,12 @@ package app.module.admin.usecase.batchLog.ports.application.domain; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeUIController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeUIController.java index b0c0f412..3e8cfabb 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeUIController.java @@ -1,7 +1,6 @@ package app.module.admin.usecase.communication.notice.createNotice.adapters.web; -import app.module.admin.usecase.communication.notice.createNotice.adapters.web.model.CreateNoticeReqVO; import app.module.admin.usecase.communication.notice.createNotice.adapters.web.model.CreateNoticeUIReqVO; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java index 6a7db3fd..d0735847 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java @@ -1,6 +1,5 @@ package app.module.admin.usecase.communication.notice.createNotice.adapters.web.model; -import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeUIReqVO.java index 6cb3962f..a4ec05d4 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeUIReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeUIReqVO.java @@ -1,15 +1,9 @@ package app.module.admin.usecase.communication.notice.createNotice.adapters.web.model; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.apache.commons.text.StringEscapeUtils; - -import java.time.LocalDateTime; -import java.util.List; @Getter @Setter diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/GetNoticeService.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/GetNoticeService.java index e7e95edf..68ba9dfb 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/GetNoticeService.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/GetNoticeService.java @@ -5,7 +5,6 @@ import app.module.admin.usecase.communication.notice.getNotice.ports.GetNoticePo import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNotice; import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeCmd; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/GetNoticesController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/GetNoticesController.java index 1cbbb135..af82f1c5 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/GetNoticesController.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/GetNoticesController.java @@ -2,18 +2,15 @@ package app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web; import app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web.model.GetNoticesReqVO; import app.module.admin.usecase.communication.notice.getNoticesUI.ports.GetNoticesPortIn; -import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices; import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; @Controller diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeUIController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeUIController.java index 2d7237d9..795cb08e 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeUIController.java @@ -1,17 +1,8 @@ package app.module.admin.usecase.communication.notice.updateNotice.adapters.web; -import app.module.admin.config.application.util.AdminUtil; -import app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web.model.GetNoticesReqVO; -import app.module.admin.usecase.communication.notice.getNoticesUI.ports.GetNoticesPortIn; -import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices; -import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; import app.module.admin.usecase.communication.notice.updateNotice.ports.UpdateNoticePortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Sort; -import org.springframework.data.web.PageableDefault; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; diff --git a/admin/src/main/java/app/module/admin/usecase/communication/sms/getSmsUI/GetSmsController.java b/admin/src/main/java/app/module/admin/usecase/communication/sms/getSmsUI/GetSmsController.java index c386860f..07e30c87 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/sms/getSmsUI/GetSmsController.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/sms/getSmsUI/GetSmsController.java @@ -1,11 +1,11 @@ package app.module.admin.usecase.communication.sms.getSmsUI; +import app.module.admin.usecase.communication.sms.getSmsUI.model.GetSmsReqVO; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; -import app.module.admin.usecase.communication.sms.getSmsUI.model.GetSmsReqVO; @Controller @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/adapters/persistence/GetSuggestionDao.java b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/adapters/persistence/GetSuggestionDao.java index 621023e2..4c68147b 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/adapters/persistence/GetSuggestionDao.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/adapters/persistence/GetSuggestionDao.java @@ -1,12 +1,13 @@ package app.module.admin.usecase.communication.suggestion.getSuggestion.adapters.persistence; -import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.GetSuggestionPortOut; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd; -import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.GetSuggestionPortOut; -import java.util.Optional; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository @RequiredArgsConstructor class GetSuggestionDao implements GetSuggestionPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/adapters/persistence/GetSuggestionMapper.java b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/adapters/persistence/GetSuggestionMapper.java index 595a8b06..9633af74 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/adapters/persistence/GetSuggestionMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/adapters/persistence/GetSuggestionMapper.java @@ -2,9 +2,10 @@ package app.module.admin.usecase.communication.suggestion.getSuggestion.adapters import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface GetSuggestionMapper { Optional getSuggestionById(GetSuggestionCmd cmd); diff --git a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/ports/GetSuggestionPortIn.java b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/ports/GetSuggestionPortIn.java index 894de0e1..927aba98 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/ports/GetSuggestionPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/ports/GetSuggestionPortIn.java @@ -1,9 +1,10 @@ package app.module.admin.usecase.communication.suggestion.getSuggestion.ports; -import java.util.Optional; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd; +import java.util.Optional; + public interface GetSuggestionPortIn { Optional operate(GetSuggestionCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/ports/GetSuggestionPortOut.java b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/ports/GetSuggestionPortOut.java index d15badfb..e259c230 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/ports/GetSuggestionPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/ports/GetSuggestionPortOut.java @@ -1,9 +1,10 @@ package app.module.admin.usecase.communication.suggestion.getSuggestion.ports; -import java.util.Optional; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd; +import java.util.Optional; + public interface GetSuggestionPortOut { Optional operate(GetSuggestionCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/ports/application/GetSuggestionService.java b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/ports/application/GetSuggestionService.java index 234ab533..fd98fc16 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/ports/application/GetSuggestionService.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestion/ports/application/GetSuggestionService.java @@ -1,13 +1,14 @@ package app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion; -import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.GetSuggestionPortIn; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.GetSuggestionPortOut; -import java.util.Optional; +import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestion; +import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class GetSuggestionService implements GetSuggestionPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestionUI/GetSuggestionUIController.java b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestionUI/GetSuggestionUIController.java index 6408e7b3..2db3d2a9 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestionUI/GetSuggestionUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestionUI/GetSuggestionUIController.java @@ -2,13 +2,13 @@ package app.module.admin.usecase.communication.suggestion.getSuggestionUI; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.GetSuggestionPortIn; import app.module.admin.usecase.communication.suggestion.getSuggestion.ports.application.domain.GetSuggestionCmd; +import app.module.admin.usecase.communication.suggestion.getSuggestionUI.model.GetSuggestionUIReqVO; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; -import app.module.admin.usecase.communication.suggestion.getSuggestionUI.model.GetSuggestionUIReqVO; @Controller @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestions/adapters/persistence/GetSuggestionsDao.java b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestions/adapters/persistence/GetSuggestionsDao.java index faab6ecc..0fbf6e53 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestions/adapters/persistence/GetSuggestionsDao.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestions/adapters/persistence/GetSuggestionsDao.java @@ -1,15 +1,16 @@ package app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.persistence; -import java.util.List; -import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.GetSuggestionsPortOut; import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestions; import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd; -import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.GetSuggestionsPortOut; +import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository @RequiredArgsConstructor class GetSuggestionsDao implements GetSuggestionsPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestions/adapters/persistence/GetSuggestionsMapper.java b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestions/adapters/persistence/GetSuggestionsMapper.java index 264bcad4..8f76d754 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestions/adapters/persistence/GetSuggestionsMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestions/adapters/persistence/GetSuggestionsMapper.java @@ -2,11 +2,12 @@ package app.module.admin.usecase.communication.suggestion.getSuggestions.adapter import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestions; import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.Pageable; +import java.util.List; + @Mapper public interface GetSuggestionsMapper { List getSuggestions(@Param("pageable") Pageable pageable, diff --git a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestions/adapters/web/GetSuggestionsController.java b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestions/adapters/web/GetSuggestionsController.java index 830cb564..316585c1 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestions/adapters/web/GetSuggestionsController.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestions/adapters/web/GetSuggestionsController.java @@ -1,5 +1,6 @@ package app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.web; +import app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.web.model.GetSuggestionsReqVO; import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.GetSuggestionsPortIn; import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd; import lombok.RequiredArgsConstructor; @@ -7,10 +8,8 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; 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 app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.web.model.GetSuggestionsReqVO; -import app.module.admin.usecase.communication.suggestion.getSuggestions.adapters.web.model.GetSuggestionsResVO; +import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestions/ports/application/GetSuggestionsService.java b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestions/ports/application/GetSuggestionsService.java index 1ccea9cb..482a98ab 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestions/ports/application/GetSuggestionsService.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestions/ports/application/GetSuggestionsService.java @@ -1,10 +1,10 @@ package app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestions; -import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd; import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.GetSuggestionsPortIn; import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.GetSuggestionsPortOut; +import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestions; +import app.module.admin.usecase.communication.suggestion.getSuggestions.ports.application.domain.GetSuggestionsCmd; +import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestionsUI/GetSuggestionsUIController.java b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestionsUI/GetSuggestionsUIController.java index cc06b13b..a5a21932 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestionsUI/GetSuggestionsUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestionsUI/GetSuggestionsUIController.java @@ -1,13 +1,12 @@ package app.module.admin.usecase.communication.suggestion.getSuggestionsUI; import app.module.admin.config.application.util.DateUiUtil; -import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import app.module.admin.usecase.communication.suggestion.getSuggestionsUI.model.GetSuggestionsUIReqVO; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; -import app.module.admin.usecase.communication.suggestion.getSuggestionsUI.model.GetSuggestionsUIReqVO; @Controller @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartDao.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartDao.java index 6321ee81..3014c2fc 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartDao.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartDao.java @@ -3,23 +3,17 @@ package app.module.admin.usecase.dashboard.chart.adapters.persistence; import app.module.admin.config.application.util.AdminUtil; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.ChartDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto; -import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionPercentDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionResearcherPercentDto; -import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionDetailExcelDto; -import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto; -import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.TotalPercentDto; import app.module.admin.usecase.dashboard.chart.adapters.web.model.TotalPercentageReqVO; import app.module.admin.usecase.dashboard.chart.ports.ChartPortOut; import app.module.core.config.application.exception.NoMatchingURIException; import app.module.core.usecase.uicode.list.adapters.persistence.UICodeListMapper; -import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; import java.util.List; @Slf4j diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartMapper.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartMapper.java index 04a5a195..6e9ac77f 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartMapper.java @@ -1,12 +1,7 @@ package app.module.admin.usecase.dashboard.chart.adapters.persistence; -import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionPercentDto; -import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionResearcherPercentDto; -import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionDetailExcelDto; -import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto; -import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.TotalPercentDto; +import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.*; import app.module.admin.usecase.dashboard.chart.adapters.web.model.TotalPercentageReqVO; -import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/ChartDto.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/ChartDto.java index a6d57f8b..ee045b10 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/ChartDto.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/ChartDto.java @@ -3,6 +3,7 @@ package app.module.admin.usecase.dashboard.chart.adapters.persistence.model; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; import lombok.AllArgsConstructor; import lombok.Data; + import java.util.List; @Data diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/DashboardExcelDto.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/DashboardExcelDto.java index 5a4cf388..d3ab6e42 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/DashboardExcelDto.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/DashboardExcelDto.java @@ -1,10 +1,11 @@ package app.module.admin.usecase.dashboard.chart.adapters.persistence.model; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/web/ChartApiController.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/web/ChartApiController.java index deb2f3cf..66941e82 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/web/ChartApiController.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/web/ChartApiController.java @@ -6,15 +6,7 @@ import app.module.admin.config.application.util.model.ExcelSheetDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionDetailExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto; -import app.module.admin.usecase.dashboard.chart.adapters.web.model.TotalPercentageReqVO; import app.module.admin.usecase.dashboard.chart.ports.ChartPortIn; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -23,7 +15,18 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; @Slf4j @RestController diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/ChartPortOut.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/ChartPortOut.java index 9f2292e8..52784d3b 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/ChartPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/ChartPortOut.java @@ -3,7 +3,6 @@ package app.module.admin.usecase.dashboard.chart.ports; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.ChartDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionResearcherPercentDto; -import app.module.admin.usecase.dashboard.chart.adapters.web.model.TotalPercentageReqVO; import java.util.List; diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/applilcation/ChartService.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/applilcation/ChartService.java index fe0fc73a..1f266207 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/applilcation/ChartService.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/ports/applilcation/ChartService.java @@ -3,7 +3,6 @@ package app.module.admin.usecase.dashboard.chart.ports.applilcation; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.ChartDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.LocalRegionResearcherPercentDto; -import app.module.admin.usecase.dashboard.chart.adapters.web.model.TotalPercentageReqVO; import app.module.admin.usecase.dashboard.chart.ports.ChartPortIn; import app.module.admin.usecase.dashboard.chart.ports.ChartPortOut; import lombok.RequiredArgsConstructor; diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/adapters/persistence/GetSmsAutoStatusDao.java b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/adapters/persistence/GetSmsAutoStatusDao.java index 915c2867..fb0a2c6f 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/adapters/persistence/GetSmsAutoStatusDao.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/adapters/persistence/GetSmsAutoStatusDao.java @@ -1,12 +1,12 @@ package app.module.admin.usecase.dashboard.getSmsAutoStatus.adapters.persistence; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; -import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatusCmd; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortOut; -import java.util.Optional; +import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository @RequiredArgsConstructor class GetSmsAutoStatusDao implements GetSmsAutoStatusPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/adapters/persistence/GetSmsAutoStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/adapters/persistence/GetSmsAutoStatusMapper.java index 91390919..d1b15c92 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/adapters/persistence/GetSmsAutoStatusMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/adapters/persistence/GetSmsAutoStatusMapper.java @@ -1,9 +1,10 @@ package app.module.admin.usecase.dashboard.getSmsAutoStatus.adapters.persistence; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface GetSmsAutoStatusMapper { Optional operate(); diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/GetSmsAutoStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/GetSmsAutoStatusPortIn.java index 5bc0a7a3..0905aef6 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/GetSmsAutoStatusPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/GetSmsAutoStatusPortIn.java @@ -1,6 +1,7 @@ package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; + import java.util.Optional; public interface GetSmsAutoStatusPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/GetSmsAutoStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/GetSmsAutoStatusPortOut.java index 76b022b0..75118843 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/GetSmsAutoStatusPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/GetSmsAutoStatusPortOut.java @@ -1,6 +1,7 @@ package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; + import java.util.Optional; public interface GetSmsAutoStatusPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/GetSmsAutoStatusService.java b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/GetSmsAutoStatusService.java index 8c8975b2..9be8f28f 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/GetSmsAutoStatusService.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/GetSmsAutoStatusService.java @@ -3,10 +3,11 @@ package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortOut; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class GetSmsAutoStatusService implements GetSmsAutoStatusPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/domain/GetSmsAutoStatus.java b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/domain/GetSmsAutoStatus.java index 1032e352..d7d00f81 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/domain/GetSmsAutoStatus.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/getSmsAutoStatus/ports/application/domain/GetSmsAutoStatus.java @@ -1,11 +1,12 @@ package app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/persistence/UpdateSmsAutoStatusDao.java b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/persistence/UpdateSmsAutoStatusDao.java index b635a613..ad96dd3f 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/persistence/UpdateSmsAutoStatusDao.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/persistence/UpdateSmsAutoStatusDao.java @@ -1,10 +1,9 @@ package app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.persistence; +import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortOut; +import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd; import app.module.core.config.application.annotation.UpdateCommand; import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd; -import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortOut; -import org.apache.ibatis.annotations.Update; import org.springframework.stereotype.Repository; @Repository diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/web/UpdateSmsAutoStatusController.java b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/web/UpdateSmsAutoStatusController.java index 129f3e0a..96ac2892 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/web/UpdateSmsAutoStatusController.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/web/UpdateSmsAutoStatusController.java @@ -1,5 +1,7 @@ package app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web; +import app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web.model.UpdateSmsAutoStatusReqVO; +import app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web.model.UpdateSmsAutoStatusResVO; import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortIn; import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd; import app.module.core.config.application.util.MessageUtil; @@ -7,12 +9,10 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import org.springframework.validation.BindingResult; -import app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web.model.UpdateSmsAutoStatusReqVO; -import app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web.model.UpdateSmsAutoStatusResVO; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/web/model/UpdateSmsAutoStatusReqVO.java b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/web/model/UpdateSmsAutoStatusReqVO.java index 02c96c4a..3e6f6888 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/web/model/UpdateSmsAutoStatusReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/adapters/web/model/UpdateSmsAutoStatusReqVO.java @@ -1,6 +1,5 @@ package app.module.admin.usecase.dashboard.updateSmsAutoStatus.adapters.web.model; -import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/application/UpdateSmsAutoStatusService.java b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/application/UpdateSmsAutoStatusService.java index b66b2a20..93be7439 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/application/UpdateSmsAutoStatusService.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/application/UpdateSmsAutoStatusService.java @@ -1,9 +1,9 @@ package app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd; import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortIn; import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.UpdateSmsAutoStatusPortOut; +import app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application.domain.UpdateSmsAutoStatusCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/application/domain/UpdateSmsAutoStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/application/domain/UpdateSmsAutoStatusCmd.java index 74b24441..3793d392 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/application/domain/UpdateSmsAutoStatusCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/updateSmsAutoStatus/ports/application/domain/UpdateSmsAutoStatusCmd.java @@ -2,7 +2,6 @@ package app.module.admin.usecase.dashboard.updateSmsAutoStatus.ports.application import app.module.core.config.adapters.persistence.component.AuditCommand; import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/editor/adapters/web/EditorImageUploadController.java b/admin/src/main/java/app/module/admin/usecase/editor/adapters/web/EditorImageUploadController.java index 2b07450e..e9b6ffdf 100644 --- a/admin/src/main/java/app/module/admin/usecase/editor/adapters/web/EditorImageUploadController.java +++ b/admin/src/main/java/app/module/admin/usecase/editor/adapters/web/EditorImageUploadController.java @@ -5,7 +5,6 @@ import app.module.core.config.application.enums.FileUploadType; import app.module.core.usecase.file.saveToStorage.ports.SaveToStoragePortIn; import app.module.core.usecase.file.saveToStorage.ports.application.domain.SaveToStorage; import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn; -import java.io.IOException; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; @@ -14,6 +13,8 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; + @Controller @RequiredArgsConstructor public class EditorImageUploadController { diff --git a/admin/src/main/java/app/module/admin/usecase/excel/getExcelMultilSheet/adapters/web/GetExcelMultiSheetController.java b/admin/src/main/java/app/module/admin/usecase/excel/getExcelMultilSheet/adapters/web/GetExcelMultiSheetController.java index 9f909e84..b9443af3 100644 --- a/admin/src/main/java/app/module/admin/usecase/excel/getExcelMultilSheet/adapters/web/GetExcelMultiSheetController.java +++ b/admin/src/main/java/app/module/admin/usecase/excel/getExcelMultilSheet/adapters/web/GetExcelMultiSheetController.java @@ -1,23 +1,22 @@ package app.module.admin.usecase.excel.getExcelMultilSheet.adapters.web; +import app.module.admin.config.application.util.ExcelWriterUtil; import app.module.admin.config.application.util.model.ExcelSheetDto; import lombok.RequiredArgsConstructor; +import org.apache.poi.ss.usermodel.IndexedColors; import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import app.module.admin.config.application.util.ExcelWriterUtil; -import java.util.List; -import java.util.Set; -import org.apache.poi.ss.usermodel.IndexedColors; -import java.util.Map; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.time.LocalDate; import java.time.format.DateTimeFormatter; +import java.util.List; +import java.util.Map; +import java.util.Set; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/home/adapters/web/HomeController.java b/admin/src/main/java/app/module/admin/usecase/home/adapters/web/HomeController.java index a02f7bbb..67efd4fd 100644 --- a/admin/src/main/java/app/module/admin/usecase/home/adapters/web/HomeController.java +++ b/admin/src/main/java/app/module/admin/usecase/home/adapters/web/HomeController.java @@ -1,16 +1,16 @@ package app.module.admin.usecase.home.adapters.web; -import app.module.admin.config.application.util.AdminUtil; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.GetSmsAutoStatusPortIn; import app.module.admin.usecase.dashboard.getSmsAutoStatus.ports.application.domain.GetSmsAutoStatus; import app.module.core.usecase.admin.view.ports.AdminViewPortIn; -import java.security.Principal; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import java.security.Principal; + @Controller @RequestMapping("/") @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumDao.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumDao.java index a094b1a4..d1f87ff1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumDao.java @@ -1,12 +1,13 @@ package app.module.admin.usecase.household.checkHouseholdNum.adapters.persistence; -import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortOut; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; -import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortOut; -import java.util.Optional; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository @RequiredArgsConstructor class CheckHouseholdNumDao implements CheckHouseholdNumPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumMapper.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumMapper.java index 34b5b825..27913667 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumMapper.java @@ -2,9 +2,10 @@ package app.module.admin.usecase.household.checkHouseholdNum.adapters.persistenc import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface CheckHouseholdNumMapper { Optional checkHouseholdNum(CheckHouseholdNumCmd cmd); diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/CheckHouseholdNumController.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/CheckHouseholdNumController.java index d666820f..234f4e7a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/CheckHouseholdNumController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/CheckHouseholdNumController.java @@ -9,7 +9,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @RestController diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/CheckHouseholdNumPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/CheckHouseholdNumPortIn.java index 6208dcbb..1dbb9170 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/CheckHouseholdNumPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/CheckHouseholdNumPortIn.java @@ -1,9 +1,10 @@ package app.module.admin.usecase.household.checkHouseholdNum.ports; -import java.util.Optional; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; +import java.util.Optional; + public interface CheckHouseholdNumPortIn { Optional operate(CheckHouseholdNumCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/CheckHouseholdNumPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/CheckHouseholdNumPortOut.java index 454aaca5..083531c1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/CheckHouseholdNumPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/CheckHouseholdNumPortOut.java @@ -1,9 +1,10 @@ package app.module.admin.usecase.household.checkHouseholdNum.ports; -import java.util.Optional; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; +import java.util.Optional; + public interface CheckHouseholdNumPortOut { Optional operate(CheckHouseholdNumCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/application/CheckHouseholdNumService.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/application/CheckHouseholdNumService.java index 301d2d3f..6f0f8b82 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/application/CheckHouseholdNumService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/ports/application/CheckHouseholdNumService.java @@ -1,13 +1,14 @@ package app.module.admin.usecase.household.checkHouseholdNum.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; -import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortIn; import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortOut; -import java.util.Optional; +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum; +import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class CheckHouseholdNumService implements CheckHouseholdNumPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java index 8df8bcd8..18147060 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java @@ -1,14 +1,13 @@ package app.module.admin.usecase.household.createHousehold.adapters.persistence; +import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortOut; +import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd; +import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateResearcherHasHouseholdCmd; import app.module.core.config.application.annotation.CreateCommand; import app.module.core.config.application.util.AuditUtil; -import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd; -import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortOut; import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; @Repository @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java index 87162c27..55750113 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java @@ -1,19 +1,18 @@ package app.module.admin.usecase.household.createHousehold.adapters.web; +import app.module.admin.usecase.household.createHousehold.adapters.web.model.CreateHouseholdReqVO; import app.module.admin.usecase.household.createHousehold.adapters.web.model.CreateHouseholdResVO; -import app.module.core.config.application.util.MessageUtil; +import app.module.admin.usecase.household.createHousehold.adapters.web.validator.CreateHouseholdValidator; import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortIn; import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; 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.createHousehold.adapters.web.model.CreateHouseholdReqVO; -import app.module.admin.usecase.household.createHousehold.adapters.web.validator.CreateHouseholdValidator; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java index aa2c9210..6d82ae4b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java @@ -2,13 +2,7 @@ package app.module.admin.usecase.household.createHousehold.adapters.web.model; import app.module.admin.config.application.enums.EmploymentType; import app.module.admin.config.application.enums.UsageType; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; @Getter @Setter diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/CreateHouseholdService.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/CreateHouseholdService.java index 863ed058..a194399e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/CreateHouseholdService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/CreateHouseholdService.java @@ -9,15 +9,15 @@ import app.module.admin.usecase.household.createHousehold.ports.application.doma import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn; import app.module.core.config.application.logging.SafeLogger; - -import org.slf4j.LoggerFactory; -import java.util.List; import lombok.RequiredArgsConstructor; +import org.slf4j.LoggerFactory; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; +import java.util.List; + @Service @RequiredArgsConstructor class CreateHouseholdService implements CreateHouseholdPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdHasRoleCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdHasRoleCmd.java index d1878982..78c6eb2c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdHasRoleCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdHasRoleCmd.java @@ -1,12 +1,13 @@ package app.module.admin.usecase.household.createHousehold.ports.application.domain; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java index f83b44c6..3fed5133 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java @@ -1,12 +1,13 @@ package app.module.admin.usecase.household.createHousehold.ports.application.domain; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateResearcherHasHouseholdCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateResearcherHasHouseholdCmd.java index a4ca33be..a5294ae3 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateResearcherHasHouseholdCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateResearcherHasHouseholdCmd.java @@ -1,7 +1,6 @@ package app.module.admin.usecase.household.createHousehold.ports.application.domain; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java b/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java index 32418eb7..876895c9 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java @@ -1,6 +1,7 @@ package app.module.admin.usecase.household.createHouseholdUI.adapters.web; import app.module.admin.config.application.util.AdminUtil; +import app.module.admin.usecase.household.createHouseholdUI.adapters.web.model.CreateHouseholdUIReqVO; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortIn; import lombok.RequiredArgsConstructor; @@ -8,7 +9,6 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; -import app.module.admin.usecase.household.createHouseholdUI.adapters.web.model.CreateHouseholdUIReqVO; import org.springframework.web.servlet.mvc.support.RedirectAttributes; @Controller diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingDao.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingDao.java index 0388b660..273edd67 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingDao.java @@ -1,10 +1,10 @@ package app.module.admin.usecase.household.createResearcherMapping.adapters.persistence; +import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortOut; +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.DeleteResearcherMappingCmd; import app.module.core.config.application.util.AuditUtil; import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; -import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortOut; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/CreateResearcherMappingController.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/CreateResearcherMappingController.java index b6c8f36d..64cec66f 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/CreateResearcherMappingController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/CreateResearcherMappingController.java @@ -1,5 +1,7 @@ package app.module.admin.usecase.household.createResearcherMapping.adapters.web; +import app.module.admin.usecase.household.createResearcherMapping.adapters.web.model.CreateResearcherMappingReqVO; +import app.module.admin.usecase.household.createResearcherMapping.adapters.web.model.CreateResearcherMappingResVO; import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortIn; import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; import app.module.core.config.application.util.MessageUtil; @@ -7,12 +9,10 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; 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.createResearcherMapping.adapters.web.model.CreateResearcherMappingReqVO; -import app.module.admin.usecase.household.createResearcherMapping.adapters.web.model.CreateResearcherMappingResVO; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingReqVO.java index bf981835..1cc216ae 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingReqVO.java @@ -1,12 +1,12 @@ package app.module.admin.usecase.household.createResearcherMapping.adapters.web.model; -import java.util.List; -import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.util.List; + @Getter @Setter @NoArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingResVO.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingResVO.java index 725f7033..a7bce1f3 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingResVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingResVO.java @@ -1,11 +1,12 @@ package app.module.admin.usecase.household.createResearcherMapping.adapters.web.model; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/CreateResearcherMappingService.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/CreateResearcherMappingService.java index 984e37a0..0adfac86 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/CreateResearcherMappingService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/CreateResearcherMappingService.java @@ -1,9 +1,9 @@ package app.module.admin.usecase.household.createResearcherMapping.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortIn; import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortOut; +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/CreateResearcherMappingCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/CreateResearcherMappingCmd.java index b3277670..1e8ceb5d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/CreateResearcherMappingCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/CreateResearcherMappingCmd.java @@ -1,12 +1,13 @@ package app.module.admin.usecase.household.createResearcherMapping.ports.application.domain; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/DeleteResearcherMappingCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/DeleteResearcherMappingCmd.java index 036c3731..69050380 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/DeleteResearcherMappingCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/DeleteResearcherMappingCmd.java @@ -1,12 +1,13 @@ package app.module.admin.usecase.household.createResearcherMapping.ports.application.domain; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/persistence/GetHouseholdsExcelDao.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/persistence/GetHouseholdsExcelDao.java index 9ac28ce2..1289410b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/persistence/GetHouseholdsExcelDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/persistence/GetHouseholdsExcelDao.java @@ -1,11 +1,12 @@ package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.adapters.persistence; +import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.GetHouseholdsExcelPortOut; import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.*; import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.GetHouseholdsExcelPortOut; -import java.util.List; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository @RequiredArgsConstructor class GetHouseholdsExcelDao implements GetHouseholdsExcelPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/persistence/GetHouseholdsExcelMapper.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/persistence/GetHouseholdsExcelMapper.java index e3d80ccc..c75c97d2 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/persistence/GetHouseholdsExcelMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/persistence/GetHouseholdsExcelMapper.java @@ -1,9 +1,9 @@ package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.adapters.persistence; import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.*; +import org.apache.ibatis.annotations.Mapper; import java.util.List; -import org.apache.ibatis.annotations.Mapper; @Mapper public interface GetHouseholdsExcelMapper { diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java index 39b3c9f7..951c3a58 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java @@ -11,21 +11,12 @@ import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports import app.module.admin.usecase.household.getHouseholdsStatus.ports.GetHouseholdsStatusPortIn; import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import app.module.core.config.application.util.DailyUtil; import app.module.core.config.application.logging.SafeLogger; +import app.module.core.config.application.util.DailyUtil; import lombok.RequiredArgsConstructor; - -import org.slf4j.LoggerFactory; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.IndexedColors; +import org.slf4j.LoggerFactory; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpHeaders; @@ -34,6 +25,14 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + @RestController @RequiredArgsConstructor class GetHouseholdsExcelController { diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/GetHouseholdsExcelService.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/GetHouseholdsExcelService.java index a4e623e9..5132f604 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/GetHouseholdsExcelService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/GetHouseholdsExcelService.java @@ -1,12 +1,13 @@ package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application; -import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.*; -import lombok.RequiredArgsConstructor; import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.GetHouseholdsExcelPortIn; import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.GetHouseholdsExcelPortOut; -import java.util.List; +import app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.*; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor class GetHouseholdsExcelService implements GetHouseholdsExcelPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetHouseholdsExcelCmd.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetHouseholdsExcelCmd.java index b85731ad..a63fc3ad 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetHouseholdsExcelCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetHouseholdsExcelCmd.java @@ -1,11 +1,12 @@ package app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java index 0ef73c4c..1f05467e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java @@ -12,14 +12,13 @@ import app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.we import app.module.admin.usecase.household.excelUploadCreateHousehold.adapters.web.model.ExcelUploadResultVO; import app.module.admin.usecase.household.excelUploadCreateHousehold.ports.ExcelUploadCreateHouseholdPortOut; import app.module.admin.usecase.researcher.adpaters.persistence.ResearcherMapper; +import app.module.core.config.application.logging.SafeLogger; import app.module.core.config.application.util.AuditUtil; import app.module.core.usecase.uicode.list.adapters.persistence.UICodeListMapper; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; -import app.module.core.config.application.logging.SafeLogger; import lombok.RequiredArgsConstructor; - -import org.slf4j.LoggerFactory; import org.apache.poi.ss.usermodel.*; +import org.slf4j.LoggerFactory; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; @@ -27,9 +26,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import java.util.Optional; @Repository @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusDao.java index dd8ccd30..0b71c711 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusDao.java @@ -1,14 +1,13 @@ package app.module.admin.usecase.household.getHouseholdStatus.adapters.persistence; -import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus; -import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; -import app.module.core.usecase.household.getHousehold.adapters.persistence.GetHouseholdMapper; -import java.util.Optional; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortOut; +import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus; +import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository @RequiredArgsConstructor class GetHouseholdStatusDao implements GetHouseholdStatusPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusMapper.java index 27e91457..bb1bc96a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/adapters/persistence/GetHouseholdStatusMapper.java @@ -2,10 +2,10 @@ package app.module.admin.usecase.household.getHouseholdStatus.adapters.persisten import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus; import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; -import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface GetHouseholdStatusMapper { Optional getHouseholdStatusById(GetHouseholdStatusCmd cmd); diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortIn.java index 88006b15..b3b3563e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortIn.java @@ -2,7 +2,7 @@ package app.module.admin.usecase.household.getHouseholdStatus.ports; import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus; import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; -import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; + import java.util.Optional; public interface GetHouseholdStatusPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortOut.java index 5768c1b7..406725ed 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/GetHouseholdStatusPortOut.java @@ -2,7 +2,7 @@ package app.module.admin.usecase.household.getHouseholdStatus.ports; import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus; import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; -import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; + import java.util.Optional; public interface GetHouseholdStatusPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/GetHouseholdStatusService.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/GetHouseholdStatusService.java index 9106d8bd..45c49a7f 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/GetHouseholdStatusService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/GetHouseholdStatusService.java @@ -1,14 +1,14 @@ package app.module.admin.usecase.household.getHouseholdStatus.ports.application; -import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus; -import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; -import java.util.Optional; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortIn; import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortOut; +import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus; +import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class GetHouseholdStatusService implements GetHouseholdStatusPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java index 5e511457..228ffe7c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java @@ -4,6 +4,7 @@ import app.module.admin.config.application.util.AdminUtil; import app.module.admin.config.application.util.DateUiUtil; import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortIn; import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; +import app.module.admin.usecase.household.getHouseholdStatusUI.adapters.web.model.GetHouseholdStatusUIReqVO; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; @@ -11,7 +12,6 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; -import app.module.admin.usecase.household.getHouseholdStatusUI.adapters.web.model.GetHouseholdStatusUIReqVO; import org.springframework.web.bind.annotation.RequestParam; @Controller diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/persistence/GetHouseholdsStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/persistence/GetHouseholdsStatusDao.java index b2a8b715..5ca39c07 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/persistence/GetHouseholdsStatusDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/persistence/GetHouseholdsStatusDao.java @@ -1,15 +1,16 @@ package app.module.admin.usecase.household.getHouseholdsStatus.adapters.persistence; -import java.util.List; -import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.getHouseholdsStatus.ports.GetHouseholdsStatusPortOut; import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd; -import app.module.admin.usecase.household.getHouseholdsStatus.ports.GetHouseholdsStatusPortOut; +import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository @RequiredArgsConstructor class GetHouseholdsStatusDao implements GetHouseholdsStatusPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/persistence/GetHouseholdsStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/persistence/GetHouseholdsStatusMapper.java index 35a1e2dc..87710f26 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/persistence/GetHouseholdsStatusMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/persistence/GetHouseholdsStatusMapper.java @@ -2,11 +2,12 @@ package app.module.admin.usecase.household.getHouseholdsStatus.adapters.persiste import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.Pageable; +import java.util.List; + @Mapper public interface GetHouseholdsStatusMapper { List getHouseholdsStatus(@Param("pageable") Pageable pageable, diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/GetHouseholdsStatusService.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/GetHouseholdsStatusService.java index 4bc320ba..15c5147d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/GetHouseholdsStatusService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/GetHouseholdsStatusService.java @@ -1,10 +1,10 @@ package app.module.admin.usecase.household.getHouseholdsStatus.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; -import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd; import app.module.admin.usecase.household.getHouseholdsStatus.ports.GetHouseholdsStatusPortIn; import app.module.admin.usecase.household.getHouseholdsStatus.ports.GetHouseholdsStatusPortOut; +import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; +import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd; +import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java index 91e28d52..ce3873dd 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java @@ -1,6 +1,5 @@ package app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain; -import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersDao.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersDao.java index 5b3b269e..515eec0c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersDao.java @@ -1,15 +1,16 @@ package app.module.admin.usecase.household.getPopupResearchers.adapters.persistence; -import java.util.List; -import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.getPopupResearchers.ports.GetPopupResearchersPortOut; import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers; import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd; -import app.module.admin.usecase.household.getPopupResearchers.ports.GetPopupResearchersPortOut; +import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository @RequiredArgsConstructor class GetPopupResearchersDao implements GetPopupResearchersPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersMapper.java index 5f4b6210..cf0b7761 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersMapper.java @@ -2,11 +2,12 @@ package app.module.admin.usecase.household.getPopupResearchers.adapters.persiste import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers; import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.Pageable; +import java.util.List; + @Mapper public interface GetPopupResearchersMapper { List getPopupResearchers(@Param("pageable") Pageable pageable, diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/GetPopupResearchersController.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/GetPopupResearchersController.java index ae68c3a5..989cb6bf 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/GetPopupResearchersController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/GetPopupResearchersController.java @@ -1,17 +1,15 @@ package app.module.admin.usecase.household.getPopupResearchers.adapters.web; +import app.module.admin.usecase.household.getPopupResearchers.adapters.web.model.GetPopupResearchersReqVO; import app.module.admin.usecase.household.getPopupResearchers.ports.GetPopupResearchersPortIn; import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd; import lombok.RequiredArgsConstructor; -import org.springframework.boot.context.properties.bind.DefaultValue; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; 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 app.module.admin.usecase.household.getPopupResearchers.adapters.web.model.GetPopupResearchersReqVO; -import app.module.admin.usecase.household.getPopupResearchers.adapters.web.model.GetPopupResearchersResVO; +import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/GetPopupResearchersService.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/GetPopupResearchersService.java index 95989c83..6768f0bb 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/GetPopupResearchersService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/GetPopupResearchersService.java @@ -1,10 +1,10 @@ package app.module.admin.usecase.household.getPopupResearchers.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers; -import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd; import app.module.admin.usecase.household.getPopupResearchers.ports.GetPopupResearchersPortIn; import app.module.admin.usecase.household.getPopupResearchers.ports.GetPopupResearchersPortOut; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd; +import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getRegionMainCodes/GetRegionMainCodesController.java b/admin/src/main/java/app/module/admin/usecase/household/getRegionMainCodes/GetRegionMainCodesController.java index 236dc460..80b73385 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getRegionMainCodes/GetRegionMainCodesController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getRegionMainCodes/GetRegionMainCodesController.java @@ -2,14 +2,13 @@ package app.module.admin.usecase.household.getRegionMainCodes; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; -import java.util.List; 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 app.module.admin.usecase.household.getRegionMainCodes.model.GetRegionMainCodesReqVO; -import app.module.admin.usecase.household.getRegionMainCodes.model.GetRegionMainCodesResVO; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; @RestController @RequiredArgsConstructor 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 732171ea..a7632a7e 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 @@ -1,12 +1,13 @@ package app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.adapters.persistence; -import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortOut; 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.monthlyInputStatus.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortOut; -import java.util.Optional; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository @RequiredArgsConstructor class GetMonthlyInputStatusDao implements GetMonthlyInputStatusPortOut { 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 5d0ab0fe..384db35f 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,9 +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; +import java.util.Optional; + @Mapper public interface GetMonthlyInputStatusMapper { Optional getMonthlyInputStatus(GetMonthlyInputStatusCmd cmd); diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/GetMonthlyInputStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/GetMonthlyInputStatusPortIn.java index 2598241e..59cc3d1c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/GetMonthlyInputStatusPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/GetMonthlyInputStatusPortIn.java @@ -1,9 +1,10 @@ package app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports; -import java.util.Optional; 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; + public interface GetMonthlyInputStatusPortIn { Optional operate(GetMonthlyInputStatusCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/GetMonthlyInputStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/GetMonthlyInputStatusPortOut.java index 5e80fc1d..27cedca5 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/GetMonthlyInputStatusPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/GetMonthlyInputStatusPortOut.java @@ -1,9 +1,10 @@ package app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports; -import java.util.Optional; 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; + public interface GetMonthlyInputStatusPortOut { Optional operate(GetMonthlyInputStatusCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/application/GetMonthlyInputStatusService.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/application/GetMonthlyInputStatusService.java index 33292ee0..9cb327ff 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/application/GetMonthlyInputStatusService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/getMonthlyInputStatus/ports/application/GetMonthlyInputStatusService.java @@ -1,13 +1,14 @@ package app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application; -import lombok.RequiredArgsConstructor; -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.monthlyInputStatus.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn; import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortOut; -import java.util.Optional; +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 lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class GetMonthlyInputStatusService implements GetMonthlyInputStatusPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusDao.java index 2e332a4e..8c47ff87 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusDao.java @@ -1,9 +1,9 @@ package app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.adapters.persistence; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.UpdateMonthlyInputStatusPortOut; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application.domain.UpdateForestProductStatusCmd; import app.module.core.config.application.annotation.UpdateCommand; import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application.domain.UpdateForestProductStatusCmd; -import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.UpdateMonthlyInputStatusPortOut; import org.springframework.stereotype.Repository; @Repository diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/application/UpdateMonthlyInputStatusService.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/application/UpdateMonthlyInputStatusService.java index d4357e49..847fe36b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/application/UpdateMonthlyInputStatusService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/application/UpdateMonthlyInputStatusService.java @@ -1,9 +1,9 @@ package app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application.domain.UpdateForestProductStatusCmd; import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.UpdateMonthlyInputStatusPortIn; import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.UpdateMonthlyInputStatusPortOut; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application.domain.UpdateForestProductStatusCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/application/domain/UpdateForestProductStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/application/domain/UpdateForestProductStatusCmd.java index 858b5104..0eed316b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/application/domain/UpdateForestProductStatusCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/application/domain/UpdateForestProductStatusCmd.java @@ -2,7 +2,6 @@ package app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInput import app.module.core.config.adapters.persistence.component.AuditCommand; import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; 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 index 646c3c5c..605fd295 100644 --- 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 @@ -1,12 +1,13 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.adapters.persistence; -import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.GetBankAutoTransferExpensePortOut; 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 lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository @RequiredArgsConstructor class GetBankAutoTransferExpenseDao implements GetBankAutoTransferExpensePortOut { 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 index 5774b777..17abff5c 100644 --- 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 @@ -2,9 +2,10 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTrans 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; +import java.util.Optional; + @Mapper public interface GetBankAutoTransferExpenseMapper { Optional getBankAutoTransferExpense( 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 index 8357be36..16fc3d75 100644 --- 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 @@ -5,11 +5,9 @@ import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransf 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; +import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor 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 index f3127945..1580c84a 100644 --- 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 @@ -1,9 +1,10 @@ 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; +import java.util.Optional; + 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 index 19a2fb2b..278caaa7 100644 --- 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 @@ -1,9 +1,10 @@ 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; +import java.util.Optional; + 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 index 5fcb9162..0d7bac99 100644 --- 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 @@ -1,13 +1,14 @@ 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 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 lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class GetBankAutoTransferExpenseService implements GetBankAutoTransferExpensePortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/persistence/GetBankAutoTransferIncomeDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/persistence/GetBankAutoTransferIncomeDao.java index 82bc2071..fc8b11d1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/persistence/GetBankAutoTransferIncomeDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/persistence/GetBankAutoTransferIncomeDao.java @@ -1,12 +1,13 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.adapters.persistence; -import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.GetBankAutoTransferIncomePortOut; import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncome; import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncomeCmd; -import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.GetBankAutoTransferIncomePortOut; -import java.util.Optional; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository @RequiredArgsConstructor class GetBankAutoTransferIncomeDao implements GetBankAutoTransferIncomePortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/persistence/GetBankAutoTransferIncomeMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/persistence/GetBankAutoTransferIncomeMapper.java index 179cab9a..016fadc4 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/persistence/GetBankAutoTransferIncomeMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/adapters/persistence/GetBankAutoTransferIncomeMapper.java @@ -2,9 +2,10 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTrans import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncome; import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncomeCmd; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface GetBankAutoTransferIncomeMapper { Optional getBankAutoTransferIncome(GetBankAutoTransferIncomeCmd cmd); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/GetBankAutoTransferIncomePortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/GetBankAutoTransferIncomePortIn.java index f03ad002..9a7c385d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/GetBankAutoTransferIncomePortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/GetBankAutoTransferIncomePortIn.java @@ -1,9 +1,10 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports; -import java.util.Optional; import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncome; import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncomeCmd; +import java.util.Optional; + public interface GetBankAutoTransferIncomePortIn { Optional operate(GetBankAutoTransferIncomeCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/GetBankAutoTransferIncomePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/GetBankAutoTransferIncomePortOut.java index 43c257b6..515bfe59 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/GetBankAutoTransferIncomePortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/GetBankAutoTransferIncomePortOut.java @@ -1,9 +1,10 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports; -import java.util.Optional; import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncome; import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncomeCmd; +import java.util.Optional; + public interface GetBankAutoTransferIncomePortOut { Optional operate(GetBankAutoTransferIncomeCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/GetBankAutoTransferIncomeService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/GetBankAutoTransferIncomeService.java index 6d6d64b2..d5cbeefc 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/GetBankAutoTransferIncomeService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferIncome/ports/application/GetBankAutoTransferIncomeService.java @@ -1,13 +1,14 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncome; -import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncomeCmd; import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.GetBankAutoTransferIncomePortIn; import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.GetBankAutoTransferIncomePortOut; -import java.util.Optional; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncome; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncomeCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class GetBankAutoTransferIncomeService implements GetBankAutoTransferIncomePortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsDao.java index a2f861d9..ff57eebc 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsDao.java @@ -1,9 +1,9 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.adapters.persistence; -import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortOut; import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; -import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortOut; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @Repository diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsMapper.java index 674aa611..b796f4de 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsMapper.java @@ -3,9 +3,10 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTrans import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferExpenseRecords; import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferIncomeRecords; import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; -import java.util.List; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface GetBankAutoTransferRecordsMapper { // 은행자동이체 수입 diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/GetBankAutoTransferRecordsService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/GetBankAutoTransferRecordsService.java index 2f8dee19..bb5d2655 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/GetBankAutoTransferRecordsService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/GetBankAutoTransferRecordsService.java @@ -1,10 +1,10 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; -import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortIn; import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortOut; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecords.java index 924fd500..adeb46d2 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecords.java @@ -1,11 +1,12 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor 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 index 27226f49..8253e37d 100644 --- 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 @@ -3,12 +3,11 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTr 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.RemoveBankAutoTransfersPortOut; import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersOutCmd; import app.module.core.config.application.annotation.DeleteCommand; import app.module.core.config.application.util.AuditUtil; 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; 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 index 6d66dc9c..bf23249e 100644 --- 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 @@ -1,5 +1,7 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.adapters.web; +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; 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; @@ -7,12 +9,10 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; 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 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 index 32c7561f..41acc065 100644 --- 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 @@ -1,12 +1,12 @@ 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; +import java.util.List; + @Getter @Setter @NoArgsConstructor 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 index cb675864..21521b2c 100644 --- 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 @@ -3,11 +3,11 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTr 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 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 lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service 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 index fd0c48f9..1c44b516 100644 --- 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 @@ -1,10 +1,11 @@ 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; +import java.util.List; + @Getter @Setter @AllArgsConstructor 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 index 3c171b09..2d6c904b 100644 --- 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 @@ -1,11 +1,12 @@ 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; +import java.util.List; + @Getter @Setter @AllArgsConstructor 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 index d2d7f4a7..396d793d 100644 --- 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 @@ -1,5 +1,8 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web; +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; 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; @@ -7,13 +10,10 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; 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 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 index e154ed89..2813a451 100644 --- 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 @@ -1,6 +1,5 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web.model; -import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; 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 index f1c5c096..0d1f06da 100644 --- 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 @@ -2,7 +2,6 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTran import app.module.core.config.adapters.persistence.component.AuditCommand; import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/persistence/SaveBankAutoTransferIncomeDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/persistence/SaveBankAutoTransferIncomeDao.java index 1952e1cc..de8af165 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/persistence/SaveBankAutoTransferIncomeDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/saveBankAutoTransferIncome/adapters/persistence/SaveBankAutoTransferIncomeDao.java @@ -3,12 +3,10 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTran 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.saveBankAutoTransferIncome.ports.SaveBankAutoTransferIncomePortOut; import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.application.domain.SaveBankAutoTransferIncomeOutCmd; -import app.module.core.config.adapters.persistence.component.AuditCommand; import app.module.core.config.application.util.AuditUtil; import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.application.domain.SaveBankAutoTransferIncomeInCmd; -import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.SaveBankAutoTransferIncomePortOut; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; 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 6fb37b5f..95bb08f7 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,8 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web.model.SaveBankAutoTransferIncomeReqVO; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web.model.SaveBankAutoTransferIncomeResVO; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web.validator.SaveBankAutoTransferIncomeValidator; 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; @@ -7,13 +10,10 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; 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.saveBankAutoTransferIncome.adapters.web.model.SaveBankAutoTransferIncomeReqVO; -import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web.model.SaveBankAutoTransferIncomeResVO; -import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web.validator.SaveBankAutoTransferIncomeValidator; @RestController @RequiredArgsConstructor 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 19bf915a..d7c62be6 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 @@ -3,11 +3,11 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTran 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.saveBankAutoTransferIncome.ports.application.domain.SaveBankAutoTransferIncomeOutCmd; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.application.domain.SaveBankAutoTransferIncomeInCmd; import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.SaveBankAutoTransferIncomePortIn; import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.SaveBankAutoTransferIncomePortOut; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.application.domain.SaveBankAutoTransferIncomeInCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.application.domain.SaveBankAutoTransferIncomeOutCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service 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 4ed490ae..6a908dab 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 @@ -2,7 +2,6 @@ package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTran import app.module.core.config.adapters.persistence.component.AuditCommand; import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyRecord/adapters/web/CreateDailyRecordController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyRecord/adapters/web/CreateDailyRecordController.java index 026863b9..94914fe1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyRecord/adapters/web/CreateDailyRecordController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyRecord/adapters/web/CreateDailyRecordController.java @@ -7,7 +7,9 @@ import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java index f846d590..691f6724 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java @@ -1,28 +1,16 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.adapters.persistence; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyExpenseRecords; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyFarmingRecords; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyForestryRecords; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyIncomeRecords; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyPowerRecords; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatus; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyWorkRecords; - -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.List; - +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortOut; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.*; import app.module.core.config.application.enums.FileStorageType; import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn; import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortOut; -import java.util.Optional; - import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Repository; +import java.util.List; +import java.util.Optional; + @Repository @RequiredArgsConstructor class GetDailyRecordStatusDetailDao implements GetDailyRecordStatusDetailPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java index cd075cfa..d28e6860 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java @@ -1,16 +1,10 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.adapters.persistence; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyExpenseRecords; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyFarmingRecords; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyForestryRecords; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyIncomeRecords; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyPowerRecords; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatus; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyWorkRecords; -import java.util.List; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.*; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface GetDailyRecordStatusDetailMapper { GetDailyRecordStatus getDailyRecordStatus(GetDailyRecordStatusCmd cmd); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java index 29098576..2cc30eb3 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java @@ -1,23 +1,9 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.adapters.web; import app.module.admin.config.application.util.model.ExcelSheetDto; -import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortIn; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.adapters.web.model.GetDailyRecordStatusDetailReqVO; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortIn; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyExpenseRecords; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyFarmingRecords; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyForestryRecords; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyIncomeRecords; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyPowerRecords; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyWorkRecords; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.*; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.IndexedColors; @@ -26,6 +12,13 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + @RestController @RequiredArgsConstructor class GetDailyRecordStatusDetailController { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailResVO.java index badeeaee..4533c781 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailResVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailResVO.java @@ -2,12 +2,13 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusD import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyExpenseRecords; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyIncomeRecords; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortIn.java index fb0557d2..d0c56921 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortIn.java @@ -1,8 +1,9 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports; -import java.util.Optional; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; + +import java.util.Optional; public interface GetDailyRecordStatusDetailPortIn { Optional operate(GetDailyRecordStatusCmd cmd); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortOut.java index fc9d00e8..93d62843 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortOut.java @@ -1,8 +1,9 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports; -import java.util.Optional; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; + +import java.util.Optional; public interface GetDailyRecordStatusDetailPortOut { Optional operate(GetDailyRecordStatusCmd cmd); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/GetDailyRecordStatusDetailService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/GetDailyRecordStatusDetailService.java index 0a834d55..0928894e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/GetDailyRecordStatusDetailService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/GetDailyRecordStatusDetailService.java @@ -1,13 +1,14 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortIn; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortOut; -import java.util.Optional; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class GetDailyRecordStatusDetailService implements GetDailyRecordStatusDetailPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java index bfe696cf..dec8d670 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java @@ -1,7 +1,5 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java index 81d0e381..650d40aa 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java @@ -1,8 +1,5 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain; -import java.math.BigDecimal; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyForestryRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyForestryRecords.java index dd2722e9..8a9d95d4 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyForestryRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyForestryRecords.java @@ -1,8 +1,5 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain; -import java.math.BigDecimal; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java index cf2ee83e..4f84dd5e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java @@ -1,8 +1,5 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain; -import java.math.BigDecimal; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyPowerRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyPowerRecords.java index 7216ef42..a97185ad 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyPowerRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyPowerRecords.java @@ -1,8 +1,5 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain; -import java.math.BigDecimal; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java index 06456a85..cb73d821 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java @@ -1,11 +1,12 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java index 4cd4cbc7..1e01bc14 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java @@ -1,7 +1,5 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountDao.java index 9560db4e..fb2debbe 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountDao.java @@ -1,12 +1,13 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.adapters.persistence; -import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.GetDailyRecordsCountPortOut; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.GetDailyRecordsCountPortOut; -import java.util.Optional; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository @RequiredArgsConstructor class GetDailyRecordsCountDao implements GetDailyRecordsCountPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountMapper.java index 7e824c03..d8feee84 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountMapper.java @@ -2,9 +2,10 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount. import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface GetDailyRecordsCountMapper { Optional getDailyRecordsCount(GetDailyRecordsCountCmd cmd); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/GetDailyRecordsCountPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/GetDailyRecordsCountPortIn.java index 6ba13bfb..5f5aafc5 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/GetDailyRecordsCountPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/GetDailyRecordsCountPortIn.java @@ -1,9 +1,10 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports; -import java.util.Optional; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; +import java.util.Optional; + public interface GetDailyRecordsCountPortIn { Optional operate(GetDailyRecordsCountCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/GetDailyRecordsCountPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/GetDailyRecordsCountPortOut.java index f587844a..b40d88f3 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/GetDailyRecordsCountPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/GetDailyRecordsCountPortOut.java @@ -1,9 +1,10 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports; -import java.util.Optional; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; +import java.util.Optional; + public interface GetDailyRecordsCountPortOut { Optional operate(GetDailyRecordsCountCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/application/GetDailyRecordsCountService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/application/GetDailyRecordsCountService.java index c5a296b3..01bcf1ed 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/application/GetDailyRecordsCountService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/application/GetDailyRecordsCountService.java @@ -1,13 +1,14 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.GetDailyRecordsCountPortIn; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.GetDailyRecordsCountPortOut; -import java.util.Optional; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class GetDailyRecordsCountService implements GetDailyRecordsCountPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusDao.java index f8eaa8e4..29e859ab 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusDao.java @@ -3,10 +3,11 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortOut; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository @RequiredArgsConstructor class GetDailyRecordsStatusDao implements GetDailyRecordsStatusPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusMapper.java index 802d95db..433ec3b9 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusMapper.java @@ -2,9 +2,10 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; -import java.util.List; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface GetDailyRecordsStatusMapper { List getDailyRecordsStatus(GetDailyRecordsStatusCmd cmd); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/web/GetDailyRecordsStatusController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/web/GetDailyRecordsStatusController.java index a614b01e..e39938bc 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/web/GetDailyRecordsStatusController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/web/GetDailyRecordsStatusController.java @@ -8,13 +8,14 @@ import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus. import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortIn; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequiredArgsConstructor class GetDailyRecordsStatusController { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusResVO.java index 92c62b51..bc3e3a78 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusResVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusResVO.java @@ -2,12 +2,13 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortIn.java index cbdbad7b..59a52d19 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortIn.java @@ -2,6 +2,7 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; + import java.util.List; public interface GetDailyRecordsStatusPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortOut.java index 63943050..88d152d0 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortOut.java @@ -2,6 +2,7 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; + import java.util.List; public interface GetDailyRecordsStatusPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/GetDailyRecordsStatusService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/GetDailyRecordsStatusService.java index aae12d87..f24d086d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/GetDailyRecordsStatusService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/GetDailyRecordsStatusService.java @@ -1,13 +1,14 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; -import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortIn; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortOut; -import java.util.List; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor class GetDailyRecordsStatusService implements GetDailyRecordsStatusPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java index ffb06c1f..70c13112 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java @@ -6,7 +6,6 @@ import app.module.core.config.application.annotation.UpdateCommand; import app.module.core.config.application.enums.DailySort; import app.module.core.config.application.logging.SafeLogger; import lombok.RequiredArgsConstructor; - import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/web/RemoveDailyController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/web/RemoveDailyController.java index 2dc47d3e..283bc5f1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/web/RemoveDailyController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/web/RemoveDailyController.java @@ -3,9 +3,8 @@ package app.module.admin.usecase.household.tab.dailyRecord.removeDaily.adapters. import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.adapters.web.modal.RemoveDailyReqVO; import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.RemoveDailyPortIn; import app.module.core.config.application.logging.SafeLogger; - -import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; +import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/RemoveDailyService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/RemoveDailyService.java index 22289303..56e0c918 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/RemoveDailyService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/RemoveDailyService.java @@ -4,7 +4,6 @@ import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.adapters.w import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.RemoveDailyPortIn; import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.RemoveDailyPortOut; import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.application.domain.RemoveDailyCmd; -import app.module.core.config.application.util.AuditUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/domain/RemoveDailyCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/domain/RemoveDailyCmd.java index ba12d13d..ddda17d2 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/domain/RemoveDailyCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/domain/RemoveDailyCmd.java @@ -2,7 +2,6 @@ package app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.app import app.module.core.config.adapters.persistence.component.AuditCommand; import app.module.core.config.application.enums.DailySort; -import app.module.core.config.application.enums.DailyTargetStatus; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseDao.java index 305f9bfb..2d8f75d7 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseDao.java @@ -6,9 +6,8 @@ import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.SaveDailyExpenseCmd; import app.module.core.config.application.annotation.CreateCommand; import app.module.core.config.application.logging.SafeLogger; - -import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @Service diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingDao.java index d410c87f..479b0401 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingDao.java @@ -6,9 +6,8 @@ import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.SaveDailyFarmingCmd; import app.module.core.config.application.annotation.CreateCommand; import app.module.core.config.application.logging.SafeLogger; - -import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @Service diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/SaveDailyFarmingReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/SaveDailyFarmingReqVO.java index e807c96c..2b93a74c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/SaveDailyFarmingReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/SaveDailyFarmingReqVO.java @@ -1,6 +1,5 @@ package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model; -import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.DailyFarmingUIReqVO; import jakarta.validation.constraints.NotBlank; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/SaveDailyFarmingService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/SaveDailyFarmingService.java index 0bcebd7d..6eb2d555 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/SaveDailyFarmingService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/SaveDailyFarmingService.java @@ -8,15 +8,12 @@ import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.GetDailyFarmingCmd; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.SaveDailyFarmingCmd; import app.module.core.config.application.util.DailyUtil; -import app.module.core.config.constants.DailyRecordConstants; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; -import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.HashMap; -import java.util.List; @Service @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryDao.java index ff25623e..5d16a170 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryDao.java @@ -6,9 +6,8 @@ import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.port import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.SaveDailyForestryCmd; import app.module.core.config.application.annotation.CreateCommand; import app.module.core.config.application.logging.SafeLogger; - -import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @Service diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/SaveDailyForestryReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/SaveDailyForestryReqVO.java index a1238b0b..c17c6966 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/SaveDailyForestryReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/SaveDailyForestryReqVO.java @@ -1,6 +1,5 @@ package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model; -import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.DailyPowerUIReqVO; import jakarta.validation.constraints.NotBlank; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java index ee456e33..b6abd24a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java @@ -2,13 +2,12 @@ package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapt import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortOut; -import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.GetDailyIncomeCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd; import app.module.core.config.application.annotation.CreateCommand; import app.module.core.config.application.logging.SafeLogger; - -import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @Service diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeMapper.java index c90cbb6d..861e9935 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeMapper.java @@ -1,8 +1,8 @@ package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; -import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.GetDailyIncomeCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java index f7396964..716de5f5 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java @@ -1,8 +1,8 @@ package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; -import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.DailyIncomeUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.validator.SaveDailyIncomeValidator; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortIn; import app.module.core.config.application.exception.NoRecordDataException; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java index 71bffa92..bd8ad3ad 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java @@ -1,6 +1,5 @@ package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model; -import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortIn.java index a4136a0f..648bba64 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortIn.java @@ -2,8 +2,8 @@ package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; -import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.DailyIncomeUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO; public interface SaveDailyIncomePortIn { /** diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortOut.java index 22d7a0ac..45e8be4a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortOut.java @@ -2,8 +2,8 @@ package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; -import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.GetDailyIncomeCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd; public interface SaveDailyIncomePortOut { /** diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/SaveDailyIncomeService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/SaveDailyIncomeService.java index 817eeff3..e168838c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/SaveDailyIncomeService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/SaveDailyIncomeService.java @@ -1,13 +1,12 @@ package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; -import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.DailyIncomeUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortIn; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortOut; -import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.GetDailyIncomeCmd; -import app.module.core.config.application.util.AuditUtil; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd; import app.module.core.config.constants.DailyRecordConstants; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import lombok.RequiredArgsConstructor; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/SaveDailyPowerDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/SaveDailyPowerDao.java index 47243873..15631a67 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/SaveDailyPowerDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/SaveDailyPowerDao.java @@ -6,9 +6,8 @@ import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.a import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.SaveDailyPowerCmd; import app.module.core.config.application.annotation.CreateCommand; import app.module.core.config.application.logging.SafeLogger; - -import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @Service diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/model/SaveDailyPowerReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/model/SaveDailyPowerReqVO.java index 56c4c43b..ae0558a2 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/model/SaveDailyPowerReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/model/SaveDailyPowerReqVO.java @@ -1,6 +1,5 @@ package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model; -import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.DailyPowerUIReqVO; import jakarta.validation.constraints.NotBlank; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/validator/SaveDailyPowerValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/validator/SaveDailyPowerValidator.java index 5a1d9f67..5cab09e8 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/validator/SaveDailyPowerValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/validator/SaveDailyPowerValidator.java @@ -1,9 +1,7 @@ package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.validator; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.SaveDailyPowerReqVO; -import app.module.core.config.constants.CommonConstants; import lombok.RequiredArgsConstructor; -import org.apache.tika.utils.StringUtils; import org.springframework.stereotype.Component; import org.springframework.validation.Errors; import org.springframework.validation.Validator; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkDao.java index 051ab691..053e693d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkDao.java @@ -1,15 +1,14 @@ package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence.modal.GetDailyWorkDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.SaveDailyWorkPortOut; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.GetDailyWorkCmd; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.SaveDailyWorkCmd; -import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.SaveDailyWorkPortOut; import app.module.core.config.application.annotation.CreateCommand; import app.module.core.config.application.logging.SafeLogger; - -import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @Slf4j diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/modal/GetDailyWorkDto.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/modal/GetDailyWorkDto.java index a272f0bf..6a0706d5 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/modal/GetDailyWorkDto.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/modal/GetDailyWorkDto.java @@ -1,6 +1,5 @@ package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence.modal; -import app.module.core.config.application.enums.DailyInputType; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java index 3f15b1b7..4129a3ee 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java @@ -8,7 +8,6 @@ import app.module.core.config.application.enums.DailyTargetStatus; import app.module.core.config.application.logging.SafeLogger; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import lombok.RequiredArgsConstructor; - import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/web/UpdateDailyNoneController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/web/UpdateDailyNoneController.java index dfb3fae8..949a4618 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/web/UpdateDailyNoneController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/web/UpdateDailyNoneController.java @@ -2,7 +2,6 @@ package app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.adapt import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.adapters.web.modal.UpdateDailyNoneReqVO; import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.UpdateDailyNonePortIn; - import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/application/UpdateDailyNoneService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/application/UpdateDailyNoneService.java index cf61d2e2..fb6b16a3 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/application/UpdateDailyNoneService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/application/UpdateDailyNoneService.java @@ -5,7 +5,6 @@ import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports. import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.UpdateDailyNonePortOut; import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.application.domain.UpdateDailyNoneCmd; import app.module.core.config.application.enums.DailyTargetStatus; -import app.module.core.config.application.util.AuditUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/adapters/persistence/GetForestProductStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/adapters/persistence/GetForestProductStatusDao.java index 309fef71..60f03579 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/adapters/persistence/GetForestProductStatusDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/adapters/persistence/GetForestProductStatusDao.java @@ -1,12 +1,13 @@ package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.adapters.persistence; -import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.GetForestProductStatusPortOut; import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatus; import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd; -import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.GetForestProductStatusPortOut; -import java.util.Optional; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository @RequiredArgsConstructor class GetForestProductStatusDao implements GetForestProductStatusPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/adapters/persistence/GetForestProductStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/adapters/persistence/GetForestProductStatusMapper.java index c5a28a07..0178fc59 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/adapters/persistence/GetForestProductStatusMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/adapters/persistence/GetForestProductStatusMapper.java @@ -2,9 +2,10 @@ package app.module.admin.usecase.household.tab.forestProduct.getForestProductSta import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatus; import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface GetForestProductStatusMapper { Optional getForestProductStatus(GetForestProductStatusCmd cmd); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/ports/GetForestProductStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/ports/GetForestProductStatusPortIn.java index 08b4c641..e9ff3f55 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/ports/GetForestProductStatusPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/ports/GetForestProductStatusPortIn.java @@ -1,9 +1,10 @@ package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports; -import java.util.Optional; import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatus; import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd; +import java.util.Optional; + public interface GetForestProductStatusPortIn { Optional operate(GetForestProductStatusCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/ports/GetForestProductStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/ports/GetForestProductStatusPortOut.java index 0a94140c..180808a5 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/ports/GetForestProductStatusPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/ports/GetForestProductStatusPortOut.java @@ -1,9 +1,10 @@ package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports; -import java.util.Optional; import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatus; import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd; +import java.util.Optional; + public interface GetForestProductStatusPortOut { Optional operate(GetForestProductStatusCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/ports/application/GetForestProductStatusService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/ports/application/GetForestProductStatusService.java index 5c4003f2..e0810b74 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/ports/application/GetForestProductStatusService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductStatus/ports/application/GetForestProductStatusService.java @@ -1,13 +1,14 @@ package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatus; -import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd; import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.GetForestProductStatusPortIn; import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.GetForestProductStatusPortOut; -import java.util.Optional; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatus; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class GetForestProductStatusService implements GetForestProductStatusPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java index e3951a04..13d838c4 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java @@ -5,10 +5,11 @@ import app.module.admin.usecase.household.tab.forestProduct.getForestProductsSta import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult; import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetMonthlyForestProductsStatus; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository @RequiredArgsConstructor class GetForestProductsStatusDao implements GetForestProductsStatusPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java index aeec235d..0d209be2 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java @@ -3,9 +3,10 @@ package app.module.admin.usecase.household.tab.forestProduct.getForestProductsSt import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatus; import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetMonthlyForestProductsStatus; -import java.util.List; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface GetForestProductsStatusMapper { GetMonthlyForestProductsStatus getMonthlyStatus(GetForestProductsStatusCmd cmd); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java index 54c89130..bdcc7e8d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java @@ -1,11 +1,12 @@ package app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor 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 e79e7bb6..0fe8ba1e 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 @@ -3,11 +3,11 @@ package app.module.admin.usecase.household.tab.forestProduct.removeForestProduct 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.forestProduct.removeForestProducts.ports.RemoveForestProductsPortOut; +import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.application.domain.RemoveForestProductsCmd; import app.module.core.config.application.annotation.DeleteCommand; import app.module.core.config.application.util.AuditUtil; import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.application.domain.RemoveForestProductsCmd; -import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.RemoveForestProductsPortOut; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/web/RemoveForestProductsController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/web/RemoveForestProductsController.java index 5fe5f500..812c5f97 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/web/RemoveForestProductsController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/web/RemoveForestProductsController.java @@ -1,5 +1,7 @@ package app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.adapters.web; +import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.adapters.web.model.RemoveForestProductsReqVO; +import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.adapters.web.model.RemoveForestProductsResVO; import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.RemoveForestProductsPortIn; import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.application.domain.RemoveForestProductsCmd; import app.module.core.config.application.util.MessageUtil; @@ -7,12 +9,10 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; 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.forestProduct.removeForestProducts.adapters.web.model.RemoveForestProductsReqVO; -import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.adapters.web.model.RemoveForestProductsResVO; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/web/model/RemoveForestProductsReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/web/model/RemoveForestProductsReqVO.java index 9af219a6..8ded63b5 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/web/model/RemoveForestProductsReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/web/model/RemoveForestProductsReqVO.java @@ -1,12 +1,12 @@ package app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.adapters.web.model; -import java.util.List; -import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.util.List; + @Getter @Setter @NoArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/application/RemoveForestProductsService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/application/RemoveForestProductsService.java index d06fae44..a0a8205b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/application/RemoveForestProductsService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/application/RemoveForestProductsService.java @@ -1,9 +1,9 @@ package app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.application.domain.RemoveForestProductsCmd; import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.RemoveForestProductsPortIn; import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.RemoveForestProductsPortOut; +import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.application.domain.RemoveForestProductsCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/application/domain/RemoveForestProductsCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/application/domain/RemoveForestProductsCmd.java index 672e6872..6f8d5f1f 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/application/domain/RemoveForestProductsCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/application/domain/RemoveForestProductsCmd.java @@ -1,12 +1,13 @@ package app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.application.domain; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/SaveForestProductController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/SaveForestProductController.java index 6076b034..10bf0ea8 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/SaveForestProductController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/SaveForestProductController.java @@ -1,5 +1,8 @@ package app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.web; +import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.web.model.SaveForestProductReqVO; +import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.web.model.SaveForestProductResVO; +import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.web.validator.SaveForestProductValidator; import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.ports.SaveForestProductPortIn; import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.ports.application.domain.SaveForestProductCmd; import app.module.core.config.application.util.MessageUtil; @@ -7,13 +10,10 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; 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.forestProduct.saveForestProduct.adapters.web.model.SaveForestProductReqVO; -import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.web.model.SaveForestProductResVO; -import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.web.validator.SaveForestProductValidator; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/model/SaveForestProductReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/model/SaveForestProductReqVO.java index 673d718e..388382d6 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/model/SaveForestProductReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/model/SaveForestProductReqVO.java @@ -1,7 +1,5 @@ package app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.web.model; -import jakarta.validation.constraints.NotBlank; -import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/application/domain/SaveForestProductCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/application/domain/SaveForestProductCmd.java index 208ada31..1d41d898 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/application/domain/SaveForestProductCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/application/domain/SaveForestProductCmd.java @@ -2,7 +2,6 @@ package app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.p import app.module.core.config.adapters.persistence.component.AuditCommand; import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/persistence/UpdateForestProductNoneDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/persistence/UpdateForestProductNoneDao.java index 426f8f9a..6985d0b0 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/persistence/UpdateForestProductNoneDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/persistence/UpdateForestProductNoneDao.java @@ -2,12 +2,10 @@ package app.module.admin.usecase.household.tab.forestProduct.updateForestProduct 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.forestProduct.updateForestProductNone.ports.UpdateForestProductNonePortOut; import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneOutCmd; -import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateMonthlyForestProductStatusCmd; import app.module.core.config.application.util.AuditUtil; import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneInCmd; -import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.UpdateForestProductNonePortOut; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/web/UpdateForestProductNoneController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/web/UpdateForestProductNoneController.java index 8cd74f22..ff5a95ef 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/web/UpdateForestProductNoneController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/web/UpdateForestProductNoneController.java @@ -1,5 +1,7 @@ package app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.adapters.web; +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.adapters.web.model.UpdateForestProductNoneReqVO; +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.adapters.web.model.UpdateForestProductNoneResVO; import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.UpdateForestProductNonePortIn; import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneInCmd; import app.module.core.config.application.util.MessageUtil; @@ -9,9 +11,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.bind.annotation.GetMapping; -import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.adapters.web.model.UpdateForestProductNoneReqVO; -import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.adapters.web.model.UpdateForestProductNoneResVO; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/web/model/UpdateForestProductNoneReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/web/model/UpdateForestProductNoneReqVO.java index b38f655e..42707d5e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/web/model/UpdateForestProductNoneReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/web/model/UpdateForestProductNoneReqVO.java @@ -1,6 +1,5 @@ package app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.adapters.web.model; -import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/UpdateForestProductNonePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/UpdateForestProductNonePortOut.java index a181922b..01f1d968 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/UpdateForestProductNonePortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/UpdateForestProductNonePortOut.java @@ -1,6 +1,5 @@ package app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports; -import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneInCmd; import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneOutCmd; public interface UpdateForestProductNonePortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/UpdateForestProductNoneService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/UpdateForestProductNoneService.java index d998f168..403ccf7a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/UpdateForestProductNoneService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/UpdateForestProductNoneService.java @@ -1,10 +1,10 @@ package app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application; -import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneOutCmd; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneInCmd; import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.UpdateForestProductNonePortIn; import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.UpdateForestProductNonePortOut; +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneInCmd; +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneOutCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/domain/UpdateMonthlyForestProductStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/domain/UpdateMonthlyForestProductStatusCmd.java index 6ebac2cb..74674327 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/domain/UpdateMonthlyForestProductStatusCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/domain/UpdateMonthlyForestProductStatusCmd.java @@ -2,7 +2,6 @@ package app.module.admin.usecase.household.tab.forestProduct.updateForestProduct import app.module.core.config.adapters.persistence.component.AuditCommand; import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/persistence/GetHouseholdVisitInfoDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/persistence/GetHouseholdVisitInfoDao.java index 357be894..c0444023 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/persistence/GetHouseholdVisitInfoDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/persistence/GetHouseholdVisitInfoDao.java @@ -1,12 +1,13 @@ package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.persistence; -import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortOut; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd; -import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortOut; -import java.util.Optional; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository @RequiredArgsConstructor class GetHouseholdVisitInfoDao implements GetHouseholdVisitInfoPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/persistence/GetHouseholdVisitInfoMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/persistence/GetHouseholdVisitInfoMapper.java index 2812dcde..c05991df 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/persistence/GetHouseholdVisitInfoMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/persistence/GetHouseholdVisitInfoMapper.java @@ -2,9 +2,10 @@ package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitI import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface GetHouseholdVisitInfoMapper { Optional getHouseholdVisitInfo(GetHouseholdVisitInfoCmd cmd); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/web/GetHouseholdVisitInfoController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/web/GetHouseholdVisitInfoController.java index 58d1b64e..8a90be60 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/web/GetHouseholdVisitInfoController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/web/GetHouseholdVisitInfoController.java @@ -1,15 +1,14 @@ package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model.GetHouseholdVisitInfoReqVO; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortIn; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd; 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.householdVisit.getHouseholdVisitInfo.adapters.web.model.GetHouseholdVisitInfoReqVO; -import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model.GetHouseholdVisitInfoResVO; +import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/GetHouseholdVisitInfoPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/GetHouseholdVisitInfoPortIn.java index 4f4a86dc..f0d12086 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/GetHouseholdVisitInfoPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/GetHouseholdVisitInfoPortIn.java @@ -1,9 +1,10 @@ package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports; -import java.util.Optional; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd; +import java.util.Optional; + public interface GetHouseholdVisitInfoPortIn { Optional operate(GetHouseholdVisitInfoCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/GetHouseholdVisitInfoPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/GetHouseholdVisitInfoPortOut.java index a05f925a..74b0968f 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/GetHouseholdVisitInfoPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/GetHouseholdVisitInfoPortOut.java @@ -1,9 +1,10 @@ package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports; -import java.util.Optional; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd; +import java.util.Optional; + public interface GetHouseholdVisitInfoPortOut { Optional operate(GetHouseholdVisitInfoCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/GetHouseholdVisitInfoService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/GetHouseholdVisitInfoService.java index 68139138..e9621f86 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/GetHouseholdVisitInfoService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/GetHouseholdVisitInfoService.java @@ -1,13 +1,14 @@ package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo; -import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortIn; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortOut; -import java.util.Optional; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class GetHouseholdVisitInfoService implements GetHouseholdVisitInfoPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/domain/GetHouseholdVisitInfo.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/domain/GetHouseholdVisitInfo.java index d3d7475e..a8fd75a9 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/domain/GetHouseholdVisitInfo.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/domain/GetHouseholdVisitInfo.java @@ -1,13 +1,13 @@ package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain; import app.module.admin.config.application.enums.ManagementType; -import java.time.LocalDateTime; -import java.util.Date; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.Date; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosDao.java index fe31ac74..a9f56379 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosDao.java @@ -1,12 +1,13 @@ package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.adapters.persistence; -import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortOut; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; -import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortOut; -import java.util.List; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository @RequiredArgsConstructor class GetHouseholdVisitInfosDao implements GetHouseholdVisitInfosPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosMapper.java index 8fd1ee2e..8e27c603 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosMapper.java @@ -2,9 +2,10 @@ package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitI import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; -import java.util.List; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface GetHouseholdVisitInfosMapper { List getHouseholdVisitInfos(GetHouseholdVisitInfosCmd cmd); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java index c0f5b2de..cc031a1e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java @@ -4,13 +4,14 @@ import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitIn import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortIn; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequiredArgsConstructor class GetHouseholdVisitInfosController { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortIn.java index 58106c25..53533376 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortIn.java @@ -2,6 +2,7 @@ package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitI import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; + import java.util.List; public interface GetHouseholdVisitInfosPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortOut.java index d6bf449c..5a4da7fe 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortOut.java @@ -2,6 +2,7 @@ package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitI import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; + import java.util.List; public interface GetHouseholdVisitInfosPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/application/GetHouseholdVisitInfosService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/application/GetHouseholdVisitInfosService.java index 9126568c..6d1839c8 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/application/GetHouseholdVisitInfosService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/application/GetHouseholdVisitInfosService.java @@ -1,13 +1,14 @@ package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; -import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortIn; import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortOut; -import java.util.List; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor class GetHouseholdVisitInfosService implements GetHouseholdVisitInfosPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/persistence/RemoveHouseholdVisitInfosDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/persistence/RemoveHouseholdVisitInfosDao.java index a70eed48..67ac7df1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/persistence/RemoveHouseholdVisitInfosDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/persistence/RemoveHouseholdVisitInfosDao.java @@ -1,9 +1,9 @@ package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.persistence; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.RemoveHouseholdVisitInfosPortOut; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd; import app.module.core.config.application.annotation.DeleteCommand; import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd; -import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.RemoveHouseholdVisitInfosPortOut; import org.springframework.stereotype.Repository; @Repository diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/RemoveHouseholdVisitInfosController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/RemoveHouseholdVisitInfosController.java index f5ed0fb6..37b43d4a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/RemoveHouseholdVisitInfosController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/RemoveHouseholdVisitInfosController.java @@ -1,5 +1,7 @@ package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web.model.RemoveHouseholdVisitInfosReqVO; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web.model.RemoveHouseholdVisitInfosResVO; import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.RemoveHouseholdVisitInfosPortIn; import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd; import app.module.core.config.application.util.MessageUtil; @@ -7,12 +9,10 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; 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.householdVisit.removeHouseholdVisitInfos.adapters.web.model.RemoveHouseholdVisitInfosReqVO; -import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web.model.RemoveHouseholdVisitInfosResVO; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/model/RemoveHouseholdVisitInfosReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/model/RemoveHouseholdVisitInfosReqVO.java index df2664b7..4c78e3e0 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/model/RemoveHouseholdVisitInfosReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/model/RemoveHouseholdVisitInfosReqVO.java @@ -1,12 +1,12 @@ package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web.model; -import java.util.List; -import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.util.List; + @Getter @Setter @NoArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/RemoveHouseholdVisitInfosService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/RemoveHouseholdVisitInfosService.java index 622386db..f4a84e2e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/RemoveHouseholdVisitInfosService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/RemoveHouseholdVisitInfosService.java @@ -1,9 +1,9 @@ package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd; import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.RemoveHouseholdVisitInfosPortIn; import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.RemoveHouseholdVisitInfosPortOut; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/domain/RemoveHouseholdVisitInfosCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/domain/RemoveHouseholdVisitInfosCmd.java index 47511d12..a3f562c2 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/domain/RemoveHouseholdVisitInfosCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/domain/RemoveHouseholdVisitInfosCmd.java @@ -1,12 +1,12 @@ package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.util.List; import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java index 8e5d90e1..736338e4 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java @@ -1,9 +1,9 @@ package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.persistence; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.SaveHouseholdVisitInfoPortOut; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; import app.module.core.config.application.util.AuditUtil; import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; -import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.SaveHouseholdVisitInfoPortOut; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoMapper.java index e26a152b..4630b7bc 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoMapper.java @@ -1,9 +1,10 @@ package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.persistence; import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface SaveHouseholdVisitInfoMapper { Optional findById(Long id); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/SaveHouseholdVisitInfoController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/SaveHouseholdVisitInfoController.java index e46cefe4..c39f6284 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/SaveHouseholdVisitInfoController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/SaveHouseholdVisitInfoController.java @@ -1,5 +1,8 @@ package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model.SaveHouseholdVisitInfoReqVO; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model.SaveHouseholdVisitInfoResVO; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.validator.SaveHouseholdVisitInfoValidator; import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.SaveHouseholdVisitInfoPortIn; import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; import app.module.core.config.application.util.MessageUtil; @@ -7,13 +10,10 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; 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.householdVisit.saveHouseholdVisitInfo.adapters.web.model.SaveHouseholdVisitInfoReqVO; -import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model.SaveHouseholdVisitInfoResVO; -import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.validator.SaveHouseholdVisitInfoValidator; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/model/SaveHouseholdVisitInfoReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/model/SaveHouseholdVisitInfoReqVO.java index cd3afaab..4029a73b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/model/SaveHouseholdVisitInfoReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/model/SaveHouseholdVisitInfoReqVO.java @@ -2,14 +2,13 @@ package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisit import app.module.admin.config.application.enums.ManagementType; import com.fasterxml.jackson.annotation.JsonFormat; -import groovy.transform.NamedParam; -import java.util.Date; -import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.util.Date; + @Getter @Setter @NoArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/validator/SaveHouseholdVisitInfoValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/validator/SaveHouseholdVisitInfoValidator.java index 5d223c09..2c28ea4a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/validator/SaveHouseholdVisitInfoValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/validator/SaveHouseholdVisitInfoValidator.java @@ -1,12 +1,13 @@ package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.validator; import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model.SaveHouseholdVisitInfoReqVO; -import java.util.Date; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import org.springframework.validation.Errors; import org.springframework.validation.Validator; +import java.util.Date; + @Component public class SaveHouseholdVisitInfoValidator implements Validator { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/SaveHouseholdVisitInfoService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/SaveHouseholdVisitInfoService.java index c4304e3b..fc2b4e34 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/SaveHouseholdVisitInfoService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/SaveHouseholdVisitInfoService.java @@ -1,9 +1,9 @@ package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.SaveHouseholdVisitInfoPortIn; import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.SaveHouseholdVisitInfoPortOut; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/domain/SaveHouseholdVisitInfoCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/domain/SaveHouseholdVisitInfoCmd.java index 3b4ea0ee..6ffdc49d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/domain/SaveHouseholdVisitInfoCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/domain/SaveHouseholdVisitInfoCmd.java @@ -1,11 +1,12 @@ package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.util.Date; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.util.Date; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/persistence/UpdateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/persistence/UpdateHouseholdDao.java index f3816235..efbea153 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/persistence/UpdateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/persistence/UpdateHouseholdDao.java @@ -1,10 +1,10 @@ package app.module.admin.usecase.household.updateHousehold.adapters.persistence; +import app.module.admin.usecase.household.updateHousehold.ports.UpdateHouseholdPortOut; import app.module.admin.usecase.household.updateHousehold.ports.application.domain.UpdateHouseholdOutCmd; import app.module.admin.usecase.household.updateHousehold.ports.application.domain.UpdateResearcherHasHouseholdCmd; import app.module.core.config.application.util.AuditUtil; import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.updateHousehold.ports.UpdateHouseholdPortOut; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java index 0849dc7e..83b89d6c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java @@ -1,18 +1,18 @@ package app.module.admin.usecase.household.updateHousehold.adapters.web; +import app.module.admin.usecase.household.updateHousehold.adapters.web.model.UpdateHouseholdReqVO; +import app.module.admin.usecase.household.updateHousehold.adapters.web.model.UpdateHouseholdResVO; +import app.module.admin.usecase.household.updateHousehold.adapters.web.validator.UpdateHouseholdValidator; import app.module.admin.usecase.household.updateHousehold.ports.UpdateHouseholdPortIn; import app.module.admin.usecase.household.updateHousehold.ports.application.domain.UpdateHouseholdInCmd; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PutMapping; 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.updateHousehold.adapters.web.model.UpdateHouseholdReqVO; -import app.module.admin.usecase.household.updateHousehold.adapters.web.model.UpdateHouseholdResVO; -import app.module.admin.usecase.household.updateHousehold.adapters.web.validator.UpdateHouseholdValidator; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/model/UpdateHouseholdReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/model/UpdateHouseholdReqVO.java index 5f724501..9d9a4a32 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/model/UpdateHouseholdReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/model/UpdateHouseholdReqVO.java @@ -2,7 +2,6 @@ package app.module.admin.usecase.household.updateHousehold.adapters.web.model; import app.module.admin.config.application.enums.EmploymentType; import app.module.admin.config.application.enums.UsageType; -import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/ports/application/UpdateHouseholdService.java b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/ports/application/UpdateHouseholdService.java index 08f82f26..aec9c74a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/ports/application/UpdateHouseholdService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/ports/application/UpdateHouseholdService.java @@ -1,10 +1,10 @@ package app.module.admin.usecase.household.updateHousehold.ports.application; -import app.module.admin.usecase.household.updateHousehold.ports.application.domain.UpdateHouseholdOutCmd; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.updateHousehold.ports.application.domain.UpdateHouseholdInCmd; import app.module.admin.usecase.household.updateHousehold.ports.UpdateHouseholdPortIn; import app.module.admin.usecase.household.updateHousehold.ports.UpdateHouseholdPortOut; +import app.module.admin.usecase.household.updateHousehold.ports.application.domain.UpdateHouseholdInCmd; +import app.module.admin.usecase.household.updateHousehold.ports.application.domain.UpdateHouseholdOutCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java index b053fb15..388ef468 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java @@ -5,6 +5,7 @@ import app.module.admin.config.application.util.DateUiUtil; import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortIn; import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus; import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; +import app.module.admin.usecase.household.updateHouseholdStatusUI.adapters.web.model.UpdateHouseholdStatusUIReqVO; import app.module.admin.usecase.household.updateHouseholdStatusUI.adapters.web.model.UpdateHouseholdStatusUIResVO; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortIn; @@ -15,7 +16,6 @@ import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; -import app.module.admin.usecase.household.updateHouseholdStatusUI.adapters.web.model.UpdateHouseholdStatusUIReqVO; import org.springframework.web.servlet.mvc.support.RedirectAttributes; @Controller diff --git a/admin/src/main/java/app/module/admin/usecase/operationlog/list/adapters/web/OperationLogListExcelController.java b/admin/src/main/java/app/module/admin/usecase/operationlog/list/adapters/web/OperationLogListExcelController.java index 999d0d5e..47521c3b 100644 --- a/admin/src/main/java/app/module/admin/usecase/operationlog/list/adapters/web/OperationLogListExcelController.java +++ b/admin/src/main/java/app/module/admin/usecase/operationlog/list/adapters/web/OperationLogListExcelController.java @@ -6,8 +6,6 @@ import app.module.core.usecase.operationlog.list.application.domain.OperationLog import app.module.core.usecase.operationlog.list.application.domain.OperationLogListFilterCommand; import app.module.core.usecase.operationlog.list.application.port.in.OperationLogListPortIn; import jakarta.servlet.http.HttpServletResponse; -import java.time.format.DateTimeFormatter; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.ss.usermodel.Row; @@ -22,6 +20,9 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; +import java.time.format.DateTimeFormatter; +import java.util.Optional; + @Controller @RequiredArgsConstructor public class OperationLogListExcelController { diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java index 58677f68..8326bfdb 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java @@ -5,7 +5,6 @@ import app.module.admin.config.application.util.AdminUtil; import app.module.admin.config.application.util.model.EnumDto; import app.module.admin.usecase.researcher.adpaters.persistence.model.*; import app.module.admin.usecase.researcher.adpaters.web.model.*; - import app.module.admin.usecase.researcher.ports.ResearcherPortOut; import app.module.core.config.application.annotation.UpdateCommand; import app.module.core.config.application.util.CommonUtil; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersHouseholdVisitDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersHouseholdVisitDto.java index 56c5085b..17b618ed 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersHouseholdVisitDto.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersHouseholdVisitDto.java @@ -2,7 +2,6 @@ package app.module.admin.usecase.researcher.adpaters.persistence.model; import app.module.admin.config.application.enums.ManagementType; import lombok.Data; -import java.time.LocalDateTime; @Data public class ResearchersHouseholdVisitDto { diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java index 5ebd85c2..5183e066 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java @@ -3,19 +3,8 @@ package app.module.admin.usecase.researcher.adpaters.web; import app.module.admin.config.application.util.ExcelWriterUtil; import app.module.admin.config.application.util.model.ExcelSheetDto; import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersDto; -import app.module.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO; -import app.module.admin.usecase.researcher.adpaters.web.model.MappingHouseholdListReqVO; -import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailReqVO; -import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO; -import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersVisitDetailReqVO; +import app.module.admin.usecase.researcher.adpaters.web.model.*; import app.module.admin.usecase.researcher.ports.ResearcherPortIn; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -25,14 +14,15 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; @Slf4j @RestController diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java index f2f02b5b..ad3abeca 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java @@ -7,12 +7,14 @@ import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailU import app.module.admin.usecase.researcher.ports.ResearcherPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortIn; -import app.module.core.usecase.uicode.view.ports.UICodeViewPortIn; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; import java.util.Objects; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/HouseholdSearchReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/HouseholdSearchReqVO.java index dcdf7caa..9d493d3c 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/HouseholdSearchReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/HouseholdSearchReqVO.java @@ -2,7 +2,6 @@ package app.module.admin.usecase.researcher.adpaters.web.model; import lombok.Getter; import lombok.Setter; -import org.springframework.web.bind.annotation.RequestParam; @Getter @Setter diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersDetailUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersDetailUIReqVO.java index b2da51d3..f8e399b1 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersDetailUIReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersDetailUIReqVO.java @@ -4,7 +4,6 @@ import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.thymeleaf.util.StringUtils; @Getter @Setter @@ -15,7 +14,6 @@ public class ResearchersDetailUIReqVO { private Integer size; private Integer adminSeq; - public Integer getPage() { // 요청 페이지 넘버 - 초기값 `0` return page != null ? page : 0; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersListReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersListReqVO.java index fe11fba4..2c3a0f83 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersListReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersListReqVO.java @@ -4,7 +4,6 @@ import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.thymeleaf.util.StringUtils; @Getter @Setter diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java index 9e120802..92af3e8e 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java @@ -6,7 +6,6 @@ import lombok.Getter; import lombok.Setter; import java.time.LocalDate; -import java.time.LocalDateTime; @Getter @Setter diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesDao.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesDao.java index 43a8cab0..60c16b82 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesDao.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/adapters/persistence/AutoSchedulesDao.java @@ -1,12 +1,13 @@ package app.module.admin.usecase.schedule.autoSchedules.adapters.persistence; import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortOut; -import java.util.Optional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import java.util.Optional; + @Slf4j @Repository @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java index e74033ea..3dabd73a 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/autoSchedules/ports/application/AutoSchedulesService.java @@ -13,15 +13,16 @@ import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.applicati import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd; import app.module.mms.ports.MMSPortIn; import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd; -import java.time.LocalDate; -import java.util.List; -import java.util.Optional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.time.LocalDate; +import java.util.List; +import java.util.Optional; + @Service @RequiredArgsConstructor @Slf4j diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/adapters/persistence/GetIncompleteHouseholdsDao.java b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/adapters/persistence/GetIncompleteHouseholdsDao.java index 832e1268..e86432fe 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/adapters/persistence/GetIncompleteHouseholdsDao.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/adapters/persistence/GetIncompleteHouseholdsDao.java @@ -3,10 +3,11 @@ package app.module.admin.usecase.schedule.getIncompleteHouseholds.adapters.persi import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.GetIncompleteHouseholdsPortOut; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository @RequiredArgsConstructor class GetIncompleteHouseholdsDao implements GetIncompleteHouseholdsPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/adapters/persistence/GetIncompleteHouseholdsMapper.java b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/adapters/persistence/GetIncompleteHouseholdsMapper.java index ec9fe7be..3af4b4f6 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/adapters/persistence/GetIncompleteHouseholdsMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/adapters/persistence/GetIncompleteHouseholdsMapper.java @@ -2,9 +2,10 @@ package app.module.admin.usecase.schedule.getIncompleteHouseholds.adapters.persi import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd; -import java.util.List; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface GetIncompleteHouseholdsMapper { List operate(GetIncompleteHouseholdsCmd cmd); diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/GetIncompleteHouseholdsPortIn.java b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/GetIncompleteHouseholdsPortIn.java index 39fe6e82..e3f9089e 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/GetIncompleteHouseholdsPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/GetIncompleteHouseholdsPortIn.java @@ -2,6 +2,7 @@ package app.module.admin.usecase.schedule.getIncompleteHouseholds.ports; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd; + import java.util.List; public interface GetIncompleteHouseholdsPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/GetIncompleteHouseholdsPortOut.java b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/GetIncompleteHouseholdsPortOut.java index ce7b640b..00bf6de5 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/GetIncompleteHouseholdsPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/GetIncompleteHouseholdsPortOut.java @@ -2,6 +2,7 @@ package app.module.admin.usecase.schedule.getIncompleteHouseholds.ports; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd; + import java.util.List; public interface GetIncompleteHouseholdsPortOut { diff --git a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/GetIncompleteHouseholdsService.java b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/GetIncompleteHouseholdsService.java index 30dcf1c3..bdd7db1f 100644 --- a/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/GetIncompleteHouseholdsService.java +++ b/admin/src/main/java/app/module/admin/usecase/schedule/getIncompleteHouseholds/ports/application/GetIncompleteHouseholdsService.java @@ -1,13 +1,14 @@ package app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; -import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.GetIncompleteHouseholdsPortIn; import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.GetIncompleteHouseholdsPortOut; -import java.util.List; +import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholds; +import app.module.admin.usecase.schedule.getIncompleteHouseholds.ports.application.domain.GetIncompleteHouseholdsCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor class GetIncompleteHouseholdsService implements GetIncompleteHouseholdsPortIn { diff --git a/admin/src/main/java/app/module/admin/usecase/uicode/save/adapters/web/UICodeSaveVO.java b/admin/src/main/java/app/module/admin/usecase/uicode/save/adapters/web/UICodeSaveVO.java index 801b5288..ccdc7bbf 100644 --- a/admin/src/main/java/app/module/admin/usecase/uicode/save/adapters/web/UICodeSaveVO.java +++ b/admin/src/main/java/app/module/admin/usecase/uicode/save/adapters/web/UICodeSaveVO.java @@ -2,11 +2,7 @@ package app.module.admin.usecase.uicode.save.adapters.web; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.NonNull; +import lombok.*; @Data @Builder diff --git a/admin/src/main/java/app/module/admin/usecase/uicode/view/adapters/web/UICodeViewController.java b/admin/src/main/java/app/module/admin/usecase/uicode/view/adapters/web/UICodeViewController.java index dba22cce..59a408b6 100644 --- a/admin/src/main/java/app/module/admin/usecase/uicode/view/adapters/web/UICodeViewController.java +++ b/admin/src/main/java/app/module/admin/usecase/uicode/view/adapters/web/UICodeViewController.java @@ -2,7 +2,6 @@ package app.module.admin.usecase.uicode.view.adapters.web; import app.module.core.usecase.uicode.view.ports.UICodeViewPortIn; import app.module.core.usecase.uicode.view.ports.application.domain.UICodeView; -import java.util.NoSuchElementException; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -10,6 +9,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.NoSuchElementException; + @RestController @RequiredArgsConstructor class UICodeViewController { diff --git a/admin/src/main/java/app/module/admin/usecase/uri/save/adapter/web/web/URISaveBindingVO.java b/admin/src/main/java/app/module/admin/usecase/uri/save/adapter/web/web/URISaveBindingVO.java index c1217d68..64b70b4a 100644 --- a/admin/src/main/java/app/module/admin/usecase/uri/save/adapter/web/web/URISaveBindingVO.java +++ b/admin/src/main/java/app/module/admin/usecase/uri/save/adapter/web/web/URISaveBindingVO.java @@ -4,12 +4,13 @@ import app.module.core.config.application.enums.AppType; import app.module.core.config.application.enums.SaveType; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.Pattern; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import org.springframework.web.multipart.MultipartFile; +import java.util.Set; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/uri/save/adapter/web/web/URISaveController.java b/admin/src/main/java/app/module/admin/usecase/uri/save/adapter/web/web/URISaveController.java index 3a9b0153..010ca67b 100644 --- a/admin/src/main/java/app/module/admin/usecase/uri/save/adapter/web/web/URISaveController.java +++ b/admin/src/main/java/app/module/admin/usecase/uri/save/adapter/web/web/URISaveController.java @@ -9,7 +9,6 @@ import app.module.core.config.application.util.MessageUtil; import app.module.core.usecase.uri.save.ports.URISavePortIn; import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand; import jakarta.validation.Valid; -import java.io.IOException; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -17,6 +16,8 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; +import java.io.IOException; + @RestController @RequiredArgsConstructor public class URISaveController { diff --git a/admin/src/main/java/app/module/admin/usecase/uri/sort/adapter/web/URISortController.java b/admin/src/main/java/app/module/admin/usecase/uri/sort/adapter/web/URISortController.java index 73a54e56..764149bd 100644 --- a/admin/src/main/java/app/module/admin/usecase/uri/sort/adapter/web/URISortController.java +++ b/admin/src/main/java/app/module/admin/usecase/uri/sort/adapter/web/URISortController.java @@ -4,8 +4,6 @@ import app.module.core.config.application.util.CoreUtil; import app.module.core.usecase.uri.sort.ports.URISortPortIn; import app.module.core.usecase.uri.sort.ports.application.domain.URISortCommand; import jakarta.validation.Valid; -import java.util.List; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -14,6 +12,9 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.stream.Collectors; + @RestController @RequiredArgsConstructor public class URISortController { diff --git a/admin/src/main/java/app/module/admin/usecase/uri/toptier/adapter/web/URITopTierController.java b/admin/src/main/java/app/module/admin/usecase/uri/toptier/adapter/web/URITopTierController.java index 87ae6f2e..6fa03b99 100644 --- a/admin/src/main/java/app/module/admin/usecase/uri/toptier/adapter/web/URITopTierController.java +++ b/admin/src/main/java/app/module/admin/usecase/uri/toptier/adapter/web/URITopTierController.java @@ -3,7 +3,6 @@ package app.module.admin.usecase.uri.toptier.adapter.web; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.uri.toptier.ports.URITopTierPortIn; import app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.http.HttpStatus; @@ -12,6 +11,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.stream.Collectors; + @RestController @RequiredArgsConstructor class URITopTierController { diff --git a/admin/src/main/java/app/module/admin/usecase/uri/toptier/adapter/web/URITreeVO.java b/admin/src/main/java/app/module/admin/usecase/uri/toptier/adapter/web/URITreeVO.java index 51584241..dae8bda3 100644 --- a/admin/src/main/java/app/module/admin/usecase/uri/toptier/adapter/web/URITreeVO.java +++ b/admin/src/main/java/app/module/admin/usecase/uri/toptier/adapter/web/URITreeVO.java @@ -1,10 +1,11 @@ package app.module.admin.usecase.uri.toptier.adapter.web; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/uri/view/adapter/web/URIBindingVO.java b/admin/src/main/java/app/module/admin/usecase/uri/view/adapter/web/URIBindingVO.java index ee8cb0f0..c0dcc656 100644 --- a/admin/src/main/java/app/module/admin/usecase/uri/view/adapter/web/URIBindingVO.java +++ b/admin/src/main/java/app/module/admin/usecase/uri/view/adapter/web/URIBindingVO.java @@ -1,12 +1,13 @@ package app.module.admin.usecase.uri.view.adapter.web; import app.module.core.config.application.enums.AppType; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.util.Set; + @Getter @Setter @NoArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/uri/view/adapter/web/URIViewController.java b/admin/src/main/java/app/module/admin/usecase/uri/view/adapter/web/URIViewController.java index 0da8cefb..0f250e36 100644 --- a/admin/src/main/java/app/module/admin/usecase/uri/view/adapter/web/URIViewController.java +++ b/admin/src/main/java/app/module/admin/usecase/uri/view/adapter/web/URIViewController.java @@ -5,7 +5,6 @@ import app.module.core.config.application.enums.AppType; import app.module.core.config.application.util.MessageUtil; import app.module.core.usecase.uri.view.ports.URIViewPortIn; import app.module.core.usecase.uri.view.ports.application.domain.URIView; -import java.util.NoSuchElementException; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -13,6 +12,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.NoSuchElementException; + @RestController @RequiredArgsConstructor public class URIViewController { diff --git a/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java b/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java index 6b33ae6e..a49f1ab9 100644 --- a/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java +++ b/admin/src/main/java/app/module/mms/adapters/persistence/MMSDao.java @@ -1,7 +1,7 @@ package app.module.mms.adapters.persistence; -import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd; import app.module.mms.ports.MMSPortOut; +import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; diff --git a/admin/src/main/java/app/module/mms/ports/application/MMSService.java b/admin/src/main/java/app/module/mms/ports/application/MMSService.java index 170b03b1..d9960cd1 100644 --- a/admin/src/main/java/app/module/mms/ports/application/MMSService.java +++ b/admin/src/main/java/app/module/mms/ports/application/MMSService.java @@ -1,8 +1,8 @@ package app.module.mms.ports.application; -import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd; import app.module.mms.ports.MMSPortIn; import app.module.mms.ports.MMSPortOut; +import app.module.mms.ports.application.domain.CreateSmsAutoSendCmd; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/admin/src/main/resources/templates/communication/sms.html b/admin/src/main/resources/templates/communication/sms.html index 7672ab40..c6f2a3b4 100644 --- a/admin/src/main/resources/templates/communication/sms.html +++ b/admin/src/main/resources/templates/communication/sms.html @@ -1,5 +1,5 @@ -
diff --git a/admin/src/main/resources/templates/home.html b/admin/src/main/resources/templates/home.html index 10bdb81e..3161d3e1 100644 --- a/admin/src/main/resources/templates/home.html +++ b/admin/src/main/resources/templates/home.html @@ -1,7 +1,6 @@
diff --git a/admin/src/main/resources/templates/layout/layout-error.html b/admin/src/main/resources/templates/layout/layout-error.html index 229f451d..ffb67252 100644 --- a/admin/src/main/resources/templates/layout/layout-error.html +++ b/admin/src/main/resources/templates/layout/layout-error.html @@ -1,5 +1,5 @@ - + diff --git a/admin/src/test/java/app/module/admin/EnableJsonUTF8.java b/admin/src/test/java/app/module/admin/EnableJsonUTF8.java index 64db6eb6..89f8d8d4 100644 --- a/admin/src/test/java/app/module/admin/EnableJsonUTF8.java +++ b/admin/src/test/java/app/module/admin/EnableJsonUTF8.java @@ -1,15 +1,12 @@ package app.module.admin; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; import org.springframework.web.filter.CharacterEncodingFilter; +import java.lang.annotation.*; + /** * MockMvc `application/json` 타입 전송 시 UTF-8 설정 어노테이션 * diff --git a/admin/src/test/java/app/module/admin/config/initData/InitAdminUserRoleTestData.java b/admin/src/test/java/app/module/admin/config/initData/InitAdminUserRoleTestData.java index 1e2c85e3..e8512087 100644 --- a/admin/src/test/java/app/module/admin/config/initData/InitAdminUserRoleTestData.java +++ b/admin/src/test/java/app/module/admin/config/initData/InitAdminUserRoleTestData.java @@ -1,6 +1,5 @@ package app.module.admin.config.initData; -import app.module.core.config.adapters.persistence.entity.Role; import app.module.core.config.adapters.persistence.repository.RoleRepo; import lombok.RequiredArgsConstructor; import org.springframework.boot.ApplicationArguments; diff --git a/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java b/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java index 02c0e791..37207ff8 100644 --- a/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java +++ b/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java @@ -1,12 +1,7 @@ package app.module.admin.config.security; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin; -import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.unauthenticated; - import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn; import app.module.core.usecase.admin.view.ports.AdminViewPortIn; -import java.util.Arrays; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -19,6 +14,10 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.TestPropertySource; import org.springframework.test.web.servlet.MockMvc; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin; +import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.unauthenticated; + @SpringBootTest @TestPropertySource("classpath:application-override.properties") @AutoConfigureMockMvc diff --git a/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java b/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java index daad7bfd..68dba740 100644 --- a/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java +++ b/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java @@ -1,11 +1,6 @@ package app.module.admin.config.security; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin; -import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.authenticated; -import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.unauthenticated; - import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn; -import java.util.Arrays; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -17,6 +12,10 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.TestPropertySource; import org.springframework.test.web.servlet.MockMvc; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin; +import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.authenticated; +import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.unauthenticated; + @SpringBootTest @TestPropertySource("classpath:application-override.properties") @AutoConfigureMockMvc diff --git a/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java b/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java index c4419369..e06fd722 100644 --- a/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java +++ b/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java @@ -1,18 +1,8 @@ package app.module.admin.feature.admin.repository.dao; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn; -import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortOut; -import app.module.core.usecase.admin.view.ports.AdminViewPortIn; -import java.util.Arrays; -import java.util.List; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.TestPropertySource; diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/component/AuditCommand.java b/core/src/main/java/app/module/core/config/adapters/persistence/component/AuditCommand.java index 03c3f724..2c05bc42 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/component/AuditCommand.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/component/AuditCommand.java @@ -1,12 +1,13 @@ package app.module.core.config.adapters.persistence.component; import app.module.core.config.application.util.CommonUtil; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; +import java.time.LocalDateTime; + @Getter @Setter public class AuditCommand { diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/component/AuditEntity.java b/core/src/main/java/app/module/core/config/adapters/persistence/component/AuditEntity.java index 9bbdb887..aae6e5a2 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/component/AuditEntity.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/component/AuditEntity.java @@ -1,9 +1,10 @@ package app.module.core.config.adapters.persistence.component; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + /** * 생성 및 수정 기록을 위한 공용 엔티티 속성. Admin 앱의 경우, LoginUserAuditAware.java (AuditorAware 구현체) 가 반환한 현재 작성자 * 정보를 담는다. diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Admin.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Admin.java index 974bf1c4..8b88d203 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Admin.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Admin.java @@ -1,12 +1,13 @@ package app.module.core.config.adapters.persistence.entity; import app.module.core.config.adapters.persistence.component.AuditEntity; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @NoArgsConstructor diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/AdminHasRole.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/AdminHasRole.java index 20eedce7..29feec3b 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/AdminHasRole.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/AdminHasRole.java @@ -1,11 +1,7 @@ package app.module.core.config.adapters.persistence.entity; import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; @Getter @Setter diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUser.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUser.java index 0bd315d3..79d30c10 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUser.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUser.java @@ -2,12 +2,13 @@ package app.module.core.config.adapters.persistence.entity; import app.module.core.config.adapters.persistence.component.AuditEntity; import app.module.core.config.application.enums.SignUpType; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @NoArgsConstructor diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java index 1b196794..6e36bd4a 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java @@ -1,7 +1,6 @@ package app.module.core.config.adapters.persistence.entity; import app.module.core.config.adapters.persistence.component.AuditEntity; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/LoggedInUser.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/LoggedInUser.java index 93784cca..cd328306 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/LoggedInUser.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/LoggedInUser.java @@ -2,12 +2,9 @@ package app.module.core.config.adapters.persistence.entity; import app.module.core.config.adapters.persistence.component.AuditEntity; import app.module.core.config.application.enums.AppType; +import lombok.*; + import java.time.LocalDateTime; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; /** * 동시접속 사용자 체크를 위한 기록용 엔티티 diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/PersistentLogins.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/PersistentLogins.java index da017269..f95f5bf4 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/PersistentLogins.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/PersistentLogins.java @@ -1,10 +1,11 @@ package app.module.core.config.adapters.persistence.entity; import app.module.core.config.adapters.persistence.component.AuditEntity; -import java.util.Date; import lombok.Getter; import lombok.Setter; +import java.util.Date; + /** * Spring Security - Remember me 기능을 위한 엔티티 */ diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Role.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Role.java index e77b1a50..9b001646 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Role.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Role.java @@ -2,11 +2,12 @@ package app.module.core.config.adapters.persistence.entity; import app.module.core.config.adapters.persistence.component.AuditEntity; import app.module.core.config.application.enums.AppType; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.util.Set; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UICode.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/UICode.java index 49e2f545..3ce8ee01 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UICode.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/UICode.java @@ -1,7 +1,6 @@ package app.module.core.config.adapters.persistence.entity; import app.module.core.config.adapters.persistence.component.AuditEntity; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/URI.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/URI.java index f88525fc..e10ef5d7 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/URI.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/URI.java @@ -2,12 +2,9 @@ package app.module.core.config.adapters.persistence.entity; import app.module.core.config.adapters.persistence.component.AuditEntity; import app.module.core.config.application.enums.AppType; +import lombok.*; + import java.util.Set; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; @Getter @Setter diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UploadFile.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/UploadFile.java index a6d6f02d..42d06f28 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UploadFile.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/UploadFile.java @@ -2,11 +2,7 @@ package app.module.core.config.adapters.persistence.entity; import app.module.core.config.adapters.persistence.component.AuditEntity; import app.module.core.config.application.enums.FileUploadType; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; @Getter @Setter diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UriHasRole.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/UriHasRole.java index 889282fc..6fa946b1 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UriHasRole.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/UriHasRole.java @@ -1,11 +1,7 @@ package app.module.core.config.adapters.persistence.entity; import app.module.core.config.adapters.persistence.component.AuditEntity; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; @Getter @Setter diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java index cbba7c02..d19f1790 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java @@ -1,7 +1,6 @@ package app.module.core.config.adapters.persistence.initData; import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn; -import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitRoleData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitRoleData.java index d5b7bbe3..8043b920 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitRoleData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitRoleData.java @@ -1,14 +1,7 @@ package app.module.core.config.adapters.persistence.initData; -import app.module.core.config.adapters.persistence.entity.Role; import app.module.core.config.application.enums.AppType; -import app.module.core.usecase.privilege.view.adapters.persistence.PrivilegeViewMapper; -import app.module.core.usecase.privilege.view.ports.application.domain.PrivilegeView; -import app.module.core.usecase.role.save.adapters.persistence.RoleSaveMapper; -import app.module.core.usecase.role.save.adapters.persistence.model.RoleHasPrivilegeSaveParam; import app.module.core.usecase.role.save.ports.RoleSavePortIn; -import java.time.LocalDateTime; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.ApplicationArguments; @@ -16,6 +9,8 @@ import org.springframework.boot.ApplicationRunner; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; +import java.util.List; + @Component @RequiredArgsConstructor @Order(3) diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java index 137aa841..c6411774 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java @@ -3,8 +3,6 @@ package app.module.core.config.adapters.persistence.initData; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.uri.save.ports.URISavePortIn; import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand; -import java.io.IOException; -import java.util.Set; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -14,6 +12,9 @@ import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.io.IOException; +import java.util.Set; + @Component @RequiredArgsConstructor @Slf4j diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriFrontData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriFrontData.java index 86e82b2f..d0b6ea69 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriFrontData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriFrontData.java @@ -1,15 +1,8 @@ package app.module.core.config.adapters.persistence.initData; -import app.module.core.config.adapters.persistence.initData.helper.RemoveAllFrontURIMapper; import app.module.core.config.application.enums.AppType; -import app.module.core.usecase.uri.getUris.ports.GetUrisPortIn; -import app.module.core.usecase.uri.getUris.ports.application.domain.URIElement; import app.module.core.usecase.uri.save.ports.URISavePortIn; import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand; -import java.io.IOException; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -19,6 +12,9 @@ import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.io.IOException; +import java.util.Set; + @Component @RequiredArgsConstructor @Slf4j diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserRoleData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserRoleData.java index 78cfdf19..3efc1eaa 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserRoleData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserRoleData.java @@ -2,7 +2,6 @@ package app.module.core.config.adapters.persistence.initData; import app.module.core.usecase.userRole.saveUserRole.ports.SaveUserRolePortIn; import app.module.core.usecase.userRole.saveUserRole.ports.application.domain.SaveUserRoleCmd; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.ApplicationArguments; @@ -10,6 +9,8 @@ import org.springframework.boot.ApplicationRunner; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; +import java.util.List; + @Component @RequiredArgsConstructor @Order(3) diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllAdminURIMapper.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllAdminURIMapper.java index 4647abdf..f93e25e8 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllAdminURIMapper.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllAdminURIMapper.java @@ -1,9 +1,10 @@ package app.module.core.config.adapters.persistence.initData.helper; import app.module.core.config.application.enums.AppType; -import java.util.List; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface RemoveAllAdminURIMapper { void deleteAllByAppType(AppType appType); diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllFrontURIMapper.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllFrontURIMapper.java index 3f3cc980..c50b3bf8 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllFrontURIMapper.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllFrontURIMapper.java @@ -1,9 +1,10 @@ package app.module.core.config.adapters.persistence.initData.helper; import app.module.core.config.application.enums.AppType; -import java.util.List; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface RemoveAllFrontURIMapper { void deleteAllByAppType(AppType appType); diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/repository/RoleRepo.java b/core/src/main/java/app/module/core/config/adapters/persistence/repository/RoleRepo.java index c2113c36..e2a02270 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/repository/RoleRepo.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/repository/RoleRepo.java @@ -2,10 +2,11 @@ package app.module.core.config.adapters.persistence.repository; import app.module.core.config.adapters.persistence.entity.Role; import app.module.core.config.application.enums.AppType; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.springframework.data.domain.Sort; +import java.util.List; + @Mapper public interface RoleRepo { diff --git a/core/src/main/java/app/module/core/config/adapters/web/advice/GlobalControllerAdvice.java b/core/src/main/java/app/module/core/config/adapters/web/advice/GlobalControllerAdvice.java index a8072ef5..26c92104 100644 --- a/core/src/main/java/app/module/core/config/adapters/web/advice/GlobalControllerAdvice.java +++ b/core/src/main/java/app/module/core/config/adapters/web/advice/GlobalControllerAdvice.java @@ -3,7 +3,6 @@ package app.module.core.config.adapters.web.advice; import app.module.core.config.application.exception.NoMatchingURIException; import app.module.core.config.application.util.CommonUtil; import jakarta.servlet.http.HttpServletRequest; -import java.util.Optional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; @@ -15,6 +14,8 @@ import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.Optional; + /** * 전역 예외 제어 객체. */ diff --git a/core/src/main/java/app/module/core/config/adapters/web/interceptor/AuditFieldInterceptor.java b/core/src/main/java/app/module/core/config/adapters/web/interceptor/AuditFieldInterceptor.java index e5bc66cc..9fbee7dd 100644 --- a/core/src/main/java/app/module/core/config/adapters/web/interceptor/AuditFieldInterceptor.java +++ b/core/src/main/java/app/module/core/config/adapters/web/interceptor/AuditFieldInterceptor.java @@ -1,9 +1,6 @@ package app.module.core.config.adapters.web.interceptor; import app.module.core.config.adapters.persistence.component.AuditEntity; -import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.List; import org.apache.ibatis.executor.Executor; import org.apache.ibatis.mapping.MappedStatement; import org.apache.ibatis.mapping.SqlCommandType; @@ -15,6 +12,10 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; +import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.List; + @Intercepts({ @Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class}) }) diff --git a/core/src/main/java/app/module/core/config/adapters/web/interceptor/URIAuthorizeInterceptor.java b/core/src/main/java/app/module/core/config/adapters/web/interceptor/URIAuthorizeInterceptor.java index 503ea778..a1faa29f 100644 --- a/core/src/main/java/app/module/core/config/adapters/web/interceptor/URIAuthorizeInterceptor.java +++ b/core/src/main/java/app/module/core/config/adapters/web/interceptor/URIAuthorizeInterceptor.java @@ -3,7 +3,6 @@ package app.module.core.config.adapters.web.interceptor; import app.module.core.usecase.uri.currentmatch.ports.application.domain.URICurrentMatching; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import java.util.Set; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.AccessDeniedException; @@ -12,6 +11,8 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; +import java.util.Set; + @Component @RequiredArgsConstructor @Slf4j diff --git a/core/src/main/java/app/module/core/config/adapters/web/interceptor/model/URITopTierVO.java b/core/src/main/java/app/module/core/config/adapters/web/interceptor/model/URITopTierVO.java index 6abcf5e1..f491c0f7 100644 --- a/core/src/main/java/app/module/core/config/adapters/web/interceptor/model/URITopTierVO.java +++ b/core/src/main/java/app/module/core/config/adapters/web/interceptor/model/URITopTierVO.java @@ -1,10 +1,11 @@ package app.module.core.config.adapters.web.interceptor.model; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/config/adapters/web/rest/error/RestErrorVO.java b/core/src/main/java/app/module/core/config/adapters/web/rest/error/RestErrorVO.java index b066fb21..e8a65bd2 100644 --- a/core/src/main/java/app/module/core/config/adapters/web/rest/error/RestErrorVO.java +++ b/core/src/main/java/app/module/core/config/adapters/web/rest/error/RestErrorVO.java @@ -1,9 +1,10 @@ package app.module.core.config.adapters.web.rest.error; -import java.util.List; import lombok.Builder; import lombok.Data; +import java.util.List; + @Builder @Data public class RestErrorVO { diff --git a/core/src/main/java/app/module/core/config/adapters/web/rest/response/RestResponse.java b/core/src/main/java/app/module/core/config/adapters/web/rest/response/RestResponse.java index abf53686..84227afc 100644 --- a/core/src/main/java/app/module/core/config/adapters/web/rest/response/RestResponse.java +++ b/core/src/main/java/app/module/core/config/adapters/web/rest/response/RestResponse.java @@ -1,9 +1,10 @@ package app.module.core.config.adapters.web.rest.response; -import java.util.List; import lombok.Builder; import lombok.Data; +import java.util.List; + @Builder @Data public class RestResponse { diff --git a/core/src/main/java/app/module/core/config/adapters/web/security/domain/CoreRole.java b/core/src/main/java/app/module/core/config/adapters/web/security/domain/CoreRole.java index de3b1b86..65c79017 100644 --- a/core/src/main/java/app/module/core/config/adapters/web/security/domain/CoreRole.java +++ b/core/src/main/java/app/module/core/config/adapters/web/security/domain/CoreRole.java @@ -1,11 +1,12 @@ package app.module.core.config.adapters.web.security.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.util.List; + @Getter @Setter @NoArgsConstructor diff --git a/core/src/main/java/app/module/core/config/adapters/web/security/entrypoint/CustomAuthenticationEntryPoint.java b/core/src/main/java/app/module/core/config/adapters/web/security/entrypoint/CustomAuthenticationEntryPoint.java index e35444ae..6d04ad28 100644 --- a/core/src/main/java/app/module/core/config/adapters/web/security/entrypoint/CustomAuthenticationEntryPoint.java +++ b/core/src/main/java/app/module/core/config/adapters/web/security/entrypoint/CustomAuthenticationEntryPoint.java @@ -3,11 +3,12 @@ package app.module.core.config.adapters.web.security.entrypoint; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import java.io.IOException; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; +import java.io.IOException; + @Component public class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint { diff --git a/core/src/main/java/app/module/core/config/application/aop/XssEscapeAspect.java b/core/src/main/java/app/module/core/config/application/aop/XssEscapeAspect.java index 9ca8711d..79ad497c 100644 --- a/core/src/main/java/app/module/core/config/application/aop/XssEscapeAspect.java +++ b/core/src/main/java/app/module/core/config/application/aop/XssEscapeAspect.java @@ -1,13 +1,14 @@ package app.module.core.config.application.aop; import app.module.core.config.application.annotation.EscapeXSS; -import java.lang.reflect.Field; import org.apache.commons.text.StringEscapeUtils; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.springframework.stereotype.Component; +import java.lang.reflect.Field; + /** * XSS 공격을 방지하기 위한 Aspect 클래스입니다. * diff --git a/core/src/main/java/app/module/core/config/application/component/YamlPropertySourceFactory.java b/core/src/main/java/app/module/core/config/application/component/YamlPropertySourceFactory.java index f08b870f..eb95fdf6 100644 --- a/core/src/main/java/app/module/core/config/application/component/YamlPropertySourceFactory.java +++ b/core/src/main/java/app/module/core/config/application/component/YamlPropertySourceFactory.java @@ -1,8 +1,5 @@ package app.module.core.config.application.component; -import java.io.IOException; -import java.util.Objects; -import java.util.Properties; import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; import org.springframework.core.env.PropertiesPropertySource; import org.springframework.core.env.PropertySource; @@ -10,6 +7,10 @@ import org.springframework.core.io.support.EncodedResource; import org.springframework.core.io.support.PropertySourceFactory; import org.springframework.lang.NonNull; +import java.io.IOException; +import java.util.Objects; +import java.util.Properties; + public class YamlPropertySourceFactory implements PropertySourceFactory { @Override diff --git a/core/src/main/java/app/module/core/config/application/converter/CustomLocalDateTimeSerializer.java b/core/src/main/java/app/module/core/config/application/converter/CustomLocalDateTimeSerializer.java index f5d98007..9bf16323 100644 --- a/core/src/main/java/app/module/core/config/application/converter/CustomLocalDateTimeSerializer.java +++ b/core/src/main/java/app/module/core/config/application/converter/CustomLocalDateTimeSerializer.java @@ -3,6 +3,7 @@ package app.module.core.config.application.converter; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; + import java.io.IOException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; diff --git a/core/src/main/java/app/module/core/config/application/converter/StringToLocalDateTimeConverter.java b/core/src/main/java/app/module/core/config/application/converter/StringToLocalDateTimeConverter.java index f543b862..973fcf2c 100644 --- a/core/src/main/java/app/module/core/config/application/converter/StringToLocalDateTimeConverter.java +++ b/core/src/main/java/app/module/core/config/application/converter/StringToLocalDateTimeConverter.java @@ -1,10 +1,11 @@ package app.module.core.config.application.converter; -import java.time.LocalDateTime; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; import org.thymeleaf.util.StringUtils; +import java.time.LocalDateTime; + /** * String 문자열을 LocalDateTime 으로 변환해주는 Converter. 현재 사용하지 않는다! */ diff --git a/core/src/main/java/app/module/core/config/application/enums/AcceptableFileType.java b/core/src/main/java/app/module/core/config/application/enums/AcceptableFileType.java index 953e816f..f76d37d3 100644 --- a/core/src/main/java/app/module/core/config/application/enums/AcceptableFileType.java +++ b/core/src/main/java/app/module/core/config/application/enums/AcceptableFileType.java @@ -1,9 +1,10 @@ package app.module.core.config.application.enums; -import java.util.Set; import lombok.Getter; import lombok.RequiredArgsConstructor; +import java.util.Set; + @Getter @RequiredArgsConstructor public enum AcceptableFileType { diff --git a/core/src/main/java/app/module/core/config/application/enums/FileUploadType.java b/core/src/main/java/app/module/core/config/application/enums/FileUploadType.java index b050a81a..78d06094 100644 --- a/core/src/main/java/app/module/core/config/application/enums/FileUploadType.java +++ b/core/src/main/java/app/module/core/config/application/enums/FileUploadType.java @@ -1,10 +1,11 @@ package app.module.core.config.application.enums; import com.fasterxml.jackson.annotation.JsonFormat; -import java.util.Set; import lombok.Getter; import lombok.RequiredArgsConstructor; +import java.util.Set; + @Getter @RequiredArgsConstructor @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/core/src/main/java/app/module/core/config/application/logging/SafeLogger.java b/core/src/main/java/app/module/core/config/application/logging/SafeLogger.java index 7964e775..9b5c69a9 100644 --- a/core/src/main/java/app/module/core/config/application/logging/SafeLogger.java +++ b/core/src/main/java/app/module/core/config/application/logging/SafeLogger.java @@ -1,7 +1,6 @@ package app.module.core.config.application.logging; import org.slf4j.Logger; -import org.springframework.security.core.Authentication; public class SafeLogger { private final Logger logger; diff --git a/core/src/main/java/app/module/core/config/application/util/AESEncryptUtil.java b/core/src/main/java/app/module/core/config/application/util/AESEncryptUtil.java index 12befe6e..5dde50c5 100644 --- a/core/src/main/java/app/module/core/config/application/util/AESEncryptUtil.java +++ b/core/src/main/java/app/module/core/config/application/util/AESEncryptUtil.java @@ -1,20 +1,20 @@ package app.module.core.config.application.util; -import java.nio.charset.StandardCharsets; -import java.security.InvalidAlgorithmParameterException; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.util.Base64; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; +import java.nio.charset.StandardCharsets; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.util.Base64; @Slf4j @Component diff --git a/core/src/main/java/app/module/core/config/application/util/CoreUtil.java b/core/src/main/java/app/module/core/config/application/util/CoreUtil.java index c6aaa676..fc639d7b 100644 --- a/core/src/main/java/app/module/core/config/application/util/CoreUtil.java +++ b/core/src/main/java/app/module/core/config/application/util/CoreUtil.java @@ -4,8 +4,6 @@ import app.module.core.config.adapters.web.rest.error.RestErrorVO; import app.module.core.config.adapters.web.rest.error.RestFieldErrorVO; import app.module.core.config.adapters.web.rest.error.RestObjectErrorVO; import app.module.core.usecase.uri.ancestry.ports.application.domain.URIAncestry; -import java.util.List; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -15,6 +13,9 @@ import org.springframework.validation.FieldError; import org.springframework.validation.ObjectError; import org.thymeleaf.util.StringUtils; +import java.util.List; +import java.util.stream.Collectors; + @Component @RequiredArgsConstructor public class CoreUtil { diff --git a/core/src/main/java/app/module/core/config/application/util/ExcelUtil.java b/core/src/main/java/app/module/core/config/application/util/ExcelUtil.java index cf854e12..5eb3045b 100644 --- a/core/src/main/java/app/module/core/config/application/util/ExcelUtil.java +++ b/core/src/main/java/app/module/core/config/application/util/ExcelUtil.java @@ -1,13 +1,6 @@ package app.module.core.config.application.util; import jakarta.servlet.http.HttpServletResponse; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.security.GeneralSecurityException; -import java.util.Arrays; -import java.util.Date; import lombok.extern.slf4j.Slf4j; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.opc.OPCPackage; @@ -21,6 +14,14 @@ import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.security.GeneralSecurityException; +import java.util.Arrays; +import java.util.Date; + @Component @Slf4j public class ExcelUtil { diff --git a/core/src/main/java/app/module/core/config/application/util/ImageUtil.java b/core/src/main/java/app/module/core/config/application/util/ImageUtil.java index 12a92bdb..be707f4a 100644 --- a/core/src/main/java/app/module/core/config/application/util/ImageUtil.java +++ b/core/src/main/java/app/module/core/config/application/util/ImageUtil.java @@ -1,12 +1,10 @@ package app.module.core.config.application.util; -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.RenderingHints; +import javax.imageio.ImageIO; +import java.awt.*; import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; -import javax.imageio.ImageIO; /** * 이미지 crop 과 resize http://egloos.zum.com/kingori/v/4486279 diff --git a/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/ExcelSaveAdminPortIn.java b/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/ExcelSaveAdminPortIn.java index 446d2ac0..8b996cfa 100644 --- a/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/ExcelSaveAdminPortIn.java +++ b/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/ExcelSaveAdminPortIn.java @@ -2,6 +2,7 @@ package app.module.core.usecase.admin.excelSaveAdmin.ports; import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO; import org.springframework.web.multipart.MultipartFile; + import java.io.IOException; public interface ExcelSaveAdminPortIn { diff --git a/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/application/ExcelSaveAdminService.java b/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/application/ExcelSaveAdminService.java index fb33f870..a786f519 100644 --- a/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/application/ExcelSaveAdminService.java +++ b/core/src/main/java/app/module/core/usecase/admin/excelSaveAdmin/ports/application/ExcelSaveAdminService.java @@ -3,7 +3,6 @@ package app.module.core.usecase.admin.excelSaveAdmin.ports.application; import app.module.core.usecase.admin.excelSaveAdmin.adapters.persistence.model.ExcelResultVO; import app.module.core.usecase.admin.excelSaveAdmin.ports.ExcelSaveAdminPortIn; import app.module.core.usecase.admin.excelSaveAdmin.ports.ExcelSaveAdminPortOut; -import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortOut; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; diff --git a/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsDao.java b/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsDao.java index 18cf9c63..08ad3a34 100644 --- a/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsDao.java +++ b/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsDao.java @@ -1,22 +1,19 @@ package app.module.core.usecase.admin.getAdmins.adapters.persistence; -import app.module.core.config.adapters.persistence.repository.AdminRepo; import app.module.core.usecase.admin.getAdmins.adapters.persistence.model.GetAdminsDto; import app.module.core.usecase.admin.getAdmins.ports.GetAdminsPortOut; import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdmins; import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdminsCmd; - - import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdminsRole; -import java.util.List; -import java.util.stream.Collectors; -import org.apache.commons.collections4.ListUtils; -import org.springframework.data.domain.PageImpl; -import org.springframework.transaction.annotation.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.stream.Collectors; @Repository @RequiredArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsMapper.java b/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsMapper.java index 7dcb43c9..d4a07f1d 100644 --- a/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsMapper.java +++ b/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsMapper.java @@ -1,14 +1,14 @@ package app.module.core.usecase.admin.getAdmins.adapters.persistence; import app.module.core.usecase.admin.getAdmins.adapters.persistence.model.GetAdminsDto; -import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdmins; import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdminsCmd; import app.module.core.usecase.admin.getAdmins.ports.application.domain.GetAdminsRole; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.Pageable; +import java.util.List; + @Mapper public interface GetAdminsMapper { List findAll(@Param("cmd") GetAdminsCmd cmd, @Param("pageable") Pageable pageable); diff --git a/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/model/GetAdminsDto.java b/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/model/GetAdminsDto.java index ce0e20e9..a552fe96 100644 --- a/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/model/GetAdminsDto.java +++ b/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/model/GetAdminsDto.java @@ -1,9 +1,10 @@ package app.module.core.usecase.admin.getAdmins.adapters.persistence.model; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter public class GetAdminsDto { diff --git a/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdmins.java b/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdmins.java index 3631c920..a04cea02 100644 --- a/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdmins.java +++ b/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdmins.java @@ -1,12 +1,13 @@ package app.module.core.usecase.admin.getAdmins.ports.application.domain; import app.module.core.config.application.component.AuditOutput; -import java.time.LocalDateTime; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import java.time.LocalDateTime; +import java.util.List; + @Getter @NoArgsConstructor @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdminsPrivilege.java b/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdminsPrivilege.java index 19b2d9be..d7b8adaa 100644 --- a/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdminsPrivilege.java +++ b/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdminsPrivilege.java @@ -1,11 +1,12 @@ package app.module.core.usecase.admin.getAdmins.ports.application.domain; -import java.io.Serializable; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.io.Serializable; + @Getter @Setter @NoArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdminsRole.java b/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdminsRole.java index 986c99fd..d5ce6454 100644 --- a/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdminsRole.java +++ b/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdminsRole.java @@ -1,12 +1,13 @@ package app.module.core.usecase.admin.getAdmins.ports.application.domain; -import java.io.Serializable; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.io.Serializable; +import java.util.List; + @Getter @Setter @NoArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/RemoveAdminDao.java b/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/RemoveAdminDao.java index e2b76eaa..2e1400bf 100644 --- a/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/RemoveAdminDao.java +++ b/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/RemoveAdminDao.java @@ -3,10 +3,11 @@ package app.module.core.usecase.admin.removeAdmin.adapters.persistence; import app.module.core.config.application.util.AuditUtil; import app.module.core.usecase.admin.removeAdmin.adapters.persistence.model.RemoveAdminParam; import app.module.core.usecase.admin.removeAdmin.ports.RemoveAdminPortOut; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; +import java.util.List; + @Component @RequiredArgsConstructor class RemoveAdminDao implements RemoveAdminPortOut { diff --git a/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/model/RemoveAdminParam.java b/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/model/RemoveAdminParam.java index a24fe354..8620c4ab 100644 --- a/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/model/RemoveAdminParam.java +++ b/core/src/main/java/app/module/core/usecase/admin/removeAdmin/adapters/persistence/model/RemoveAdminParam.java @@ -1,12 +1,12 @@ package app.module.core.usecase.admin.removeAdmin.adapters.persistence.model; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.time.LocalDateTime; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/admin/removeAdmin/ports/application/RemoveAdminService.java b/core/src/main/java/app/module/core/usecase/admin/removeAdmin/ports/application/RemoveAdminService.java index e9d7d2ed..7d7fb3bd 100644 --- a/core/src/main/java/app/module/core/usecase/admin/removeAdmin/ports/application/RemoveAdminService.java +++ b/core/src/main/java/app/module/core/usecase/admin/removeAdmin/ports/application/RemoveAdminService.java @@ -2,10 +2,11 @@ package app.module.core.usecase.admin.removeAdmin.ports.application; import app.module.core.usecase.admin.removeAdmin.ports.RemoveAdminPortIn; import app.module.core.usecase.admin.removeAdmin.ports.RemoveAdminPortOut; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor class RemoveAdminService implements RemoveAdminPortIn { diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java index 66a4b1e4..ae2c26d8 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java @@ -7,7 +7,6 @@ import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortOut; import app.module.core.usecase.admin.saveAdmin.ports.application.domain.SaveAdminCmd; import app.module.core.usecase.admin.view.adapters.persistence.AdminViewMapper; import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/DeleteAdminHasRoleParam.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/DeleteAdminHasRoleParam.java index 170bc301..0db76ed5 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/DeleteAdminHasRoleParam.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/DeleteAdminHasRoleParam.java @@ -1,7 +1,6 @@ package app.module.core.usecase.admin.saveAdmin.adapters.persistence.model; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/SaveAdminHasRoleParam.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/SaveAdminHasRoleParam.java index ab6d1032..a4523c4f 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/SaveAdminHasRoleParam.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/SaveAdminHasRoleParam.java @@ -1,8 +1,6 @@ package app.module.core.usecase.admin.saveAdmin.adapters.persistence.model; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.time.LocalDateTime; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java index 8c25cf97..c88695f7 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java @@ -5,12 +5,13 @@ import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortOut; import app.module.core.usecase.admin.saveAdmin.ports.application.domain.SaveAdminCmd; import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.admin.view.ports.application.domain.AdminView; -import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import org.thymeleaf.util.StringUtils; +import java.time.LocalDateTime; + @Service @RequiredArgsConstructor public class SaveAdminService implements SaveAdminPortIn { diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java index 9c742d90..6ae8ce08 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java @@ -1,12 +1,12 @@ package app.module.core.usecase.admin.saveAdmin.ports.application.domain; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.time.LocalDateTime; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/admin/status/adapters/persistence/AdminUpdateAccountLockDao.java b/core/src/main/java/app/module/core/usecase/admin/status/adapters/persistence/AdminUpdateAccountLockDao.java index 4e9f61cc..52e5d206 100644 --- a/core/src/main/java/app/module/core/usecase/admin/status/adapters/persistence/AdminUpdateAccountLockDao.java +++ b/core/src/main/java/app/module/core/usecase/admin/status/adapters/persistence/AdminUpdateAccountLockDao.java @@ -3,12 +3,12 @@ package app.module.core.usecase.admin.status.adapters.persistence; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.admin.status.adapters.persistence.model.AdminUpdateAccountLockParam; import app.module.core.usecase.admin.status.ports.AdminUpdateAccountLockPortOut; -import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; -import org.springframework.cglib.core.Local; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; + @Repository @RequiredArgsConstructor public class AdminUpdateAccountLockDao implements AdminUpdateAccountLockPortOut { diff --git a/core/src/main/java/app/module/core/usecase/admin/status/adapters/persistence/AdminUpdateLoginFailDao.java b/core/src/main/java/app/module/core/usecase/admin/status/adapters/persistence/AdminUpdateLoginFailDao.java index bde42615..f6d1a2f3 100644 --- a/core/src/main/java/app/module/core/usecase/admin/status/adapters/persistence/AdminUpdateLoginFailDao.java +++ b/core/src/main/java/app/module/core/usecase/admin/status/adapters/persistence/AdminUpdateLoginFailDao.java @@ -3,11 +3,12 @@ package app.module.core.usecase.admin.status.adapters.persistence; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.admin.status.adapters.persistence.model.AdminUpdateLoginFailParam; import app.module.core.usecase.admin.status.ports.AdminUpdateLoginFailPortOut; -import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; + @Repository @RequiredArgsConstructor public class AdminUpdateLoginFailDao implements AdminUpdateLoginFailPortOut { diff --git a/core/src/main/java/app/module/core/usecase/admin/status/adapters/persistence/model/AdminUpdateAccountLockParam.java b/core/src/main/java/app/module/core/usecase/admin/status/adapters/persistence/model/AdminUpdateAccountLockParam.java index 02ec3f7c..17178f81 100644 --- a/core/src/main/java/app/module/core/usecase/admin/status/adapters/persistence/model/AdminUpdateAccountLockParam.java +++ b/core/src/main/java/app/module/core/usecase/admin/status/adapters/persistence/model/AdminUpdateAccountLockParam.java @@ -1,9 +1,9 @@ package app.module.core.usecase.admin.status.adapters.persistence.model; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; -import lombok.Setter; + +import java.time.LocalDateTime; @Getter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/admin/status/adapters/persistence/model/AdminUpdateLoginFailParam.java b/core/src/main/java/app/module/core/usecase/admin/status/adapters/persistence/model/AdminUpdateLoginFailParam.java index dfd8babd..b26b6d6e 100644 --- a/core/src/main/java/app/module/core/usecase/admin/status/adapters/persistence/model/AdminUpdateLoginFailParam.java +++ b/core/src/main/java/app/module/core/usecase/admin/status/adapters/persistence/model/AdminUpdateLoginFailParam.java @@ -1,9 +1,9 @@ package app.module.core.usecase.admin.status.adapters.persistence.model; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; -import org.apache.ibatis.annotations.Mapper; + +import java.time.LocalDateTime; @Getter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewDao.java b/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewDao.java index ff1cf6d5..7f78b6d6 100644 --- a/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewDao.java +++ b/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewDao.java @@ -2,11 +2,12 @@ package app.module.core.usecase.admin.view.adapters.persistence; import app.module.core.usecase.admin.view.ports.AdminViewPortOut; import app.module.core.usecase.admin.view.ports.application.domain.AdminView; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import java.util.Optional; + @Repository @RequiredArgsConstructor class AdminViewDao implements AdminViewPortOut { diff --git a/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewMapper.java b/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewMapper.java index fd74a545..7df5a93c 100644 --- a/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewMapper.java +++ b/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewMapper.java @@ -2,10 +2,10 @@ package app.module.core.usecase.admin.view.adapters.persistence; import app.module.core.config.adapters.web.security.domain.CoreRole; import app.module.core.usecase.admin.view.ports.application.domain.AdminView; -import java.util.List; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface AdminViewMapper { Optional findById(String id); diff --git a/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/model/AdminViewDto.java b/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/model/AdminViewDto.java index 5cfc6ca1..79fd130e 100644 --- a/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/model/AdminViewDto.java +++ b/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/model/AdminViewDto.java @@ -1,11 +1,12 @@ package app.module.core.usecase.admin.view.adapters.persistence.model; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.time.LocalDateTime; + @Data @AllArgsConstructor @NoArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/admin/view/ports/AdminViewPortIn.java b/core/src/main/java/app/module/core/usecase/admin/view/ports/AdminViewPortIn.java index 5ef7ed95..0eb484c6 100644 --- a/core/src/main/java/app/module/core/usecase/admin/view/ports/AdminViewPortIn.java +++ b/core/src/main/java/app/module/core/usecase/admin/view/ports/AdminViewPortIn.java @@ -1,6 +1,7 @@ package app.module.core.usecase.admin.view.ports; import app.module.core.usecase.admin.view.ports.application.domain.AdminView; + import java.util.Optional; public interface AdminViewPortIn { diff --git a/core/src/main/java/app/module/core/usecase/admin/view/ports/AdminViewPortOut.java b/core/src/main/java/app/module/core/usecase/admin/view/ports/AdminViewPortOut.java index b3c475b1..f733468a 100644 --- a/core/src/main/java/app/module/core/usecase/admin/view/ports/AdminViewPortOut.java +++ b/core/src/main/java/app/module/core/usecase/admin/view/ports/AdminViewPortOut.java @@ -1,6 +1,7 @@ package app.module.core.usecase.admin.view.ports; import app.module.core.usecase.admin.view.ports.application.domain.AdminView; + import java.util.Optional; public interface AdminViewPortOut { diff --git a/core/src/main/java/app/module/core/usecase/admin/view/ports/application/AdminViewService.java b/core/src/main/java/app/module/core/usecase/admin/view/ports/application/AdminViewService.java index 1593910e..df49b3e8 100644 --- a/core/src/main/java/app/module/core/usecase/admin/view/ports/application/AdminViewService.java +++ b/core/src/main/java/app/module/core/usecase/admin/view/ports/application/AdminViewService.java @@ -3,10 +3,11 @@ package app.module.core.usecase.admin.view.ports.application; import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.admin.view.ports.AdminViewPortOut; import app.module.core.usecase.admin.view.ports.application.domain.AdminView; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class AdminViewService implements AdminViewPortIn { diff --git a/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java b/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java index 2d63888f..792b66be 100644 --- a/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java +++ b/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java @@ -1,13 +1,13 @@ package app.module.core.usecase.admin.view.ports.application.domain; import app.module.core.config.adapters.web.security.domain.CoreRole; -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.time.LocalDateTime; + @Data @AllArgsConstructor @NoArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/PrivilegeView.java b/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/PrivilegeView.java index e37443c5..5dbb03cf 100644 --- a/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/PrivilegeView.java +++ b/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/PrivilegeView.java @@ -1,11 +1,12 @@ package app.module.core.usecase.admin.view.ports.application.domain; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.io.Serializable; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/RoleView.java b/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/RoleView.java index bdb586b4..b0048ceb 100644 --- a/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/RoleView.java +++ b/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/RoleView.java @@ -1,11 +1,12 @@ package app.module.core.usecase.admin.view.ports.application.domain; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + import java.io.Serializable; import java.time.LocalDateTime; import java.util.List; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; @Data @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/cache/refresh/adapter/web/RefreshCacheController.java b/core/src/main/java/app/module/core/usecase/cache/refresh/adapter/web/RefreshCacheController.java index ffbc3fe2..834de777 100644 --- a/core/src/main/java/app/module/core/usecase/cache/refresh/adapter/web/RefreshCacheController.java +++ b/core/src/main/java/app/module/core/usecase/cache/refresh/adapter/web/RefreshCacheController.java @@ -1,7 +1,6 @@ package app.module.core.usecase.cache.refresh.adapter.web; import app.module.core.config.adapters.web.rest.response.RestResponse; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; @@ -10,6 +9,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; +import java.util.Optional; + @Controller @RequiredArgsConstructor public class RefreshCacheController { diff --git a/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortIn.java b/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortIn.java index bafc9aec..8a2a78e4 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortIn.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortIn.java @@ -3,7 +3,6 @@ package app.module.core.usecase.daily.record.ports; import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.core.usecase.daily.record.adapters.persistence.model.RecordAlertDto; import app.module.core.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO; -import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; public interface DailyRecordPortIn { /** diff --git a/core/src/main/java/app/module/core/usecase/daily/record/ports/application/DailyRecordService.java b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/DailyRecordService.java index 73683270..a3fe4322 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/ports/application/DailyRecordService.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/DailyRecordService.java @@ -6,19 +6,16 @@ import app.module.core.config.application.util.AuditUtil; import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.core.usecase.daily.record.adapters.persistence.model.RecordAlertDto; import app.module.core.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO; -import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.core.usecase.daily.record.ports.DailyRecordPortOut; import app.module.core.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd; import app.module.core.usecase.daily.record.ports.application.domain.GetDailyRecordCmd; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; -@Slf4j @Service @RequiredArgsConstructor public class DailyRecordService implements DailyRecordPortIn { diff --git a/core/src/main/java/app/module/core/usecase/excel/createCell/ports/CreateCellPortIn.java b/core/src/main/java/app/module/core/usecase/excel/createCell/ports/CreateCellPortIn.java index 043c94ec..0c7b8347 100644 --- a/core/src/main/java/app/module/core/usecase/excel/createCell/ports/CreateCellPortIn.java +++ b/core/src/main/java/app/module/core/usecase/excel/createCell/ports/CreateCellPortIn.java @@ -1,18 +1,10 @@ package app.module.core.usecase.excel.createCell.ports; import app.module.core.usecase.excel.createCell.ports.application.model.CellConfig; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.*; + import java.util.List; -import org.apache.poi.ss.usermodel.BorderStyle; -import org.apache.poi.ss.usermodel.FillPatternType; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.VerticalAlignment; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.xssf.usermodel.IndexedColorMap; -import org.apache.poi.xssf.usermodel.XSSFCellStyle; -import org.apache.poi.xssf.usermodel.XSSFColor; -import org.apache.poi.xssf.usermodel.XSSFFont; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; public interface CreateCellPortIn { diff --git a/core/src/main/java/app/module/core/usecase/excel/createCell/ports/application/CreateCellService.java b/core/src/main/java/app/module/core/usecase/excel/createCell/ports/application/CreateCellService.java index 5b15dc23..90e1a49c 100644 --- a/core/src/main/java/app/module/core/usecase/excel/createCell/ports/application/CreateCellService.java +++ b/core/src/main/java/app/module/core/usecase/excel/createCell/ports/application/CreateCellService.java @@ -2,18 +2,17 @@ package app.module.core.usecase.excel.createCell.ports.application; import app.module.core.usecase.excel.createCell.ports.CreateCellPortIn; import app.module.core.usecase.excel.createCell.ports.application.model.CellConfig; -import java.util.List; import lombok.RequiredArgsConstructor; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.BorderStyle; // POI 5.x BorderStyle Enum 추가 -import org.apache.poi.ss.usermodel.CellType; // POI 5.x CellType Enum 추가 import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.RegionUtil; import org.apache.poi.xssf.usermodel.XSSFCellStyle; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor public class CreateCellService implements CreateCellPortIn { diff --git a/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileDao.java b/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileDao.java index 3e3b0579..3de8502b 100644 --- a/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileDao.java +++ b/core/src/main/java/app/module/core/usecase/file/createFile/adapters/persistence/CreateFileDao.java @@ -6,11 +6,12 @@ import app.module.core.usecase.file.createFile.ports.CreateFilePortOut; import app.module.core.usecase.file.createFile.ports.application.domain.CreateFile; import app.module.core.usecase.file.createFile.ports.application.domain.CreateFileCmd; import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository @RequiredArgsConstructor class CreateFileDao implements CreateFilePortOut { diff --git a/core/src/main/java/app/module/core/usecase/file/createFile/adapters/web/CreateFileController.java b/core/src/main/java/app/module/core/usecase/file/createFile/adapters/web/CreateFileController.java index 3e72c80a..c1f90e28 100644 --- a/core/src/main/java/app/module/core/usecase/file/createFile/adapters/web/CreateFileController.java +++ b/core/src/main/java/app/module/core/usecase/file/createFile/adapters/web/CreateFileController.java @@ -6,7 +6,6 @@ import app.module.core.usecase.file.createFile.ports.application.domain.CreateFi import app.module.core.usecase.file.createFile.ports.application.domain.CreateFileCmd; import app.module.core.usecase.file.saveToStorage.ports.SaveToStoragePortIn; import app.module.core.usecase.file.saveToStorage.ports.application.domain.SaveToStorage; -import java.io.IOException; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -15,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; + @RestController @RequiredArgsConstructor class CreateFileController { diff --git a/core/src/main/java/app/module/core/usecase/file/createFile/adapters/web/model/CreateFileReqVO.java b/core/src/main/java/app/module/core/usecase/file/createFile/adapters/web/model/CreateFileReqVO.java index 89d1d54b..fdf5d150 100644 --- a/core/src/main/java/app/module/core/usecase/file/createFile/adapters/web/model/CreateFileReqVO.java +++ b/core/src/main/java/app/module/core/usecase/file/createFile/adapters/web/model/CreateFileReqVO.java @@ -1,11 +1,7 @@ package app.module.core.usecase.file.createFile.adapters.web.model; import app.module.core.config.application.enums.FileUploadType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; @Getter @Setter diff --git a/core/src/main/java/app/module/core/usecase/file/createFile/ports/CreateFilePortIn.java b/core/src/main/java/app/module/core/usecase/file/createFile/ports/CreateFilePortIn.java index b8d80f6e..0061d52d 100644 --- a/core/src/main/java/app/module/core/usecase/file/createFile/ports/CreateFilePortIn.java +++ b/core/src/main/java/app/module/core/usecase/file/createFile/ports/CreateFilePortIn.java @@ -2,6 +2,7 @@ package app.module.core.usecase.file.createFile.ports; import app.module.core.usecase.file.createFile.ports.application.domain.CreateFile; import app.module.core.usecase.file.createFile.ports.application.domain.CreateFileCmd; + import java.util.Optional; public interface CreateFilePortIn { diff --git a/core/src/main/java/app/module/core/usecase/file/createFile/ports/CreateFilePortOut.java b/core/src/main/java/app/module/core/usecase/file/createFile/ports/CreateFilePortOut.java index 38fee3e2..7a04b5f3 100644 --- a/core/src/main/java/app/module/core/usecase/file/createFile/ports/CreateFilePortOut.java +++ b/core/src/main/java/app/module/core/usecase/file/createFile/ports/CreateFilePortOut.java @@ -2,6 +2,7 @@ package app.module.core.usecase.file.createFile.ports; import app.module.core.usecase.file.createFile.ports.application.domain.CreateFile; import app.module.core.usecase.file.createFile.ports.application.domain.CreateFileCmd; + import java.util.Optional; public interface CreateFilePortOut { diff --git a/core/src/main/java/app/module/core/usecase/file/createFile/ports/application/CreateFileService.java b/core/src/main/java/app/module/core/usecase/file/createFile/ports/application/CreateFileService.java index 3c9784a2..dc3be9d3 100644 --- a/core/src/main/java/app/module/core/usecase/file/createFile/ports/application/CreateFileService.java +++ b/core/src/main/java/app/module/core/usecase/file/createFile/ports/application/CreateFileService.java @@ -5,11 +5,12 @@ import app.module.core.usecase.file.createFile.ports.CreateFilePortIn; import app.module.core.usecase.file.createFile.ports.CreateFilePortOut; import app.module.core.usecase.file.createFile.ports.application.domain.CreateFile; import app.module.core.usecase.file.createFile.ports.application.domain.CreateFileCmd; -import java.util.Optional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.Optional; + @Slf4j @Service @RequiredArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/file/getFile/adapters/persistence/GetFileDao.java b/core/src/main/java/app/module/core/usecase/file/getFile/adapters/persistence/GetFileDao.java index e81f8b40..fca48550 100644 --- a/core/src/main/java/app/module/core/usecase/file/getFile/adapters/persistence/GetFileDao.java +++ b/core/src/main/java/app/module/core/usecase/file/getFile/adapters/persistence/GetFileDao.java @@ -3,10 +3,11 @@ package app.module.core.usecase.file.getFile.adapters.persistence; import app.module.core.usecase.file.getFile.ports.GetFilePortOut; import app.module.core.usecase.file.getFile.ports.application.domain.GetFile; import app.module.core.usecase.file.getFile.ports.application.domain.GetFileCmd; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository @RequiredArgsConstructor class GetFileDao implements GetFilePortOut { diff --git a/core/src/main/java/app/module/core/usecase/file/getFile/adapters/persistence/GetFileMapper.java b/core/src/main/java/app/module/core/usecase/file/getFile/adapters/persistence/GetFileMapper.java index 43e3e6bc..a97deace 100644 --- a/core/src/main/java/app/module/core/usecase/file/getFile/adapters/persistence/GetFileMapper.java +++ b/core/src/main/java/app/module/core/usecase/file/getFile/adapters/persistence/GetFileMapper.java @@ -1,10 +1,11 @@ package app.module.core.usecase.file.getFile.adapters.persistence; import app.module.core.usecase.file.getFile.ports.application.domain.GetFile; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Optional; + @Mapper public interface GetFileMapper { Optional findById(@Param("id") Long id); diff --git a/core/src/main/java/app/module/core/usecase/file/getFile/ports/GetFilePortIn.java b/core/src/main/java/app/module/core/usecase/file/getFile/ports/GetFilePortIn.java index 74ce421d..a7f619d7 100644 --- a/core/src/main/java/app/module/core/usecase/file/getFile/ports/GetFilePortIn.java +++ b/core/src/main/java/app/module/core/usecase/file/getFile/ports/GetFilePortIn.java @@ -2,6 +2,7 @@ package app.module.core.usecase.file.getFile.ports; import app.module.core.usecase.file.getFile.ports.application.domain.GetFile; import app.module.core.usecase.file.getFile.ports.application.domain.GetFileCmd; + import java.util.Optional; public interface GetFilePortIn { diff --git a/core/src/main/java/app/module/core/usecase/file/getFile/ports/GetFilePortOut.java b/core/src/main/java/app/module/core/usecase/file/getFile/ports/GetFilePortOut.java index 2672478e..f7ba0d34 100644 --- a/core/src/main/java/app/module/core/usecase/file/getFile/ports/GetFilePortOut.java +++ b/core/src/main/java/app/module/core/usecase/file/getFile/ports/GetFilePortOut.java @@ -2,6 +2,7 @@ package app.module.core.usecase.file.getFile.ports; import app.module.core.usecase.file.getFile.ports.application.domain.GetFile; import app.module.core.usecase.file.getFile.ports.application.domain.GetFileCmd; + import java.util.Optional; public interface GetFilePortOut { diff --git a/core/src/main/java/app/module/core/usecase/file/getFile/ports/application/GetFileService.java b/core/src/main/java/app/module/core/usecase/file/getFile/ports/application/GetFileService.java index f11eb7b0..44d4c584 100644 --- a/core/src/main/java/app/module/core/usecase/file/getFile/ports/application/GetFileService.java +++ b/core/src/main/java/app/module/core/usecase/file/getFile/ports/application/GetFileService.java @@ -4,10 +4,11 @@ import app.module.core.usecase.file.getFile.ports.GetFilePortIn; import app.module.core.usecase.file.getFile.ports.GetFilePortOut; import app.module.core.usecase.file.getFile.ports.application.domain.GetFile; import app.module.core.usecase.file.getFile.ports.application.domain.GetFileCmd; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class GetFileService implements GetFilePortIn { diff --git a/core/src/main/java/app/module/core/usecase/file/getFile/ports/application/domain/GetFile.java b/core/src/main/java/app/module/core/usecase/file/getFile/ports/application/domain/GetFile.java index 121f7ee7..8aec0198 100644 --- a/core/src/main/java/app/module/core/usecase/file/getFile/ports/application/domain/GetFile.java +++ b/core/src/main/java/app/module/core/usecase/file/getFile/ports/application/domain/GetFile.java @@ -1,12 +1,11 @@ package app.module.core.usecase.file.getFile.ports.application.domain; import app.module.core.config.application.enums.FileUploadType; -import java.time.LocalDateTime; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter public class GetFile { diff --git a/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/SaveToStoragePortIn.java b/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/SaveToStoragePortIn.java index 3515d000..f25aef5f 100644 --- a/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/SaveToStoragePortIn.java +++ b/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/SaveToStoragePortIn.java @@ -2,9 +2,10 @@ package app.module.core.usecase.file.saveToStorage.ports; import app.module.core.config.application.enums.FileUploadType; import app.module.core.usecase.file.saveToStorage.ports.application.domain.SaveToStorage; +import org.springframework.web.multipart.MultipartFile; + import java.io.IOException; import java.util.Optional; -import org.springframework.web.multipart.MultipartFile; public interface SaveToStoragePortIn { diff --git a/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/SaveToStorageService.java b/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/SaveToStorageService.java index 39d13b2c..1489d20f 100644 --- a/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/SaveToStorageService.java +++ b/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/SaveToStorageService.java @@ -9,21 +9,18 @@ import app.module.core.config.application.util.MessageUtil; import app.module.core.usecase.file.saveToStorage.ports.SaveToStoragePortIn; import app.module.core.usecase.file.saveToStorage.ports.application.domain.SaveToStorage; import app.module.core.usecase.file.saveToStorage.ports.application.strategy.FileUploadStrategy; -import java.io.IOException; -import java.io.InputStream; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.NoSuchElementException; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; import lombok.RequiredArgsConstructor; import org.apache.tika.Tika; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; +import java.io.InputStream; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.*; + @Service @RequiredArgsConstructor public class SaveToStorageService implements SaveToStoragePortIn { diff --git a/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/FileUploadStrategy.java b/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/FileUploadStrategy.java index a120ce1e..f04015db 100644 --- a/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/FileUploadStrategy.java +++ b/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/FileUploadStrategy.java @@ -1,9 +1,10 @@ package app.module.core.usecase.file.saveToStorage.ports.application.strategy; import app.module.core.config.application.enums.FileStorageType; -import java.io.IOException; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; + public interface FileUploadStrategy { FileStorageType getStorageType(); diff --git a/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/LocalStorageFileUploadStrategy.java b/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/LocalStorageFileUploadStrategy.java index e4a12d67..1814e238 100644 --- a/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/LocalStorageFileUploadStrategy.java +++ b/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/LocalStorageFileUploadStrategy.java @@ -3,17 +3,18 @@ package app.module.core.usecase.file.saveToStorage.ports.application.strategy; import app.module.core.config.application.enums.FileStorageType; import app.module.core.config.application.util.CommonUtil; import jakarta.annotation.PostConstruct; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; @Service @RequiredArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/SftpStorageFileUploadStrategy.java b/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/SftpStorageFileUploadStrategy.java index c468d3f0..606b6a83 100644 --- a/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/SftpStorageFileUploadStrategy.java +++ b/core/src/main/java/app/module/core/usecase/file/saveToStorage/ports/application/strategy/SftpStorageFileUploadStrategy.java @@ -16,11 +16,6 @@ import org.springframework.web.multipart.MultipartFile; import java.io.ByteArrayInputStream; import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.StandardCopyOption; @Service @RequiredArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/file/updateFile/adapters/persistence/UpdateFileDao.java b/core/src/main/java/app/module/core/usecase/file/updateFile/adapters/persistence/UpdateFileDao.java index bf43ea60..e25e5a0e 100644 --- a/core/src/main/java/app/module/core/usecase/file/updateFile/adapters/persistence/UpdateFileDao.java +++ b/core/src/main/java/app/module/core/usecase/file/updateFile/adapters/persistence/UpdateFileDao.java @@ -1,28 +1,17 @@ package app.module.core.usecase.file.updateFile.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.UploadFile; import app.module.core.config.application.annotation.DeleteCommand; -import app.module.core.config.application.annotation.UpdateCommand; -import app.module.core.config.application.enums.FileUploadType; import app.module.core.config.application.util.AuditUtil; -import app.module.core.config.application.util.CommonUtil; import app.module.core.config.application.util.SftpFileDeleteUtil; -import app.module.core.usecase.file.createFile.ports.CreateFilePortOut; -import app.module.core.usecase.file.createFile.ports.application.domain.CreateFile; -import app.module.core.usecase.file.createFile.ports.application.domain.CreateFileCmd; import app.module.core.usecase.file.updateFile.ports.UpdateFilePortOut; import app.module.core.usecase.file.updateFile.ports.application.domain.UpdateFileCmd; import app.module.core.usecase.file.updateFile.ports.application.domain.UpdateUploadFileParam; import app.module.core.usecase.file.updateFile.ports.application.domain.UploadFileDto; -import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.SftpException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; import java.util.List; -import java.util.Optional; @Slf4j @Repository diff --git a/core/src/main/java/app/module/core/usecase/file/updateFile/ports/application/domain/UpdateUploadFileParam.java b/core/src/main/java/app/module/core/usecase/file/updateFile/ports/application/domain/UpdateUploadFileParam.java index 283c1b2f..57545a09 100644 --- a/core/src/main/java/app/module/core/usecase/file/updateFile/ports/application/domain/UpdateUploadFileParam.java +++ b/core/src/main/java/app/module/core/usecase/file/updateFile/ports/application/domain/UpdateUploadFileParam.java @@ -1,7 +1,6 @@ package app.module.core.usecase.file.updateFile.ports.application.domain; import app.module.core.config.adapters.persistence.component.AuditCommand; -import app.module.core.config.application.enums.FileUploadType; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/app/module/core/usecase/file/updateFile/ports/application/domain/UploadFileDto.java b/core/src/main/java/app/module/core/usecase/file/updateFile/ports/application/domain/UploadFileDto.java index dcdcfd0b..fc73734b 100644 --- a/core/src/main/java/app/module/core/usecase/file/updateFile/ports/application/domain/UploadFileDto.java +++ b/core/src/main/java/app/module/core/usecase/file/updateFile/ports/application/domain/UploadFileDto.java @@ -1,9 +1,10 @@ package app.module.core.usecase.file.updateFile.ports.application.domain; import app.module.core.config.adapters.persistence.component.AuditCommand; -import app.module.core.config.adapters.persistence.component.AuditEntity; -import app.module.core.config.application.enums.FileUploadType; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import java.time.LocalDateTime; diff --git a/core/src/main/java/app/module/core/usecase/file/url/application/port/in/FileUrlService.java b/core/src/main/java/app/module/core/usecase/file/url/application/port/in/FileUrlService.java index 8cf512b9..5a108de9 100644 --- a/core/src/main/java/app/module/core/usecase/file/url/application/port/in/FileUrlService.java +++ b/core/src/main/java/app/module/core/usecase/file/url/application/port/in/FileUrlService.java @@ -2,11 +2,12 @@ package app.module.core.usecase.file.url.application.port.in; import app.module.core.config.application.enums.FileStorageType; import app.module.core.usecase.file.url.strategy.FileUrlStrategy; -import java.util.NoSuchElementException; -import java.util.Set; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.NoSuchElementException; +import java.util.Set; + @Service(value = "fileUrlService") @RequiredArgsConstructor public class FileUrlService implements FileUrlPortIn { diff --git a/core/src/main/java/app/module/core/usecase/getAttachment/adapters/web/GetAttachmentController.java b/core/src/main/java/app/module/core/usecase/getAttachment/adapters/web/GetAttachmentController.java index fd0f2b76..11aa3da5 100644 --- a/core/src/main/java/app/module/core/usecase/getAttachment/adapters/web/GetAttachmentController.java +++ b/core/src/main/java/app/module/core/usecase/getAttachment/adapters/web/GetAttachmentController.java @@ -5,14 +5,6 @@ import app.module.core.config.application.util.SftpFileDownloader; import app.module.core.usecase.file.getFile.ports.GetFilePortIn; import app.module.core.usecase.file.getFile.ports.application.domain.GetFile; import app.module.core.usecase.file.getFile.ports.application.domain.GetFileCmd; - -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.nio.file.Paths; - import com.jcraft.jsch.JSchException; import com.jcraft.jsch.SftpException; import lombok.RequiredArgsConstructor; @@ -27,7 +19,13 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.util.UriUtils; + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.nio.file.Paths; @Slf4j @RestController diff --git a/core/src/main/java/app/module/core/usecase/household/getHousehold/adapters/persistence/GetHouseholdDao.java b/core/src/main/java/app/module/core/usecase/household/getHousehold/adapters/persistence/GetHouseholdDao.java index 55afdf60..c01daaf6 100644 --- a/core/src/main/java/app/module/core/usecase/household/getHousehold/adapters/persistence/GetHouseholdDao.java +++ b/core/src/main/java/app/module/core/usecase/household/getHousehold/adapters/persistence/GetHouseholdDao.java @@ -3,10 +3,11 @@ package app.module.core.usecase.household.getHousehold.adapters.persistence; import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortOut; import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold; import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository @RequiredArgsConstructor class GetHouseholdDao implements GetHouseholdPortOut { diff --git a/core/src/main/java/app/module/core/usecase/household/getHousehold/adapters/persistence/GetHouseholdMapper.java b/core/src/main/java/app/module/core/usecase/household/getHousehold/adapters/persistence/GetHouseholdMapper.java index 37e28dd8..247f81a4 100644 --- a/core/src/main/java/app/module/core/usecase/household/getHousehold/adapters/persistence/GetHouseholdMapper.java +++ b/core/src/main/java/app/module/core/usecase/household/getHousehold/adapters/persistence/GetHouseholdMapper.java @@ -2,9 +2,10 @@ package app.module.core.usecase.household.getHousehold.adapters.persistence; import app.module.core.config.adapters.web.security.domain.CoreRole; import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold; +import org.apache.ibatis.annotations.Mapper; + import java.util.Optional; import java.util.Set; -import org.apache.ibatis.annotations.Mapper; @Mapper public interface GetHouseholdMapper { diff --git a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/GetHouseholdPortIn.java b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/GetHouseholdPortIn.java index 5ea9bde1..1e0561e3 100644 --- a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/GetHouseholdPortIn.java +++ b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/GetHouseholdPortIn.java @@ -1,9 +1,10 @@ package app.module.core.usecase.household.getHousehold.ports; -import java.util.Optional; import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold; import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; +import java.util.Optional; + public interface GetHouseholdPortIn { Optional operate(GetHouseholdCmd cmd); } \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/GetHouseholdPortOut.java b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/GetHouseholdPortOut.java index 3e3cf372..ebbe5d4f 100644 --- a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/GetHouseholdPortOut.java +++ b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/GetHouseholdPortOut.java @@ -1,9 +1,10 @@ package app.module.core.usecase.household.getHousehold.ports; -import java.util.Optional; import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold; import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; +import java.util.Optional; + public interface GetHouseholdPortOut { Optional operate(GetHouseholdCmd cmd); } \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/GetHouseholdService.java b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/GetHouseholdService.java index 4f8014de..08429ec0 100644 --- a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/GetHouseholdService.java +++ b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/GetHouseholdService.java @@ -1,13 +1,14 @@ package app.module.core.usecase.household.getHousehold.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold; -import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn; import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortOut; -import java.util.Optional; +import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold; +import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class GetHouseholdService implements GetHouseholdPortIn { diff --git a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java index 25820236..d55b3f43 100644 --- a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java +++ b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java @@ -1,17 +1,14 @@ package app.module.core.usecase.household.getHousehold.ports.application.domain; import app.module.core.config.adapters.web.security.domain.CoreRole; -import app.module.core.config.application.enums.SignUpType; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.Set; -import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.time.LocalDateTime; +import java.util.Set; + @Getter @Setter @NoArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/image/crop/application/port/in/ImageCropPortIn.java b/core/src/main/java/app/module/core/usecase/image/crop/application/port/in/ImageCropPortIn.java index 6fd90feb..4d9ac44f 100644 --- a/core/src/main/java/app/module/core/usecase/image/crop/application/port/in/ImageCropPortIn.java +++ b/core/src/main/java/app/module/core/usecase/image/crop/application/port/in/ImageCropPortIn.java @@ -1,9 +1,10 @@ package app.module.core.usecase.image.crop.application.port.in; import app.module.core.usecase.file.saveToStorage.ports.application.domain.SaveToStorage; -import java.io.IOException; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; + public interface ImageCropPortIn { void operate( diff --git a/core/src/main/java/app/module/core/usecase/image/crop/application/port/in/ImageCropService.java b/core/src/main/java/app/module/core/usecase/image/crop/application/port/in/ImageCropService.java index 360cf768..fb804593 100644 --- a/core/src/main/java/app/module/core/usecase/image/crop/application/port/in/ImageCropService.java +++ b/core/src/main/java/app/module/core/usecase/image/crop/application/port/in/ImageCropService.java @@ -3,17 +3,18 @@ package app.module.core.usecase.image.crop.application.port.in; import app.module.core.config.application.util.CommonUtil; import app.module.core.config.application.util.ImageUtil; import app.module.core.usecase.file.saveToStorage.ports.application.domain.SaveToStorage; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import javax.imageio.ImageIO; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; @Service @RequiredArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveDao.java b/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveDao.java index 9239302a..47d42c27 100644 --- a/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveDao.java +++ b/core/src/main/java/app/module/core/usecase/loggedinuser/save/adapter/persistence/LoggedInUserSaveDao.java @@ -1,8 +1,8 @@ package app.module.core.usecase.loggedinuser.save.adapter.persistence; +import app.module.core.config.adapters.persistence.entity.LoggedInUser; import app.module.core.usecase.loggedinuser.save.ports.LoggedInUserSavePortOut; import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd; -import app.module.core.config.adapters.persistence.entity.LoggedInUser; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogListDao.java b/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogListDao.java index b9e77f9c..49ad29fc 100644 --- a/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogListDao.java +++ b/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogListDao.java @@ -3,7 +3,6 @@ package app.module.core.usecase.operationlog.list.adapter.persistence; import app.module.core.usecase.operationlog.list.application.domain.OperationLogElement; import app.module.core.usecase.operationlog.list.application.domain.OperationLogListFilterCommand; import app.module.core.usecase.operationlog.list.application.port.out.OperationLogListPortOut; -import java.util.List; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.data.domain.Page; @@ -11,6 +10,8 @@ import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository @RequiredArgsConstructor class OperationLogListDao implements OperationLogListPortOut { diff --git a/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogMapper.java b/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogMapper.java index bdf0ef2a..adca345e 100644 --- a/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogMapper.java +++ b/core/src/main/java/app/module/core/usecase/operationlog/list/adapter/persistence/OperationLogMapper.java @@ -2,10 +2,11 @@ package app.module.core.usecase.operationlog.list.adapter.persistence; import app.module.core.usecase.operationlog.list.application.domain.OperationLogElement; import app.module.core.usecase.operationlog.list.application.domain.OperationLogListFilterCommand; -import org.springframework.data.domain.Pageable; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +import java.util.List; @Mapper public interface OperationLogMapper { diff --git a/core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogElement.java b/core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogElement.java index f3bb8649..cde4c942 100644 --- a/core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogElement.java +++ b/core/src/main/java/app/module/core/usecase/operationlog/list/application/domain/OperationLogElement.java @@ -3,11 +3,12 @@ package app.module.core.usecase.operationlog.list.application.domain; import app.module.core.config.application.component.AuditOutput; import app.module.core.config.application.enums.AppType; import app.module.core.config.application.enums.OperationLogType; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/privilege/list/adapters/persistence/PrivilegeListDao.java b/core/src/main/java/app/module/core/usecase/privilege/list/adapters/persistence/PrivilegeListDao.java index dbec3119..909d157f 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/list/adapters/persistence/PrivilegeListDao.java +++ b/core/src/main/java/app/module/core/usecase/privilege/list/adapters/persistence/PrivilegeListDao.java @@ -3,11 +3,12 @@ package app.module.core.usecase.privilege.list.adapters.persistence; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.privilege.list.ports.PrivilegeListPortOut; import app.module.core.usecase.privilege.list.ports.application.domain.PrivilegeElement; -import java.util.List; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.List; +import java.util.stream.Collectors; + @Repository @RequiredArgsConstructor public class PrivilegeListDao implements PrivilegeListPortOut { diff --git a/core/src/main/java/app/module/core/usecase/privilege/list/adapters/persistence/PrivilegeListMapper.java b/core/src/main/java/app/module/core/usecase/privilege/list/adapters/persistence/PrivilegeListMapper.java index 57a60460..8a904adb 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/list/adapters/persistence/PrivilegeListMapper.java +++ b/core/src/main/java/app/module/core/usecase/privilege/list/adapters/persistence/PrivilegeListMapper.java @@ -2,10 +2,11 @@ package app.module.core.usecase.privilege.list.adapters.persistence; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.privilege.list.adapters.persistence.model.PrivilegeListDto; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface PrivilegeListMapper { List findByAppType(@Param("appType") AppType appType); diff --git a/core/src/main/java/app/module/core/usecase/privilege/list/adapters/persistence/model/PrivilegeListDto.java b/core/src/main/java/app/module/core/usecase/privilege/list/adapters/persistence/model/PrivilegeListDto.java index 9efe5162..45bf1d62 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/list/adapters/persistence/model/PrivilegeListDto.java +++ b/core/src/main/java/app/module/core/usecase/privilege/list/adapters/persistence/model/PrivilegeListDto.java @@ -1,12 +1,12 @@ package app.module.core.usecase.privilege.list.adapters.persistence.model; import app.module.core.config.application.enums.AppType; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; -import lombok.NoArgsConstructor; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/privilege/list/ports/PrivilegeListPortIn.java b/core/src/main/java/app/module/core/usecase/privilege/list/ports/PrivilegeListPortIn.java index 0fb2607c..e61d41e2 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/list/ports/PrivilegeListPortIn.java +++ b/core/src/main/java/app/module/core/usecase/privilege/list/ports/PrivilegeListPortIn.java @@ -2,6 +2,7 @@ package app.module.core.usecase.privilege.list.ports; import app.module.core.config.application.component.AuditOutput; import app.module.core.config.application.enums.AppType; + import java.util.List; public interface PrivilegeListPortIn { diff --git a/core/src/main/java/app/module/core/usecase/privilege/list/ports/PrivilegeListPortOut.java b/core/src/main/java/app/module/core/usecase/privilege/list/ports/PrivilegeListPortOut.java index 00ea51b3..3f7b971c 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/list/ports/PrivilegeListPortOut.java +++ b/core/src/main/java/app/module/core/usecase/privilege/list/ports/PrivilegeListPortOut.java @@ -2,6 +2,7 @@ package app.module.core.usecase.privilege.list.ports; import app.module.core.config.application.component.AuditOutput; import app.module.core.config.application.enums.AppType; + import java.util.List; public interface PrivilegeListPortOut { diff --git a/core/src/main/java/app/module/core/usecase/privilege/list/ports/application/PrivilegeListService.java b/core/src/main/java/app/module/core/usecase/privilege/list/ports/application/PrivilegeListService.java index 202f6e81..0b91e9d0 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/list/ports/application/PrivilegeListService.java +++ b/core/src/main/java/app/module/core/usecase/privilege/list/ports/application/PrivilegeListService.java @@ -4,10 +4,11 @@ import app.module.core.config.application.enums.AppType; import app.module.core.usecase.privilege.list.ports.PrivilegeListPortIn; import app.module.core.usecase.privilege.list.ports.PrivilegeListPortOut; import app.module.core.usecase.privilege.list.ports.application.domain.PrivilegeElement; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor public class PrivilegeListService implements PrivilegeListPortIn { diff --git a/core/src/main/java/app/module/core/usecase/privilege/list/ports/application/domain/PrivilegeElement.java b/core/src/main/java/app/module/core/usecase/privilege/list/ports/application/domain/PrivilegeElement.java index 9b2ce39d..930b1404 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/list/ports/application/domain/PrivilegeElement.java +++ b/core/src/main/java/app/module/core/usecase/privilege/list/ports/application/domain/PrivilegeElement.java @@ -1,11 +1,12 @@ package app.module.core.usecase.privilege.list.ports.application.domain; import app.module.core.config.application.component.AuditOutput; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/privilege/remove/ports/application/domain/PrivilegeRemoveOutCmd.java b/core/src/main/java/app/module/core/usecase/privilege/remove/ports/application/domain/PrivilegeRemoveOutCmd.java index fd51e4f3..d3281938 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/remove/ports/application/domain/PrivilegeRemoveOutCmd.java +++ b/core/src/main/java/app/module/core/usecase/privilege/remove/ports/application/domain/PrivilegeRemoveOutCmd.java @@ -1,7 +1,6 @@ package app.module.core.usecase.privilege.remove.ports.application.domain; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeNextOrderNoMapper.java b/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeNextOrderNoMapper.java index 24b820ba..50d059ab 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeNextOrderNoMapper.java +++ b/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeNextOrderNoMapper.java @@ -1,8 +1,9 @@ package app.module.core.usecase.privilege.save.adapters.persistence; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface PrivilegeNextOrderNoMapper { Optional findMaxOrderNo(); diff --git a/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveMapper.java b/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveMapper.java index 3e4f1ca1..c3235914 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveMapper.java +++ b/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveMapper.java @@ -1,6 +1,5 @@ package app.module.core.usecase.privilege.save.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Privilege; import app.module.core.usecase.privilege.save.ports.application.domain.PrivilegeSaveCommand; import org.apache.ibatis.annotations.Mapper; diff --git a/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveRepo.java b/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveRepo.java index 8e29a60a..16e89600 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveRepo.java +++ b/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveRepo.java @@ -1,9 +1,9 @@ package app.module.core.usecase.privilege.save.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Privilege; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface PrivilegeSaveRepo { diff --git a/core/src/main/java/app/module/core/usecase/privilege/save/ports/application/PrivilegeSaveService.java b/core/src/main/java/app/module/core/usecase/privilege/save/ports/application/PrivilegeSaveService.java index f0418628..b9a56a68 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/save/ports/application/PrivilegeSaveService.java +++ b/core/src/main/java/app/module/core/usecase/privilege/save/ports/application/PrivilegeSaveService.java @@ -7,10 +7,11 @@ import app.module.core.usecase.privilege.save.ports.PrivilegeSavePortIn; import app.module.core.usecase.privilege.save.ports.PrivilegeSavePortOut; import app.module.core.usecase.privilege.save.ports.application.domain.PrivilegeSaveCommand; import app.module.core.usecase.privilege.view.ports.PrivilegeViewPortOut; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor public class PrivilegeSaveService implements PrivilegeSavePortIn { diff --git a/core/src/main/java/app/module/core/usecase/privilege/sort/ports/PrivilegeSortPortIn.java b/core/src/main/java/app/module/core/usecase/privilege/sort/ports/PrivilegeSortPortIn.java index 6bcd084f..d52ca565 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/sort/ports/PrivilegeSortPortIn.java +++ b/core/src/main/java/app/module/core/usecase/privilege/sort/ports/PrivilegeSortPortIn.java @@ -1,6 +1,7 @@ package app.module.core.usecase.privilege.sort.ports; import app.module.core.usecase.privilege.sort.ports.application.domain.PrivilegeSortCmd; + import java.util.List; public interface PrivilegeSortPortIn { diff --git a/core/src/main/java/app/module/core/usecase/privilege/sort/ports/application/PrivilegeSortService.java b/core/src/main/java/app/module/core/usecase/privilege/sort/ports/application/PrivilegeSortService.java index eedd6d7f..6f9ccd04 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/sort/ports/application/PrivilegeSortService.java +++ b/core/src/main/java/app/module/core/usecase/privilege/sort/ports/application/PrivilegeSortService.java @@ -3,10 +3,11 @@ package app.module.core.usecase.privilege.sort.ports.application; import app.module.core.usecase.privilege.sort.ports.PrivilegeSortPortIn; import app.module.core.usecase.privilege.sort.ports.PrivilegeSortPortOut; import app.module.core.usecase.privilege.sort.ports.application.domain.PrivilegeSortCmd; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; @Service @RequiredArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/privilege/view/adapters/persistence/PrivilegeViewMapper.java b/core/src/main/java/app/module/core/usecase/privilege/view/adapters/persistence/PrivilegeViewMapper.java index f49ff2e6..f66822c9 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/view/adapters/persistence/PrivilegeViewMapper.java +++ b/core/src/main/java/app/module/core/usecase/privilege/view/adapters/persistence/PrivilegeViewMapper.java @@ -1,9 +1,10 @@ package app.module.core.usecase.privilege.view.adapters.persistence; import app.module.core.usecase.privilege.view.ports.application.domain.PrivilegeView; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface PrivilegeViewMapper { Optional findById(String id); diff --git a/core/src/main/java/app/module/core/usecase/privilege/view/ports/application/domain/PrivilegeView.java b/core/src/main/java/app/module/core/usecase/privilege/view/ports/application/domain/PrivilegeView.java index 724e5d4b..7b4c2046 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/view/ports/application/domain/PrivilegeView.java +++ b/core/src/main/java/app/module/core/usecase/privilege/view/ports/application/domain/PrivilegeView.java @@ -1,11 +1,12 @@ package app.module.core.usecase.privilege.view.ports.application.domain; import app.module.core.config.application.component.AuditOutput; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/role/list/adapters/persistence/RoleListDao.java b/core/src/main/java/app/module/core/usecase/role/list/adapters/persistence/RoleListDao.java index 2cfbe867..64d2f0f1 100644 --- a/core/src/main/java/app/module/core/usecase/role/list/adapters/persistence/RoleListDao.java +++ b/core/src/main/java/app/module/core/usecase/role/list/adapters/persistence/RoleListDao.java @@ -6,15 +6,15 @@ import app.module.core.usecase.role.list.adapters.persistence.model.RoleListDto; import app.module.core.usecase.role.list.ports.RoleListPortOut; import app.module.core.usecase.role.list.ports.application.domain.PrivilegeElement; import app.module.core.usecase.role.list.ports.application.domain.RoleElement; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + @Repository @RequiredArgsConstructor public class RoleListDao implements RoleListPortOut { diff --git a/core/src/main/java/app/module/core/usecase/role/list/adapters/persistence/RoleListMapper.java b/core/src/main/java/app/module/core/usecase/role/list/adapters/persistence/RoleListMapper.java index aafb5c7d..aa116421 100644 --- a/core/src/main/java/app/module/core/usecase/role/list/adapters/persistence/RoleListMapper.java +++ b/core/src/main/java/app/module/core/usecase/role/list/adapters/persistence/RoleListMapper.java @@ -3,10 +3,11 @@ package app.module.core.usecase.role.list.adapters.persistence; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.role.list.adapters.persistence.model.RoleHasPrivilegeDto; import app.module.core.usecase.role.list.adapters.persistence.model.RoleListDto; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface RoleListMapper { List findRolesByAppType(@Param("appType") AppType appType); diff --git a/core/src/main/java/app/module/core/usecase/role/list/adapters/persistence/model/RoleListDto.java b/core/src/main/java/app/module/core/usecase/role/list/adapters/persistence/model/RoleListDto.java index fd94026f..bd0c3147 100644 --- a/core/src/main/java/app/module/core/usecase/role/list/adapters/persistence/model/RoleListDto.java +++ b/core/src/main/java/app/module/core/usecase/role/list/adapters/persistence/model/RoleListDto.java @@ -1,11 +1,12 @@ package app.module.core.usecase.role.list.adapters.persistence.model; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @NoArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/role/list/ports/RoleListPortIn.java b/core/src/main/java/app/module/core/usecase/role/list/ports/RoleListPortIn.java index 25b2e3c8..8a7b4455 100644 --- a/core/src/main/java/app/module/core/usecase/role/list/ports/RoleListPortIn.java +++ b/core/src/main/java/app/module/core/usecase/role/list/ports/RoleListPortIn.java @@ -2,6 +2,7 @@ package app.module.core.usecase.role.list.ports; import app.module.core.config.application.component.AuditOutput; import app.module.core.config.application.enums.AppType; + import java.util.List; public interface RoleListPortIn { diff --git a/core/src/main/java/app/module/core/usecase/role/list/ports/RoleListPortOut.java b/core/src/main/java/app/module/core/usecase/role/list/ports/RoleListPortOut.java index 4974e175..64bda824 100644 --- a/core/src/main/java/app/module/core/usecase/role/list/ports/RoleListPortOut.java +++ b/core/src/main/java/app/module/core/usecase/role/list/ports/RoleListPortOut.java @@ -2,6 +2,7 @@ package app.module.core.usecase.role.list.ports; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.role.list.ports.application.domain.RoleElement; + import java.util.List; public interface RoleListPortOut { diff --git a/core/src/main/java/app/module/core/usecase/role/list/ports/application/RoleListService.java b/core/src/main/java/app/module/core/usecase/role/list/ports/application/RoleListService.java index 20333dc4..7b0c0d13 100644 --- a/core/src/main/java/app/module/core/usecase/role/list/ports/application/RoleListService.java +++ b/core/src/main/java/app/module/core/usecase/role/list/ports/application/RoleListService.java @@ -4,10 +4,11 @@ import app.module.core.config.application.enums.AppType; import app.module.core.usecase.role.list.ports.RoleListPortIn; import app.module.core.usecase.role.list.ports.RoleListPortOut; import app.module.core.usecase.role.list.ports.application.domain.RoleElement; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; @Service @RequiredArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/role/list/ports/application/domain/RoleElement.java b/core/src/main/java/app/module/core/usecase/role/list/ports/application/domain/RoleElement.java index a330cf9f..5f30fdca 100644 --- a/core/src/main/java/app/module/core/usecase/role/list/ports/application/domain/RoleElement.java +++ b/core/src/main/java/app/module/core/usecase/role/list/ports/application/domain/RoleElement.java @@ -1,13 +1,14 @@ package app.module.core.usecase.role.list.ports.application.domain; import app.module.core.config.application.component.AuditOutput; -import java.time.LocalDateTime; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.time.LocalDateTime; +import java.util.List; + @Getter @Setter @NoArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleNextOrderNoMapper.java b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleNextOrderNoMapper.java index 58265c13..fc25664d 100644 --- a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleNextOrderNoMapper.java +++ b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleNextOrderNoMapper.java @@ -1,8 +1,9 @@ package app.module.core.usecase.role.save.adapters.persistence; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface RoleNextOrderNoMapper { Optional getMaxOrderNo(); diff --git a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveDao.java b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveDao.java index f0e4c636..52d71432 100644 --- a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveDao.java +++ b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveDao.java @@ -3,18 +3,17 @@ package app.module.core.usecase.role.save.adapters.persistence; import app.module.core.config.adapters.persistence.entity.Role; import app.module.core.config.application.enums.AppType; import app.module.core.config.application.util.AuditUtil; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.role.save.ports.RoleSavePortOut; import app.module.core.usecase.role.save.adapters.persistence.model.RoleHasPrivilegeDeleteParam; import app.module.core.usecase.role.save.adapters.persistence.model.RoleHasPrivilegeSaveParam; +import app.module.core.usecase.role.save.ports.RoleSavePortOut; import app.module.core.usecase.role.view.adapters.persistence.RoleViewMapper; -import java.time.LocalDateTime; -import java.util.List; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + @Repository @RequiredArgsConstructor public class RoleSaveDao implements RoleSavePortOut { diff --git a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java index 73aee0d0..9fc5c208 100644 --- a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java +++ b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java @@ -1,8 +1,6 @@ package app.module.core.usecase.role.save.adapters.persistence.model; import app.module.core.config.adapters.persistence.component.AuditCommand; -import app.module.core.config.application.util.AuditUtil; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeSaveParam.java b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeSaveParam.java index 7ac4e4b0..6e1507b7 100644 --- a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeSaveParam.java +++ b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeSaveParam.java @@ -1,12 +1,12 @@ package app.module.core.usecase.role.save.adapters.persistence.model; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.time.LocalDateTime; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.util.List; + @AllArgsConstructor @Getter @Setter diff --git a/core/src/main/java/app/module/core/usecase/role/save/ports/RoleSavePortIn.java b/core/src/main/java/app/module/core/usecase/role/save/ports/RoleSavePortIn.java index 46ecce7a..f75ea5e2 100644 --- a/core/src/main/java/app/module/core/usecase/role/save/ports/RoleSavePortIn.java +++ b/core/src/main/java/app/module/core/usecase/role/save/ports/RoleSavePortIn.java @@ -1,6 +1,7 @@ package app.module.core.usecase.role.save.ports; import app.module.core.config.application.enums.AppType; + import java.util.List; public interface RoleSavePortIn { diff --git a/core/src/main/java/app/module/core/usecase/role/save/ports/RoleSavePortOut.java b/core/src/main/java/app/module/core/usecase/role/save/ports/RoleSavePortOut.java index 4e7bde55..e1223355 100644 --- a/core/src/main/java/app/module/core/usecase/role/save/ports/RoleSavePortOut.java +++ b/core/src/main/java/app/module/core/usecase/role/save/ports/RoleSavePortOut.java @@ -1,6 +1,7 @@ package app.module.core.usecase.role.save.ports; import app.module.core.config.application.enums.AppType; + import java.util.List; public interface RoleSavePortOut { diff --git a/core/src/main/java/app/module/core/usecase/role/save/ports/application/RoleSaveService.java b/core/src/main/java/app/module/core/usecase/role/save/ports/application/RoleSaveService.java index 7c58269b..8b7345bb 100644 --- a/core/src/main/java/app/module/core/usecase/role/save/ports/application/RoleSaveService.java +++ b/core/src/main/java/app/module/core/usecase/role/save/ports/application/RoleSaveService.java @@ -7,11 +7,12 @@ import app.module.core.usecase.role.save.ports.RoleNextOrderNoPortOut; import app.module.core.usecase.role.save.ports.RoleSavePortIn; import app.module.core.usecase.role.save.ports.RoleSavePortOut; import app.module.core.usecase.role.view.ports.RoleViewPortIn; -import java.util.List; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Optional; + @Service @RequiredArgsConstructor public class RoleSaveService implements RoleSavePortIn { diff --git a/core/src/main/java/app/module/core/usecase/role/sort/ports/RoleSortPortIn.java b/core/src/main/java/app/module/core/usecase/role/sort/ports/RoleSortPortIn.java index 6ba3593e..3bef9cee 100644 --- a/core/src/main/java/app/module/core/usecase/role/sort/ports/RoleSortPortIn.java +++ b/core/src/main/java/app/module/core/usecase/role/sort/ports/RoleSortPortIn.java @@ -1,6 +1,7 @@ package app.module.core.usecase.role.sort.ports; import app.module.core.usecase.role.sort.ports.application.domain.RoleSortCommand; + import java.util.List; public interface RoleSortPortIn { diff --git a/core/src/main/java/app/module/core/usecase/role/sort/ports/application/RoleSortService.java b/core/src/main/java/app/module/core/usecase/role/sort/ports/application/RoleSortService.java index 478394fb..658a6d40 100644 --- a/core/src/main/java/app/module/core/usecase/role/sort/ports/application/RoleSortService.java +++ b/core/src/main/java/app/module/core/usecase/role/sort/ports/application/RoleSortService.java @@ -3,10 +3,11 @@ package app.module.core.usecase.role.sort.ports.application; import app.module.core.usecase.role.sort.ports.RoleSortPortIn; import app.module.core.usecase.role.sort.ports.RoleSortPortOut; import app.module.core.usecase.role.sort.ports.application.domain.RoleSortCommand; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; @Service @RequiredArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/role/view/adapters/persistence/RoleViewDao.java b/core/src/main/java/app/module/core/usecase/role/view/adapters/persistence/RoleViewDao.java index f8c75491..33bfe0ff 100644 --- a/core/src/main/java/app/module/core/usecase/role/view/adapters/persistence/RoleViewDao.java +++ b/core/src/main/java/app/module/core/usecase/role/view/adapters/persistence/RoleViewDao.java @@ -1,16 +1,10 @@ package app.module.core.usecase.role.view.adapters.persistence; -import app.module.core.config.adapters.persistence.repository.RoleRepo; -import app.module.core.usecase.role.view.adapters.persistence.model.RoleViewDto; import app.module.core.usecase.role.view.ports.RoleViewPortOut; import app.module.core.usecase.role.view.ports.application.domain.RoleView; -import java.util.List; -import java.util.Optional; -import org.springframework.transaction.annotation.Transactional; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; @Repository @RequiredArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/role/view/adapters/persistence/RoleViewMapper.java b/core/src/main/java/app/module/core/usecase/role/view/adapters/persistence/RoleViewMapper.java index 0cc07044..606c33a9 100644 --- a/core/src/main/java/app/module/core/usecase/role/view/adapters/persistence/RoleViewMapper.java +++ b/core/src/main/java/app/module/core/usecase/role/view/adapters/persistence/RoleViewMapper.java @@ -1,11 +1,12 @@ package app.module.core.usecase.role.view.adapters.persistence; import app.module.core.usecase.role.view.adapters.persistence.model.RoleViewDto; -import java.util.List; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; +import java.util.Optional; + @Mapper public interface RoleViewMapper { Optional findRoleById(@Param("roleId") String roleId); diff --git a/core/src/main/java/app/module/core/usecase/role/view/adapters/persistence/model/RoleViewDto.java b/core/src/main/java/app/module/core/usecase/role/view/adapters/persistence/model/RoleViewDto.java index 18c044bd..747ca0c4 100644 --- a/core/src/main/java/app/module/core/usecase/role/view/adapters/persistence/model/RoleViewDto.java +++ b/core/src/main/java/app/module/core/usecase/role/view/adapters/persistence/model/RoleViewDto.java @@ -1,10 +1,10 @@ package app.module.core.usecase.role.view.adapters.persistence.model; -import java.time.LocalDateTime; -import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter public class RoleViewDto { diff --git a/core/src/main/java/app/module/core/usecase/role/view/ports/application/domain/RoleView.java b/core/src/main/java/app/module/core/usecase/role/view/ports/application/domain/RoleView.java index 40c861f1..9187ddc4 100644 --- a/core/src/main/java/app/module/core/usecase/role/view/ports/application/domain/RoleView.java +++ b/core/src/main/java/app/module/core/usecase/role/view/ports/application/domain/RoleView.java @@ -1,13 +1,14 @@ package app.module.core.usecase.role.view.ports.application.domain; import app.module.core.config.application.component.AuditOutput; -import java.time.LocalDateTime; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; +import java.util.List; + @Getter @Setter @Builder diff --git a/core/src/main/java/app/module/core/usecase/uicode/list/adapters/persistence/UICodeListDao.java b/core/src/main/java/app/module/core/usecase/uicode/list/adapters/persistence/UICodeListDao.java index 5d5db3d5..fbcd113a 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/list/adapters/persistence/UICodeListDao.java +++ b/core/src/main/java/app/module/core/usecase/uicode/list/adapters/persistence/UICodeListDao.java @@ -2,11 +2,11 @@ package app.module.core.usecase.uicode.list.adapters.persistence; import app.module.core.usecase.uicode.list.ports.UICodeListPortOut; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; -import java.util.List; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository @RequiredArgsConstructor class UICodeListDao implements UICodeListPortOut { diff --git a/core/src/main/java/app/module/core/usecase/uicode/list/adapters/persistence/UICodeListMapper.java b/core/src/main/java/app/module/core/usecase/uicode/list/adapters/persistence/UICodeListMapper.java index 63371733..f9301e7c 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/list/adapters/persistence/UICodeListMapper.java +++ b/core/src/main/java/app/module/core/usecase/uicode/list/adapters/persistence/UICodeListMapper.java @@ -1,10 +1,11 @@ package app.module.core.usecase.uicode.list.adapters.persistence; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface UICodeListMapper { List findByParentId(@Param("parentId") String parentId); diff --git a/core/src/main/java/app/module/core/usecase/uicode/list/ports/UICodeListPortIn.java b/core/src/main/java/app/module/core/usecase/uicode/list/ports/UICodeListPortIn.java index 4181df5c..f8d791a3 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/list/ports/UICodeListPortIn.java +++ b/core/src/main/java/app/module/core/usecase/uicode/list/ports/UICodeListPortIn.java @@ -1,6 +1,7 @@ package app.module.core.usecase.uicode.list.ports; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; + import java.util.List; public interface UICodeListPortIn { diff --git a/core/src/main/java/app/module/core/usecase/uicode/list/ports/UICodeListPortOut.java b/core/src/main/java/app/module/core/usecase/uicode/list/ports/UICodeListPortOut.java index c7043ce2..628db38a 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/list/ports/UICodeListPortOut.java +++ b/core/src/main/java/app/module/core/usecase/uicode/list/ports/UICodeListPortOut.java @@ -1,6 +1,7 @@ package app.module.core.usecase.uicode.list.ports; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; + import java.util.List; public interface UICodeListPortOut { diff --git a/core/src/main/java/app/module/core/usecase/uicode/list/ports/application/UICodeListService.java b/core/src/main/java/app/module/core/usecase/uicode/list/ports/application/UICodeListService.java index 5ffcc4a6..c8d34dd9 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/list/ports/application/UICodeListService.java +++ b/core/src/main/java/app/module/core/usecase/uicode/list/ports/application/UICodeListService.java @@ -3,11 +3,12 @@ package app.module.core.usecase.uicode.list.ports.application; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortOut; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor class UICodeListService implements UICodeListPortIn { diff --git a/core/src/main/java/app/module/core/usecase/uicode/remove/ports/application/domain/UICodeRemoveOutCmd.java b/core/src/main/java/app/module/core/usecase/uicode/remove/ports/application/domain/UICodeRemoveOutCmd.java index d2c18522..df477988 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/remove/ports/application/domain/UICodeRemoveOutCmd.java +++ b/core/src/main/java/app/module/core/usecase/uicode/remove/ports/application/domain/UICodeRemoveOutCmd.java @@ -1,7 +1,6 @@ package app.module.core.usecase.uicode.remove.ports.application.domain; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeMaxOrderNoDao.java b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeMaxOrderNoDao.java index 9a8eda89..2ab6c332 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeMaxOrderNoDao.java +++ b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeMaxOrderNoDao.java @@ -1,10 +1,11 @@ package app.module.core.usecase.uicode.save.adapters.persistence; import app.module.core.usecase.uicode.save.ports.UICodeMaxOrderNoPortOut; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository @RequiredArgsConstructor class UICodeMaxOrderNoDao implements UICodeMaxOrderNoPortOut { diff --git a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeMaxOrderNoMapper.java b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeMaxOrderNoMapper.java index 36f1f6a5..4e6a2dcc 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeMaxOrderNoMapper.java +++ b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeMaxOrderNoMapper.java @@ -1,8 +1,9 @@ package app.module.core.usecase.uicode.save.adapters.persistence; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface UICodeMaxOrderNoMapper { Optional getMaxOrderNo(String parentId); diff --git a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/model/DeleteUICodeParam.java b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/model/DeleteUICodeParam.java index 2a86172d..502af288 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/model/DeleteUICodeParam.java +++ b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/model/DeleteUICodeParam.java @@ -1,10 +1,11 @@ package app.module.core.usecase.uicode.save.adapters.persistence.model; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/uicode/sort/adapters/web/UICodeSortController.java b/core/src/main/java/app/module/core/usecase/uicode/sort/adapters/web/UICodeSortController.java index fcb666e0..4144c84a 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/sort/adapters/web/UICodeSortController.java +++ b/core/src/main/java/app/module/core/usecase/uicode/sort/adapters/web/UICodeSortController.java @@ -2,8 +2,6 @@ package app.module.core.usecase.uicode.sort.adapters.web; import app.module.core.usecase.uicode.sort.ports.UICodeSortPortIn; import app.module.core.usecase.uicode.sort.ports.application.domain.UICodeSortCommand; -import java.util.List; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -11,6 +9,9 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.stream.Collectors; + @RestController @RequiredArgsConstructor class UICodeSortController { diff --git a/core/src/main/java/app/module/core/usecase/uicode/sort/ports/UICodeSortPortIn.java b/core/src/main/java/app/module/core/usecase/uicode/sort/ports/UICodeSortPortIn.java index ab9403d6..56b5db78 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/sort/ports/UICodeSortPortIn.java +++ b/core/src/main/java/app/module/core/usecase/uicode/sort/ports/UICodeSortPortIn.java @@ -1,6 +1,7 @@ package app.module.core.usecase.uicode.sort.ports; import app.module.core.usecase.uicode.sort.ports.application.domain.UICodeSortCommand; + import java.util.List; public interface UICodeSortPortIn { diff --git a/core/src/main/java/app/module/core/usecase/uicode/sort/ports/application/UICodeSortService.java b/core/src/main/java/app/module/core/usecase/uicode/sort/ports/application/UICodeSortService.java index d8cb94d1..4d3a7fb6 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/sort/ports/application/UICodeSortService.java +++ b/core/src/main/java/app/module/core/usecase/uicode/sort/ports/application/UICodeSortService.java @@ -3,11 +3,12 @@ package app.module.core.usecase.uicode.sort.ports.application; import app.module.core.usecase.uicode.sort.ports.UICodeSortPortIn; import app.module.core.usecase.uicode.sort.ports.UICodeSortPortOut; import app.module.core.usecase.uicode.sort.ports.application.domain.UICodeSortCommand; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; @Service @RequiredArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierDao.java b/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierDao.java index 98558ccc..dfcfd939 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierDao.java +++ b/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierDao.java @@ -3,12 +3,13 @@ package app.module.core.usecase.uicode.toptier.adapters.persistence; import app.module.core.config.adapters.persistence.entity.UICode; import app.module.core.usecase.uicode.toptier.ports.UICodeTopTierPortOut; import app.module.core.usecase.uicode.toptier.ports.application.domain.UICodeTopTier; -import java.util.List; -import org.springframework.transaction.annotation.Transactional; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.stream.Collectors; @Repository @RequiredArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierMapper.java b/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierMapper.java index e291e8df..9a92296c 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierMapper.java +++ b/core/src/main/java/app/module/core/usecase/uicode/toptier/adapters/persistence/UICodeTopTierMapper.java @@ -1,9 +1,10 @@ package app.module.core.usecase.uicode.toptier.adapters.persistence; import app.module.core.config.adapters.persistence.entity.UICode; -import java.util.List; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface UICodeTopTierMapper { UICode findTopTier(); // parent_id IS NULL 인 UICode 조회 diff --git a/core/src/main/java/app/module/core/usecase/uicode/toptier/ports/application/domain/UICodeTopTier.java b/core/src/main/java/app/module/core/usecase/uicode/toptier/ports/application/domain/UICodeTopTier.java index d2584811..a9961188 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/toptier/ports/application/domain/UICodeTopTier.java +++ b/core/src/main/java/app/module/core/usecase/uicode/toptier/ports/application/domain/UICodeTopTier.java @@ -1,10 +1,11 @@ package app.module.core.usecase.uicode.toptier.ports.application.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/uicode/view/adapters/persistence/UICodeViewMapper.java b/core/src/main/java/app/module/core/usecase/uicode/view/adapters/persistence/UICodeViewMapper.java index 8686e322..c7910c96 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/view/adapters/persistence/UICodeViewMapper.java +++ b/core/src/main/java/app/module/core/usecase/uicode/view/adapters/persistence/UICodeViewMapper.java @@ -1,9 +1,10 @@ package app.module.core.usecase.uicode.view.adapters.persistence; import app.module.core.usecase.uicode.view.ports.application.domain.UICodeView; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface UICodeViewMapper { Optional findById(String id); diff --git a/core/src/main/java/app/module/core/usecase/uicode/view/ports/UICodeViewPortIn.java b/core/src/main/java/app/module/core/usecase/uicode/view/ports/UICodeViewPortIn.java index f32bcf97..fd00c726 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/view/ports/UICodeViewPortIn.java +++ b/core/src/main/java/app/module/core/usecase/uicode/view/ports/UICodeViewPortIn.java @@ -1,6 +1,7 @@ package app.module.core.usecase.uicode.view.ports; import app.module.core.usecase.uicode.view.ports.application.domain.UICodeView; + import java.util.Optional; public interface UICodeViewPortIn { diff --git a/core/src/main/java/app/module/core/usecase/uicode/view/ports/application/UICodeViewService.java b/core/src/main/java/app/module/core/usecase/uicode/view/ports/application/UICodeViewService.java index 903d9367..c026bdcc 100644 --- a/core/src/main/java/app/module/core/usecase/uicode/view/ports/application/UICodeViewService.java +++ b/core/src/main/java/app/module/core/usecase/uicode/view/ports/application/UICodeViewService.java @@ -3,10 +3,11 @@ package app.module.core.usecase.uicode.view.ports.application; import app.module.core.usecase.uicode.view.ports.UICodeViewPortIn; import app.module.core.usecase.uicode.view.ports.UICodeViewPortOut; import app.module.core.usecase.uicode.view.ports.application.domain.UICodeView; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class UICodeViewService implements UICodeViewPortIn { diff --git a/core/src/main/java/app/module/core/usecase/uri/ancestry/ports/URIAncestryPortIn.java b/core/src/main/java/app/module/core/usecase/uri/ancestry/ports/URIAncestryPortIn.java index 9a7fd8e0..a1f3786e 100644 --- a/core/src/main/java/app/module/core/usecase/uri/ancestry/ports/URIAncestryPortIn.java +++ b/core/src/main/java/app/module/core/usecase/uri/ancestry/ports/URIAncestryPortIn.java @@ -2,6 +2,7 @@ package app.module.core.usecase.uri.ancestry.ports; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.uri.ancestry.ports.application.domain.URIAncestry; + import java.util.List; public interface URIAncestryPortIn { diff --git a/core/src/main/java/app/module/core/usecase/uri/ancestry/ports/application/URIAncestryService.java b/core/src/main/java/app/module/core/usecase/uri/ancestry/ports/application/URIAncestryService.java index 35d0f885..4457e26c 100644 --- a/core/src/main/java/app/module/core/usecase/uri/ancestry/ports/application/URIAncestryService.java +++ b/core/src/main/java/app/module/core/usecase/uri/ancestry/ports/application/URIAncestryService.java @@ -6,12 +6,13 @@ import app.module.core.usecase.uri.ancestry.ports.application.domain.URIAncestry import app.module.core.usecase.uri.currentmatch.ports.application.domain.URICurrentMatching; import app.module.core.usecase.uri.view.ports.URIViewPortIn; import app.module.core.usecase.uri.view.ports.application.domain.URIView; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Optional; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/URICurrentMatchingService.java b/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/URICurrentMatchingService.java index 7239e81e..505b5420 100644 --- a/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/URICurrentMatchingService.java +++ b/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/URICurrentMatchingService.java @@ -6,13 +6,14 @@ import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.uri.currentmatch.ports.URICurrentMatchingPortIn; import app.module.core.usecase.uri.currentmatch.ports.application.domain.URICurrentMatching; import app.module.core.usecase.uri.getUris.ports.GetUrisPortIn; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + @Service @RequiredArgsConstructor @Slf4j diff --git a/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/domain/URICurrentMatching.java b/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/domain/URICurrentMatching.java index 793ccd8a..61634219 100644 --- a/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/domain/URICurrentMatching.java +++ b/core/src/main/java/app/module/core/usecase/uri/currentmatch/ports/application/domain/URICurrentMatching.java @@ -1,11 +1,12 @@ package app.module.core.usecase.uri.currentmatch.ports.application.domain; import app.module.core.config.application.enums.AppType; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.util.Set; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisDao.java b/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisDao.java index 1da805da..6d2ebef9 100644 --- a/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisDao.java +++ b/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisDao.java @@ -3,18 +3,17 @@ package app.module.core.usecase.uri.getUris.adapters.persistence; import app.module.core.config.adapters.persistence.entity.Role; import app.module.core.config.adapters.persistence.entity.RoleHasPrivilege; import app.module.core.config.application.enums.AppType; -import app.module.core.usecase.uri.getUris.adapters.persistence.model.GetRoleHasPrivilegesDto; import app.module.core.usecase.uri.getUris.adapters.persistence.model.GetRolesDto; import app.module.core.usecase.uri.getUris.adapters.persistence.model.GetUrisDto; import app.module.core.usecase.uri.getUris.ports.GetUrisPortOut; import app.module.core.usecase.uri.getUris.ports.application.domain.URIElement; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Repository; +import java.util.List; +import java.util.stream.Collectors; + @Repository @RequiredArgsConstructor class GetUrisDao implements GetUrisPortOut { diff --git a/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisMapper.java b/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisMapper.java index e92f3e26..66ffe8aa 100644 --- a/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisMapper.java +++ b/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/GetUrisMapper.java @@ -2,12 +2,12 @@ package app.module.core.usecase.uri.getUris.adapters.persistence; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.uri.getUris.adapters.persistence.model.GetRolesDto; -import app.module.core.usecase.uri.getUris.adapters.persistence.model.GetRoleHasPrivilegesDto; import app.module.core.usecase.uri.getUris.adapters.persistence.model.GetUrisDto; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface GetUrisMapper { List findAllByAppType(AppType appType); diff --git a/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/model/GetRolesDto.java b/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/model/GetRolesDto.java index 2fc78b4d..867aa84d 100644 --- a/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/model/GetRolesDto.java +++ b/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/model/GetRolesDto.java @@ -1,13 +1,13 @@ package app.module.core.usecase.uri.getUris.adapters.persistence.model; import app.module.core.config.application.enums.AppType; -import java.util.List; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.util.List; + @Getter @Setter @NoArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/model/GetUrisDto.java b/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/model/GetUrisDto.java index 1ba68a5b..aa4c73c8 100644 --- a/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/model/GetUrisDto.java +++ b/core/src/main/java/app/module/core/usecase/uri/getUris/adapters/persistence/model/GetUrisDto.java @@ -1,8 +1,6 @@ package app.module.core.usecase.uri.getUris.adapters.persistence.model; import app.module.core.config.application.enums.AppType; -import java.time.LocalDateTime; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/app/module/core/usecase/uri/getUris/ports/GetUrisPortIn.java b/core/src/main/java/app/module/core/usecase/uri/getUris/ports/GetUrisPortIn.java index 41f9b6db..0de74540 100644 --- a/core/src/main/java/app/module/core/usecase/uri/getUris/ports/GetUrisPortIn.java +++ b/core/src/main/java/app/module/core/usecase/uri/getUris/ports/GetUrisPortIn.java @@ -2,6 +2,7 @@ package app.module.core.usecase.uri.getUris.ports; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.uri.getUris.ports.application.domain.URIElement; + import java.util.List; public interface GetUrisPortIn { diff --git a/core/src/main/java/app/module/core/usecase/uri/getUris/ports/GetUrisPortOut.java b/core/src/main/java/app/module/core/usecase/uri/getUris/ports/GetUrisPortOut.java index 4c345160..5b9319f3 100644 --- a/core/src/main/java/app/module/core/usecase/uri/getUris/ports/GetUrisPortOut.java +++ b/core/src/main/java/app/module/core/usecase/uri/getUris/ports/GetUrisPortOut.java @@ -2,6 +2,7 @@ package app.module.core.usecase.uri.getUris.ports; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.uri.getUris.ports.application.domain.URIElement; + import java.util.List; public interface GetUrisPortOut { diff --git a/core/src/main/java/app/module/core/usecase/uri/getUris/ports/application/GetUrisService.java b/core/src/main/java/app/module/core/usecase/uri/getUris/ports/application/GetUrisService.java index 76de99ad..28809439 100644 --- a/core/src/main/java/app/module/core/usecase/uri/getUris/ports/application/GetUrisService.java +++ b/core/src/main/java/app/module/core/usecase/uri/getUris/ports/application/GetUrisService.java @@ -4,11 +4,12 @@ import app.module.core.config.application.enums.AppType; import app.module.core.usecase.uri.getUris.ports.GetUrisPortIn; import app.module.core.usecase.uri.getUris.ports.GetUrisPortOut; import app.module.core.usecase.uri.getUris.ports.application.domain.URIElement; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor class GetUrisService implements GetUrisPortIn { diff --git a/core/src/main/java/app/module/core/usecase/uri/getUris/ports/application/domain/URIElement.java b/core/src/main/java/app/module/core/usecase/uri/getUris/ports/application/domain/URIElement.java index 74f799f2..49a64940 100644 --- a/core/src/main/java/app/module/core/usecase/uri/getUris/ports/application/domain/URIElement.java +++ b/core/src/main/java/app/module/core/usecase/uri/getUris/ports/application/domain/URIElement.java @@ -2,11 +2,12 @@ package app.module.core.usecase.uri.getUris.ports.application.domain; import app.module.core.config.adapters.persistence.entity.Role; import app.module.core.config.application.enums.AppType; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.util.Set; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/uri/remove/adapters/persistence/URIRemoveDao.java b/core/src/main/java/app/module/core/usecase/uri/remove/adapters/persistence/URIRemoveDao.java index 55317329..7429f845 100644 --- a/core/src/main/java/app/module/core/usecase/uri/remove/adapters/persistence/URIRemoveDao.java +++ b/core/src/main/java/app/module/core/usecase/uri/remove/adapters/persistence/URIRemoveDao.java @@ -3,10 +3,11 @@ package app.module.core.usecase.uri.remove.adapters.persistence; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.uri.remove.adapters.persistence.model.URIRemoveParam; import app.module.core.usecase.uri.remove.ports.URIRemovePortOut; -import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.time.LocalDateTime; + @Repository @RequiredArgsConstructor class URIRemoveDao implements URIRemovePortOut { diff --git a/core/src/main/java/app/module/core/usecase/uri/remove/adapters/persistence/model/URIRemoveParam.java b/core/src/main/java/app/module/core/usecase/uri/remove/adapters/persistence/model/URIRemoveParam.java index 7f2c57f0..14fde5b3 100644 --- a/core/src/main/java/app/module/core/usecase/uri/remove/adapters/persistence/model/URIRemoveParam.java +++ b/core/src/main/java/app/module/core/usecase/uri/remove/adapters/persistence/model/URIRemoveParam.java @@ -1,10 +1,11 @@ package app.module.core.usecase.uri.remove.adapters.persistence.model; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @AllArgsConstructor @Getter @Setter diff --git a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/URIMaxOrderNoMapper.java b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/URIMaxOrderNoMapper.java index afecb628..2c6e5bf4 100644 --- a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/URIMaxOrderNoMapper.java +++ b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/URIMaxOrderNoMapper.java @@ -1,8 +1,9 @@ package app.module.core.usecase.uri.save.adapters.persistence; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface URIMaxOrderNoMapper { Optional getMaxOrderNo(String parentId); diff --git a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/URISaveDao.java b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/URISaveDao.java index d3685580..991e9cf6 100644 --- a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/URISaveDao.java +++ b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/URISaveDao.java @@ -1,23 +1,18 @@ package app.module.core.usecase.uri.save.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Role; import app.module.core.config.adapters.persistence.entity.URI; -import app.module.core.config.adapters.persistence.entity.UriHasRole; -import app.module.core.config.adapters.persistence.repository.URIRepo; import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.uri.getUris.ports.GetUrisPortIn; import app.module.core.usecase.uri.save.adapters.persistence.model.UriHasRoleDeleteParam; import app.module.core.usecase.uri.save.adapters.persistence.model.UriHasRoleSaveParam; import app.module.core.usecase.uri.save.ports.URISavePortOut; import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Set; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.transaction.annotation.Transactional; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.Set; @Repository @RequiredArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/UriSaveMapper.java b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/UriSaveMapper.java index 6a5d85ad..c32d5a9c 100644 --- a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/UriSaveMapper.java +++ b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/UriSaveMapper.java @@ -3,9 +3,10 @@ package app.module.core.usecase.uri.save.adapters.persistence; import app.module.core.config.adapters.persistence.entity.URI; import app.module.core.usecase.uri.save.adapters.persistence.model.UriHasRoleDeleteParam; import app.module.core.usecase.uri.save.adapters.persistence.model.UriHasRoleSaveParam; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface UriSaveMapper { void insertUri(URI uri); diff --git a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/model/UriHasRoleDeleteParam.java b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/model/UriHasRoleDeleteParam.java index b2a67e0b..8b6d9e88 100644 --- a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/model/UriHasRoleDeleteParam.java +++ b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/model/UriHasRoleDeleteParam.java @@ -1,10 +1,11 @@ package app.module.core.usecase.uri.save.adapters.persistence.model; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/model/UriHasRoleSaveParam.java b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/model/UriHasRoleSaveParam.java index 06f35e10..55f79111 100644 --- a/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/model/UriHasRoleSaveParam.java +++ b/core/src/main/java/app/module/core/usecase/uri/save/adapters/persistence/model/UriHasRoleSaveParam.java @@ -1,12 +1,12 @@ package app.module.core.usecase.uri.save.adapters.persistence.model; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; +import java.util.Set; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/uri/save/ports/URISavePortIn.java b/core/src/main/java/app/module/core/usecase/uri/save/ports/URISavePortIn.java index 176838fc..0b48c238 100644 --- a/core/src/main/java/app/module/core/usecase/uri/save/ports/URISavePortIn.java +++ b/core/src/main/java/app/module/core/usecase/uri/save/ports/URISavePortIn.java @@ -1,9 +1,10 @@ package app.module.core.usecase.uri.save.ports; import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand; -import java.io.IOException; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; + public interface URISavePortIn { String connect(URISaveCommand uri, MultipartFile ogImageFile, boolean checkDuplicate) diff --git a/core/src/main/java/app/module/core/usecase/uri/save/ports/application/URISaveService.java b/core/src/main/java/app/module/core/usecase/uri/save/ports/application/URISaveService.java index c95d68b1..58cbc1cd 100644 --- a/core/src/main/java/app/module/core/usecase/uri/save/ports/application/URISaveService.java +++ b/core/src/main/java/app/module/core/usecase/uri/save/ports/application/URISaveService.java @@ -12,14 +12,15 @@ import app.module.core.usecase.uri.save.ports.URISavePortIn; import app.module.core.usecase.uri.save.ports.URISavePortOut; import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand; import app.module.core.usecase.uri.view.ports.URIViewPortIn; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.transaction.annotation.Transactional; -import java.io.IOException; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; + @Service @RequiredArgsConstructor class URISaveService implements URISavePortIn { diff --git a/core/src/main/java/app/module/core/usecase/uri/save/ports/application/domain/URISaveCommand.java b/core/src/main/java/app/module/core/usecase/uri/save/ports/application/domain/URISaveCommand.java index 7ec21289..433d7ad9 100644 --- a/core/src/main/java/app/module/core/usecase/uri/save/ports/application/domain/URISaveCommand.java +++ b/core/src/main/java/app/module/core/usecase/uri/save/ports/application/domain/URISaveCommand.java @@ -1,11 +1,12 @@ package app.module.core.usecase.uri.save.ports.application.domain; import app.module.core.config.application.enums.AppType; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.util.Set; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/uri/sort/adapters/persistence/URISortDao.java b/core/src/main/java/app/module/core/usecase/uri/sort/adapters/persistence/URISortDao.java index 4cc72b0d..e148182d 100644 --- a/core/src/main/java/app/module/core/usecase/uri/sort/adapters/persistence/URISortDao.java +++ b/core/src/main/java/app/module/core/usecase/uri/sort/adapters/persistence/URISortDao.java @@ -4,11 +4,12 @@ import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.uri.sort.adapters.persistence.model.URISortParam; import app.module.core.usecase.uri.sort.ports.URISortPortOut; import app.module.core.usecase.uri.sort.ports.application.domain.URISortCommand; -import java.time.LocalDateTime; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; @Repository @RequiredArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/uri/sort/adapters/persistence/URISortRepo.java b/core/src/main/java/app/module/core/usecase/uri/sort/adapters/persistence/URISortRepo.java index 0083d9f2..f03d91d3 100644 --- a/core/src/main/java/app/module/core/usecase/uri/sort/adapters/persistence/URISortRepo.java +++ b/core/src/main/java/app/module/core/usecase/uri/sort/adapters/persistence/URISortRepo.java @@ -1,6 +1,5 @@ package app.module.core.usecase.uri.sort.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.URI; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/core/src/main/java/app/module/core/usecase/uri/sort/adapters/persistence/model/URISortParam.java b/core/src/main/java/app/module/core/usecase/uri/sort/adapters/persistence/model/URISortParam.java index 39ea24be..c3a878d1 100644 --- a/core/src/main/java/app/module/core/usecase/uri/sort/adapters/persistence/model/URISortParam.java +++ b/core/src/main/java/app/module/core/usecase/uri/sort/adapters/persistence/model/URISortParam.java @@ -1,12 +1,13 @@ package app.module.core.usecase.uri.sort.adapters.persistence.model; import app.module.core.usecase.uri.sort.ports.application.domain.URISortCommand; -import java.time.LocalDateTime; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/uri/sort/ports/URISortPortIn.java b/core/src/main/java/app/module/core/usecase/uri/sort/ports/URISortPortIn.java index aa572102..28298ae1 100644 --- a/core/src/main/java/app/module/core/usecase/uri/sort/ports/URISortPortIn.java +++ b/core/src/main/java/app/module/core/usecase/uri/sort/ports/URISortPortIn.java @@ -1,6 +1,7 @@ package app.module.core.usecase.uri.sort.ports; import app.module.core.usecase.uri.sort.ports.application.domain.URISortCommand; + import java.util.List; public interface URISortPortIn { diff --git a/core/src/main/java/app/module/core/usecase/uri/sort/ports/URISortPortOut.java b/core/src/main/java/app/module/core/usecase/uri/sort/ports/URISortPortOut.java index e27806e3..03bbaeba 100644 --- a/core/src/main/java/app/module/core/usecase/uri/sort/ports/URISortPortOut.java +++ b/core/src/main/java/app/module/core/usecase/uri/sort/ports/URISortPortOut.java @@ -1,6 +1,7 @@ package app.module.core.usecase.uri.sort.ports; import app.module.core.usecase.uri.sort.ports.application.domain.URISortCommand; + import java.util.List; public interface URISortPortOut { diff --git a/core/src/main/java/app/module/core/usecase/uri/sort/ports/application/URISortService.java b/core/src/main/java/app/module/core/usecase/uri/sort/ports/application/URISortService.java index 18ab0e29..00768b44 100644 --- a/core/src/main/java/app/module/core/usecase/uri/sort/ports/application/URISortService.java +++ b/core/src/main/java/app/module/core/usecase/uri/sort/ports/application/URISortService.java @@ -3,11 +3,12 @@ package app.module.core.usecase.uri.sort.ports.application; import app.module.core.usecase.uri.sort.ports.URISortPortIn; import app.module.core.usecase.uri.sort.ports.URISortPortOut; import app.module.core.usecase.uri.sort.ports.application.domain.URISortCommand; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor class URISortService implements URISortPortIn { diff --git a/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URIMapper.java b/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URIMapper.java index 49c0baf9..bbd4ad34 100644 --- a/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URIMapper.java +++ b/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URIMapper.java @@ -2,10 +2,11 @@ package app.module.core.usecase.uri.toptier.adapters.persistence; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface URIMapper { URITopTier findTopTierByAppType(@Param("appType") AppType appType); diff --git a/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URITopTierDao.java b/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URITopTierDao.java index d72fe639..ae6df937 100644 --- a/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URITopTierDao.java +++ b/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URITopTierDao.java @@ -3,12 +3,13 @@ package app.module.core.usecase.uri.toptier.adapters.persistence; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.uri.toptier.ports.URITopTierPortOut; import app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier; -import java.util.List; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.stream.Collectors; + @Repository @RequiredArgsConstructor public class URITopTierDao implements URITopTierPortOut { diff --git a/core/src/main/java/app/module/core/usecase/uri/toptier/ports/application/domain/URITopTier.java b/core/src/main/java/app/module/core/usecase/uri/toptier/ports/application/domain/URITopTier.java index f2dfe890..a4723401 100644 --- a/core/src/main/java/app/module/core/usecase/uri/toptier/ports/application/domain/URITopTier.java +++ b/core/src/main/java/app/module/core/usecase/uri/toptier/ports/application/domain/URITopTier.java @@ -1,12 +1,13 @@ package app.module.core.usecase.uri.toptier.ports.application.domain; import app.module.core.config.application.enums.AppType; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.util.List; + @Getter @Setter @NoArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/uri/view/ports/URIViewPortIn.java b/core/src/main/java/app/module/core/usecase/uri/view/ports/URIViewPortIn.java index c7242843..cb863d1b 100644 --- a/core/src/main/java/app/module/core/usecase/uri/view/ports/URIViewPortIn.java +++ b/core/src/main/java/app/module/core/usecase/uri/view/ports/URIViewPortIn.java @@ -2,6 +2,7 @@ package app.module.core.usecase.uri.view.ports; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.uri.view.ports.application.domain.URIView; + import java.util.Optional; public interface URIViewPortIn { diff --git a/core/src/main/java/app/module/core/usecase/uri/view/ports/application/URIViewService.java b/core/src/main/java/app/module/core/usecase/uri/view/ports/application/URIViewService.java index bce13039..40687f72 100644 --- a/core/src/main/java/app/module/core/usecase/uri/view/ports/application/URIViewService.java +++ b/core/src/main/java/app/module/core/usecase/uri/view/ports/application/URIViewService.java @@ -5,11 +5,12 @@ import app.module.core.config.application.enums.AppType; import app.module.core.usecase.uri.getUris.ports.GetUrisPortIn; import app.module.core.usecase.uri.view.ports.URIViewPortIn; import app.module.core.usecase.uri.view.ports.application.domain.URIView; -import java.util.Optional; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; +import java.util.stream.Collectors; + @Service @RequiredArgsConstructor class URIViewService implements URIViewPortIn { diff --git a/core/src/main/java/app/module/core/usecase/uri/view/ports/application/domain/URIView.java b/core/src/main/java/app/module/core/usecase/uri/view/ports/application/domain/URIView.java index eae58e35..ad05f5b9 100644 --- a/core/src/main/java/app/module/core/usecase/uri/view/ports/application/domain/URIView.java +++ b/core/src/main/java/app/module/core/usecase/uri/view/ports/application/domain/URIView.java @@ -1,11 +1,12 @@ package app.module.core.usecase.uri.view.ports.application.domain; import app.module.core.config.application.enums.AppType; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.util.Set; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserDao.java b/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserDao.java index 810d7ef2..5af5fd60 100644 --- a/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserDao.java +++ b/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/CreateUserDao.java @@ -6,14 +6,14 @@ import app.module.core.usecase.user.createUser.adapters.persistence.model.SaveFr import app.module.core.usecase.user.createUser.ports.CreateUserPortOut; import app.module.core.usecase.user.createUser.ports.application.domain.CreateUser; import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd; +import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; + import java.time.LocalDateTime; import java.util.Optional; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - @Repository @RequiredArgsConstructor class CreateUserDao implements CreateUserPortOut { diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/model/SaveFrontUserHasRoleParam.java b/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/model/SaveFrontUserHasRoleParam.java index c5879942..f6f5a1b5 100644 --- a/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/model/SaveFrontUserHasRoleParam.java +++ b/core/src/main/java/app/module/core/usecase/user/createUser/adapters/persistence/model/SaveFrontUserHasRoleParam.java @@ -1,11 +1,12 @@ package app.module.core.usecase.user.createUser.adapters.persistence.model; -import java.time.LocalDateTime; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; +import java.util.Set; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortIn.java b/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortIn.java index 326467fd..7d6fb3f3 100644 --- a/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortIn.java +++ b/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortIn.java @@ -2,6 +2,7 @@ package app.module.core.usecase.user.createUser.ports; import app.module.core.usecase.user.createUser.ports.application.domain.CreateUser; import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd; + import java.util.Optional; public interface CreateUserPortIn { diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortOut.java b/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortOut.java index 49505200..5e842578 100644 --- a/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortOut.java +++ b/core/src/main/java/app/module/core/usecase/user/createUser/ports/CreateUserPortOut.java @@ -2,6 +2,7 @@ package app.module.core.usecase.user.createUser.ports; import app.module.core.usecase.user.createUser.ports.application.domain.CreateUser; import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd; + import java.util.Optional; public interface CreateUserPortOut { diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/CreateUserService.java b/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/CreateUserService.java index c80fe312..37a01e5d 100644 --- a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/CreateUserService.java +++ b/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/CreateUserService.java @@ -4,11 +4,12 @@ import app.module.core.usecase.user.createUser.ports.CreateUserPortIn; import app.module.core.usecase.user.createUser.ports.CreateUserPortOut; import app.module.core.usecase.user.createUser.ports.application.domain.CreateUser; import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class CreateUserService implements CreateUserPortIn { diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUser.java b/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUser.java index 2b962f75..f42225a3 100644 --- a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUser.java +++ b/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUser.java @@ -1,11 +1,12 @@ package app.module.core.usecase.user.createUser.ports.application.domain; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.Set; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUserCmd.java b/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUserCmd.java index fb4690d6..46ac6445 100644 --- a/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUserCmd.java +++ b/core/src/main/java/app/module/core/usecase/user/createUser/ports/application/domain/CreateUserCmd.java @@ -1,12 +1,13 @@ package app.module.core.usecase.user.createUser.ports.application.domain; import app.module.core.config.application.enums.SignUpType; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.Set; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserDao.java b/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserDao.java index 46f7ab22..c5e19d6f 100644 --- a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserDao.java +++ b/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserDao.java @@ -7,13 +7,14 @@ import app.module.core.usecase.user.findUser.ports.FindUserPortOut; import app.module.core.usecase.user.findUser.ports.application.domain.FindProfileImages; import app.module.core.usecase.user.findUser.ports.application.domain.FindUser; import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; -import java.util.List; -import java.util.Optional; -import java.util.Set; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.Optional; +import java.util.Set; + @Repository @RequiredArgsConstructor class FindUserDao implements FindUserPortOut { diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserMapper.java b/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserMapper.java index 4405dcf2..d1d2f43c 100644 --- a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserMapper.java +++ b/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/FindUserMapper.java @@ -3,10 +3,11 @@ package app.module.core.usecase.user.findUser.adapters.persistence; import app.module.core.config.adapters.web.security.domain.CoreRole; import app.module.core.usecase.user.findUser.adapters.persistence.model.FindUserDto; import app.module.core.usecase.user.findUser.ports.application.domain.FindProfileImages; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface FindUserMapper { FindUserDto findUserById(String id); diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/model/FindUserDto.java b/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/model/FindUserDto.java index ba4704bc..b89174b5 100644 --- a/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/model/FindUserDto.java +++ b/core/src/main/java/app/module/core/usecase/user/findUser/adapters/persistence/model/FindUserDto.java @@ -1,11 +1,12 @@ package app.module.core.usecase.user.findUser.adapters.persistence.model; import app.module.core.config.application.enums.SignUpType; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortIn.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortIn.java index 6b30a8eb..df97bbf9 100644 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortIn.java +++ b/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortIn.java @@ -2,6 +2,7 @@ package app.module.core.usecase.user.findUser.ports; import app.module.core.usecase.user.findUser.ports.application.domain.FindUser; import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; + import java.util.Optional; public interface FindUserPortIn { diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortOut.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortOut.java index e6d3b3f4..1a21eb90 100644 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortOut.java +++ b/core/src/main/java/app/module/core/usecase/user/findUser/ports/FindUserPortOut.java @@ -2,6 +2,7 @@ package app.module.core.usecase.user.findUser.ports; import app.module.core.usecase.user.findUser.ports.application.domain.FindUser; import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; + import java.util.Optional; public interface FindUserPortOut { diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/FindUserService.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/FindUserService.java index 07ce74d9..7c85a835 100644 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/FindUserService.java +++ b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/FindUserService.java @@ -7,11 +7,12 @@ import app.module.core.usecase.user.findUser.ports.FindUserPortOut; import app.module.core.usecase.user.findUser.ports.application.domain.FindProfileImages; import app.module.core.usecase.user.findUser.ports.application.domain.FindUser; import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class FindUserService implements FindUserPortIn { diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindProfileImages.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindProfileImages.java index 0a25f536..0f6299e4 100644 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindProfileImages.java +++ b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindProfileImages.java @@ -1,11 +1,7 @@ package app.module.core.usecase.user.findUser.ports.application.domain; import app.module.core.config.application.enums.FileUploadType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; @Getter @Setter diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUser.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUser.java index ddc02e2f..74e7631a 100644 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUser.java +++ b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUser.java @@ -2,13 +2,14 @@ package app.module.core.usecase.user.findUser.ports.application.domain; import app.module.core.config.adapters.web.security.domain.CoreRole; import app.module.core.config.application.enums.SignUpType; -import java.time.LocalDateTime; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; +import java.util.Set; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserRole.java b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserRole.java index f7840fb5..efb8b4c4 100644 --- a/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserRole.java +++ b/core/src/main/java/app/module/core/usecase/user/findUser/ports/application/domain/FindUserRole.java @@ -1,11 +1,12 @@ package app.module.core.usecase.user.findUser.ports.application.domain; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.Set; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesDao.java b/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesDao.java index b5239e46..ab7d5af3 100644 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesDao.java +++ b/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesDao.java @@ -3,12 +3,11 @@ package app.module.core.usecase.user.getRoles.adapters.persistence; import app.module.core.usecase.user.getRoles.ports.GetRolesPortOut; import app.module.core.usecase.user.getRoles.ports.application.domain.GetRoles; import app.module.core.usecase.user.getRoles.ports.application.domain.GetRolesCmd; -import java.util.List; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Sort; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository @RequiredArgsConstructor class GetRolesDao implements GetRolesPortOut { diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesMapper.java b/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesMapper.java index 09345c24..dd3d158f 100644 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesMapper.java +++ b/core/src/main/java/app/module/core/usecase/user/getRoles/adapters/persistence/GetRolesMapper.java @@ -2,9 +2,10 @@ package app.module.core.usecase.user.getRoles.adapters.persistence; import app.module.core.usecase.user.getRoles.ports.application.domain.GetRoles; import app.module.core.usecase.user.getRoles.ports.application.domain.GetRolesCmd; -import java.util.List; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface GetRolesMapper { List findByAppType(GetRolesCmd cmd); diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortIn.java b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortIn.java index 22d27eec..7ce9107c 100644 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortIn.java +++ b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortIn.java @@ -2,6 +2,7 @@ package app.module.core.usecase.user.getRoles.ports; import app.module.core.usecase.user.getRoles.ports.application.domain.GetRoles; import app.module.core.usecase.user.getRoles.ports.application.domain.GetRolesCmd; + import java.util.List; public interface GetRolesPortIn { diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortOut.java b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortOut.java index 64c0a849..a5fc84ca 100644 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortOut.java +++ b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/GetRolesPortOut.java @@ -2,6 +2,7 @@ package app.module.core.usecase.user.getRoles.ports; import app.module.core.usecase.user.getRoles.ports.application.domain.GetRoles; import app.module.core.usecase.user.getRoles.ports.application.domain.GetRolesCmd; + import java.util.List; public interface GetRolesPortOut { diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/GetRolesService.java b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/GetRolesService.java index 17c14a25..8c5fa4f0 100644 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/GetRolesService.java +++ b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/GetRolesService.java @@ -4,10 +4,11 @@ import app.module.core.usecase.user.getRoles.ports.GetRolesPortIn; import app.module.core.usecase.user.getRoles.ports.GetRolesPortOut; import app.module.core.usecase.user.getRoles.ports.application.domain.GetRoles; import app.module.core.usecase.user.getRoles.ports.application.domain.GetRolesCmd; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor class GetRolesService implements GetRolesPortIn { diff --git a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRoles.java b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRoles.java index 2b66aa53..be90704f 100644 --- a/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRoles.java +++ b/core/src/main/java/app/module/core/usecase/user/getRoles/ports/application/domain/GetRoles.java @@ -1,11 +1,12 @@ package app.module.core.usecase.user.getRoles.ports.application.domain; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersDao.java b/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersDao.java index 350f8694..95574a6a 100644 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersDao.java +++ b/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersDao.java @@ -5,8 +5,6 @@ import app.module.core.usecase.user.getUsers.ports.GetUsersPortOut; import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsers; import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersCmd; import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersRole; -import java.util.List; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -14,6 +12,9 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.stream.Collectors; + @Repository @RequiredArgsConstructor class GetUsersDao implements GetUsersPortOut { diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersMapper.java b/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersMapper.java index caea81a0..45259c75 100644 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersMapper.java +++ b/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/GetUsersMapper.java @@ -3,10 +3,11 @@ package app.module.core.usecase.user.getUsers.adapters.persistence; import app.module.core.usecase.user.getUsers.adapters.persistence.model.GetUsersDto; import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersCmd; import app.module.core.usecase.user.getUsers.ports.application.domain.GetUsersRole; -import org.springframework.data.domain.Pageable; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +import java.util.List; @Mapper public interface GetUsersMapper { diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/model/GetUsersDto.java b/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/model/GetUsersDto.java index 68a79a60..213906ea 100644 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/model/GetUsersDto.java +++ b/core/src/main/java/app/module/core/usecase/user/getUsers/adapters/persistence/model/GetUsersDto.java @@ -1,10 +1,11 @@ package app.module.core.usecase.user.getUsers.adapters.persistence.model; import app.module.core.config.application.enums.SignUpType; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter public class GetUsersDto { diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsers.java b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsers.java index 94317f1d..1d64e9e5 100644 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsers.java +++ b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsers.java @@ -1,13 +1,14 @@ package app.module.core.usecase.user.getUsers.ports.application.domain; import app.module.core.config.application.enums.SignUpType; -import java.time.LocalDateTime; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; +import java.util.Set; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersPrivilege.java b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersPrivilege.java index 2f0667b2..29c5c2ac 100644 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersPrivilege.java +++ b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersPrivilege.java @@ -1,10 +1,6 @@ package app.module.core.usecase.user.getUsers.ports.application.domain; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; @Getter @Setter diff --git a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersRole.java b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersRole.java index 4fd7cc42..58d077f4 100644 --- a/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersRole.java +++ b/core/src/main/java/app/module/core/usecase/user/getUsers/ports/application/domain/GetUsersRole.java @@ -1,11 +1,8 @@ package app.module.core.usecase.user.getUsers.ports.application.domain; +import lombok.*; + import java.util.Set; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; @Getter @Setter diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserDao.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserDao.java index ffcbe2f0..54b14c34 100644 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserDao.java +++ b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserDao.java @@ -6,11 +6,12 @@ import app.module.core.usecase.user.updateFrontUser.adapters.persistence.model.U import app.module.core.usecase.user.updateFrontUser.adapters.persistence.model.UpdateFrontUserParam; import app.module.core.usecase.user.updateFrontUser.ports.UpdateFrontUserPortOut; import app.module.core.usecase.user.updateFrontUser.ports.application.domain.UpdateFrontUserOutCmd; -import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; +import java.time.LocalDateTime; + @Repository @RequiredArgsConstructor class UpdateFrontUserDao implements UpdateFrontUserPortOut { diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserMapper.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserMapper.java index 77fdb3df..0b0fd8b6 100644 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserMapper.java +++ b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/UpdateFrontUserMapper.java @@ -3,7 +3,6 @@ package app.module.core.usecase.user.updateFrontUser.adapters.persistence; import app.module.core.config.adapters.persistence.entity.FrontUser; import app.module.core.usecase.user.updateFrontUser.adapters.persistence.model.UpdateFrontUserHasUploadFileParam; import app.module.core.usecase.user.updateFrontUser.adapters.persistence.model.UpdateFrontUserParam; -import java.util.List; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserHasUploadFileParam.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserHasUploadFileParam.java index 8a3ff805..d41d8e2b 100644 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserHasUploadFileParam.java +++ b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserHasUploadFileParam.java @@ -1,11 +1,12 @@ package app.module.core.usecase.user.updateFrontUser.adapters.persistence.model; -import java.time.LocalDateTime; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserParam.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserParam.java index 89e9aa2b..0b399dd3 100644 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserParam.java +++ b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/adapters/persistence/model/UpdateFrontUserParam.java @@ -1,10 +1,11 @@ package app.module.core.usecase.user.updateFrontUser.adapters.persistence.model; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/UpdateFrontUserService.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/UpdateFrontUserService.java index 0df7ea31..aae83b3c 100644 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/UpdateFrontUserService.java +++ b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/UpdateFrontUserService.java @@ -9,14 +9,15 @@ import app.module.core.usecase.user.updateFrontUser.ports.UpdateFrontUserPortIn; import app.module.core.usecase.user.updateFrontUser.ports.UpdateFrontUserPortOut; import app.module.core.usecase.user.updateFrontUser.ports.application.domain.UpdateFrontUserInCmd; import app.module.core.usecase.user.updateFrontUser.ports.application.domain.UpdateFrontUserOutCmd; -import java.time.LocalDateTime; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import org.thymeleaf.util.StringUtils; +import java.time.LocalDateTime; +import java.util.stream.Collectors; + @Service @RequiredArgsConstructor class UpdateFrontUserService implements UpdateFrontUserPortIn { diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserInCmd.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserInCmd.java index 6de72c3c..7c486f0f 100644 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserInCmd.java +++ b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserInCmd.java @@ -1,11 +1,12 @@ package app.module.core.usecase.user.updateFrontUser.ports.application.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserOutCmd.java b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserOutCmd.java index 42b0f22c..5eb189fb 100644 --- a/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserOutCmd.java +++ b/core/src/main/java/app/module/core/usecase/user/updateFrontUser/ports/application/domain/UpdateFrontUserOutCmd.java @@ -1,14 +1,15 @@ package app.module.core.usecase.user.updateFrontUser.ports.application.domain; import app.module.core.config.application.enums.SignUpType; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Set; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserDao.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserDao.java index 3ec25cb7..1c38ec8c 100644 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserDao.java +++ b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/UpdateUserDao.java @@ -6,12 +6,13 @@ import app.module.core.usecase.user.updateUserByAdmin.adapters.persistence.model import app.module.core.usecase.user.updateUserByAdmin.adapters.persistence.model.UpdateFrontUserHasRoleParam; import app.module.core.usecase.user.updateUserByAdmin.ports.UpdateUserPortOut; import app.module.core.usecase.user.updateUserByAdmin.ports.application.domain.UpdateUserCmd; -import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; + @Repository @RequiredArgsConstructor class UpdateUserDao implements UpdateUserPortOut { diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserByAdminParam.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserByAdminParam.java index 2f82933a..c973b888 100644 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserByAdminParam.java +++ b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserByAdminParam.java @@ -1,10 +1,11 @@ package app.module.core.usecase.user.updateUserByAdmin.adapters.persistence.model; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserHasRoleParam.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserHasRoleParam.java index 8120bd13..4b3df653 100644 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserHasRoleParam.java +++ b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/adapters/persistence/model/UpdateFrontUserHasRoleParam.java @@ -1,11 +1,12 @@ package app.module.core.usecase.user.updateUserByAdmin.adapters.persistence.model; -import java.time.LocalDateTime; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/domain/UpdateUserCmd.java b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/domain/UpdateUserCmd.java index 3a0725b8..7a72457d 100644 --- a/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/domain/UpdateUserCmd.java +++ b/core/src/main/java/app/module/core/usecase/user/updateUserByAdmin/ports/application/domain/UpdateUserCmd.java @@ -1,11 +1,12 @@ package app.module.core.usecase.user.updateUserByAdmin.ports.application.domain; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.Set; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/adapters/persistence/GetUserPrivilegeDao.java b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/adapters/persistence/GetUserPrivilegeDao.java index 0e33ef42..92e829ee 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/adapters/persistence/GetUserPrivilegeDao.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/adapters/persistence/GetUserPrivilegeDao.java @@ -3,10 +3,11 @@ package app.module.core.usecase.userPrivilege.getUserPrivilege.adapters.persiste import app.module.core.usecase.userPrivilege.getUserPrivilege.ports.GetUserPrivilegePortOut; import app.module.core.usecase.userPrivilege.getUserPrivilege.ports.application.domain.GetUserPrivilege; import app.module.core.usecase.userPrivilege.getUserPrivilege.ports.application.domain.GetUserPrivilegeCmd; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository @RequiredArgsConstructor class GetUserPrivilegeDao implements GetUserPrivilegePortOut { diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/adapters/persistence/GetUserPrivilegeMapper.java b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/adapters/persistence/GetUserPrivilegeMapper.java index 9042edb9..5e5b44ec 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/adapters/persistence/GetUserPrivilegeMapper.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/adapters/persistence/GetUserPrivilegeMapper.java @@ -1,9 +1,10 @@ package app.module.core.usecase.userPrivilege.getUserPrivilege.adapters.persistence; import app.module.core.usecase.userPrivilege.getUserPrivilege.ports.application.domain.GetUserPrivilege; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface GetUserPrivilegeMapper { Optional findById(String id); diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/ports/GetUserPrivilegePortIn.java b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/ports/GetUserPrivilegePortIn.java index ddb5c89d..39ca324c 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/ports/GetUserPrivilegePortIn.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/ports/GetUserPrivilegePortIn.java @@ -2,6 +2,7 @@ package app.module.core.usecase.userPrivilege.getUserPrivilege.ports; import app.module.core.usecase.userPrivilege.getUserPrivilege.ports.application.domain.GetUserPrivilege; import app.module.core.usecase.userPrivilege.getUserPrivilege.ports.application.domain.GetUserPrivilegeCmd; + import java.util.Optional; public interface GetUserPrivilegePortIn { diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/ports/GetUserPrivilegePortOut.java b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/ports/GetUserPrivilegePortOut.java index 8f426439..1ea3473c 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/ports/GetUserPrivilegePortOut.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/ports/GetUserPrivilegePortOut.java @@ -2,6 +2,7 @@ package app.module.core.usecase.userPrivilege.getUserPrivilege.ports; import app.module.core.usecase.userPrivilege.getUserPrivilege.ports.application.domain.GetUserPrivilege; import app.module.core.usecase.userPrivilege.getUserPrivilege.ports.application.domain.GetUserPrivilegeCmd; + import java.util.Optional; public interface GetUserPrivilegePortOut { diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/ports/application/GetUserPrivilegeService.java b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/ports/application/GetUserPrivilegeService.java index d5b015de..aa71e1da 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/ports/application/GetUserPrivilegeService.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/ports/application/GetUserPrivilegeService.java @@ -4,10 +4,11 @@ import app.module.core.usecase.userPrivilege.getUserPrivilege.ports.GetUserPrivi import app.module.core.usecase.userPrivilege.getUserPrivilege.ports.GetUserPrivilegePortOut; import app.module.core.usecase.userPrivilege.getUserPrivilege.ports.application.domain.GetUserPrivilege; import app.module.core.usecase.userPrivilege.getUserPrivilege.ports.application.domain.GetUserPrivilegeCmd; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class GetUserPrivilegeService implements GetUserPrivilegePortIn { diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/ports/application/domain/GetUserPrivilege.java b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/ports/application/domain/GetUserPrivilege.java index 19e0156d..de0bf03d 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/ports/application/domain/GetUserPrivilege.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivilege/ports/application/domain/GetUserPrivilege.java @@ -1,12 +1,13 @@ package app.module.core.usecase.userPrivilege.getUserPrivilege.ports.application.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.time.LocalDateTime; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/adapters/persistence/GetUserPrivilegesDao.java b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/adapters/persistence/GetUserPrivilegesDao.java index dd053031..e8e6159d 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/adapters/persistence/GetUserPrivilegesDao.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/adapters/persistence/GetUserPrivilegesDao.java @@ -3,10 +3,11 @@ package app.module.core.usecase.userPrivilege.getUserPrivileges.adapters.persist import app.module.core.config.application.enums.AppType; import app.module.core.usecase.userPrivilege.getUserPrivileges.ports.GetUserPrivilegesPortOut; import app.module.core.usecase.userPrivilege.getUserPrivileges.ports.application.domain.GetUserPrivileges; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository @RequiredArgsConstructor class GetUserPrivilegesDao implements GetUserPrivilegesPortOut { diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/adapters/persistence/GetUserPrivilegesMapper.java b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/adapters/persistence/GetUserPrivilegesMapper.java index 9f95c910..4caee8c9 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/adapters/persistence/GetUserPrivilegesMapper.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/adapters/persistence/GetUserPrivilegesMapper.java @@ -2,10 +2,11 @@ package app.module.core.usecase.userPrivilege.getUserPrivileges.adapters.persist import app.module.core.config.application.enums.AppType; import app.module.core.usecase.userPrivilege.getUserPrivileges.ports.application.domain.GetUserPrivileges; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface GetUserPrivilegesMapper { List findAllByAppType(@Param("appType")AppType appType); diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/ports/GetUserPrivilegesPortIn.java b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/ports/GetUserPrivilegesPortIn.java index a2c84a0d..0e5f812a 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/ports/GetUserPrivilegesPortIn.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/ports/GetUserPrivilegesPortIn.java @@ -2,6 +2,7 @@ package app.module.core.usecase.userPrivilege.getUserPrivileges.ports; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.userPrivilege.getUserPrivileges.ports.application.domain.GetUserPrivileges; + import java.util.List; public interface GetUserPrivilegesPortIn { diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/ports/GetUserPrivilegesPortOut.java b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/ports/GetUserPrivilegesPortOut.java index 31a47c87..ae7ff9b4 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/ports/GetUserPrivilegesPortOut.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/ports/GetUserPrivilegesPortOut.java @@ -2,6 +2,7 @@ package app.module.core.usecase.userPrivilege.getUserPrivileges.ports; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.userPrivilege.getUserPrivileges.ports.application.domain.GetUserPrivileges; + import java.util.List; public interface GetUserPrivilegesPortOut { diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/ports/application/GetUserPrivilegesService.java b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/ports/application/GetUserPrivilegesService.java index 9233afe7..d6a0c211 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/ports/application/GetUserPrivilegesService.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/getUserPrivileges/ports/application/GetUserPrivilegesService.java @@ -4,10 +4,11 @@ import app.module.core.config.application.enums.AppType; import app.module.core.usecase.userPrivilege.getUserPrivileges.ports.GetUserPrivilegesPortIn; import app.module.core.usecase.userPrivilege.getUserPrivileges.ports.GetUserPrivilegesPortOut; import app.module.core.usecase.userPrivilege.getUserPrivileges.ports.application.domain.GetUserPrivileges; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor class GetUserPrivilegesService implements GetUserPrivilegesPortIn { diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/ports/application/domain/RemoveUserPrivilegeCmd.java b/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/ports/application/domain/RemoveUserPrivilegeCmd.java index 357021aa..b505c8fb 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/ports/application/domain/RemoveUserPrivilegeCmd.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/removeUserPrivilege/ports/application/domain/RemoveUserPrivilegeCmd.java @@ -2,7 +2,6 @@ package app.module.core.usecase.userPrivilege.removeUserPrivilege.ports.applicat import app.module.core.config.adapters.persistence.component.AuditCommand; import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeDao.java b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeDao.java index ba295985..3a35702c 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeDao.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeDao.java @@ -7,10 +7,11 @@ import app.module.core.usecase.userPrivilege.getUserPrivilege.ports.application. import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.SaveUserPrivilegePortOut; import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.application.domain.SaveUserPrivilege; import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.application.domain.SaveUserPrivilegeCmd; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository @RequiredArgsConstructor public class SaveUserPrivilegeDao implements SaveUserPrivilegePortOut { diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeMapper.java b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeMapper.java index b67e87e0..f7f4076b 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeMapper.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/adapters/persistence/SaveUserPrivilegeMapper.java @@ -2,10 +2,11 @@ package app.module.core.usecase.userPrivilege.saveUserPrivilege.adapters.persist import app.module.core.config.adapters.persistence.entity.Privilege; import app.module.core.config.application.enums.AppType; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Optional; + @Mapper public interface SaveUserPrivilegeMapper { Optional getMaxOrderNo(@Param("appType") AppType appType); diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/ports/SaveUserPrivilegePortIn.java b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/ports/SaveUserPrivilegePortIn.java index b375e635..a341c04f 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/ports/SaveUserPrivilegePortIn.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/ports/SaveUserPrivilegePortIn.java @@ -2,6 +2,7 @@ package app.module.core.usecase.userPrivilege.saveUserPrivilege.ports; import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.application.domain.SaveUserPrivilege; import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.application.domain.SaveUserPrivilegeCmd; + import java.util.Optional; public interface SaveUserPrivilegePortIn { diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/ports/SaveUserPrivilegePortOut.java b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/ports/SaveUserPrivilegePortOut.java index bd938476..2ea4171a 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/ports/SaveUserPrivilegePortOut.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/ports/SaveUserPrivilegePortOut.java @@ -2,6 +2,7 @@ package app.module.core.usecase.userPrivilege.saveUserPrivilege.ports; import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.application.domain.SaveUserPrivilege; import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.application.domain.SaveUserPrivilegeCmd; + import java.util.Optional; public interface SaveUserPrivilegePortOut { diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/ports/application/SaveUserPrivilegeService.java b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/ports/application/SaveUserPrivilegeService.java index 49558063..5fc85e02 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/ports/application/SaveUserPrivilegeService.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/saveUserPrivilege/ports/application/SaveUserPrivilegeService.java @@ -4,10 +4,11 @@ import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.SaveUserPri import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.SaveUserPrivilegePortOut; import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.application.domain.SaveUserPrivilege; import app.module.core.usecase.userPrivilege.saveUserPrivilege.ports.application.domain.SaveUserPrivilegeCmd; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor public class SaveUserPrivilegeService implements SaveUserPrivilegePortIn { diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/SortUserPrivilegeDao.java b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/SortUserPrivilegeDao.java index ec1877c0..4a85ddef 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/SortUserPrivilegeDao.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/SortUserPrivilegeDao.java @@ -1,10 +1,8 @@ package app.module.core.usecase.userPrivilege.sortUserPrivilege.adapters.persistence; import app.module.core.config.application.util.AuditUtil; -import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.userPrivilege.sortUserPrivilege.adapters.persistence.model.SortUserPrivilegeParam; import app.module.core.usecase.userPrivilege.sortUserPrivilege.ports.SortUserPrivilegePortOut; -import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/model/SortUserPrivilegeParam.java b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/model/SortUserPrivilegeParam.java index e3165214..e1769fb9 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/model/SortUserPrivilegeParam.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/adapters/persistence/model/SortUserPrivilegeParam.java @@ -1,7 +1,6 @@ package app.module.core.usecase.userPrivilege.sortUserPrivilege.adapters.persistence.model; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/application/SortUserPrivilegeService.java b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/application/SortUserPrivilegeService.java index a42939b1..9985558d 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/application/SortUserPrivilegeService.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/application/SortUserPrivilegeService.java @@ -3,9 +3,9 @@ package app.module.core.usecase.userPrivilege.sortUserPrivilege.ports.applicatio import app.module.core.usecase.userPrivilege.sortUserPrivilege.ports.SortUserPrivilegePortIn; import app.module.core.usecase.userPrivilege.sortUserPrivilege.ports.SortUserPrivilegePortOut; import app.module.core.usecase.userPrivilege.sortUserPrivilege.ports.application.domain.SortUserPrivilegeCmd; -import org.springframework.transaction.annotation.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/application/domain/SortUserPrivilegeCmd.java b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/application/domain/SortUserPrivilegeCmd.java index bc4c58b9..2ee06f6f 100644 --- a/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/application/domain/SortUserPrivilegeCmd.java +++ b/core/src/main/java/app/module/core/usecase/userPrivilege/sortUserPrivilege/ports/application/domain/SortUserPrivilegeCmd.java @@ -1,11 +1,12 @@ package app.module.core.usecase.userPrivilege.sortUserPrivilege.ports.application.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/userRole/getUserRole/adapters/persistence/GetUserRoleDao.java b/core/src/main/java/app/module/core/usecase/userRole/getUserRole/adapters/persistence/GetUserRoleDao.java index 5319aa13..a0500e75 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/getUserRole/adapters/persistence/GetUserRoleDao.java +++ b/core/src/main/java/app/module/core/usecase/userRole/getUserRole/adapters/persistence/GetUserRoleDao.java @@ -3,11 +3,12 @@ package app.module.core.usecase.userRole.getUserRole.adapters.persistence; import app.module.core.usecase.userRole.getUserRole.ports.GetUserRolePortOut; import app.module.core.usecase.userRole.getUserRole.ports.application.domain.GetUserRole; import app.module.core.usecase.userRole.getUserRole.ports.application.domain.GetUserRoleCmd; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import java.util.Optional; + @Repository @RequiredArgsConstructor class GetUserRoleDao implements GetUserRolePortOut { diff --git a/core/src/main/java/app/module/core/usecase/userRole/getUserRole/adapters/persistence/GetUserRoleMapper.java b/core/src/main/java/app/module/core/usecase/userRole/getUserRole/adapters/persistence/GetUserRoleMapper.java index 7006b190..18d2f3c6 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/getUserRole/adapters/persistence/GetUserRoleMapper.java +++ b/core/src/main/java/app/module/core/usecase/userRole/getUserRole/adapters/persistence/GetUserRoleMapper.java @@ -2,9 +2,10 @@ package app.module.core.usecase.userRole.getUserRole.adapters.persistence; import app.module.core.usecase.userRole.getUserRole.ports.application.domain.GetUserRole; import app.module.core.usecase.userRole.getUserRole.ports.application.domain.GetUserRoleCmd; -import java.util.List; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface GetUserRoleMapper { GetUserRole findRoleById(GetUserRoleCmd cmd); diff --git a/core/src/main/java/app/module/core/usecase/userRole/getUserRole/ports/GetUserRolePortIn.java b/core/src/main/java/app/module/core/usecase/userRole/getUserRole/ports/GetUserRolePortIn.java index 4d48096a..59afd461 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/getUserRole/ports/GetUserRolePortIn.java +++ b/core/src/main/java/app/module/core/usecase/userRole/getUserRole/ports/GetUserRolePortIn.java @@ -2,6 +2,7 @@ package app.module.core.usecase.userRole.getUserRole.ports; import app.module.core.usecase.userRole.getUserRole.ports.application.domain.GetUserRole; import app.module.core.usecase.userRole.getUserRole.ports.application.domain.GetUserRoleCmd; + import java.util.Optional; public interface GetUserRolePortIn { diff --git a/core/src/main/java/app/module/core/usecase/userRole/getUserRole/ports/GetUserRolePortOut.java b/core/src/main/java/app/module/core/usecase/userRole/getUserRole/ports/GetUserRolePortOut.java index a46326a2..73f947b9 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/getUserRole/ports/GetUserRolePortOut.java +++ b/core/src/main/java/app/module/core/usecase/userRole/getUserRole/ports/GetUserRolePortOut.java @@ -2,6 +2,7 @@ package app.module.core.usecase.userRole.getUserRole.ports; import app.module.core.usecase.userRole.getUserRole.ports.application.domain.GetUserRole; import app.module.core.usecase.userRole.getUserRole.ports.application.domain.GetUserRoleCmd; + import java.util.Optional; public interface GetUserRolePortOut { diff --git a/core/src/main/java/app/module/core/usecase/userRole/getUserRole/ports/application/GetUserRoleService.java b/core/src/main/java/app/module/core/usecase/userRole/getUserRole/ports/application/GetUserRoleService.java index 150d23c4..07430213 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/getUserRole/ports/application/GetUserRoleService.java +++ b/core/src/main/java/app/module/core/usecase/userRole/getUserRole/ports/application/GetUserRoleService.java @@ -4,10 +4,11 @@ import app.module.core.usecase.userRole.getUserRole.ports.GetUserRolePortIn; import app.module.core.usecase.userRole.getUserRole.ports.GetUserRolePortOut; import app.module.core.usecase.userRole.getUserRole.ports.application.domain.GetUserRole; import app.module.core.usecase.userRole.getUserRole.ports.application.domain.GetUserRoleCmd; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class GetUserRoleService implements GetUserRolePortIn { diff --git a/core/src/main/java/app/module/core/usecase/userRole/getUserRole/ports/application/domain/GetUserRole.java b/core/src/main/java/app/module/core/usecase/userRole/getUserRole/ports/application/domain/GetUserRole.java index dffe83c5..d428405f 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/getUserRole/ports/application/domain/GetUserRole.java +++ b/core/src/main/java/app/module/core/usecase/userRole/getUserRole/ports/application/domain/GetUserRole.java @@ -1,13 +1,10 @@ package app.module.core.usecase.userRole.getUserRole.ports.application.domain; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.*; + import java.time.LocalDateTime; import java.util.List; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; @Getter @Setter diff --git a/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/adapters/persistence/GetUserRolesDao.java b/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/adapters/persistence/GetUserRolesDao.java index 771d6c93..5b6258a0 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/adapters/persistence/GetUserRolesDao.java +++ b/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/adapters/persistence/GetUserRolesDao.java @@ -6,12 +6,13 @@ import app.module.core.usecase.userRole.getUserRoles.adapters.persistence.model. import app.module.core.usecase.userRole.getUserRoles.ports.GetUserRolesPortOut; import app.module.core.usecase.userRole.getUserRoles.ports.application.domain.GetUserPrivileges; import app.module.core.usecase.userRole.getUserRoles.ports.application.domain.GetUserRoles; -import java.util.List; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.stream.Collectors; + @Repository @RequiredArgsConstructor class GetUserRolesDao implements GetUserRolesPortOut { diff --git a/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/adapters/persistence/GetUserRolesMapper.java b/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/adapters/persistence/GetUserRolesMapper.java index 0a29e108..af6b9ed6 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/adapters/persistence/GetUserRolesMapper.java +++ b/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/adapters/persistence/GetUserRolesMapper.java @@ -3,10 +3,11 @@ package app.module.core.usecase.userRole.getUserRoles.adapters.persistence; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.userRole.getUserRoles.adapters.persistence.model.GetUserPrivilegesDto; import app.module.core.usecase.userRole.getUserRoles.adapters.persistence.model.GetUserRolesDto; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface GetUserRolesMapper { List findRolesByAppType(@Param("appType") AppType appType); diff --git a/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/ports/GetUserRolesPortIn.java b/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/ports/GetUserRolesPortIn.java index 65b589bd..28d2bf39 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/ports/GetUserRolesPortIn.java +++ b/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/ports/GetUserRolesPortIn.java @@ -2,6 +2,7 @@ package app.module.core.usecase.userRole.getUserRoles.ports; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.userRole.getUserRoles.ports.application.domain.GetUserRoles; + import java.util.List; public interface GetUserRolesPortIn { diff --git a/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/ports/GetUserRolesPortOut.java b/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/ports/GetUserRolesPortOut.java index 6c4649be..eb49dc56 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/ports/GetUserRolesPortOut.java +++ b/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/ports/GetUserRolesPortOut.java @@ -2,6 +2,7 @@ package app.module.core.usecase.userRole.getUserRoles.ports; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.userRole.getUserRoles.ports.application.domain.GetUserRoles; + import java.util.List; public interface GetUserRolesPortOut { diff --git a/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/ports/application/GetUserRolesService.java b/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/ports/application/GetUserRolesService.java index 451e47d0..a8876059 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/ports/application/GetUserRolesService.java +++ b/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/ports/application/GetUserRolesService.java @@ -4,10 +4,11 @@ import app.module.core.config.application.enums.AppType; import app.module.core.usecase.userRole.getUserRoles.ports.GetUserRolesPortIn; import app.module.core.usecase.userRole.getUserRoles.ports.GetUserRolesPortOut; import app.module.core.usecase.userRole.getUserRoles.ports.application.domain.GetUserRoles; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + @Service @RequiredArgsConstructor class GetUserRolesService implements GetUserRolesPortIn { diff --git a/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/ports/application/domain/GetUserRoles.java b/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/ports/application/domain/GetUserRoles.java index 60906ba1..e89348dd 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/ports/application/domain/GetUserRoles.java +++ b/core/src/main/java/app/module/core/usecase/userRole/getUserRoles/ports/application/domain/GetUserRoles.java @@ -1,11 +1,12 @@ package app.module.core.usecase.userRole.getUserRoles.ports.application.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/ports/application/domain/RemoveUserRoleCmd.java b/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/ports/application/domain/RemoveUserRoleCmd.java index 3d1bd918..96022d69 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/ports/application/domain/RemoveUserRoleCmd.java +++ b/core/src/main/java/app/module/core/usecase/userRole/removeUserRole/ports/application/domain/RemoveUserRoleCmd.java @@ -2,7 +2,6 @@ package app.module.core.usecase.userRole.removeUserRole.ports.application.domain import app.module.core.config.adapters.persistence.component.AuditCommand; import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleDao.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleDao.java index b882fce0..66759342 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleDao.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleDao.java @@ -3,7 +3,6 @@ package app.module.core.usecase.userRole.saveUserRole.adapters.persistence; import app.module.core.config.adapters.persistence.entity.Role; import app.module.core.config.application.enums.AppType; import app.module.core.config.application.util.AuditUtil; -import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.role.view.adapters.persistence.RoleViewMapper; import app.module.core.usecase.role.view.adapters.persistence.model.RoleViewDto; import app.module.core.usecase.userRole.saveUserRole.adapters.persistence.model.RoleHasPrivilegeDeleteParam; @@ -11,13 +10,13 @@ import app.module.core.usecase.userRole.saveUserRole.adapters.persistence.model. import app.module.core.usecase.userRole.saveUserRole.ports.SaveUserRolePortOut; import app.module.core.usecase.userRole.saveUserRole.ports.application.domain.SaveUserRole; import app.module.core.usecase.userRole.saveUserRole.ports.application.domain.SaveUserRoleCmd; -import java.time.LocalDateTime; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; +import java.util.Optional; + @Repository @RequiredArgsConstructor class SaveUserRoleDao implements SaveUserRolePortOut { diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleMapper.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleMapper.java index 221864bd..c3030a1c 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleMapper.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/SaveUserRoleMapper.java @@ -4,9 +4,10 @@ import app.module.core.config.adapters.persistence.entity.Role; import app.module.core.config.application.enums.AppType; import app.module.core.usecase.userRole.saveUserRole.adapters.persistence.model.RoleHasPrivilegeDeleteParam; import app.module.core.usecase.userRole.saveUserRole.adapters.persistence.model.RoleHasPrivilegeSaveParam; -import java.util.Optional; import org.apache.ibatis.annotations.Mapper; +import java.util.Optional; + @Mapper public interface SaveUserRoleMapper { void insertRole(Role role); diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java index a4f6d756..ba92f017 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java @@ -1,7 +1,6 @@ package app.module.core.usecase.userRole.saveUserRole.adapters.persistence.model; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeSaveParam.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeSaveParam.java index f8b2b522..11435a2d 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeSaveParam.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/adapters/persistence/model/RoleHasPrivilegeSaveParam.java @@ -1,11 +1,11 @@ package app.module.core.usecase.userRole.saveUserRole.adapters.persistence.model; import app.module.core.config.adapters.persistence.component.AuditCommand; -import java.time.LocalDateTime; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.List; + @Getter @AllArgsConstructor public class RoleHasPrivilegeSaveParam extends AuditCommand { diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/SaveUserRolePortIn.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/SaveUserRolePortIn.java index 4c7feda5..744822bd 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/SaveUserRolePortIn.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/SaveUserRolePortIn.java @@ -2,6 +2,7 @@ package app.module.core.usecase.userRole.saveUserRole.ports; import app.module.core.usecase.userRole.saveUserRole.ports.application.domain.SaveUserRole; import app.module.core.usecase.userRole.saveUserRole.ports.application.domain.SaveUserRoleCmd; + import java.util.Optional; public interface SaveUserRolePortIn { diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/SaveUserRolePortOut.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/SaveUserRolePortOut.java index ce55ecb7..f6897f1f 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/SaveUserRolePortOut.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/SaveUserRolePortOut.java @@ -2,6 +2,7 @@ package app.module.core.usecase.userRole.saveUserRole.ports; import app.module.core.usecase.userRole.saveUserRole.ports.application.domain.SaveUserRole; import app.module.core.usecase.userRole.saveUserRole.ports.application.domain.SaveUserRoleCmd; + import java.util.Optional; public interface SaveUserRolePortOut { diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/application/SaveUserRoleService.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/application/SaveUserRoleService.java index 3f09717f..cd9b6a8d 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/application/SaveUserRoleService.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/application/SaveUserRoleService.java @@ -4,10 +4,11 @@ import app.module.core.usecase.userRole.saveUserRole.ports.SaveUserRolePortIn; import app.module.core.usecase.userRole.saveUserRole.ports.SaveUserRolePortOut; import app.module.core.usecase.userRole.saveUserRole.ports.application.domain.SaveUserRole; import app.module.core.usecase.userRole.saveUserRole.ports.application.domain.SaveUserRoleCmd; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor class SaveUserRoleService implements SaveUserRolePortIn { diff --git a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/application/domain/SaveUserRoleCmd.java b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/application/domain/SaveUserRoleCmd.java index b5835e52..f6b5c0da 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/application/domain/SaveUserRoleCmd.java +++ b/core/src/main/java/app/module/core/usecase/userRole/saveUserRole/ports/application/domain/SaveUserRoleCmd.java @@ -1,11 +1,12 @@ package app.module.core.usecase.userRole.saveUserRole.ports.application.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/adapters/persistence/SortUserRoleDao.java b/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/adapters/persistence/SortUserRoleDao.java index f9f6b0fc..24c34e03 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/adapters/persistence/SortUserRoleDao.java +++ b/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/adapters/persistence/SortUserRoleDao.java @@ -2,10 +2,8 @@ package app.module.core.usecase.userRole.sortUserRole.adapters.persistence; import app.module.core.config.application.enums.AppType; import app.module.core.config.application.util.AuditUtil; -import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.userRole.sortUserRole.adapters.persistence.model.SortUserRoleParam; import app.module.core.usecase.userRole.sortUserRole.ports.SortUserRolePortOut; -import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/adapters/persistence/SortUserRoleRepo.java b/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/adapters/persistence/SortUserRoleRepo.java index d3b0079e..63c61595 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/adapters/persistence/SortUserRoleRepo.java +++ b/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/adapters/persistence/SortUserRoleRepo.java @@ -1,6 +1,5 @@ package app.module.core.usecase.userRole.sortUserRole.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Role; import app.module.core.config.application.enums.AppType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/ports/application/SortUserRoleService.java b/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/ports/application/SortUserRoleService.java index 69031cb7..2a5d67ba 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/ports/application/SortUserRoleService.java +++ b/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/ports/application/SortUserRoleService.java @@ -3,9 +3,9 @@ package app.module.core.usecase.userRole.sortUserRole.ports.application; import app.module.core.usecase.userRole.sortUserRole.ports.SortUserRolePortIn; import app.module.core.usecase.userRole.sortUserRole.ports.SortUserRolePortOut; import app.module.core.usecase.userRole.sortUserRole.ports.application.domain.SortUserRoleCmd; -import org.springframework.transaction.annotation.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/ports/application/domain/SortUserRoleCmd.java b/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/ports/application/domain/SortUserRoleCmd.java index 4912466c..25f63dcb 100644 --- a/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/ports/application/domain/SortUserRoleCmd.java +++ b/core/src/main/java/app/module/core/usecase/userRole/sortUserRole/ports/application/domain/SortUserRoleCmd.java @@ -1,11 +1,12 @@ package app.module.core.usecase.userRole.sortUserRole.ports.application.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor diff --git a/core/src/test/java/app/module/core/common/util/AESEncryptUtilTest.java b/core/src/test/java/app/module/core/common/util/AESEncryptUtilTest.java index cd9d5e55..f5946df2 100644 --- a/core/src/test/java/app/module/core/common/util/AESEncryptUtilTest.java +++ b/core/src/test/java/app/module/core/common/util/AESEncryptUtilTest.java @@ -1,17 +1,5 @@ package app.module.core.common.util; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import app.module.core.config.application.util.AESEncryptUtil; -import java.security.InvalidAlgorithmParameterException; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import javax.crypto.BadPaddingException; -import javax.crypto.IllegalBlockSizeException; -import javax.crypto.NoSuchPaddingException; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.TestPropertySource; diff --git a/front/src/main/java/app/module/front/config/FrontWebMvcConfig.java b/front/src/main/java/app/module/front/config/FrontWebMvcConfig.java index 016eb52e..31835eed 100644 --- a/front/src/main/java/app/module/front/config/FrontWebMvcConfig.java +++ b/front/src/main/java/app/module/front/config/FrontWebMvcConfig.java @@ -3,10 +3,6 @@ package app.module.front.config; import app.module.core.config.adapters.web.interceptor.URIAuthorizeInterceptor; import app.module.core.config.application.enums.PublicAccess; import app.module.front.config.adapters.web.interceptor.FrontURIInterceptor; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -22,6 +18,11 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.i18n.CookieLocaleResolver; import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; +import java.util.stream.Collectors; + @Configuration @RequiredArgsConstructor public class FrontWebMvcConfig implements WebMvcConfigurer { diff --git a/front/src/main/java/app/module/front/config/adapters/web/interceptor/FrontURIInterceptor.java b/front/src/main/java/app/module/front/config/adapters/web/interceptor/FrontURIInterceptor.java index 7fd96fa1..d4294889 100644 --- a/front/src/main/java/app/module/front/config/adapters/web/interceptor/FrontURIInterceptor.java +++ b/front/src/main/java/app/module/front/config/adapters/web/interceptor/FrontURIInterceptor.java @@ -11,7 +11,6 @@ import app.module.core.usecase.uri.toptier.ports.URITopTierPortIn; import app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -19,6 +18,8 @@ import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; +import java.util.stream.Collectors; + @Component @RequiredArgsConstructor @Slf4j diff --git a/front/src/main/java/app/module/front/config/application/security/FrontDetailService.java b/front/src/main/java/app/module/front/config/application/security/FrontDetailService.java index 3056c07d..eac3653b 100644 --- a/front/src/main/java/app/module/front/config/application/security/FrontDetailService.java +++ b/front/src/main/java/app/module/front/config/application/security/FrontDetailService.java @@ -2,18 +2,9 @@ package app.module.front.config.application.security; import app.module.core.config.adapters.web.security.domain.CorePrivilege; import app.module.core.config.adapters.web.security.domain.CoreRole; -import app.module.core.usecase.household.getHousehold.adapters.persistence.GetHouseholdMapper; import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn; import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold; import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; -import app.module.core.usecase.user.findUser.ports.FindUserPortIn; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUser; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; -import java.time.LocalDateTime; -import java.util.Collection; -import java.util.Optional; -import java.util.stream.Collectors; -import java.util.stream.Stream; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.GrantedAuthority; @@ -23,6 +14,11 @@ import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; +import java.util.Collection; +import java.util.stream.Collectors; +import java.util.stream.Stream; + @Service @RequiredArgsConstructor public class FrontDetailService implements UserDetailsService { diff --git a/front/src/main/java/app/module/front/config/application/security/FrontHouseholdUser.java b/front/src/main/java/app/module/front/config/application/security/FrontHouseholdUser.java index 439918b3..996299ed 100644 --- a/front/src/main/java/app/module/front/config/application/security/FrontHouseholdUser.java +++ b/front/src/main/java/app/module/front/config/application/security/FrontHouseholdUser.java @@ -1,11 +1,12 @@ package app.module.front.config.application.security; -import java.util.Collection; import lombok.Getter; import lombok.Setter; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.User; +import java.util.Collection; + @Setter @Getter public class FrontHouseholdUser extends User { diff --git a/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java b/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java index 28aeec36..9332772d 100644 --- a/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java +++ b/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java @@ -2,10 +2,6 @@ package app.module.front.config.application.security; import app.module.core.config.adapters.web.security.entrypoint.CustomAuthenticationEntryPoint; import app.module.core.config.application.enums.PublicAccess; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; -import javax.sql.DataSource; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.servlet.ServletListenerRegistrationBean; @@ -23,6 +19,10 @@ import org.springframework.security.web.authentication.rememberme.PersistentToke import org.springframework.security.web.session.HttpSessionEventPublisher; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; +import javax.sql.DataSource; +import java.util.Arrays; +import java.util.List; + @Configuration @EnableWebSecurity @RequiredArgsConstructor diff --git a/front/src/main/java/app/module/front/config/application/security/FrontUser.java b/front/src/main/java/app/module/front/config/application/security/FrontUser.java index c4b5aac1..fd47d3f8 100644 --- a/front/src/main/java/app/module/front/config/application/security/FrontUser.java +++ b/front/src/main/java/app/module/front/config/application/security/FrontUser.java @@ -1,11 +1,12 @@ package app.module.front.config.application.security; -import java.util.Collection; import lombok.Getter; import lombok.Setter; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.User; +import java.util.Collection; + @Getter @Setter public class FrontUser extends User { diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java index 9136f42c..2e43d854 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java @@ -5,15 +5,15 @@ import app.module.core.config.application.enums.DailyTargetStatus; import app.module.core.config.application.enums.MonthStatus; import app.module.core.config.application.util.DailyUtil; import app.module.core.config.constants.DailyRecordConstants; +import app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; +import app.module.core.usecase.daily.record.ports.application.domain.GetDailyRecordCmd; import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto; import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto; import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut; import app.module.front.usecase.daily.calendar.ports.application.domain.CalendarChildren; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; -import app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper; -import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; -import app.module.core.usecase.daily.record.ports.application.domain.GetDailyRecordCmd; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java index 02e1e69c..da1a93ac 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java @@ -1,6 +1,5 @@ package app.module.front.usecase.daily.calendar.ports; -import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto; import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java index 9f2c5405..aad773bf 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java @@ -1,9 +1,9 @@ package app.module.front.usecase.daily.calendar.ports; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; -import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; import java.util.List; diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java index eed3c8b7..2830db2d 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.calendar.ports.application; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; import app.module.front.config.application.util.AuthUtil; import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto; import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO; @@ -7,7 +8,6 @@ import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortIn; import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; -import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -35,13 +35,15 @@ public class RecordCalendarService implements RecordCalendarPortIn { int dataNoneCount = portOut.getDataNoneCountBySomeDayAfter(command.getHouseholdSeq()); MonthlyStatusDto monthly = portOut.getMonthlyStatus(command); - String returnValue = "DONE"; + String returnValue; if (dataNoneCount != 0) { returnValue = "DATA_NONE"; } else if (monthly != null && monthly.isForestNone()) { returnValue = "FOREST_NONE"; } else if (monthly != null && monthly.isBankNone()) { returnValue = "BANK_NONE"; + } else { + returnValue = "DONE"; } return returnValue; diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendarCmd.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendarCmd.java index 28f5090a..b460249d 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendarCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendarCmd.java @@ -1,6 +1,8 @@ package app.module.front.usecase.daily.calendar.ports.application.domain; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; @Getter @Setter diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseDao.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseDao.java index 0d3069d9..919bccf8 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseDao.java @@ -1,14 +1,13 @@ package app.module.front.usecase.daily.expense.adapters.persistence; +import app.module.core.config.application.logging.SafeLogger; import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto; import app.module.front.usecase.daily.expense.ports.DailyExpensePortOut; import app.module.front.usecase.daily.expense.ports.application.domain.CreateDailyExpenseCmd; import app.module.front.usecase.daily.expense.ports.application.domain.GetDailyExpenseCmd; import app.module.front.usecase.daily.expense.ports.application.domain.RemoveDailyExpenseCmd; -import app.module.core.config.application.logging.SafeLogger; - -import org.slf4j.LoggerFactory; import lombok.RequiredArgsConstructor; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/DailyExpenseController.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/DailyExpenseController.java index 7a75ba8e..ad4a0849 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/DailyExpenseController.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/DailyExpenseController.java @@ -2,13 +2,13 @@ package app.module.front.usecase.daily.expense.adapters.web; import app.module.core.config.application.exception.NoRecordDataException; import app.module.core.config.application.util.CoreUtil; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpenseReqVO; import app.module.front.usecase.daily.expense.adapters.web.model.RemoveDailyExpenseReqVO; import app.module.front.usecase.daily.expense.adapters.web.validator.CreateDailyExpenseValidator; import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn; -import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; -import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/DailyExpenseUIController.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/DailyExpenseUIController.java index e5a7f4bd..3e1c14d1 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/DailyExpenseUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/DailyExpenseUIController.java @@ -1,14 +1,14 @@ package app.module.front.usecase.daily.expense.adapters.web; +import app.module.core.config.application.enums.DailySort; import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto; import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO; import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn; -import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; -import app.module.core.config.application.enums.DailySort; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; -import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/ports/DailyExpensePortOut.java b/front/src/main/java/app/module/front/usecase/daily/expense/ports/DailyExpensePortOut.java index edefcebd..0054a27b 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/ports/DailyExpensePortOut.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/ports/DailyExpensePortOut.java @@ -4,8 +4,6 @@ import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyEx import app.module.front.usecase.daily.expense.ports.application.domain.CreateDailyExpenseCmd; import app.module.front.usecase.daily.expense.ports.application.domain.GetDailyExpenseCmd; import app.module.front.usecase.daily.expense.ports.application.domain.RemoveDailyExpenseCmd; -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; -import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; import java.util.List; diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingMapper.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingMapper.java index 2aa6eca1..9fab6c5e 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingMapper.java @@ -4,8 +4,6 @@ import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFa import app.module.front.usecase.daily.farming.ports.application.domain.CreateDailyFarmingCmd; import app.module.front.usecase.daily.farming.ports.application.domain.GetDailyFarmingCmd; import app.module.front.usecase.daily.farming.ports.application.domain.RemoveDailyFarmingCmd; -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; -import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingMonthDto.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingMonthDto.java index 87faf87f..a64acfb7 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingMonthDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingMonthDto.java @@ -1,6 +1,5 @@ package app.module.front.usecase.daily.farming.adapters.persistence.model; -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import lombok.Getter; import lombok.Setter; diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingController.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingController.java index 3ce2c514..b4759316 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingController.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingController.java @@ -2,13 +2,13 @@ package app.module.front.usecase.daily.farming.adapters.web; import app.module.core.config.application.exception.NoRecordDataException; import app.module.core.config.application.util.CoreUtil; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO; import app.module.front.usecase.daily.farming.adapters.web.model.RemoveDailyFarmingReqVO; import app.module.front.usecase.daily.farming.adapters.web.validator.CreateDailyFarmingValidator; import app.module.front.usecase.daily.farming.ports.application.DailyFarmingService; -import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; -import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingUIController.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingUIController.java index 7ea1ef47..b6ac88b9 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingUIController.java @@ -1,14 +1,14 @@ package app.module.front.usecase.daily.farming.adapters.web; +import app.module.core.config.application.enums.DailySort; import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto; import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO; import app.module.front.usecase.daily.farming.ports.application.DailyFarmingService; -import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; -import app.module.core.config.application.enums.DailySort; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; -import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortIn.java b/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortIn.java index 00e541e1..0b0e28e1 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortIn.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortIn.java @@ -6,8 +6,6 @@ import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFa import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO; import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO; import app.module.front.usecase.daily.farming.adapters.web.model.RemoveDailyFarmingReqVO; -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeMonthDto; -import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO; import java.util.List; diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortOut.java b/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortOut.java index 6b189a3b..21f42ed8 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortOut.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortOut.java @@ -5,8 +5,6 @@ import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFa import app.module.front.usecase.daily.farming.ports.application.domain.CreateDailyFarmingCmd; import app.module.front.usecase.daily.farming.ports.application.domain.GetDailyFarmingCmd; import app.module.front.usecase.daily.farming.ports.application.domain.RemoveDailyFarmingCmd; -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; -import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; import java.util.List; diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/DailyForestryMapper.java b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/DailyForestryMapper.java index 16c00b4b..6ffa8529 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/DailyForestryMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/DailyForestryMapper.java @@ -5,8 +5,6 @@ import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyF import app.module.front.usecase.daily.forestry.ports.application.domain.CreateDailyForestryCmd; import app.module.front.usecase.daily.forestry.ports.application.domain.GetDailyForestryCmd; import app.module.front.usecase.daily.forestry.ports.application.domain.RemoveDailyForestryCmd; -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; -import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryMonthDto.java b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryMonthDto.java index 447dc5f1..471e7c07 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryMonthDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryMonthDto.java @@ -1,6 +1,5 @@ package app.module.front.usecase.daily.forestry.adapters.persistence.model; -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import lombok.Getter; import lombok.Setter; diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/DailyForestryController.java b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/DailyForestryController.java index 541cbd22..2d1655c7 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/DailyForestryController.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/DailyForestryController.java @@ -2,13 +2,13 @@ package app.module.front.usecase.daily.forestry.adapters.web; import app.module.core.config.application.exception.NoRecordDataException; import app.module.core.config.application.util.CoreUtil; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.front.usecase.daily.forestry.adapters.web.model.CreateDailyForestryReqVO; import app.module.front.usecase.daily.forestry.adapters.web.model.RemoveDailyForestryReqVO; import app.module.front.usecase.daily.forestry.adapters.web.validator.CreateDailyForestryValidator; import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn; -import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; -import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/DailyForestryUIController.java b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/DailyForestryUIController.java index 38410f12..af80bbfc 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/DailyForestryUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/DailyForestryUIController.java @@ -1,14 +1,14 @@ package app.module.front.usecase.daily.forestry.adapters.web; +import app.module.core.config.application.enums.DailySort; import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryDto; import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryUIReqVO; import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn; -import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; -import app.module.core.config.application.enums.DailySort; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; -import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/DailyForestryPortOut.java b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/DailyForestryPortOut.java index 75f946c2..cf19b9dd 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/DailyForestryPortOut.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/DailyForestryPortOut.java @@ -4,8 +4,6 @@ import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyF import app.module.front.usecase.daily.forestry.ports.application.domain.CreateDailyForestryCmd; import app.module.front.usecase.daily.forestry.ports.application.domain.GetDailyForestryCmd; import app.module.front.usecase.daily.forestry.ports.application.domain.RemoveDailyForestryCmd; -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; -import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; import java.util.List; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeMapper.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeMapper.java index 9a05694d..7c6d34e1 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeMapper.java @@ -1,7 +1,7 @@ package app.module.front.usecase.daily.income.adapters.persistence; -import app.module.front.usecase.daily.income.ports.application.domain.CreateDailyIncomeCmd; import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.income.ports.application.domain.CreateDailyIncomeCmd; import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; import app.module.front.usecase.daily.income.ports.application.domain.RemoveDailyIncomeCmd; import org.apache.ibatis.annotations.Mapper; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeController.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeController.java index b38faa15..99278abc 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeController.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeController.java @@ -2,13 +2,13 @@ package app.module.front.usecase.daily.income.adapters.web; import app.module.core.config.application.exception.NoRecordDataException; import app.module.core.config.application.util.CoreUtil; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO; import app.module.front.usecase.daily.income.adapters.web.model.RemoveDailyIncomeReqVO; import app.module.front.usecase.daily.income.adapters.web.validator.CreateDailyIncomeValidator; import app.module.front.usecase.daily.income.ports.DailyIncomePortIn; -import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; -import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeUIController.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeUIController.java index d0bf902b..c94a91b0 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeUIController.java @@ -1,14 +1,14 @@ package app.module.front.usecase.daily.income.adapters.web; +import app.module.core.config.application.enums.DailySort; import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO; import app.module.front.usecase.daily.income.ports.DailyIncomePortIn; -import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; -import app.module.core.config.application.enums.DailySort; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; -import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/DailyInputType.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/DailyInputType.java index 64afec34..9119fed9 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/DailyInputType.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/DailyInputType.java @@ -1,8 +1,5 @@ package app.module.front.usecase.daily.income.adapters.web.model; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - public enum DailyInputType { /** * 직접 입력 diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/RemoveDailyIncomeReqVO.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/RemoveDailyIncomeReqVO.java index 7c2fc150..19c6cd17 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/RemoveDailyIncomeReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/RemoveDailyIncomeReqVO.java @@ -2,7 +2,9 @@ package app.module.front.usecase.daily.income.adapters.web.model; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import jakarta.validation.constraints.NotBlank; -import lombok.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; @Getter @Setter diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerMapper.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerMapper.java index c32b1345..2729451b 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerMapper.java @@ -1,12 +1,9 @@ package app.module.front.usecase.daily.power.adapters.persistence; -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; -import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; -import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd; import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto; +import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd; import app.module.front.usecase.daily.power.ports.application.domain.GetDailyPowerCmd; import app.module.front.usecase.daily.power.ports.application.domain.RemoveDailyPowerCmd; -import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerController.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerController.java index 123def9e..7e3a6930 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerController.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerController.java @@ -2,13 +2,13 @@ package app.module.front.usecase.daily.power.adapters.web; import app.module.core.config.application.exception.NoRecordDataException; import app.module.core.config.application.util.CoreUtil; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.front.usecase.daily.power.adapters.web.model.CreateDailyPowerReqVO; import app.module.front.usecase.daily.power.adapters.web.model.RemoveDailyPowerReqVO; import app.module.front.usecase.daily.power.adapters.web.validator.CreateDailyPowerValidator; import app.module.front.usecase.daily.power.ports.DailyPowerPortIn; -import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; -import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerUIController.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerUIController.java index 4130ec5c..13cc4b39 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerUIController.java @@ -1,13 +1,13 @@ package app.module.front.usecase.daily.power.adapters.web; +import app.module.core.config.application.enums.DailySort; import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto; import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO; import app.module.front.usecase.daily.power.ports.DailyPowerPortIn; -import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; -import app.module.core.config.application.enums.DailySort; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; -import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/validator/CreateDailyPowerValidator.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/validator/CreateDailyPowerValidator.java index 097dc9a0..e16c2d2c 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/validator/CreateDailyPowerValidator.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/validator/CreateDailyPowerValidator.java @@ -2,7 +2,6 @@ package app.module.front.usecase.daily.power.adapters.web.validator; import app.module.front.usecase.daily.power.adapters.web.model.CreateDailyPowerReqVO; import lombok.RequiredArgsConstructor; -import org.apache.tika.utils.StringUtils; import org.springframework.stereotype.Component; import org.springframework.validation.Errors; import org.springframework.validation.Validator; diff --git a/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortOut.java b/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortOut.java index 009389a9..7449e9f1 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortOut.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortOut.java @@ -1,8 +1,5 @@ package app.module.front.usecase.daily.power.ports; - -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; -import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto; import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd; import app.module.front.usecase.daily.power.ports.application.domain.GetDailyPowerCmd; diff --git a/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/DailyReceiptController.java b/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/DailyReceiptController.java index 0ca56713..5679d78d 100644 --- a/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/DailyReceiptController.java +++ b/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/DailyReceiptController.java @@ -13,14 +13,15 @@ import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpe import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn; import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO; import app.module.front.usecase.daily.income.adapters.web.model.DailyInputType; -import app.module.front.usecase.daily.income.adapters.web.model.RemoveDailyIncomeReqVO; import app.module.front.usecase.daily.income.ports.DailyIncomePortIn; -import app.module.front.usecase.daily.receipt.adapters.web.model.*; +import app.module.front.usecase.daily.receipt.adapters.web.model.CreateReceiptFileReqVO; +import app.module.front.usecase.daily.receipt.adapters.web.model.CreateReceiptHasFileReqVO; +import app.module.front.usecase.daily.receipt.adapters.web.model.ReceiptItem; +import app.module.front.usecase.daily.receipt.adapters.web.model.ReceiptResVO; import app.module.front.usecase.daily.receipt.ports.DailyReceiptPortIn; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.*; diff --git a/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/model/CreateReceiptHasFileReqVO.java b/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/model/CreateReceiptHasFileReqVO.java index 31cbd885..4dcfbb08 100644 --- a/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/model/CreateReceiptHasFileReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/model/CreateReceiptHasFileReqVO.java @@ -1,9 +1,10 @@ package app.module.front.usecase.daily.receipt.adapters.web.model; import app.module.core.config.adapters.persistence.component.AuditCommand; -import app.module.core.config.application.enums.DailyInputType; -import app.module.core.config.application.enums.FileUploadType; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; @Getter @Setter diff --git a/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/model/CreateReceiptUploadFileReqVO.java b/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/model/CreateReceiptUploadFileReqVO.java index ab64633e..63a7cad0 100644 --- a/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/model/CreateReceiptUploadFileReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/model/CreateReceiptUploadFileReqVO.java @@ -1,8 +1,10 @@ package app.module.front.usecase.daily.receipt.adapters.web.model; import app.module.core.config.adapters.persistence.component.AuditCommand; -import app.module.core.config.application.enums.FileUploadType; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; @Getter @Setter diff --git a/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/model/ReceiptItem.java b/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/model/ReceiptItem.java index be3a0057..09874444 100644 --- a/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/model/ReceiptItem.java +++ b/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/model/ReceiptItem.java @@ -1,7 +1,9 @@ package app.module.front.usecase.daily.receipt.adapters.web.model; import com.fasterxml.jackson.annotation.JsonAlias; -import lombok.*; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; @Getter @Setter diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java index f9951da3..28e08403 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java @@ -1,14 +1,12 @@ package app.module.front.usecase.daily.record.adapters.web; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.core.config.application.enums.DailyTargetStatus; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.core.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO; -import app.module.front.config.application.util.AuditUtil; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.front.config.application.util.AuthUtil; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.front.usecase.daily.record.adapters.web.validator.CreateDailyRecordValidator; -import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -44,7 +42,6 @@ public class DailyRecordController { } DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); - log.debug("reqVO: {}", reqVO); DailyRecordDto detail = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq()); formVO.setRecordMonth(reqVO.getSearchMonth()); @@ -53,7 +50,6 @@ public class DailyRecordController { formVO.setEndDate(detail.getEndDate()); formVO.setFarming(detail.isFarmingOpen()); formVO.setHouseholdSeq(reqVO.getHouseholdSeq()); - log.debug("formVO: {}", formVO); dailyRecordPortIn.create(formVO); diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java index e3676535..3f4384b6 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java @@ -1,6 +1,9 @@ package app.module.front.usecase.daily.record.adapters.web; +import app.module.core.config.application.enums.DailyStatus; import app.module.core.config.application.exception.NoMatchingURIException; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO; import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn; import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO; @@ -11,10 +14,7 @@ import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReq import app.module.front.usecase.daily.income.ports.DailyIncomePortIn; import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO; import app.module.front.usecase.daily.power.ports.DailyPowerPortIn; -import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; -import app.module.core.config.application.enums.DailyStatus; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; -import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO; import app.module.front.usecase.daily.work.ports.DailyWorkPortIn; import lombok.RequiredArgsConstructor; diff --git a/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java b/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java index 2525b2e2..a9de5c74 100644 --- a/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java @@ -2,24 +2,22 @@ package app.module.front.usecase.daily.status.adapters.web; import app.module.core.config.application.enums.DailySort; import app.module.core.config.application.exception.NoMatchingURIException; -import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseMonthDto; import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO; import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn; import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO; import app.module.front.usecase.daily.farming.ports.DailyFarmingPortIn; import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryUIReqVO; import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn; -import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO; import app.module.front.usecase.daily.income.ports.DailyIncomePortIn; import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO; import app.module.front.usecase.daily.power.ports.DailyPowerPortIn; import app.module.front.usecase.daily.status.adapters.web.model.DailyStatusUIReqVO; +import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import app.module.front.usecase.daily.status.ports.DailyStatusPortIn; import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO; import app.module.front.usecase.daily.work.ports.DailyWorkPortIn; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; @@ -30,7 +28,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; import java.util.Objects; -@Slf4j @Controller @RequiredArgsConstructor @RequestMapping(path = "/status/daily") @@ -50,8 +47,7 @@ public class DailyStatusUIController { */ @GetMapping(path = "") public String index(Model model, @ModelAttribute DailyStatusUIReqVO reqVO) { - log.debug("reqVO: {}", reqVO); - + model.addAttribute("reqVO", reqVO); model.addAttribute("detail", dailyStatusPortIn.operate(reqVO)); @@ -61,7 +57,7 @@ public class DailyStatusUIController { /** * 일계부 입력 현황 상세 화면 - * + * @param model Model * @param step 조회 항목 * @param searchMonth 검색 월 diff --git a/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/model/DailyStatusUIReqVO.java b/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/model/DailyStatusUIReqVO.java index 5804730d..bfc02f4f 100644 --- a/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/model/DailyStatusUIReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/model/DailyStatusUIReqVO.java @@ -1,14 +1,9 @@ package app.module.front.usecase.daily.status.adapters.web.model; -import app.module.core.config.application.util.DailyUtil; -import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.apache.tika.utils.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -19,8 +14,6 @@ import java.util.List; @Setter @ToString(callSuper = true) public class DailyStatusUIReqVO extends DailyUIReqVO { - private static final Logger LOGGER = LoggerFactory.getLogger(RecordCalendarUIReqVO.class); - private static DailyUtil dailyUtil; public DailyStatusUIReqVO() { setSearchMonth(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM"))); diff --git a/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/DailyWorkMapper.java b/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/DailyWorkMapper.java index 65c9172c..b391a434 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/DailyWorkMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/DailyWorkMapper.java @@ -1,12 +1,9 @@ package app.module.front.usecase.daily.work.adapters.persistence; -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; -import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; -import app.module.front.usecase.daily.work.ports.application.domain.CreateDailyWorkCmd; import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto; +import app.module.front.usecase.daily.work.ports.application.domain.CreateDailyWorkCmd; import app.module.front.usecase.daily.work.ports.application.domain.GetDailyWorkCmd; import app.module.front.usecase.daily.work.ports.application.domain.RemoveDailyWorkCmd; -import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkController.java b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkController.java index 3432e492..ff62d8a2 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkController.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkController.java @@ -3,8 +3,8 @@ package app.module.front.usecase.daily.work.adapters.web; import app.module.core.config.application.exception.NoRecordDataException; import app.module.core.config.application.util.CoreUtil; import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; -import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; +import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO; import app.module.front.usecase.daily.work.adapters.web.model.RemoveDailyWorkReqVO; import app.module.front.usecase.daily.work.adapters.web.validator.CreateDailyWorkValidator; diff --git a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkUIController.java b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkUIController.java index 79e33a98..2ea558a2 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkUIController.java @@ -1,11 +1,11 @@ package app.module.front.usecase.daily.work.adapters.web; -import app.module.core.config.application.exception.NoRecordDataException; -import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; -import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.core.config.application.enums.DailySort; -import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto; import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO; import app.module.front.usecase.daily.work.ports.DailyWorkPortIn; diff --git a/front/src/main/java/app/module/front/usecase/daily/work/ports/DailyWorkPortIn.java b/front/src/main/java/app/module/front/usecase/daily/work/ports/DailyWorkPortIn.java index df4af1bf..a61152fd 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/ports/DailyWorkPortIn.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/ports/DailyWorkPortIn.java @@ -1,8 +1,5 @@ package app.module.front.usecase.daily.work.ports; - -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeMonthDto; -import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO; import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto; import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkMonthDto; import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO; diff --git a/front/src/main/java/app/module/front/usecase/editor/adapters/web/EditorImageUploadController.java b/front/src/main/java/app/module/front/usecase/editor/adapters/web/EditorImageUploadController.java index 3cab651a..a904bab7 100644 --- a/front/src/main/java/app/module/front/usecase/editor/adapters/web/EditorImageUploadController.java +++ b/front/src/main/java/app/module/front/usecase/editor/adapters/web/EditorImageUploadController.java @@ -5,7 +5,6 @@ import app.module.core.config.application.enums.FileUploadType; import app.module.core.usecase.file.saveToStorage.ports.SaveToStoragePortIn; import app.module.core.usecase.file.saveToStorage.ports.application.domain.SaveToStorage; import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn; -import java.io.IOException; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; @@ -14,6 +13,8 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; + @Controller @RequiredArgsConstructor public class EditorImageUploadController { diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/model/CreateForestProductDto.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/model/CreateForestProductDto.java index 21876472..ae728902 100644 --- a/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/model/CreateForestProductDto.java +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/model/CreateForestProductDto.java @@ -5,7 +5,6 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import java.math.BigDecimal; import java.time.LocalDateTime; @Getter diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java index 50c7c22d..d989559c 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java @@ -17,10 +17,6 @@ import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.applica import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; import app.module.front.usecase.info.monthly.updateMonthlyInputStatus.ports.UpdateMonthlyInputStatusPortIn; import app.module.front.usecase.info.monthly.updateMonthlyInputStatus.ports.application.domain.UpdateMonthlyInputStatusCmd; -import app.module.front.usecase.info.monthlyProduct.createForestProduct.ports.CreateForestProductPortIn; -import app.module.front.usecase.info.monthlyProduct.createForestProduct.ports.application.domain.CreateForestProductCmd; -import app.module.front.usecase.info.monthlyProduct.removeMonthForestProducts.ports.RemoveMonthForestProductsPortIn; -import app.module.front.usecase.info.monthlyProduct.removeMonthForestProducts.ports.application.domain.RemoveMonthForestProductsCmd; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java index d4b8c13f..6a206608 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java @@ -12,8 +12,6 @@ import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.applica import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.GetPrevMonthlyInputStatusPortIn; import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.application.domain.GetPrevMonthlyInputStatus; import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.application.domain.GetPrevMonthlyInputStatusCmd; -import app.module.front.usecase.info.monthlyProduct.getMonthlyForestProducts.ports.application.domain.GetMonthlyForestProducts; -import app.module.front.usecase.info.monthlyProduct.getMonthlyForestProducts.ports.application.domain.GetMonthlyForestProductsCmd; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputProductReqVO.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputProductReqVO.java index cf6fa217..72d8913f 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputProductReqVO.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputProductReqVO.java @@ -2,8 +2,6 @@ package app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web.model; import lombok.*; -import java.math.BigDecimal; - @Getter @Setter @NoArgsConstructor diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankOutputUI/adapters/web/GetBankOutputUIController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankOutputUI/adapters/web/GetBankOutputUIController.java index abc49a5d..809bd58e 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankOutputUI/adapters/web/GetBankOutputUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankOutputUI/adapters/web/GetBankOutputUIController.java @@ -9,15 +9,11 @@ import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetB import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; -import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.GetMonthlyInputStatussPortIn; -import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatuss; -import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatussCmd; import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.GetPrevMonthlyInputStatusPortIn; import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.application.domain.GetPrevMonthlyInputStatus; import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.application.domain.GetPrevMonthlyInputStatusCmd; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; @@ -29,7 +25,6 @@ import org.springframework.web.bind.annotation.PathVariable; import java.time.LocalDate; import java.time.YearMonth; import java.time.format.DateTimeFormatter; -import java.util.NoSuchElementException; @Controller @RequiredArgsConstructor diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBanksUI/adapters/web/GetBanksUIController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBanksUI/adapters/web/GetBanksUIController.java index 29a1cdb7..f3740b23 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBanksUI/adapters/web/GetBanksUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBanksUI/adapters/web/GetBanksUIController.java @@ -1,9 +1,6 @@ package app.module.front.usecase.info.bankUI.getBanksUI.adapters.web; import app.module.core.config.application.enums.MonthStatus; -import app.module.core.config.application.util.CommonUtil; -import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn; -import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; import app.module.front.config.application.util.AuthUtil; import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.GetMonthlyInputStatussPortIn; import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatuss; @@ -13,7 +10,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import org.springframework.data.web.PageableDefault; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/adapters/persistence/model/CreateForestProductDto.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/adapters/persistence/model/CreateForestProductDto.java index 40128ef5..b35c6607 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/adapters/persistence/model/CreateForestProductDto.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/adapters/persistence/model/CreateForestProductDto.java @@ -5,7 +5,6 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import java.math.BigDecimal; import java.time.LocalDateTime; @Getter diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/ports/application/domain/CreateForestProductCmd.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/ports/application/domain/CreateForestProductCmd.java index 3369e641..0a631cd3 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/ports/application/domain/CreateForestProductCmd.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/ports/application/domain/CreateForestProductCmd.java @@ -6,8 +6,6 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import java.math.BigDecimal; - @Getter @Setter @AllArgsConstructor diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProduct/ports/application/domain/GetForestProduct.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProduct/ports/application/domain/GetForestProduct.java index 811d87ce..9c265720 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProduct/ports/application/domain/GetForestProduct.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProduct/ports/application/domain/GetForestProduct.java @@ -5,7 +5,6 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import java.math.BigDecimal; import java.time.LocalDateTime; @Getter diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/adapters/persistence/model/GetForestProductsDto.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/adapters/persistence/model/GetForestProductsDto.java index b4bc7f24..fa156478 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/adapters/persistence/model/GetForestProductsDto.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/adapters/persistence/model/GetForestProductsDto.java @@ -4,7 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; -import java.math.BigDecimal; import java.time.LocalDateTime; @Getter diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/ports/application/domain/GetForestProducts.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/ports/application/domain/GetForestProducts.java index 484c1886..26b8b32e 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/ports/application/domain/GetForestProducts.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/ports/application/domain/GetForestProducts.java @@ -5,7 +5,6 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import java.math.BigDecimal; import java.time.LocalDateTime; @Getter diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/adapters/persistence/model/GetMonthlyForestProductsDto.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/adapters/persistence/model/GetMonthlyForestProductsDto.java index 5dda1840..beda9579 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/adapters/persistence/model/GetMonthlyForestProductsDto.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/adapters/persistence/model/GetMonthlyForestProductsDto.java @@ -4,7 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; -import java.math.BigDecimal; import java.time.LocalDateTime; @Getter diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/ports/application/domain/GetMonthlyForestProducts.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/ports/application/domain/GetMonthlyForestProducts.java index 666043f7..489b5622 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/ports/application/domain/GetMonthlyForestProducts.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/ports/application/domain/GetMonthlyForestProducts.java @@ -5,7 +5,6 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import java.math.BigDecimal; import java.time.LocalDateTime; @Getter diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/adapters/persistence/model/UpdateForestProductDto.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/adapters/persistence/model/UpdateForestProductDto.java index c889b62d..26f99157 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/adapters/persistence/model/UpdateForestProductDto.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/adapters/persistence/model/UpdateForestProductDto.java @@ -5,7 +5,6 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import java.math.BigDecimal; import java.time.LocalDateTime; @Getter diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/ports/application/domain/UpdateForestProductCmd.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/ports/application/domain/UpdateForestProductCmd.java index 784b0f04..0569d022 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/ports/application/domain/UpdateForestProductCmd.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/ports/application/domain/UpdateForestProductCmd.java @@ -5,8 +5,6 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import java.math.BigDecimal; - @Getter @Setter @AllArgsConstructor diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/CreateMonthlyController.java b/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/CreateMonthlyController.java index a838f143..36c31beb 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/CreateMonthlyController.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/CreateMonthlyController.java @@ -2,6 +2,8 @@ package app.module.front.usecase.info.monthlyUI.createMonthlyUI.adapters.web; import app.module.core.config.application.enums.MonthStatus; import app.module.core.config.application.util.CoreUtil; +import app.module.front.config.application.response.ApiResponse; +import app.module.front.config.application.util.AuthUtil; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; @@ -11,8 +13,6 @@ import app.module.front.usecase.info.monthlyProduct.createForestProduct.ports.Cr import app.module.front.usecase.info.monthlyProduct.createForestProduct.ports.application.domain.CreateForestProductCmd; import app.module.front.usecase.info.monthlyProduct.removeMonthForestProducts.ports.RemoveMonthForestProductsPortIn; import app.module.front.usecase.info.monthlyProduct.removeMonthForestProducts.ports.application.domain.RemoveMonthForestProductsCmd; -import app.module.front.config.application.response.ApiResponse; -import app.module.front.config.application.util.AuthUtil; import app.module.front.usecase.info.monthlyUI.createMonthlyUI.adapters.web.model.CreateMonthlyProductReqVO; import app.module.front.usecase.info.monthlyUI.createMonthlyUI.adapters.web.model.CreateMonthlyReqVO; import jakarta.validation.Valid; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/CreateMonthlyUIController.java b/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/CreateMonthlyUIController.java index 7b085c0c..4b12cc1a 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/CreateMonthlyUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/CreateMonthlyUIController.java @@ -1,6 +1,8 @@ package app.module.front.usecase.info.monthlyUI.createMonthlyUI.adapters.web; import app.module.core.config.application.enums.MonthStatus; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import app.module.front.config.application.util.AuthUtil; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; @@ -13,8 +15,6 @@ import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.app import app.module.front.usecase.info.monthlyProduct.getMonthlyForestProducts.ports.GetMonthlyForestProductsPortIn; import app.module.front.usecase.info.monthlyProduct.getMonthlyForestProducts.ports.application.domain.GetMonthlyForestProducts; import app.module.front.usecase.info.monthlyProduct.getMonthlyForestProducts.ports.application.domain.GetMonthlyForestProductsCmd; -import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; -import app.module.front.config.application.util.AuthUtil; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -25,6 +25,7 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; + import java.time.LocalDate; import java.time.YearMonth; import java.time.format.DateTimeFormatter; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/model/CreateMonthlyProductReqVO.java b/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/model/CreateMonthlyProductReqVO.java index ee89a091..133a7908 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/model/CreateMonthlyProductReqVO.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/model/CreateMonthlyProductReqVO.java @@ -2,8 +2,6 @@ package app.module.front.usecase.info.monthlyUI.createMonthlyUI.adapters.web.mod import lombok.*; -import java.math.BigDecimal; - @Getter @Setter @NoArgsConstructor diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyUI/getMonthlysUI/adapters/web/GetMonthlysUIController.java b/front/src/main/java/app/module/front/usecase/info/monthlyUI/getMonthlysUI/adapters/web/GetMonthlysUIController.java index 196edcc1..4765fd5a 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyUI/getMonthlysUI/adapters/web/GetMonthlysUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyUI/getMonthlysUI/adapters/web/GetMonthlysUIController.java @@ -1,10 +1,10 @@ package app.module.front.usecase.info.monthlyUI.getMonthlysUI.adapters.web; import app.module.core.config.application.enums.MonthStatus; +import app.module.front.config.application.util.AuthUtil; import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.GetMonthlyInputStatussPortIn; import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatuss; import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatussCmd; -import app.module.front.config.application.util.AuthUtil; import app.module.front.usecase.info.monthlyUI.getMonthlysUI.adapters.web.model.GetMonthlyssReqVO; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; diff --git a/front/src/main/java/app/module/front/usecase/info/userFront/getUserFront/adapters/persistence/GetUserFrontMapper.java b/front/src/main/java/app/module/front/usecase/info/userFront/getUserFront/adapters/persistence/GetUserFrontMapper.java index 930d4277..4dba939c 100644 --- a/front/src/main/java/app/module/front/usecase/info/userFront/getUserFront/adapters/persistence/GetUserFrontMapper.java +++ b/front/src/main/java/app/module/front/usecase/info/userFront/getUserFront/adapters/persistence/GetUserFrontMapper.java @@ -1,11 +1,9 @@ package app.module.front.usecase.info.userFront.getUserFront.adapters.persistence; -import app.module.core.config.adapters.web.security.domain.CoreRole; import app.module.front.usecase.info.userFront.getUserFront.ports.application.domain.GetUserFront; import org.apache.ibatis.annotations.Mapper; import java.util.Optional; -import java.util.Set; @Mapper public interface GetUserFrontMapper { diff --git a/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/adapters/persistence/InsertTermAgreementMapper.java b/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/adapters/persistence/InsertTermAgreementMapper.java index ab49cb1c..a1293a9e 100644 --- a/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/adapters/persistence/InsertTermAgreementMapper.java +++ b/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/adapters/persistence/InsertTermAgreementMapper.java @@ -1,11 +1,8 @@ package app.module.front.usecase.info.userFront.insertTermAgreement.adapters.persistence; -import app.module.front.usecase.info.userFront.getUserFront.ports.application.domain.GetUserFront; import app.module.front.usecase.info.userFront.insertTermAgreement.ports.application.domain.InsertTermAgreementCmd; import org.apache.ibatis.annotations.Mapper; -import java.util.Optional; - @Mapper public interface InsertTermAgreementMapper { void insert(InsertTermAgreementCmd cmd); diff --git a/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/ports/application/InsertTermAgreementService.java b/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/ports/application/InsertTermAgreementService.java index 1951de41..dec44e86 100644 --- a/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/ports/application/InsertTermAgreementService.java +++ b/front/src/main/java/app/module/front/usecase/info/userFront/insertTermAgreement/ports/application/InsertTermAgreementService.java @@ -3,9 +3,6 @@ package app.module.front.usecase.info.userFront.insertTermAgreement.ports.applic import app.module.front.usecase.info.userFront.insertTermAgreement.ports.InsertTermAgreementPortIn; import app.module.front.usecase.info.userFront.insertTermAgreement.ports.InsertTermAgreementPortOut; import app.module.front.usecase.info.userFront.insertTermAgreement.ports.application.domain.InsertTermAgreementCmd; -import app.module.front.usecase.info.userFront.updateUser.ports.UpdateUserFrontPortIn; -import app.module.front.usecase.info.userFront.updateUser.ports.UpdateUserFrontPortOut; -import app.module.front.usecase.info.userFront.updateUser.ports.application.domain.UpdateUserFrontCmd; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/front/src/main/java/app/module/front/usecase/info/userUI/getUserPasswordUI/adapters/web/model/GetUserPasswordReqVO.java b/front/src/main/java/app/module/front/usecase/info/userUI/getUserPasswordUI/adapters/web/model/GetUserPasswordReqVO.java index 4a1dbf82..5aef8478 100644 --- a/front/src/main/java/app/module/front/usecase/info/userUI/getUserPasswordUI/adapters/web/model/GetUserPasswordReqVO.java +++ b/front/src/main/java/app/module/front/usecase/info/userUI/getUserPasswordUI/adapters/web/model/GetUserPasswordReqVO.java @@ -2,7 +2,9 @@ package app.module.front.usecase.info.userUI.getUserPasswordUI.adapters.web.mode import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; @Data @NoArgsConstructor // 기본 생성자 자동 추가 diff --git a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserController.java b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserController.java index 981795d9..37649b6c 100644 --- a/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserController.java +++ b/front/src/main/java/app/module/front/usecase/info/userUI/updateUserUI/adapters/web/UpdateUserController.java @@ -17,7 +17,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; diff --git a/front/src/main/java/app/module/front/usecase/menu/adapters/web/MenuController.java b/front/src/main/java/app/module/front/usecase/menu/adapters/web/MenuController.java index 1734c83c..395d3ac9 100644 --- a/front/src/main/java/app/module/front/usecase/menu/adapters/web/MenuController.java +++ b/front/src/main/java/app/module/front/usecase/menu/adapters/web/MenuController.java @@ -1,6 +1,5 @@ package app.module.front.usecase.menu.adapters.web; -import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO; import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortIn; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus;