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 d81d7db4..d493b88d 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 @@ -20,8 +20,8 @@ import org.springframework.web.bind.annotation.*; @RequestMapping(path = "/api/household/daily/farming") public class SaveDailyFarmingController { private final DailyRecordPortIn dailyRecordPortIn; - private final SaveDailyFarmingPortIn DailyFarmingPortIn; - private final SaveDailyFarmingValidator DailyFarmingValidator; + private final SaveDailyFarmingPortIn dailyFarmingPortIn; + private final SaveDailyFarmingValidator dailyFarmingValidator; /** * 일계부 농업생산 조회 @@ -34,7 +34,7 @@ public class SaveDailyFarmingController { reqVO.setId(Long.parseLong(id)); - GetDailyFarmingDto detail = DailyFarmingPortIn.detail(reqVO); + GetDailyFarmingDto detail = dailyFarmingPortIn.detail(reqVO); if (detail == null) { return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); } @@ -51,7 +51,7 @@ public class SaveDailyFarmingController { @PostMapping(path = "/save") ResponseEntity create(@Valid @RequestBody SaveDailyFarmingReqVO formVO, BindingResult bindingResult) { - DailyFarmingValidator.validate(formVO, bindingResult); + dailyFarmingValidator.validate(formVO, bindingResult); if (bindingResult.hasErrors()) { return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) .body(bindingResult.getFieldErrors()); @@ -63,7 +63,7 @@ public class SaveDailyFarmingController { formVO.setGroupNo(dailyRecord.getGroupNo()); formVO.setDailyId(dailyRecord.getId()); - DailyFarmingPortIn.create(formVO); + dailyFarmingPortIn.create(formVO); return ResponseEntity.status(HttpStatus.OK).body(formVO); } 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 deleted file mode 100644 index 9bf16323..00000000 --- a/core/src/main/java/app/module/core/config/application/converter/CustomLocalDateTimeSerializer.java +++ /dev/null @@ -1,27 +0,0 @@ -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; - -/** - * RestController 응답시 LocalDateTime 필드 속성의 JSON 직렬화를 위해 선언됨. - */ -public class CustomLocalDateTimeSerializer extends JsonSerializer { - - private static final DateTimeFormatter formatter = - DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"); - - @Override - public void serialize( - LocalDateTime localDateTime, - JsonGenerator jsonGenerator, - SerializerProvider serializerProvider) - throws IOException { - jsonGenerator.writeString(formatter.format(localDateTime)); - } -} 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 deleted file mode 100644 index 973fcf2c..00000000 --- a/core/src/main/java/app/module/core/config/application/converter/StringToLocalDateTimeConverter.java +++ /dev/null @@ -1,19 +0,0 @@ -package app.module.core.config.application.converter; - -import org.springframework.core.convert.converter.Converter; -import org.springframework.stereotype.Component; -import org.thymeleaf.util.StringUtils; - -import java.time.LocalDateTime; - -/** - * String 문자열을 LocalDateTime 으로 변환해주는 Converter. 현재 사용하지 않는다! - */ -@Component -public class StringToLocalDateTimeConverter implements Converter { - - @Override - public LocalDateTime convert(String source) { - return StringUtils.isEmpty(source) ? null : LocalDateTime.parse(source); - } -} 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 4457e26c..06dbdd4b 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 @@ -18,13 +18,13 @@ import java.util.Optional; @RequiredArgsConstructor class URIAncestryService implements URIAncestryPortIn { - private final app.module.core.usecase.uri.currentmatch.ports.URICurrentMatchingPortIn URICurrentMatchingPortIn; + private final app.module.core.usecase.uri.currentmatch.ports.URICurrentMatchingPortIn uriCurrentMatchingPortIn; private final URIViewPortIn uriViewPortIn; @Override public List connect(AppType appType, String uri) { List hierarchy = new ArrayList<>(); - URICurrentMatching currentMatchingURI = URICurrentMatchingPortIn.connect(appType, uri); + URICurrentMatching currentMatchingURI = uriCurrentMatchingPortIn.connect(appType, uri); URIAncestry mm = new URIAncestry( currentMatchingURI.getId(), diff --git a/front/src/main/java/app/module/front/config/constants/CommonConstants.java b/front/src/main/java/app/module/front/config/constants/CommonConstants.java deleted file mode 100644 index 2a389ef4..00000000 --- a/front/src/main/java/app/module/front/config/constants/CommonConstants.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.front.config.constants; - -public final class CommonConstants { - private CommonConstants() { - throw new IllegalAccessError("어플리케이션에서 공통으로 사용되는 상수 클래스로 생성자를 사용할 수 없습니다."); - } - - /** - * 단위의 직접입력 코드 - */ - public static final String UNIT_CODE_SELF = "code.record.unit.self"; - - /** - * 작업 면적의 직접입력 코드 - */ - public static final String AREA_CODE_OTHER = "code.record.area.self"; -} diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/validator/CreateDailyExpenseValidator.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/validator/CreateDailyExpenseValidator.java index a67f79c1..6ddd1de1 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/validator/CreateDailyExpenseValidator.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/validator/CreateDailyExpenseValidator.java @@ -1,6 +1,6 @@ package app.module.front.usecase.daily.expense.adapters.web.validator; -import app.module.front.config.constants.CommonConstants; +import app.module.core.config.constants.CommonConstants; import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpenseReqVO; import lombok.RequiredArgsConstructor; import org.apache.tika.utils.StringUtils; diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java index d47bfeff..ce3e1681 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java @@ -1,11 +1,11 @@ package app.module.front.usecase.daily.expense.ports.application; +import app.module.core.config.constants.CommonConstants; 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 app.module.front.config.application.util.AuditUtil; -import app.module.front.config.constants.CommonConstants; import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto; import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseMonthDto; import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpenseReqVO; diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/validator/CreateDailyFarmingValidator.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/validator/CreateDailyFarmingValidator.java index 636c74f9..7ebbd452 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/validator/CreateDailyFarmingValidator.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/validator/CreateDailyFarmingValidator.java @@ -1,6 +1,6 @@ package app.module.front.usecase.daily.farming.adapters.web.validator; -import app.module.front.config.constants.CommonConstants; +import app.module.core.config.constants.CommonConstants; import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO; import lombok.RequiredArgsConstructor; import org.apache.tika.utils.StringUtils; diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java index 9dfd75da..a5d44945 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java @@ -1,11 +1,11 @@ package app.module.front.usecase.daily.farming.ports.application; import app.module.core.config.application.util.DailyUtil; +import app.module.core.config.constants.CommonConstants; 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 app.module.front.config.application.util.AuditUtil; -import app.module.front.config.constants.CommonConstants; import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto; import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingMonthDto; import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO; diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/validator/CreateDailyForestryValidator.java b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/validator/CreateDailyForestryValidator.java index 1ca14c4a..298cf847 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/validator/CreateDailyForestryValidator.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/validator/CreateDailyForestryValidator.java @@ -1,6 +1,6 @@ package app.module.front.usecase.daily.forestry.adapters.web.validator; -import app.module.front.config.constants.CommonConstants; +import app.module.core.config.constants.CommonConstants; import app.module.front.usecase.daily.forestry.adapters.web.model.CreateDailyForestryReqVO; import lombok.RequiredArgsConstructor; import org.apache.tika.utils.StringUtils; diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java index 85386bf7..80575894 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java @@ -1,11 +1,11 @@ package app.module.front.usecase.daily.forestry.ports.application; +import app.module.core.config.constants.CommonConstants; 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 app.module.front.config.application.util.AuditUtil; -import app.module.front.config.constants.CommonConstants; import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryDto; import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryMonthDto; import app.module.front.usecase.daily.forestry.adapters.web.model.CreateDailyForestryReqVO; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/validator/CreateDailyIncomeValidator.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/validator/CreateDailyIncomeValidator.java index 8983829a..359c2e65 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/validator/CreateDailyIncomeValidator.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/validator/CreateDailyIncomeValidator.java @@ -1,6 +1,6 @@ package app.module.front.usecase.daily.income.adapters.web.validator; -import app.module.front.config.constants.CommonConstants; +import app.module.core.config.constants.CommonConstants; import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO; import lombok.RequiredArgsConstructor; import org.apache.tika.utils.StringUtils; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java index 43417e68..a38606e4 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java @@ -1,11 +1,11 @@ package app.module.front.usecase.daily.income.ports.application; +import app.module.core.config.constants.CommonConstants; 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 app.module.front.config.application.util.AuditUtil; -import app.module.front.config.constants.CommonConstants; import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeMonthDto; import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO; diff --git a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/validator/CreateDailyWorkValidator.java b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/validator/CreateDailyWorkValidator.java index 1d01ff9d..c493893a 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/validator/CreateDailyWorkValidator.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/validator/CreateDailyWorkValidator.java @@ -1,6 +1,6 @@ package app.module.front.usecase.daily.work.adapters.web.validator; -import app.module.front.config.constants.CommonConstants; +import app.module.core.config.constants.CommonConstants; import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO; import lombok.RequiredArgsConstructor; import org.apache.tika.utils.StringUtils; diff --git a/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java b/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java index 12acf4c2..5e9d08db 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java @@ -1,10 +1,10 @@ package app.module.front.usecase.daily.work.ports.application; +import app.module.core.config.constants.CommonConstants; 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 app.module.front.config.application.util.AuditUtil; -import app.module.front.config.constants.CommonConstants; 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;