포트 패캐지로 수정

This commit is contained in:
주수현
2025-06-17 14:52:51 +09:00
parent d60bb1e7c7
commit aaaef3b9d9
19 changed files with 236 additions and 75 deletions

View File

@@ -1,20 +1,17 @@
package app.module.admin.usecase.researcher.service;
package app.module.admin.usecase.researcher.adpaters.persistence;
import app.module.admin.usecase.household.getHouseholdsStatus.adapters.persistence.GetHouseholdsStatusMapper;
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd;
import app.module.admin.usecase.researcher.getPopupHouseholds.adapters.persistence.GetPopupHouseholdsMapper;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
import app.module.admin.usecase.researcher.persistence.ResearcherMapper;
import app.module.admin.usecase.researcher.persistence.model.ResearchersDto;
import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto;
import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto;
import app.module.admin.usecase.researcher.web.model.HouseholdSearchReqVO;
import app.module.admin.usecase.researcher.web.model.MappingHouseholdListReqVO;
import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO;
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
import app.module.admin.usecase.researcher.ports.ResearcherPortOut;
import app.module.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.MappingHouseholdListReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO;
import app.module.core.config.application.util.CommonUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -29,7 +26,7 @@ import java.util.List;
@Slf4j
@Service
@RequiredArgsConstructor
public class ResearcherServiceImpl implements ResearcherService {
public class ResearcherDao implements ResearcherPortOut {
private final ResearcherMapper researcherMapper;
private final GetPopupHouseholdsMapper getPopupHouseholdsMapper;
@@ -73,7 +70,7 @@ public class ResearcherServiceImpl implements ResearcherService {
@Override
public Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO) {
Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize());
List<GetPopupHouseholds> households = getPopupHouseholdsMapper.getPopupHouseholds(pageable,
List<GetPopupHouseholds> households = researcherMapper.getPopupHouseholds(pageable,
new GetPopupHouseholdsCmd(
reqVO.getOwnerField(),
reqVO.getOwnerValue(),

View File

@@ -1,12 +1,15 @@
package app.module.admin.usecase.researcher.persistence;
package app.module.admin.usecase.researcher.adpaters.persistence;
import app.module.admin.usecase.researcher.persistence.model.ResearchersDto;
import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto;
import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto;
import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO;
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;
import java.util.List;
@@ -25,5 +28,6 @@ public interface ResearcherMapper {
void deleteHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("deletedBy") String deletedBy);
Integer insertHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("createdBy") String createdBy);
List<GetPopupHouseholds> getPopupHouseholds(@Param("pageable") Pageable pageable,
@Param("cmd") GetPopupHouseholdsCmd cmd);
}

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.researcher.persistence.model;
package app.module.admin.usecase.researcher.adpaters.persistence.model;
import lombok.Data;

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.researcher.persistence.model;
package app.module.admin.usecase.researcher.adpaters.persistence.model;
import lombok.Data;

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.researcher.persistence.model;
package app.module.admin.usecase.researcher.adpaters.persistence.model;
import app.module.admin.config.application.enums.ManagementType;
import lombok.Data;

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.researcher.persistence.model;
package app.module.admin.usecase.researcher.adpaters.persistence.model;
import lombok.Data;

View File

@@ -1,7 +1,10 @@
package app.module.admin.usecase.researcher.web;
package app.module.admin.usecase.researcher.adpaters.web;
import app.module.admin.usecase.researcher.service.ResearcherService;
import app.module.admin.usecase.researcher.web.model.*;
import app.module.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.MappingHouseholdListReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO;
import app.module.admin.usecase.researcher.ports.ResearcherPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
@@ -15,35 +18,35 @@ import java.util.List;
@RequiredArgsConstructor
@RequestMapping(path = "/api/researcher")
class ResearcherApiController {
private final ResearcherService researcherService;
private final ResearcherPortIn researcherPortIn;
@GetMapping(path = "/list")
ResponseEntity<?> operate( @ModelAttribute("reqVO") ResearchersListReqVO reqVO) {
return ResponseEntity.status(HttpStatus.OK).body(researcherService.list(reqVO));
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.list(reqVO));
}
@GetMapping(path = "/mappingHouseholdList")
ResponseEntity<?> mappingHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) {
return ResponseEntity.status(HttpStatus.OK).body(researcherService.mappingHouseholdList(reqVO));
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.mappingHouseholdList(reqVO));
}
@GetMapping(path = "/visitHouseholdList")
ResponseEntity<?> visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) {
return ResponseEntity.status(HttpStatus.OK).body(researcherService.visitHouseholdList(reqVO));
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdList(reqVO));
}
@DeleteMapping(path = "/visitHousehold/remove")
ResponseEntity<?> visitHouseholdDelete( @RequestBody List<Integer> selectIds) {
return ResponseEntity.status(HttpStatus.OK).body(researcherService.visitHouseholdDelete(selectIds));
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdDelete(selectIds));
}
@GetMapping("/mappingHousehold/search")
ResponseEntity<?> searchMappingHousehold(HouseholdSearchReqVO reqVO) {
return ResponseEntity.status(HttpStatus.OK).body(researcherService.searchMappingHousehold(reqVO));
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.searchMappingHousehold(reqVO));
}
@PostMapping("/mappingHousehold/update")
ResponseEntity<?> updateMappingHousehold(@RequestBody MappingHouseholdListReqVO reqVO ) {
return ResponseEntity.status(HttpStatus.OK).body(researcherService.updateMappingHousehold(reqVO));
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.updateMappingHousehold(reqVO));
}
}

