[SonarQube][FindBugs] duplicating this literal, SafeLogger

This commit is contained in:
김현주
2025-07-21 14:40:40 +09:00
parent 1748bd62fb
commit 0be90dc915
30 changed files with 227 additions and 157 deletions

View File

@@ -1,6 +1,7 @@
package app.module.front.usecase.daily.expense.adapters.web;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.config.application.logging.SafeLogger;
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;
@@ -11,17 +12,19 @@ import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.LoggerFactory;
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/record/expense")
public class DailyExpenseController {
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(DailyExpenseController.class));
private final CoreUtil coreUtil;
private final DailyRecordPortIn dailyRecordPortIn;
private final DailyExpensePortIn dailyExpensePortIn;
@@ -52,7 +55,7 @@ public class DailyExpenseController {
formVO.setGroupNo(Integer.parseInt(groupNo));
formVO.setId(Long.parseLong(id));
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyExpensePortIn.create(formVO);
@@ -71,7 +74,7 @@ public class DailyExpenseController {
ResponseEntity<?> remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
, @Valid @RequestBody RemoveDailyExpenseReqVO formVO, BindingResult bindingResult) {
log.debug("before formVO: {}", formVO);
safeLogger.debug("before formVO: {}", formVO);
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
@@ -82,7 +85,7 @@ public class DailyExpenseController {
formVO.setSearchMonth(dailyRecord.getRecordMonth());
formVO.setGroupNo(dailyRecord.getGroupNo());
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyExpensePortIn.remove(formVO);
@@ -104,7 +107,7 @@ public class DailyExpenseController {
formVO.setSearchMonth(dailyRecord.getRecordMonth());
formVO.setGroupNo(dailyRecord.getGroupNo());
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyExpensePortIn.remove(formVO);
@@ -119,7 +122,7 @@ public class DailyExpenseController {
*/
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
safeLogger.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {

View File

@@ -2,6 +2,7 @@ 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.config.application.logging.SafeLogger;
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;
@@ -10,7 +11,8 @@ import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIR
import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
@@ -22,11 +24,12 @@ import org.thymeleaf.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
@Slf4j
@Controller
@RequiredArgsConstructor
@RequestMapping(path = "/record/expense")
public class DailyExpenseUIController {
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(DailyExpenseUIController.class));
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordPortIn dailyRecordPortIn;
private final DailyExpensePortIn dailyExpensePortIn;
@@ -48,7 +51,7 @@ public class DailyExpenseUIController {
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo, targetList);
DailyExpenseUIReqVO reqVO = new DailyExpenseUIReqVO(searchMonth, groupNo);
log.debug("reqVO: {}", reqVO);
safeLogger.debug("reqVO: {}", reqVO);
List<DailyExpenseDto> expenseList = dailyExpensePortIn.list(reqVO);
@@ -79,7 +82,7 @@ public class DailyExpenseUIController {
} else {
reqVO.setId(Long.parseLong(id));
}
log.debug("reqVO: {}", reqVO);
safeLogger.debug("reqVO: {}", reqVO);
DailyExpenseDto detail = new DailyExpenseDto();
if (reqVO.getId() != 0L) {
@@ -106,7 +109,7 @@ public class DailyExpenseUIController {
*/
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo, String targetList) {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
safeLogger.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {

View File

@@ -23,28 +23,28 @@ public class CreateDailyExpenseValidator implements Validator {
if (vo.getQuantity() == null && !StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"quantity", "valid.common.required",
"quantity", CommonConstants.VALID_CODE_NOTBLANK,
"수량을 입력해 주세요.");
}
if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"unitCode", "valid.common.required",
"unitCode", CommonConstants.VALID_CODE_NOTBLANK,
"단위를 선택해 주세요.");
}
if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) {
errors.rejectValue(
"unitSelf", "valid.common.required",
"unitSelf", CommonConstants.VALID_CODE_NOTBLANK,
"단위를 입력해 주세요.");
}
if (vo.getPrice() == null && vo.getEstimatedValue() == null) {
errors.rejectValue(
"price", "valid.common.required",
"price", CommonConstants.VALID_CODE_NOTBLANK,
"현금 또는 현물평가액을 입력해 주세요.");
errors.rejectValue(
"estimatedValue", "valid.common.required",
"estimatedValue", CommonConstants.VALID_CODE_NOTBLANK,
"현금 또는 현물평가액을 입력해 주세요.");
}
}

View File

@@ -1,6 +1,7 @@
package app.module.front.usecase.daily.farming.adapters.web;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.config.application.logging.SafeLogger;
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;
@@ -11,17 +12,19 @@ import app.module.front.usecase.daily.farming.ports.application.DailyFarmingServ
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.LoggerFactory;
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/record/farming")
public class DailyFarmingController {
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(DailyFarmingController.class));
private final CoreUtil coreUtil;
private final DailyRecordPortIn dailyRecordPortIn;
private final DailyFarmingService dailyFarmingPortIn;
@@ -52,7 +55,7 @@ public class DailyFarmingController {
formVO.setGroupNo(Integer.parseInt(groupNo));
formVO.setId(Long.parseLong(id));
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyFarmingPortIn.create(formVO);
@@ -71,7 +74,7 @@ public class DailyFarmingController {
ResponseEntity<?> remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
, @Valid @RequestBody RemoveDailyFarmingReqVO formVO, BindingResult bindingResult) {
log.debug("before formVO: {}", formVO);
safeLogger.debug("before formVO: {}", formVO);
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
@@ -82,7 +85,7 @@ public class DailyFarmingController {
formVO.setSearchMonth(dailyRecord.getRecordMonth());
formVO.setGroupNo(dailyRecord.getGroupNo());
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyFarmingPortIn.remove(formVO);
@@ -104,7 +107,7 @@ public class DailyFarmingController {
formVO.setSearchMonth(dailyRecord.getRecordMonth());
formVO.setGroupNo(dailyRecord.getGroupNo());
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyFarmingPortIn.remove(formVO);
@@ -119,7 +122,7 @@ public class DailyFarmingController {
*/
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
safeLogger.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {

View File

@@ -2,6 +2,7 @@ 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.config.application.logging.SafeLogger;
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;
@@ -10,7 +11,8 @@ import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIR
import app.module.front.usecase.daily.farming.ports.application.DailyFarmingService;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
@@ -22,11 +24,12 @@ import org.thymeleaf.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
@Slf4j
@Controller
@RequiredArgsConstructor
@RequestMapping(path = "/record/farming")
public class DailyFarmingUIController {
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(DailyFarmingUIController.class));
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordPortIn dailyRecordPortIn;
private final DailyFarmingService dailyFarmingPortIn;
@@ -48,7 +51,7 @@ public class DailyFarmingUIController {
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo, targetList);
DailyFarmingUIReqVO reqVO = new DailyFarmingUIReqVO(searchMonth, groupNo);
log.debug("reqVO: {}", reqVO);
safeLogger.debug("reqVO: {}", reqVO);
List<DailyFarmingDto> farmingList = dailyFarmingPortIn.list(reqVO);
@@ -79,7 +82,7 @@ public class DailyFarmingUIController {
} else {
reqVO.setId(Long.parseLong(id));
}
log.debug("reqVO: {}", reqVO);
safeLogger.debug("reqVO: {}", reqVO);
DailyFarmingDto detail = new DailyFarmingDto();
if (reqVO.getId() != 0L) {
@@ -106,7 +109,7 @@ public class DailyFarmingUIController {
*/
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo, String targetList) {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
safeLogger.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {

View File

@@ -23,31 +23,31 @@ public class CreateDailyFarmingValidator implements Validator {
if ("code.record.farming.self".equals(vo.getProductCode()) && StringUtils.isBlank(vo.getProductSelf())) {
errors.rejectValue(
"productSelf", "valid.common.required",
"productSelf", CommonConstants.VALID_CODE_NOTBLANK,
"생산물을 입력해 주세요.");
}
if (vo.getQuantity() == null && !StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"quantity", "valid.common.required",
"quantity", CommonConstants.VALID_CODE_NOTBLANK,
"수량을 입력해 주세요.");
}
if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"unitCode", "valid.common.required",
"unitCode", CommonConstants.VALID_CODE_NOTBLANK,
"단위를 선택해 주세요.");
}
if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) {
errors.rejectValue(
"unitSelf", "valid.common.required",
"unitSelf", CommonConstants.VALID_CODE_NOTBLANK,
"단위를 입력해 주세요.");
}
if (vo.getEstimatedValue() == null) {
errors.rejectValue(
"estimatedValue", "valid.common.required",
"estimatedValue", CommonConstants.VALID_CODE_NOTBLANK,
"현물평가액을 입력해 주세요.");
}
}

View File

@@ -1,6 +1,7 @@
package app.module.front.usecase.daily.forestry.adapters.web;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.config.application.logging.SafeLogger;
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;
@@ -11,17 +12,19 @@ import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.LoggerFactory;
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/record/forestry")
public class DailyForestryController {
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(DailyForestryController.class));
private final CoreUtil coreUtil;
private final DailyRecordPortIn dailyRecordService;
private final DailyForestryPortIn dailyForestryPortIn;
@@ -52,7 +55,7 @@ public class DailyForestryController {
formVO.setGroupNo(Integer.parseInt(groupNo));
formVO.setId(Long.parseLong(id));
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyForestryPortIn.create(formVO);
@@ -71,7 +74,7 @@ public class DailyForestryController {
ResponseEntity<?> remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
, @Valid @RequestBody RemoveDailyForestryReqVO formVO, BindingResult bindingResult) {
log.debug("before formVO: {}", formVO);
safeLogger.debug("before formVO: {}", formVO);
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
@@ -82,7 +85,7 @@ public class DailyForestryController {
formVO.setSearchMonth(dailyRecord.getRecordMonth());
formVO.setGroupNo(dailyRecord.getGroupNo());
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyForestryPortIn.remove(formVO);
@@ -104,7 +107,7 @@ public class DailyForestryController {
formVO.setSearchMonth(dailyRecord.getRecordMonth());
formVO.setGroupNo(dailyRecord.getGroupNo());
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyForestryPortIn.remove(formVO);
@@ -119,7 +122,7 @@ public class DailyForestryController {
*/
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
safeLogger.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordService.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {

View File

@@ -2,6 +2,7 @@ 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.config.application.logging.SafeLogger;
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;
@@ -10,7 +11,8 @@ import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryU
import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
@@ -22,11 +24,12 @@ import org.thymeleaf.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
@Slf4j
@Controller
@RequiredArgsConstructor
@RequestMapping(path = "/record/forestry")
public class DailyForestryUIController {
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(DailyForestryUIController.class));
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordPortIn dailyRecordPortIn;
private final DailyForestryPortIn dailyForestryPortIn;
@@ -48,7 +51,7 @@ public class DailyForestryUIController {
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo, targetList);
DailyForestryUIReqVO reqVO = new DailyForestryUIReqVO(searchMonth, groupNo);
log.debug("reqVO: {}", reqVO);
safeLogger.debug("reqVO: {}", reqVO);
List<DailyForestryDto> forestryList = dailyForestryPortIn.list(reqVO);
@@ -79,7 +82,7 @@ public class DailyForestryUIController {
} else {
reqVO.setId(Long.parseLong(id));
}
log.debug("reqVO: {}", reqVO);
safeLogger.debug("reqVO: {}", reqVO);
DailyForestryDto detail = new DailyForestryDto();
if (reqVO.getId() != 0L) {
@@ -106,7 +109,7 @@ public class DailyForestryUIController {
*/
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo, String targetList) {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
safeLogger.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {

View File

@@ -23,25 +23,25 @@ public class CreateDailyForestryValidator implements Validator {
if (vo.getQuantity() == null && !StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"quantity", "valid.common.required",
"quantity", CommonConstants.VALID_CODE_NOTBLANK,
"수량을 입력해 주세요.");
}
if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"unitCode", "valid.common.required",
"unitCode", CommonConstants.VALID_CODE_NOTBLANK,
"단위를 선택해 주세요.");
}
if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) {
errors.rejectValue(
"unitSelf", "valid.common.required",
"unitSelf", CommonConstants.VALID_CODE_NOTBLANK,
"단위를 입력해 주세요.");
}
if (vo.getEstimatedValue() == null) {
errors.rejectValue(
"estimatedValue", "valid.common.required",
"estimatedValue", CommonConstants.VALID_CODE_NOTBLANK,
"현물평가액을 입력해 주세요.");
}
}

View File

@@ -1,6 +1,7 @@
package app.module.front.usecase.daily.income.adapters.web;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.config.application.logging.SafeLogger;
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;
@@ -11,17 +12,19 @@ import app.module.front.usecase.daily.income.ports.DailyIncomePortIn;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.LoggerFactory;
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/record/income")
public class DailyIncomeController {
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(DailyIncomeController.class));
private final CoreUtil coreUtil;
private final DailyRecordPortIn dailyRecordPortIn;
private final DailyIncomePortIn dailyIncomePortIn;
@@ -52,7 +55,7 @@ public class DailyIncomeController {
formVO.setGroupNo(Integer.parseInt(groupNo));
formVO.setId(Long.parseLong(id));
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyIncomePortIn.create(formVO);
@@ -71,7 +74,7 @@ public class DailyIncomeController {
ResponseEntity<?> remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
, @Valid @RequestBody RemoveDailyIncomeReqVO formVO, BindingResult bindingResult) {
log.debug("before formVO: {}", formVO);
safeLogger.debug("before formVO: {}", formVO);
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
@@ -82,7 +85,7 @@ public class DailyIncomeController {
formVO.setSearchMonth(dailyRecord.getRecordMonth());
formVO.setGroupNo(dailyRecord.getGroupNo());
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyIncomePortIn.remove(formVO);
@@ -104,7 +107,7 @@ public class DailyIncomeController {
formVO.setSearchMonth(dailyRecord.getRecordMonth());
formVO.setGroupNo(dailyRecord.getGroupNo());
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyIncomePortIn.remove(formVO);
@@ -119,7 +122,7 @@ public class DailyIncomeController {
*/
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
safeLogger.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {

View File

@@ -2,6 +2,7 @@ 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.config.application.logging.SafeLogger;
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;
@@ -10,8 +11,9 @@ 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.record.adapters.web.model.DailyUIReqVO;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
@@ -22,11 +24,12 @@ import org.springframework.web.bind.annotation.RequestParam;
import java.util.ArrayList;
import java.util.List;
@Slf4j
@Controller
@RequiredArgsConstructor
@RequestMapping(path = "/record/income")
public class DailyIncomeUIController {
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(DailyIncomeUIController.class));
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordPortIn dailyRecordPortIn;
private final DailyIncomePortIn dailyIncomePortIn;
@@ -48,7 +51,7 @@ public class DailyIncomeUIController {
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo, targetList);
DailyIncomeUIReqVO reqVO = new DailyIncomeUIReqVO(searchMonth, groupNo);
log.debug("reqVO: {}", reqVO);
safeLogger.debug("reqVO: {}", reqVO);
List<DailyIncomeDto> incomeList = dailyIncomePortIn.list(reqVO);
@@ -80,7 +83,7 @@ public class DailyIncomeUIController {
} else {
reqVO.setId(Long.parseLong(id));
}
log.debug("reqVO: {}", reqVO);
safeLogger.debug("reqVO: {}", reqVO);
DailyIncomeDto detail = new DailyIncomeDto();
if (reqVO.getId() != 0L) {
@@ -107,7 +110,7 @@ public class DailyIncomeUIController {
*/
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo, String targetList) {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
safeLogger.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {

View File

@@ -23,28 +23,28 @@ public class CreateDailyIncomeValidator implements Validator {
if (vo.getQuantity() == null && !StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"quantity", "valid.common.required",
"quantity", CommonConstants.VALID_CODE_NOTBLANK,
"수량을 입력해 주세요.");
}
if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"unitCode", "valid.common.required",
"unitCode", CommonConstants.VALID_CODE_NOTBLANK,
"단위를 선택해 주세요.");
}
if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) {
errors.rejectValue(
"unitSelf", "valid.common.required",
"unitSelf", CommonConstants.VALID_CODE_NOTBLANK,
"단위를 입력해 주세요.");
}
if (vo.getPrice() == null && vo.getEstimatedValue() == null) {
errors.rejectValue(
"price", "valid.common.required",
"price", CommonConstants.VALID_CODE_NOTBLANK,
"현금 또는 현물평가액을 입력해 주세요.");
errors.rejectValue(
"estimatedValue", "valid.common.required",
"estimatedValue", CommonConstants.VALID_CODE_NOTBLANK,
"현금 또는 현물평가액을 입력해 주세요.");
}
}

View File

@@ -1,6 +1,7 @@
package app.module.front.usecase.daily.power.adapters.web;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.config.application.logging.SafeLogger;
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;
@@ -11,17 +12,19 @@ import app.module.front.usecase.daily.power.ports.DailyPowerPortIn;
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.LoggerFactory;
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/record/power")
public class DailyPowerController {
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(DailyPowerController.class));
private final CoreUtil coreUtil;
private final DailyRecordPortIn dailyRecordPortIn;
private final DailyPowerPortIn dailyPowerPortIn;
@@ -52,7 +55,7 @@ public class DailyPowerController {
formVO.setGroupNo(Integer.parseInt(groupNo));
formVO.setId(Long.parseLong(id));
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyPowerPortIn.create(formVO);
@@ -71,7 +74,7 @@ public class DailyPowerController {
ResponseEntity<?> remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
, @Valid @RequestBody RemoveDailyPowerReqVO formVO, BindingResult bindingResult) {
log.debug("before formVO: {}", formVO);
safeLogger.debug("before formVO: {}", formVO);
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
@@ -82,7 +85,7 @@ public class DailyPowerController {
formVO.setSearchMonth(dailyRecord.getRecordMonth());
formVO.setGroupNo(dailyRecord.getGroupNo());
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyPowerPortIn.remove(formVO);
@@ -104,7 +107,7 @@ public class DailyPowerController {
formVO.setSearchMonth(dailyRecord.getRecordMonth());
formVO.setGroupNo(dailyRecord.getGroupNo());
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyPowerPortIn.remove(formVO);
@@ -119,7 +122,7 @@ public class DailyPowerController {
*/
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
safeLogger.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {

View File

@@ -2,6 +2,7 @@ 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.config.application.logging.SafeLogger;
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;
@@ -9,7 +10,8 @@ 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.record.adapters.web.model.DailyUIReqVO;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
@@ -21,11 +23,12 @@ import org.thymeleaf.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
@Slf4j
@Controller
@RequiredArgsConstructor
@RequestMapping(path = "/record/power")
public class DailyPowerUIController {
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(DailyPowerUIController.class));
private final DailyRecordPortIn dailyRecordPortIn;
private final DailyPowerPortIn dailyPowerPortIn;
@@ -46,7 +49,7 @@ public class DailyPowerUIController {
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo, targetList);
DailyPowerUIReqVO reqVO = new DailyPowerUIReqVO(searchMonth, groupNo);
log.debug("reqVO: {}", reqVO);
safeLogger.debug("reqVO: {}", reqVO);
List<DailyPowerDto> powerList = dailyPowerPortIn.list(reqVO);
@@ -77,7 +80,7 @@ public class DailyPowerUIController {
} else {
reqVO.setId(Long.parseLong(id));
}
log.debug("reqVO: {}", reqVO);
safeLogger.debug("reqVO: {}", reqVO);
DailyPowerDto detail = new DailyPowerDto();
if (reqVO.getId() != 0L) {
@@ -101,7 +104,7 @@ public class DailyPowerUIController {
*/
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo, String targetList) {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
safeLogger.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.power.adapters.web.validator;
import app.module.core.config.constants.CommonConstants;
import app.module.front.usecase.daily.power.adapters.web.model.CreateDailyPowerReqVO;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
@@ -21,10 +22,10 @@ public class CreateDailyPowerValidator implements Validator {
if (vo.getOwnedHours() == null && vo.getLeasedHours() == null) {
errors.rejectValue(
"ownedHours", "valid.common.required",
"ownedHours", CommonConstants.VALID_CODE_NOTBLANK,
"자가 사용시간 또는 임차 사용시간을 입력해 주세요.");
errors.rejectValue(
"leasedHours", "valid.common.required",
"leasedHours", CommonConstants.VALID_CODE_NOTBLANK,
"자가 사용시간 또는 임차 사용시간을 입력해 주세요.");
}
}

View File

@@ -1,6 +1,7 @@
package app.module.front.usecase.daily.work.adapters.web;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.config.application.logging.SafeLogger;
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;
@@ -11,17 +12,19 @@ import app.module.front.usecase.daily.work.adapters.web.validator.CreateDailyWor
import app.module.front.usecase.daily.work.ports.DailyWorkPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.LoggerFactory;
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/record/work")
public class DailyWorkController {
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(DailyWorkController.class));
private final CoreUtil coreUtil;
private final DailyRecordPortIn dailyRecordPortIn;
private final DailyWorkPortIn dailyWorkPortIn;
@@ -53,7 +56,7 @@ public class DailyWorkController {
formVO.setGroupNo(Integer.parseInt(groupNo));
formVO.setId(Long.parseLong(id));
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyWorkPortIn.create(formVO);
@@ -73,7 +76,7 @@ public class DailyWorkController {
ResponseEntity<?> remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
, @Valid @RequestBody RemoveDailyWorkReqVO formVO, BindingResult bindingResult) {
log.debug("before formVO: {}", formVO);
safeLogger.debug("before formVO: {}", formVO);
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
@@ -84,7 +87,7 @@ public class DailyWorkController {
formVO.setSearchMonth(dailyRecord.getRecordMonth());
formVO.setGroupNo(dailyRecord.getGroupNo());
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyWorkPortIn.remove(formVO);
@@ -107,7 +110,7 @@ public class DailyWorkController {
formVO.setSearchMonth(dailyRecord.getRecordMonth());
formVO.setGroupNo(dailyRecord.getGroupNo());
formVO.setDailyRecordSeq(dailyRecord.getId());
log.debug("formVO: {}", formVO);
safeLogger.debug("formVO: {}", formVO);
dailyWorkPortIn.remove(formVO);
@@ -123,7 +126,7 @@ public class DailyWorkController {
*/
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
safeLogger.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {

View File

@@ -2,6 +2,7 @@ package app.module.front.usecase.daily.work.adapters.web;
import app.module.core.config.application.enums.DailySort;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.config.application.logging.SafeLogger;
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;
@@ -10,7 +11,8 @@ import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkD
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.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
@@ -22,11 +24,12 @@ import org.thymeleaf.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
@Slf4j
@Controller
@RequiredArgsConstructor
@RequestMapping(path = "/record/work")
public class DailyWorkUIController {
SafeLogger safeLogger = new SafeLogger(LoggerFactory.getLogger(DailyWorkUIController.class));
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordPortIn dailyRecordPortIn;
private final DailyWorkPortIn dailyWorkPortIn;
@@ -48,7 +51,7 @@ public class DailyWorkUIController {
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo, targetList);
DailyWorkUIReqVO reqVO = new DailyWorkUIReqVO(searchMonth, groupNo);
log.debug("reqVO: {}", reqVO);
safeLogger.debug("reqVO: {}", reqVO);
List<DailyWorkDto> workList = dailyWorkPortIn.list(reqVO);
@@ -79,7 +82,7 @@ public class DailyWorkUIController {
} else {
reqVO.setId(Long.parseLong(id));
}
log.debug("reqVO: {}", reqVO);
safeLogger.debug("reqVO: {}", reqVO);
DailyWorkDto detail = new DailyWorkDto();
if (reqVO.getId() != 0L) {
@@ -107,7 +110,7 @@ public class DailyWorkUIController {
*/
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo, String targetList) {
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
log.debug("getRecordUIReq: {}", reqVO);
safeLogger.debug("getRecordUIReq: {}", reqVO);
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
if (dailyRecord == null || dailyRecord.getId() == null) {

View File

@@ -23,37 +23,37 @@ public class CreateDailyWorkValidator implements Validator {
if (vo.getWorkLandArea() == null && !StringUtils.isBlank(vo.getAreaUnitCode())) {
errors.rejectValue(
"workLandArea", "valid.common.required",
"workLandArea", CommonConstants.VALID_CODE_NOTBLANK,
"작업 면적을 입력해 주세요.");
}
if (vo.getWorkLandArea() != null && StringUtils.isBlank(vo.getAreaUnitCode())) {
errors.rejectValue(
"areaUnitCode", "valid.common.required",
"areaUnitCode", CommonConstants.VALID_CODE_NOTBLANK,
"단위를 선택해 주세요.");
}
if (CommonConstants.AREA_CODE_OTHER.equals(vo.getAreaUnitCode()) && StringUtils.isBlank(vo.getAreaUnitSelf())) {
errors.rejectValue(
"areaUnitSelf", "valid.common.required",
"areaUnitSelf", CommonConstants.VALID_CODE_NOTBLANK,
"단위를 입력해 주세요.");
}
if (vo.getHarvestQuantity() == null && !StringUtils.isBlank(vo.getHarvestUnitCode())) {
errors.rejectValue(
"harvestQuantity", "valid.common.required",
"harvestQuantity", CommonConstants.VALID_CODE_NOTBLANK,
"수확량을 입력해 주세요.");
}
if (vo.getHarvestQuantity() != null && StringUtils.isBlank(vo.getHarvestUnitCode())) {
errors.rejectValue(
"harvestUnitCode", "valid.common.required",
"harvestUnitCode", CommonConstants.VALID_CODE_NOTBLANK,
"단위를 선택해 주세요.");
}
if (CommonConstants.UNIT_CODE_SELF.equals(vo.getHarvestUnitCode()) && StringUtils.isBlank(vo.getHarvestUnitSelf())) {
errors.rejectValue(
"harvestUnitSelf", "valid.common.required",
"harvestUnitSelf", CommonConstants.VALID_CODE_NOTBLANK,
"단위를 입력해 주세요.");
}