Merge branch 'kangsun' into 'dev'

[BO] 임가현황 > 은행자동이체 내역 탭 작업

See merge request korea-research/korea-research!73
This commit is contained in:
이강선 매니저/ST
2025-07-02 07:08:55 +00:00
55 changed files with 1288 additions and 1415 deletions

View File

@@ -10,8 +10,10 @@ import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class GetMonthlyInputStatusDao implements GetMonthlyInputStatusPortOut {
private final GetMonthlyInputStatusMapper mapper;
@Override
public Optional<GetMonthlyInputStatus> operate(GetMonthlyInputStatusCmd cmd) {
return Optional.empty();
return mapper.getMonthlyInputStatus(cmd);
}
}

View File

@@ -2,7 +2,10 @@ package app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputSta
import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus;
import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd;
import java.util.Optional;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GetMonthlyInputStatusMapper {
GetMonthlyInputStatus getMonthlyInputStatus(GetMonthlyInputStatusCmd cmd);
Optional<GetMonthlyInputStatus> getMonthlyInputStatus(GetMonthlyInputStatusCmd cmd);
}

View File

@@ -7,4 +7,5 @@ import org.apache.ibatis.annotations.Mapper;
public interface UpdateMonthlyInputStatusMapper {
void updateForestProductStatus(UpdateForestProductStatusCmd cmd);
void updateBankInputStatus(UpdateForestProductStatusCmd cmd);
void updateBankOutputStatus(UpdateForestProductStatusCmd cmd);
}

View File

@@ -0,0 +1,19 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.adapters.persistence;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpense;
import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpenseCmd;
import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.GetBankAutoTransferExpensePortOut;
import java.util.Optional;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class GetBankAutoTransferExpenseDao implements GetBankAutoTransferExpensePortOut {
private final GetBankAutoTransferExpenseMapper mapper;
@Override
public Optional<GetBankAutoTransferExpense> operate(GetBankAutoTransferExpenseCmd cmd) {
return mapper.getBankAutoTransferExpense(cmd);
}
}

View File

@@ -0,0 +1,12 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.adapters.persistence;
import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpense;
import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpenseCmd;
import java.util.Optional;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GetBankAutoTransferExpenseMapper {
Optional<GetBankAutoTransferExpense> getBankAutoTransferExpense(
GetBankAutoTransferExpenseCmd cmd);
}

View File

