diff --git a/src/main/java/com/kri/contact/server/controller/ListExternalController.java b/src/main/java/com/kri/contact/server/controller/ListExternalController.java index f482dc6..dd828af 100644 --- a/src/main/java/com/kri/contact/server/controller/ListExternalController.java +++ b/src/main/java/com/kri/contact/server/controller/ListExternalController.java @@ -7,6 +7,7 @@ import com.kri.contact.server.dto.list.ListUpdateRequestDto; import com.kri.contact.server.service.ListHeaderService; import com.kri.contact.server.service.ListSearchService; import com.kri.contact.server.service.ListUpdateService; +import com.kri.contact.server.service.ProjectService; import com.kri.contact.server.service.common.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -32,14 +33,16 @@ public class ListExternalController { private final ListHeaderService listHeaderService; private final ListSearchService listSearchService; private final ListUpdateService listUpdateService; + private final ProjectService projectService; private final SystemEventLogService systemEventLogService; @Operation(summary = "리스트 헤더 조회") - @GetMapping("/header/{prjctIdx}") + @GetMapping("/header/{prjctCd}") public List searchListHeader( - @PathVariable Long prjctIdx, + @PathVariable String prjctCd, RequestUserContext ctx ) { + Long prjctIdx = projectService.getProjectIdxByCode(prjctCd); LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); List headerNames = listHeaderService.getHeaderName(prjctIdx); systemEventLogService.writeSearchListHeaderFromExternal(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx); @@ -48,27 +51,29 @@ public class ListExternalController { } @Operation(summary = "리스트 정보 조회") - @GetMapping("/search/{prjctIdx}/{sid}") + @GetMapping("/search/{prjctCd}/{sid}") public ListSearchExternalDto searchListWithSid( - @PathVariable Long prjctIdx, + @PathVariable String prjctCd, @PathVariable String sid, RequestUserContext ctx ) { + Long prjctIdx = projectService.getProjectIdxByCode(prjctCd); LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); - ListSearchExternalDto listInfo = listSearchService.searchListWithSidFromExternal(prjctIdx, sid); + ListSearchExternalDto listInfo = listSearchService.searchListWithSidFromExternal(prjctIdx, prjctCd, sid); systemEventLogService.writeSearchListFromExternal(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, sid); return listInfo; } @Operation(summary = "리스트 수정 sid기반") - @PatchMapping("/update/{prjctIdx}/{sid}") + @PatchMapping("/update/{prjctCd}/{sid}") public int updateListWithSid( - @PathVariable Long prjctIdx, + @PathVariable String prjctCd, @PathVariable String sid, @RequestBody Map updateContents, RequestUserContext ctx ) { + Long prjctIdx = projectService.getProjectIdxByCode(prjctCd); Map contentsByHeaderId = listHeaderService.convertHeaderNamesToIds( prjctIdx, updateContents diff --git a/src/main/java/com/kri/contact/server/dto/list/ListSearchExternalDto.java b/src/main/java/com/kri/contact/server/dto/list/ListSearchExternalDto.java index a50101c..431f321 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListSearchExternalDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListSearchExternalDto.java @@ -15,8 +15,8 @@ import lombok.Setter; @AllArgsConstructor @Schema(description = "외부에서 리스트 조회") public class ListSearchExternalDto { - @Schema(description = "프로젝트 고유키") - private Long prjctIdx; + @Schema(description = "프로젝트 코드") + private String prjctCd; @Schema(description = "SID") private String sid; diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ProjectRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ProjectRepository.java index fdeff1c..db2b6eb 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ProjectRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ProjectRepository.java @@ -3,6 +3,7 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.persistence.entity.TPrjctEntity; import java.time.LocalDateTime; import java.util.List; +import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; @@ -16,6 +17,8 @@ public interface ProjectRepository extends JpaRepository, TPrjctEntity findByPrjctIdxAndDelFalse(Long prjctIdx); + Optional findByPrjctCdAndDelFalse(String prjctCd); + @Query(""" select distinct p.ownerDept from TPrjctEntity p diff --git a/src/main/java/com/kri/contact/server/service/ListSearchService.java b/src/main/java/com/kri/contact/server/service/ListSearchService.java index 45849f5..6a58b2b 100644 --- a/src/main/java/com/kri/contact/server/service/ListSearchService.java +++ b/src/main/java/com/kri/contact/server/service/ListSearchService.java @@ -88,7 +88,7 @@ public class ListSearchService { } @Transactional(readOnly = true) - public ListSearchExternalDto searchListWithSidFromExternal(Long prjctIdx, String sid) { + public ListSearchExternalDto searchListWithSidFromExternal(Long prjctIdx, String prjctCd, String sid) { ListFilterDto filterDto = ListFilterDto.onlyOneSid(sid); List result = createListSearchBase( prjctIdx, @@ -116,7 +116,7 @@ public class ListSearchService { ); return ListSearchExternalDto.builder() - .prjctIdx(list.getPrjctIdx()) + .prjctCd(prjctCd) .sid(list.getSid()) .itemList(itemList) .build(); diff --git a/src/main/java/com/kri/contact/server/service/ProjectService.java b/src/main/java/com/kri/contact/server/service/ProjectService.java index 33a9473..9275304 100644 --- a/src/main/java/com/kri/contact/server/service/ProjectService.java +++ b/src/main/java/com/kri/contact/server/service/ProjectService.java @@ -91,6 +91,14 @@ public class ProjectService { return withSurveys(projectRepository.findByPrjctIdxAndDelFalse(prjctIdx)); } + @Transactional(readOnly = true) + public Long getProjectIdxByCode(String prjctCd) { + return projectRepository.findByPrjctCdAndDelFalse(prjctCd) + .map(TPrjctEntity::getPrjctIdx) + .orElseThrow(() -> BusinessException.notFound("PROJECT_NOT_FOUND", "프로젝트를 찾을 수 없습니다.") + .with("prjctCd", prjctCd)); + } + @Transactional(readOnly = true) public List getTopProject( int topCount,