diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java similarity index 75% rename from admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java index ed3d5868..ec0be769 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java @@ -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 searchMappingHousehold(HouseholdSearchReqVO reqVO) { Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize()); - List households = getPopupHouseholdsMapper.getPopupHouseholds(pageable, + List households = researcherMapper.getPopupHouseholds(pageable, new GetPopupHouseholdsCmd( reqVO.getOwnerField(), reqVO.getOwnerValue(), diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java similarity index 53% rename from admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java index 30a63b6b..8055ecf7 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java @@ -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(@Param("pageable") Pageable pageable, + @Param("cmd") GetPopupHouseholdsCmd cmd); } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/HouseholdDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/HouseholdDto.java similarity index 78% rename from admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/HouseholdDto.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/HouseholdDto.java index d57de63a..f41ca4b6 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/HouseholdDto.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/HouseholdDto.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.researcher.persistence.model; +package app.module.admin.usecase.researcher.adpaters.persistence.model; import lombok.Data; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersDto.java similarity index 81% rename from admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersDto.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersDto.java index 6034eed0..e9cb074d 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersDto.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersDto.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.researcher.persistence.model; +package app.module.admin.usecase.researcher.adpaters.persistence.model; import lombok.Data; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersHouseholdVisitDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersHouseholdVisitDto.java similarity index 87% rename from admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersHouseholdVisitDto.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersHouseholdVisitDto.java index 2032d861..1c629523 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersHouseholdVisitDto.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersHouseholdVisitDto.java @@ -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; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersMappingHouseholdDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersMappingHouseholdDto.java similarity index 85% rename from admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersMappingHouseholdDto.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersMappingHouseholdDto.java index 8df195ac..5ac2355c 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersMappingHouseholdDto.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/ResearchersMappingHouseholdDto.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.researcher.persistence.model; +package app.module.admin.usecase.researcher.adpaters.persistence.model; import lombok.Data; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherApiController.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java similarity index 67% rename from admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherApiController.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java index 385dc947..cdac49cb 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherApiController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java @@ -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 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)); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java similarity index 77% rename from admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java index c54ae362..6d62b867 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherController.java @@ -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()); // 모달용 지역 diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/GetResearchersUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/GetResearchersUIReqVO.java similarity index 93% rename from admin/src/main/java/app/module/admin/usecase/researcher/web/model/GetResearchersUIReqVO.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/GetResearchersUIReqVO.java index b960b119..9caa21a1 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/GetResearchersUIReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/GetResearchersUIReqVO.java @@ -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; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/HouseholdSearchReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/HouseholdSearchReqVO.java similarity index 91% rename from admin/src/main/java/app/module/admin/usecase/researcher/web/model/HouseholdSearchReqVO.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/HouseholdSearchReqVO.java index 6043c4a8..dcdf7caa 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/HouseholdSearchReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/HouseholdSearchReqVO.java @@ -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; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/MappingHouseholdListReqVO.java similarity index 76% rename from admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListReqVO.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/MappingHouseholdListReqVO.java index a78b0687..45c8a35e 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/MappingHouseholdListReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/MappingHouseholdListReqVO.java @@ -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; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersDetailReqVO.java similarity index 88% rename from admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailReqVO.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersDetailReqVO.java index aa125d49..f5337e74 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersDetailReqVO.java @@ -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; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersDetailUIReqVO.java similarity index 90% rename from admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailUIReqVO.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersDetailUIReqVO.java index 795dfaf0..b2da51d3 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersDetailUIReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersDetailUIReqVO.java @@ -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; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersListReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersListReqVO.java similarity index 91% rename from admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersListReqVO.java rename to admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersListReqVO.java index 4dddadd9..35e0850b 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/model/ResearchersListReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersListReqVO.java @@ -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; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java new file mode 100644 index 00000000..3cb092eb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java @@ -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 list(ResearchersListReqVO reqVO); + ResearchersDto detail(Integer adminSeq); + Page mappingHouseholdList(ResearchersDetailReqVO reqVO); + Page visitHouseholdList(ResearchersDetailReqVO reqVO); + Integer visitHouseholdDelete(List selectIds); + Page searchMappingHousehold(HouseholdSearchReqVO reqVO); + Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java new file mode 100644 index 00000000..90cf528c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java @@ -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 list(ResearchersListReqVO reqVO); + ResearchersDto detail(Integer adminSeq); + Page mappingHouseholdList(ResearchersDetailReqVO reqVO); + Page visitHouseholdList(ResearchersDetailReqVO reqVO); + Integer visitHouseholdDelete(List selectIds); + Page searchMappingHousehold(HouseholdSearchReqVO reqVO); + Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java new file mode 100644 index 00000000..55849eeb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java @@ -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 list(ResearchersListReqVO reqVO){ + return portOut.list(reqVO); + } + @Override + public ResearchersDto detail(Integer adminSeq){ + return portOut.detail(adminSeq); + } + @Override + public Page mappingHouseholdList(ResearchersDetailReqVO reqVO){ + return portOut.mappingHouseholdList(reqVO); + } + @Override + public Page visitHouseholdList(ResearchersDetailReqVO reqVO){ + return portOut.visitHouseholdList(reqVO); + } + @Override + public Integer visitHouseholdDelete(List selectIds){ + return portOut.visitHouseholdDelete(selectIds); + } + @Override + public Page searchMappingHousehold(HouseholdSearchReqVO reqVO){ + return portOut.searchMappingHousehold(reqVO); + } + @Override + public Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO){ + return portOut.updateMappingHousehold(reqVO); + } + +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java deleted file mode 100644 index e558a688..00000000 --- a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java +++ /dev/null @@ -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 list(ResearchersListReqVO reqVO); - ResearchersDto detail(Integer adminSeq); - Page mappingHouseholdList(ResearchersDetailReqVO reqVO); - Page visitHouseholdList(ResearchersDetailReqVO reqVO); - Integer visitHouseholdDelete(List selectIds); - Page searchMappingHousehold(HouseholdSearchReqVO reqVO); - Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO); - -} diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index b08ac843..4f998561 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -1,9 +1,9 @@ - + - select a.seq, a.id, @@ -35,7 +35,7 @@ LIMIT #{size} OFFSET #{page}*#{size} - select COUNT(a.seq) from admin a join admin_has_role ahr ON a.seq = ahr.admin_seq @@ -186,4 +186,83 @@ #{createdBy} ) + + \ No newline at end of file