diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/adapters/persistence/GetPopupHouseholdsDao.java b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/adapters/persistence/GetPopupHouseholdsDao.java new file mode 100644 index 00000000..ec15f7a3 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/adapters/persistence/GetPopupHouseholdsDao.java @@ -0,0 +1,25 @@ +package app.module.admin.usecase.researcher.getPopupHouseholds.adapters.persistence; + +import app.module.admin.usecase.researcher.getPopupHouseholds.ports.GetPopupHouseholdsPortOut; +import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds; +import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetPopupHouseholdsDao implements GetPopupHouseholdsPortOut { + private final GetPopupHouseholdsMapper mapper; + + @Override + public Page operate(Pageable pageable, GetPopupHouseholdsCmd cmd) { + + List result = mapper.getPopupHouseholds(pageable, cmd); + + return new PageImpl<>(result, pageable, result.isEmpty() ? 0 : result.get(0).getHouseholdSeq()); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/adapters/persistence/GetPopupHouseholdsMapper.java b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/adapters/persistence/GetPopupHouseholdsMapper.java new file mode 100644 index 00000000..c767d3f7 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/adapters/persistence/GetPopupHouseholdsMapper.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.researcher.getPopupHouseholds.adapters.persistence; + +import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds; +import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +@Mapper +public interface GetPopupHouseholdsMapper { + List getPopupHouseholds(@Param("pageable") Pageable pageable, + @Param("cmd") GetPopupHouseholdsCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/GetPopupHouseholdsPortIn.java b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/GetPopupHouseholdsPortIn.java new file mode 100644 index 00000000..4baf0dea --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/GetPopupHouseholdsPortIn.java @@ -0,0 +1,10 @@ +package app.module.admin.usecase.researcher.getPopupHouseholds.ports; + +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; + +public interface GetPopupHouseholdsPortIn { + Page operate(Pageable pageable, GetPopupHouseholdsCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/GetPopupHouseholdsPortOut.java b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/GetPopupHouseholdsPortOut.java new file mode 100644 index 00000000..b173a073 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/GetPopupHouseholdsPortOut.java @@ -0,0 +1,10 @@ +package app.module.admin.usecase.researcher.getPopupHouseholds.ports; + +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; + +public interface GetPopupHouseholdsPortOut { + Page operate(Pageable pageable, GetPopupHouseholdsCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/GetPopupHouseholdsService.java b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/GetPopupHouseholdsService.java new file mode 100644 index 00000000..7e644605 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/GetPopupHouseholdsService.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.researcher.getPopupHouseholds.ports.application; + +import lombok.RequiredArgsConstructor; +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.getPopupHouseholds.ports.GetPopupHouseholdsPortIn; +import app.module.admin.usecase.researcher.getPopupHouseholds.ports.GetPopupHouseholdsPortOut; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetPopupHouseholdsService implements GetPopupHouseholdsPortIn { + private final GetPopupHouseholdsPortOut portOut; + + @Override + public Page operate(Pageable pageable, GetPopupHouseholdsCmd cmd) { + return portOut.operate(pageable, cmd); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/domain/GetPopupHouseholds.java b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/domain/GetPopupHouseholds.java new file mode 100644 index 00000000..a693efd4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/domain/GetPopupHouseholds.java @@ -0,0 +1,31 @@ +package app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetPopupHouseholds { + private Integer householdSeq; + private String householdNum; + private String householdName; + private String householdPhone; + private String regionMainCode; + private String regionMainName; + private String regionSubCode; + private String regionSubName; + private String regionDetailCode; + private String regionDetailName; + private String industryLargeCode; + private String industryLargeName; + private String industryMiddleCode; + private String industryMiddleName; + private Boolean isPanel; + private String researcherName; + private Integer total; +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/domain/GetPopupHouseholdsCmd.java b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/domain/GetPopupHouseholdsCmd.java new file mode 100644 index 00000000..84fe7e59 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/getPopupHouseholds/ports/application/domain/GetPopupHouseholdsCmd.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetPopupHouseholdsCmd { + private String ownerField; + private String ownerValue; + private String regionMainCode; + private String regionSubCode; + private String regionDetailCode; + private Boolean isPanel; + private Boolean isMapping; +} 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 index 819e4bc7..55f41b6a 100644 --- 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 @@ -1,6 +1,7 @@ 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; @@ -19,5 +20,5 @@ public interface ResearcherService { Page mappingHouseholdList(ResearchersDetailReqVO reqVO); Page visitHouseholdList(ResearchersDetailReqVO reqVO); Integer visitHouseholdDelete(List selectIds); - Page searchMappingHousehold(HouseholdSearchReqVO reqVO); + Page searchMappingHousehold(HouseholdSearchReqVO reqVO); } 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/service/ResearcherServiceImpl.java index f1b59d5a..d40665bb 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java @@ -3,6 +3,9 @@ package app.module.admin.usecase.researcher.service; 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; @@ -28,7 +31,7 @@ import java.util.List; @RequiredArgsConstructor public class ResearcherServiceImpl implements ResearcherService { private final ResearcherMapper researcherMapper; - private final GetHouseholdsStatusMapper householdsStatusMapper; + private final GetPopupHouseholdsMapper getPopupHouseholdsMapper; @Override public Page list(ResearchersListReqVO reqVO) { @@ -68,13 +71,21 @@ public class ResearcherServiceImpl implements ResearcherService { } @Override - public Page searchMappingHousehold(HouseholdSearchReqVO reqVO) { + public Page searchMappingHousehold(HouseholdSearchReqVO reqVO) { Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize()); - List householdsStatus = householdsStatusMapper.getHouseholdsStatus(pageable, - new GetHouseholdsStatusCmd(reqVO)); + List households = getPopupHouseholdsMapper.getPopupHouseholds(pageable, + new GetPopupHouseholdsCmd( + reqVO.getOwnerField(), + reqVO.getOwnerValue(), + reqVO.getRegionMainCode(), + reqVO.getRegionSubCode(), + reqVO.getRegionDetailCode(), + reqVO.getIsPanel(), + reqVO.getIsMapping() + )); - return new PageImpl<>(householdsStatus, pageable, - householdsStatus.isEmpty() ? 0 : householdsStatus.get(0).getTotal()); + return new PageImpl<>(households, pageable, + households.isEmpty() ? 0 : households.get(0).getTotal()); } } diff --git a/admin/src/main/resources/mappers/researcher/GetPopupHouseholdsMapper.xml b/admin/src/main/resources/mappers/researcher/GetPopupHouseholdsMapper.xml new file mode 100644 index 00000000..ec2ea9a8 --- /dev/null +++ b/admin/src/main/resources/mappers/researcher/GetPopupHouseholdsMapper.xml @@ -0,0 +1,90 @@ + + + + + \ No newline at end of file