@@ -0,0 +1,24 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.adapters.web;
import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.GetBankAutoTransferExpensePortIn;
import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpenseCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.adapters.web.model.GetBankAutoTransferExpenseReqVO;
import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.adapters.web.model.GetBankAutoTransferExpenseResVO;
@RestController
@RequiredArgsConstructor
class GetBankAutoTransferExpenseController {
private final GetBankAutoTransferExpensePortIn portIn;
@GetMapping(path = "/api/household/bankAutoTransferExpense/{id}")
ResponseEntity<?> operate(@PathVariable Long id) {
return ResponseEntity.status(HttpStatus.OK).body(
portIn.operate(new GetBankAutoTransferExpenseCmd(id)).orElse(null));
}
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetBankAutoTransferExpenseReqVO {
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetBankAutoTransferExpenseResVO {
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports;
import java.util.Optional;
import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpense;
import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpenseCmd;
public interface GetBankAutoTransferExpensePortIn {
Optional<GetBankAutoTransferExpense> operate(GetBankAutoTransferExpenseCmd cmd);
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports;
import java.util.Optional;
import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpense;
import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpenseCmd;
public interface GetBankAutoTransferExpensePortOut {
Optional<GetBankAutoTransferExpense> operate(GetBankAutoTransferExpenseCmd cmd);
}

View File

@@ -0,0 +1,20 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpense;
import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpenseCmd;
import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.GetBankAutoTransferExpensePortIn;
import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.GetBankAutoTransferExpensePortOut;
import java.util.Optional;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class GetBankAutoTransferExpenseService implements GetBankAutoTransferExpensePortIn {
private final GetBankAutoTransferExpensePortOut portOut;
@Override
public Optional<GetBankAutoTransferExpense> operate(GetBankAutoTransferExpenseCmd cmd) {
return portOut.operate(cmd);
}
}

View File

@@ -0,0 +1,23 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetBankAutoTransferExpense {
private Long id;
private Long householdSeq;
private String expenseCode;
private String transferCategoryCode;
private String transferCategory;
private String sourcePurpose;
private String count;
private String unitCode;
private String unit;
private Long price;
}

View File

@@ -0,0 +1,14 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetBankAutoTransferExpenseCmd {
private Long id;
}

View File

@@ -17,6 +17,7 @@ public class GetBankAutoTransferIncome {
private String expenseCode;
private String transferCategoryCode;
private String transferCategory;
private String sourcePurpose;
private String count;
private String unitCode;
private String unit;

View File

@@ -0,0 +1,41 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.adapters.persistence;
import app.module.admin.config.application.enums.MonthlyInputStatusType;
import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.adapters.persistence.UpdateMonthlyInputStatusMapper;
import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application.domain.UpdateForestProductStatusCmd;
import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersOutCmd;
import app.module.core.config.application.annotation.DeleteCommand;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersInCmd;
import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.RemoveBankAutoTransfersPortOut;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
@Repository
@RequiredArgsConstructor
class RemoveBankAutoTransfersDao implements RemoveBankAutoTransfersPortOut {
private final RemoveBankAutoTransfersMapper removeBankAutoTransfersMapper;
private final UpdateMonthlyInputStatusMapper updateMonthlyInputStatusMapper;
@Override
@DeleteCommand
@Transactional
public void operate(RemoveBankAutoTransfersOutCmd outCmd) {
// 삭제
removeBankAutoTransfersMapper.remove(outCmd);
if (!removeBankAutoTransfersMapper.existsBankAutoTransfer(outCmd.getMonthlyInputStatusId())) {
// 수입내역 모두 삭제되었을 경우 입력상태 미등록으로 update
if (outCmd.getRemoveType().equals("INCOME")) {
updateMonthlyInputStatusMapper.updateBankInputStatus(
new UpdateForestProductStatusCmd(outCmd.getMonthlyInputStatusId(),
MonthlyInputStatusType.NONE.name()));
} else {
// 지출내역 모두 삭제되었을 경우 입력상태 미등록으로 update
updateMonthlyInputStatusMapper.updateBankOutputStatus(
new UpdateForestProductStatusCmd(outCmd.getMonthlyInputStatusId(),
MonthlyInputStatusType.NONE.name()));
}
}
}
}

View File

@@ -0,0 +1,11 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.adapters.persistence;
import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersInCmd;
import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersOutCmd;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface RemoveBankAutoTransfersMapper {
void remove(RemoveBankAutoTransfersOutCmd cmd);
boolean existsBankAutoTransfer(Long monthlyInputStatusId);
}

View File

@@ -0,0 +1,40 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.adapters.web;
import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.RemoveBankAutoTransfersPortIn;
import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersInCmd;
import app.module.core.config.application.util.MessageUtil;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.BindingResult;
import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.adapters.web.model.RemoveBankAutoTransfersReqVO;
import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.adapters.web.model.RemoveBankAutoTransfersResVO;
@RestController
@RequiredArgsConstructor
class RemoveBankAutoTransfersController {
private final RemoveBankAutoTransfersPortIn portIn;
private final MessageUtil messageUtil;
@DeleteMapping(path = "/api/household/bank/delete")
ResponseEntity<?> operate(@Valid @RequestBody RemoveBankAutoTransfersReqVO reqVO,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(bindingResult);
}
portIn.operate(
new RemoveBankAutoTransfersInCmd(
reqVO.getHouseholdSeq(),
reqVO.getRecordMonth(),
reqVO.getRemoveType(),
reqVO.getRemoveIds()));
return ResponseEntity.status(HttpStatus.OK).body(new RemoveBankAutoTransfersResVO(
messageUtil.getMessage("operation.common.remove.done")));
}
}

View File

@@ -0,0 +1,19 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.adapters.web.model;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@EqualsAndHashCode
public class RemoveBankAutoTransfersReqVO {
private Long householdSeq;
private String recordMonth;
private String removeType;
private List<Long> removeIds;
}

View File

@@ -0,0 +1,14 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class RemoveBankAutoTransfersResVO {
private String message;
}

View File

@@ -0,0 +1,7 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports;
import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersInCmd;
public interface RemoveBankAutoTransfersPortIn {
void operate(RemoveBankAutoTransfersInCmd inCmd);
}

View File

@@ -0,0 +1,7 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports;
import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersOutCmd;
public interface RemoveBankAutoTransfersPortOut {
void operate(RemoveBankAutoTransfersOutCmd outCmd);
}

View File

@@ -0,0 +1,31 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application;
import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn;
import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus;
import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd;
import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersOutCmd;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain.RemoveBankAutoTransfersInCmd;
import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.RemoveBankAutoTransfersPortIn;
import app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.RemoveBankAutoTransfersPortOut;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class RemoveBankAutoTransfersService implements RemoveBankAutoTransfersPortIn {
private final GetMonthlyInputStatusPortIn getMonthlyInputStatusPortIn;
private final RemoveBankAutoTransfersPortOut portOut;
@Override
public void operate(RemoveBankAutoTransfersInCmd inCmd) {
GetMonthlyInputStatus monthlyInputStatus =
getMonthlyInputStatusPortIn
.operate(new GetMonthlyInputStatusCmd(inCmd.getHouseholdSeq(), inCmd.getRecordMonth()))
.orElseThrow(() -> new IllegalStateException("입력 상태 정보가 존재하지 않습니다."));
portOut.operate(new RemoveBankAutoTransfersOutCmd(
monthlyInputStatus.getId(),
inCmd.getRemoveType(),
inCmd.getRemoveIds()));
}
}

View File

@@ -0,0 +1,16 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
public class RemoveBankAutoTransfersInCmd {
private Long householdSeq;
private String recordMonth;
private String removeType;
private List<Long> removeIds;
}

View File

@@ -0,0 +1,16 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.removeBankAutoTranfers.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
public class RemoveBankAutoTransfersOutCmd extends AuditCommand {
private Long monthlyInputStatusId;
private String removeType;
private List<Long> removeIds;
}

View File

@@ -0,0 +1,42 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.persistence;
import app.module.admin.config.application.enums.MonthlyInputStatusType;
import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.adapters.persistence.UpdateMonthlyInputStatusMapper;
import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application.domain.UpdateForestProductStatusCmd;
import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.SaveBankAutoTransferExpensePortOut;
import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain.SaveBankAutoTransferExpenseOutCmd;
import app.module.core.config.application.util.AuditUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
@Repository
@RequiredArgsConstructor
class SaveBankAutoTransferExpenseDao implements SaveBankAutoTransferExpensePortOut {
private final SaveBankAutoTransferExpenseMapper saveBankAutoTransferExpenseMapper;
private final UpdateMonthlyInputStatusMapper updateMonthlyInputStatusMapper;
@Override
@Transactional
public void operate(SaveBankAutoTransferExpenseOutCmd outCmd) {
if (outCmd.getBankAutoTransferId() == null) {
// 등록 상태가 "REGISTERED"가 아닐 경우 "REGISTERED"로 update
if (!MonthlyInputStatusType.REGISTERED.name().equals(
outCmd.getBankAutoTransferOutputStatus())) {
updateMonthlyInputStatusMapper.updateBankOutputStatus(
new UpdateForestProductStatusCmd(
outCmd.getMonthlyInputStatusId(),
MonthlyInputStatusType.REGISTERED.name()));
}
// 은행자동이체(지출) 등록
saveBankAutoTransferExpenseMapper.createBankAutoTransferExpense(
AuditUtil.create(outCmd));
} else {
// 은행자동이체(지출) update
saveBankAutoTransferExpenseMapper.updateBankAutoTransferExpense(
AuditUtil.update(outCmd));
}
}
}

View File

@@ -0,0 +1,10 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.persistence;
import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain.SaveBankAutoTransferExpenseOutCmd;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface SaveBankAutoTransferExpenseMapper {
void createBankAutoTransferExpense(SaveBankAutoTransferExpenseOutCmd cmd);
void updateBankAutoTransferExpense(SaveBankAutoTransferExpenseOutCmd cmd);
}

View File

@@ -0,0 +1,51 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web;
import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.SaveBankAutoTransferExpensePortIn;
import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain.SaveBankAutoTransferExpenseInCmd;
import app.module.core.config.application.util.MessageUtil;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.BindingResult;
import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web.model.SaveBankAutoTransferExpenseReqVO;
import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web.model.SaveBankAutoTransferExpenseResVO;
import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web.validator.SaveBankAutoTransferExpenseValidator;
@RestController
@RequiredArgsConstructor
class SaveBankAutoTransferExpenseController {
private final SaveBankAutoTransferExpenseValidator validator;
private final SaveBankAutoTransferExpensePortIn portIn;
private final MessageUtil messageUtil;
@PostMapping(path = "/api/household/bank/expense/save")
ResponseEntity<?> operate(@Valid @RequestBody SaveBankAutoTransferExpenseReqVO reqVO,
BindingResult bindingResult) {
validator.validate(reqVO, bindingResult);
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
}
portIn.operate(
new SaveBankAutoTransferExpenseInCmd(
reqVO.getBankAutoTransferId(),
reqVO.getHouseholdSeq(),
reqVO.getRecordMonth(),
reqVO.getExpenseCode(),
reqVO.getTransferCategoryCode(),
reqVO.getTransferCategory(),
reqVO.getSourcePurpose(),
reqVO.getCount(),
reqVO.getUnitCode(),
reqVO.getUnit(),
reqVO.getPrice()));
return ResponseEntity.status(HttpStatus.OK).body(new SaveBankAutoTransferExpenseResVO(
messageUtil.getMessage("operation.common.save.done")));
}
}

View File

@@ -0,0 +1,25 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@EqualsAndHashCode
public class SaveBankAutoTransferExpenseReqVO {
private Long bankAutoTransferId;
private Long householdSeq;
private String recordMonth;
private String expenseCode;
private String transferCategoryCode;
private String transferCategory;
private String sourcePurpose;
private String count;
private String unitCode;
private String unit;
private Long price;
}

View File

@@ -0,0 +1,14 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class SaveBankAutoTransferExpenseResVO {
private String message;
}

View File

@@ -0,0 +1,63 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web.validator;
import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.adapters.web.model.SaveBankAutoTransferExpenseReqVO;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
@Component
public class SaveBankAutoTransferExpenseValidator implements Validator {
@Override
public boolean supports(Class<?> clazz) {
return SaveBankAutoTransferExpenseReqVO.class.equals(clazz);
}
@Override
public void validate(Object target, Errors errors) {
SaveBankAutoTransferExpenseReqVO vo = (SaveBankAutoTransferExpenseReqVO) target;
// 지출의 종류 null 체크
if (!StringUtils.hasText(vo.getTransferCategoryCode())) {
errors.rejectValue("transferCategoryCode", "error.transferCategoryCode",
"지출의 종류를 선택해주세요.");
return;
}
// 지출의 종류 직접입력일 때 unll 체크
if (vo.getTransferCategoryCode().equals("code.bank.output.self") && !StringUtils.hasText(
vo.getTransferCategory())) {
errors.rejectValue("transferCategory", "error.transferCategory",
"지출의 종류를 입력해주세요.");
return;
}
// 수량 입력 O, 단위 선택 X
if (StringUtils.hasText(vo.getCount()) && !StringUtils.hasText(vo.getUnitCode())) {
errors.rejectValue("unitCode", "error.unitCode",
"단위를 선택해주세요.");
return;
}
// 수량 입력 X, 단위 선택 O
if (StringUtils.hasText(vo.getUnitCode()) && !StringUtils.hasText(vo.getCount())) {
errors.rejectValue("count", "error.count",
"수량을 입력해주세요.");
return;
}
// 단위 직접입력 선택 후 직접입력 input null 일 경우
if (vo.getUnitCode().equals("code.count.unit.self") && !StringUtils.hasText(vo.getUnit())) {
errors.rejectValue("unit", "error.unit",
"직접입력 단위를 입력해주세요.");
return;
}
// 현금
if (vo.getPrice() == null) {
errors.rejectValue("price", "error.price",
"현금(원)을 입력해주세요.");
}
}
}

View File

@@ -0,0 +1,7 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports;
import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain.SaveBankAutoTransferExpenseInCmd;
public interface SaveBankAutoTransferExpensePortIn {
void operate(SaveBankAutoTransferExpenseInCmd inCmd);
}

View File

@@ -0,0 +1,7 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports;
import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain.SaveBankAutoTransferExpenseOutCmd;
public interface SaveBankAutoTransferExpensePortOut {
void operate(SaveBankAutoTransferExpenseOutCmd outCmd);
}

View File

@@ -0,0 +1,45 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application;
import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn;
import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus;
import app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd;
import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.SaveBankAutoTransferExpensePortIn;
import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.SaveBankAutoTransferExpensePortOut;
import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain.SaveBankAutoTransferExpenseInCmd;
import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain.SaveBankAutoTransferExpenseOutCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class SaveBankAutoTransferExpenseService implements SaveBankAutoTransferExpensePortIn {
private final SaveBankAutoTransferExpensePortOut portOut;
private final GetMonthlyInputStatusPortIn getMonthlyInputStatusPortIn;
@Override
public void operate(SaveBankAutoTransferExpenseInCmd inCmd) {
// 월별 등록상태 조회
GetMonthlyInputStatus monthlyInputStatus = getMonthlyInputStatusPortIn
.operate(new GetMonthlyInputStatusCmd(inCmd.getHouseholdSeq(), inCmd.getRecordMonth()))
.orElse(null);
portOut.operate(new SaveBankAutoTransferExpenseOutCmd(
inCmd.getBankAutoTransferId(),
inCmd.getHouseholdSeq(),
inCmd.getRecordMonth(),
inCmd.getExpenseCode(),
inCmd.getTransferCategoryCode(),
inCmd.getTransferCategory(),
inCmd.getSourcePurpose(),
inCmd.getCount(),
inCmd.getUnitCode(),
inCmd.getUnit(),
inCmd.getPrice(),
"code.bank.output", // 지출 type code
"2", // 지출 유형 2 고정
monthlyInputStatus.getId(),
monthlyInputStatus.getBankAutoTransferOutputStatus()));
}
}

View File

@@ -0,0 +1,24 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class SaveBankAutoTransferExpenseInCmd {
private Long bankAutoTransferId;
private Long householdSeq;
private String recordMonth;
private String expenseCode;
private String transferCategoryCode;
private String transferCategory;
private String sourcePurpose;
private String count;
private String unitCode;
private String unit;
private Long price;
}

View File

@@ -0,0 +1,28 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferExpense.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
public class SaveBankAutoTransferExpenseOutCmd extends AuditCommand {
private Long bankAutoTransferId;
private Long householdSeq;
private String recordMonth;
private String expenseCode;
private String transferCategoryCode;
private String transferCategory;
private String sourcePurpose;
private String count;
private String unitCode;
private String unit;
private Long price;
private String transferType;
private String category;
private Long monthlyInputStatusId;
private String bankAutoTransferOutputStatus;
}

View File

@@ -1,5 +1,7 @@
package app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.web;
import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.SaveBankAutoTransferIncomePortIn;
import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.ports.application.domain.SaveBankAutoTransferIncomeInCmd;
import app.module.core.config.application.util.MessageUtil;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
@@ -16,19 +18,36 @@ import app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTrans
@RestController
@RequiredArgsConstructor
class SaveBankAutoTransferIncomeController {
private final SaveBankAutoTransferIncomeValidator validator;
private final MessageUtil messageUtil;
private final SaveBankAutoTransferIncomeValidator validator;
private final SaveBankAutoTransferIncomePortIn portIn;
private final MessageUtil messageUtil;
@PostMapping(path = "/api/household/bank/income/save")
ResponseEntity<?> operate(
@Valid @RequestBody SaveBankAutoTransferIncomeReqVO reqVO, BindingResult bindingResult) {
validator.validate(reqVO, bindingResult);
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
@PostMapping(path = "/api/household/bank/income/save")
ResponseEntity<?> operate(@Valid @RequestBody SaveBankAutoTransferIncomeReqVO reqVO,
BindingResult bindingResult) {
validator.validate(reqVO, bindingResult);
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
}
portIn.operate(
new SaveBankAutoTransferIncomeInCmd(
reqVO.getBankAutoTransferId(),
reqVO.getHouseholdSeq(),
reqVO.getRecordMonth(),
reqVO.getCropCode(),
reqVO.getIncomeCode(),
reqVO.getExpenseCode(),
reqVO.getTransferCategoryCode(),
reqVO.getTransferCategory(),
reqVO.getSourcePurpose(),
reqVO.getCount(),
reqVO.getUnitCode(),
reqVO.getUnit(),
reqVO.getPrice()));
return ResponseEntity.status(HttpStatus.OK).body(new SaveBankAutoTransferIncomeResVO(
messageUtil.getMessage("operation.common.save.done")));
}
return ResponseEntity.status(HttpStatus.OK)
.body(new SaveBankAutoTransferIncomeResVO(messageUtil.getMessage("operation.common.save.done")));
}
}

View File

@@ -22,5 +22,5 @@ public class SaveBankAutoTransferIncomeReqVO {
private String count;
private String unitCode;
private String unit;
private String price;
private Long price;
}

View File

@@ -9,32 +9,64 @@ import org.springframework.validation.Validator;
@Component
public class SaveBankAutoTransferIncomeValidator implements Validator {
@Override
public boolean supports(Class<?> clazz) {
return SaveBankAutoTransferIncomeReqVO.class.equals(clazz);
}
@Override
public void validate(Object target, Errors errors) {
SaveBankAutoTransferIncomeReqVO vo = (SaveBankAutoTransferIncomeReqVO) target;
if(!StringUtils.hasText(vo.getTransferCategoryCode())) {
errors.rejectValue("transferCategoryCode", "error.transferCategoryCode", "수입의 종류를 선택해주세요.");
return;
@Override
public boolean supports(Class<?> clazz) {
return SaveBankAutoTransferIncomeReqVO.class.equals(clazz);
}
// 수입의 종류가 특정 코드가 아닐 때만 대상 체크
if (!vo.getTransferCategoryCode().equals("code.bank.input.10") &&
!vo.getTransferCategoryCode().equals("code.bank.input.12") &&
!vo.getTransferCategoryCode().equals("code.bank.input.13") &&
!StringUtils.hasText(vo.getTransferCategory())) {
errors.rejectValue("transferCategory", "error.transferCategory", "대상을 입력해주세요.");
return;
}
@Override
public void validate(Object target, Errors errors) {
SaveBankAutoTransferIncomeReqVO vo = (SaveBankAutoTransferIncomeReqVO) target;
// 현금
if(!StringUtils.hasText(vo.getPrice())) {
errors.rejectValue("price", "error.price", "현금(원)을 입력해주세요.");
// 수입의 종류 null 체크
if (!StringUtils.hasText(vo.getTransferCategoryCode())) {
errors.rejectValue("transferCategoryCode", "error.transferCategoryCode",
"수입의 종류를 선택해주세요.");
return;
}
// 수입의 종류가 특정 코드가 아닐 때만 대상 체크
if (!vo.getTransferCategoryCode().equals("code.bank.input.10")
&& !vo.getTransferCategoryCode().equals("code.bank.input.12")
&& !vo.getTransferCategoryCode().equals("code.bank.input.13")
&& !StringUtils.hasText(vo.getTransferCategory())) {
errors.rejectValue("transferCategory", "error.transferCategory",
"대상을 입력해주세요.");
return;
}
// 수입의 종류 직접입력일 때 unll 체크
if(vo.getTransferCategoryCode().equals("code.bank.input.self")
&& !StringUtils.hasText(vo.getTransferCategory())) {
errors.rejectValue("transferCategory", "error.transferCategory",
"수입의 종류를 입력해주세요.");
}
// 수량 입력 O, 단위 선택 X
if (StringUtils.hasText(vo.getCount()) && !StringUtils.hasText(vo.getUnitCode())) {
errors.rejectValue("unitCode", "error.unitCode",
"단위를 선택해주세요.");
return;
}
// 수량 입력 X, 단위 선택 O
if (StringUtils.hasText(vo.getUnitCode()) && !StringUtils.hasText(vo.getCount())) {
errors.rejectValue("count", "error.count",
"수량을 입력해주세요.");
return;
}
// 단위 직접입력 선택 후 직접입력 input null 일 경우
if (vo.getUnitCode().equals("code.count.unit.self") && !StringUtils.hasText(vo.getUnit())) {
errors.rejectValue("unit", "error.unit",
"직접입력 단위를 입력해주세요.");
return;
}
// 현금
if (vo.getPrice() == null) {
errors.rejectValue("price", "error.price",
"현금(원)을 입력해주세요.");
}
}
}
}

View File

@@ -40,7 +40,7 @@ class SaveBankAutoTransferIncomeService implements SaveBankAutoTransferIncomePor
inCmd.getUnit(),
inCmd.getPrice(),
"code.bank.input", // 수입 type code
"1", // 수입 유형 1
"1", // 수입 유형 1 고정
monthlyInputStatus.getId(),
monthlyInputStatus.getBankAutoTransferInputStatus()
));

View File

@@ -22,5 +22,5 @@ public class SaveBankAutoTransferIncomeInCmd {
private String count;
private String unitCode;
private String unit;
private String price;
private Long price;
}

View File

@@ -22,7 +22,7 @@ public class SaveBankAutoTransferIncomeOutCmd extends AuditCommand {
private String count;
private String unitCode;
private String unit;
private String price;
private Long price;
private String transferType;
private String category;
private Long monthlyInputStatusId;

View File

@@ -13,21 +13,21 @@ import org.springframework.transaction.annotation.Transactional;
@Repository
@RequiredArgsConstructor
class RemoveForestProductsDao implements RemoveForestProductsPortOut {
private final RemoveForestProductsMapper removeForestProductsMapper;
private final UpdateMonthlyInputStatusMapper updateMonthlyInputStatusMapper;
private final RemoveForestProductsMapper removeForestProductsMapper;
private final UpdateMonthlyInputStatusMapper updateMonthlyInputStatusMapper;
@Override
@DeleteCommand
@Transactional
public void operate(RemoveForestProductsCmd cmd) {
// 임산물 현황 삭제
removeForestProductsMapper.removeForestProducts(cmd);
@Override
@DeleteCommand
@Transactional
public void operate(RemoveForestProductsCmd cmd) {
// 임산물 현황 삭제
removeForestProductsMapper.remove(cmd);
// 임산물 모두 삭제됐을 경우 입력상태 미등록으로 update
if (!removeForestProductsMapper.existsForestProduct(cmd.getMonthlyInputStatusId())) {
updateMonthlyInputStatusMapper.updateForestProductStatus(
new UpdateForestProductStatusCmd(cmd.getMonthlyInputStatusId(),
MonthlyInputStatusType.NONE.name()));
// 임산물 모두 삭제됐을 경우 입력상태 미등록으로 update
if (!removeForestProductsMapper.existsForestProduct(cmd.getMonthlyInputStatusId())) {
updateMonthlyInputStatusMapper.updateForestProductStatus(
new UpdateForestProductStatusCmd(cmd.getMonthlyInputStatusId(),
MonthlyInputStatusType.NONE.name()));
}
}
}
}

View File

@@ -5,6 +5,6 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface RemoveForestProductsMapper {
void removeForestProducts(RemoveForestProductsCmd cmd);
void remove(RemoveForestProductsCmd cmd);
boolean existsForestProduct(Long monthlyInputStatusId);
}