View File

@@ -1,8 +1,9 @@
package app.module.admin.usecase.researcher.web;
package app.module.admin.usecase.researcher.adpaters.web;
import app.module.admin.config.application.util.DateUiUtil;
import app.module.admin.usecase.researcher.service.ResearcherService;
import app.module.admin.usecase.researcher.web.model.*;
import app.module.admin.usecase.researcher.adpaters.web.model.GetResearchersUIReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailUIReqVO;
import app.module.admin.usecase.researcher.ports.ResearcherPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -17,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping(path = "/researcher")
class ResearcherController {
private final UICodeListPortIn uiCodeListPortIn;
private final ResearcherService researcherService;
private final ResearcherPortIn researcherPortIn;
@GetMapping(path = "/researchers")
public String operate(Model model, @ModelAttribute("reqVO") GetResearchersUIReqVO reqVO) {
@@ -28,7 +29,7 @@ class ResearcherController {
@GetMapping(path = "/{adminSeq}")
public String operateDetail(Model model, @PathVariable Integer adminSeq, @ModelAttribute("reqVO") ResearchersDetailUIReqVO reqVO) {
model.addAttribute("researcherDto", researcherService.detail(adminSeq));
model.addAttribute("researcherDto", researcherPortIn.detail(adminSeq));
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue());
// 모달용 지역

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.researcher.web.model;
package app.module.admin.usecase.researcher.adpaters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.researcher.web.model;
package app.module.admin.usecase.researcher.adpaters.web.model;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.researcher.web.model;
package app.module.admin.usecase.researcher.adpaters.web.model;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.researcher.web.model;
package app.module.admin.usecase.researcher.adpaters.web.model;
import lombok.Getter;
import lombok.Setter;

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.researcher.web.model;
package app.module.admin.usecase.researcher.adpaters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.researcher.web.model;
package app.module.admin.usecase.researcher.adpaters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;

View File

@@ -0,0 +1,25 @@
package app.module.admin.usecase.researcher.ports;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
import app.module.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.MappingHouseholdListReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import java.util.List;
public interface ResearcherPortIn {
Page<ResearchersDto> list(ResearchersListReqVO reqVO);
ResearchersDto detail(Integer adminSeq);
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
Integer visitHouseholdDelete(List<Integer> selectIds);
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO);
}

View File

@@ -0,0 +1,25 @@
package app.module.admin.usecase.researcher.ports;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
import app.module.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.MappingHouseholdListReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import java.util.List;
public interface ResearcherPortOut {
Page<ResearchersDto> list(ResearchersListReqVO reqVO);
ResearchersDto detail(Integer adminSeq);
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
Integer visitHouseholdDelete(List<Integer> selectIds);
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO);
}

View File

@@ -0,0 +1,53 @@
package app.module.admin.usecase.researcher.ports.application;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersHouseholdVisitDto;
import app.module.admin.usecase.researcher.adpaters.persistence.model.ResearchersMappingHouseholdDto;
import app.module.admin.usecase.researcher.adpaters.web.model.HouseholdSearchReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.MappingHouseholdListReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersDetailReqVO;
import app.module.admin.usecase.researcher.adpaters.web.model.ResearchersListReqVO;
import app.module.admin.usecase.researcher.ports.ResearcherPortIn;
import app.module.admin.usecase.researcher.ports.ResearcherPortOut;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
@RequiredArgsConstructor
class ResearcherService implements ResearcherPortIn {
private final ResearcherPortOut portOut;
@Override
public Page<ResearchersDto> list(ResearchersListReqVO reqVO){
return portOut.list(reqVO);
}
@Override
public ResearchersDto detail(Integer adminSeq){
return portOut.detail(adminSeq);
}
@Override
public Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO){
return portOut.mappingHouseholdList(reqVO);
}
@Override
public Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO){
return portOut.visitHouseholdList(reqVO);
}
@Override
public Integer visitHouseholdDelete(List<Integer> selectIds){
return portOut.visitHouseholdDelete(selectIds);
}
@Override
public Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO){
return portOut.searchMappingHousehold(reqVO);
}
@Override
public Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO){
return portOut.updateMappingHousehold(reqVO);
}
}

View File

@@ -1,26 +0,0 @@
package app.module.admin.usecase.researcher.service;
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.persistence.model.ResearchersDto;
import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto;
import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto;
import app.module.admin.usecase.researcher.web.model.HouseholdSearchReqVO;
import app.module.admin.usecase.researcher.web.model.MappingHouseholdListReqVO;
import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO;
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
import org.springframework.data.domain.Page;
import java.util.List;
public interface ResearcherService {
Page<ResearchersDto> list(ResearchersListReqVO reqVO);
ResearchersDto detail(Integer adminSeq);
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
Integer visitHouseholdDelete(List<Integer> selectIds);
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO);
}