From e897178edb4f0e011949ec340255b9afceb8b234 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Tue, 3 Mar 2026 16:24:39 +0900 Subject: [PATCH 1/9] =?UTF-8?q?260303=5F01=5FENH:=20user=20=ED=8C=8C?= =?UTF-8?q?=ED=8A=B8=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kri/contact/server/common/consts/ContactConstant.java | 2 ++ .../kri/contact/server/persistence/entity/TUserEntity.java | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java index 360c6af..cf65a66 100644 --- a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java +++ b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java @@ -3,6 +3,8 @@ package com.kri.contact.server.common.consts; public final class ContactConstant { public static final String DEFAULT_COMPANY_NAME = "KRI"; + public static final String DEFAULT_USER_TEAM = "S101"; + public static final int OUTSOURCE_USER_ROLE = 4000; public static final int FIELDWORK_USER_ROLE = 9000; private ContactConstant() { diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TUserEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TUserEntity.java index bf16349..d97483b 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TUserEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TUserEntity.java @@ -1,5 +1,6 @@ package com.kri.contact.server.persistence.entity; +import com.kri.contact.server.common.consts.ContactConstant; import com.kri.contact.server.dto.UserInfoDto; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -55,9 +56,10 @@ public class TUserEntity { @Size(max = 32) @NotNull + @Builder.Default @ColumnDefault("'S101'") @Column(name = "user_team", nullable = false, length = 32, updatable = false) - private String userTeam; + private String userTeam = "S101"; @NotNull @Column(name = "user_role", nullable = false) @@ -87,6 +89,7 @@ public class TUserEntity { @NotNull @ColumnDefault("0") + @Builder.Default @Column(name = "is_del", nullable = false) private Boolean del = false; @@ -106,7 +109,7 @@ public class TUserEntity { .userTeam( dto.getUserTeam() != null && !dto.getUserTeam().isBlank() ? dto.getUserTeam() - : "S101" // DB 기본값과 맞춰서 디폴트 세팅 + : ContactConstant.DEFAULT_USER_TEAM ) .userRole(dto.getUserRole()) .memo(dto.getMemo() != null ? dto.getMemo() : "") -- 2.49.0.windows.1 From 4456205f13a9c664f5607773c367bda75b7b1553 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Fri, 6 Mar 2026 11:16:44 +0900 Subject: [PATCH 2/9] =?UTF-8?q?260306=5F01=5FENH:=20DTO=20=EC=95=84?= =?UTF-8?q?=ED=82=A4=ED=85=8D=EC=B2=98=20=EC=A1=B0=EC=A0=95=20=EB=B0=8F=20?= =?UTF-8?q?ListHeader=20RU=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/common/consts/ContactConstant.java | 2 +- .../server/common/enums/ChannelType.java | 2 +- .../server/common/enums/ListHeaderGrade.java | 31 ++++++ .../server/common/enums/ListHeaderType.java | 35 ++++++ .../server/common/enums/ProjectStatus.java | 2 +- .../server/common/enums/ResultCodeType.java | 2 +- .../server/common/enums/SurveyType.java | 2 +- .../server/common/enums/SystemEventType.java | 2 + .../intranet/IntranetExtensionApiClient.java | 2 +- .../common/util/ExcelUploadResultUtil.java | 2 +- .../server/controller/AuthController.java | 4 +- .../controller/ListHeaderController.java | 41 +++++++ .../server/controller/ProjectController.java | 12 +- .../controller/ResultCodeController.java | 2 +- .../server/controller/RoleController.java | 2 +- .../server/controller/UserController.java | 6 +- .../dto/{ => auth}/LoginRequestDto.java | 2 +- .../dto/{ => auth}/LoginResponseDto.java | 2 +- .../dto/{ => common}/DataVerificationDto.java | 2 +- .../{ => excel}/ExcelUploadResponseDto.java | 2 +- .../server/dto/list/ListHeaderDto.java | 96 ++++++++++++++++ .../ProjectCreateRequestDto.java | 2 +- .../dto/{ => project}/ProjectInfoDto.java | 2 +- .../ProjectMainTemplateUpdateRequestDto.java | 2 +- .../ProjectOwnerResponseDto.java | 2 +- .../ProjectSearchRequestDto.java | 2 +- .../ProjectUpdateRequestDto.java | 2 +- .../dto/{ => project}/ResultCodeDto.java | 2 +- .../server/dto/{ => user}/RoleInfoDto.java | 2 +- .../server/dto/{ => user}/UserInfoDto.java | 2 +- .../entity/TListCallHistEntity.java | 105 ++++++++++++++++++ .../persistence/entity/TListEntityId.java | 4 +- .../persistence/entity/TListHeaderEntity.java | 71 +++++++++++- .../entity/TListHeaderEntityId.java | 11 +- .../persistence/entity/TListItemEntityId.java | 4 +- .../entity/TListItemUploadEntityId.java | 4 +- .../entity/TPrjctAssignEntityId.java | 4 +- .../persistence/entity/TPrjctEntity.java | 4 +- .../entity/TPrjctMainTmplatEntity.java | 2 +- .../entity/TPrjctMainTmplatEntityId.java | 4 +- .../persistence/entity/TResultCodeEntity.java | 2 +- .../entity/TResultCodeEntityId.java | 4 +- .../entity/TRoleFuncMapEntityId.java | 1 + .../persistence/entity/TUserEntity.java | 2 +- .../repository/ListHeaderRepository.java | 23 ++++ .../repository/ListItemRepository.java | 11 ++ .../repository/ListRepository.java | 12 ++ .../repository/ProjectAssignRepository.java | 5 +- .../ProjectMainTemplateRepository.java | 5 +- .../repository/ProjectRepository.java | 1 + .../repository/ResultCodeRepository.java | 4 +- .../repository/RoleRepository.java | 4 +- .../repository/SystemEventLogRepository.java | 4 +- .../repository/UserRepository.java | 7 +- .../contact/server/service/AuthService.java | 4 +- .../server/service/ListHeaderService.java | 98 ++++++++++++++++ .../server/service/ListItemService.java | 18 +++ .../contact/server/service/ListService.java | 15 +++ .../server/service/ProjectService.java | 22 ++-- .../server/service/ResultCodeService.java | 2 +- .../contact/server/service/RoleService.java | 2 +- .../server/service/SystemEventLogService.java | 23 +++- .../contact/server/service/UserService.java | 8 +- src/main/resources/application-dev.yml | 2 +- src/main/resources/application-local.yml | 2 +- src/main/resources/application-prod.yml | 2 +- src/main/resources/application.yml | 7 ++ 67 files changed, 679 insertions(+), 95 deletions(-) create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListHeaderGrade.java create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java create mode 100644 src/main/java/com/kri/contact/server/controller/ListHeaderController.java rename src/main/java/com/kri/contact/server/dto/{ => auth}/LoginRequestDto.java (88%) rename src/main/java/com/kri/contact/server/dto/{ => auth}/LoginResponseDto.java (93%) rename src/main/java/com/kri/contact/server/dto/{ => common}/DataVerificationDto.java (93%) rename src/main/java/com/kri/contact/server/dto/{ => excel}/ExcelUploadResponseDto.java (95%) create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java rename src/main/java/com/kri/contact/server/dto/{ => project}/ProjectCreateRequestDto.java (94%) rename src/main/java/com/kri/contact/server/dto/{ => project}/ProjectInfoDto.java (98%) rename src/main/java/com/kri/contact/server/dto/{ => project}/ProjectMainTemplateUpdateRequestDto.java (93%) rename src/main/java/com/kri/contact/server/dto/{ => project}/ProjectOwnerResponseDto.java (91%) rename src/main/java/com/kri/contact/server/dto/{ => project}/ProjectSearchRequestDto.java (94%) rename src/main/java/com/kri/contact/server/dto/{ => project}/ProjectUpdateRequestDto.java (93%) rename src/main/java/com/kri/contact/server/dto/{ => project}/ResultCodeDto.java (96%) rename src/main/java/com/kri/contact/server/dto/{ => user}/RoleInfoDto.java (97%) rename src/main/java/com/kri/contact/server/dto/{ => user}/UserInfoDto.java (98%) create mode 100644 src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListHeaderRepository.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java create mode 100644 src/main/java/com/kri/contact/server/service/ListHeaderService.java create mode 100644 src/main/java/com/kri/contact/server/service/ListItemService.java create mode 100644 src/main/java/com/kri/contact/server/service/ListService.java diff --git a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java index cf65a66..e3e4687 100644 --- a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java +++ b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java @@ -1,7 +1,7 @@ package com.kri.contact.server.common.consts; public final class ContactConstant { - + public static final int INSERT_CHUNK_SIZE = 1_000; public static final String DEFAULT_COMPANY_NAME = "KRI"; public static final String DEFAULT_USER_TEAM = "S101"; diff --git a/src/main/java/com/kri/contact/server/common/enums/ChannelType.java b/src/main/java/com/kri/contact/server/common/enums/ChannelType.java index 567e6a1..60a2f70 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ChannelType.java +++ b/src/main/java/com/kri/contact/server/common/enums/ChannelType.java @@ -25,7 +25,7 @@ public enum ChannelType implements CodeEnum { return null; } for (ChannelType s : values()) { - if (s.code == code) { + if (s.code.equals(code)) { return s; } } diff --git a/src/main/java/com/kri/contact/server/common/enums/ListHeaderGrade.java b/src/main/java/com/kri/contact/server/common/enums/ListHeaderGrade.java new file mode 100644 index 0000000..0d3b7eb --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListHeaderGrade.java @@ -0,0 +1,31 @@ +package com.kri.contact.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.kri.common.enums.CodeEnum; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +public enum ListHeaderGrade implements CodeEnum { + + IMMUTABLE((short) 0), // 불변 헤더 (옵션 변경 불가) + RESERVED((short) 1), // Default 헤더 (옵션 변경 가능) + COMMON((short) 10); // 일반 헤더 (옵션 변경 가능) + + private final Short code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ListHeaderGrade fromCode(Short code) { + if (code == null) { + return null; + } + for (ListHeaderGrade s : values()) { + if (s.code.equals(code)) { + return s; + } + } + throw new IllegalArgumentException("Unknown ListHeaderGrade code: " + code); + } +} diff --git a/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java b/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java new file mode 100644 index 0000000..9df6253 --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java @@ -0,0 +1,35 @@ +package com.kri.contact.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.kri.common.enums.CodeEnum; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +public enum ListHeaderType implements CodeEnum { + + SID((short) 11), //11 : SID + IS_USE((short) 12), //12 : 사용여부 + MEMO((short) 19), //19 : 메모 + TEL_NUM((short) 21), //21 : 전화번호 + EMAIL((short) 31), //31 : 이메일 + FILE((short) 81), //81 : 파일업로드 + TEXT((short) 91); //91 : 텍스트 + + private final Short code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ListHeaderType fromCode(Short code) { + if (code == null) { + return null; + } + for (ListHeaderType s : values()) { + if (s.code.equals(code)) { + return s; + } + } + throw new IllegalArgumentException("Unknown ListHeaderType code: " + code); + } +} \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/common/enums/ProjectStatus.java b/src/main/java/com/kri/contact/server/common/enums/ProjectStatus.java index 75af61d..8ecbde9 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ProjectStatus.java +++ b/src/main/java/com/kri/contact/server/common/enums/ProjectStatus.java @@ -21,7 +21,7 @@ public enum ProjectStatus implements CodeEnum { return null; } for (ProjectStatus s : values()) { - if (s.code == code) { + if (s.code.equals(code)) { return s; } } diff --git a/src/main/java/com/kri/contact/server/common/enums/ResultCodeType.java b/src/main/java/com/kri/contact/server/common/enums/ResultCodeType.java index 4f0e10a..8208841 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ResultCodeType.java +++ b/src/main/java/com/kri/contact/server/common/enums/ResultCodeType.java @@ -22,7 +22,7 @@ public enum ResultCodeType implements CodeEnum { return null; } for (ResultCodeType s : values()) { - if (s.code == code) { + if (s.code.equals(code)) { return s; } } diff --git a/src/main/java/com/kri/contact/server/common/enums/SurveyType.java b/src/main/java/com/kri/contact/server/common/enums/SurveyType.java index e5480e5..eb50514 100644 --- a/src/main/java/com/kri/contact/server/common/enums/SurveyType.java +++ b/src/main/java/com/kri/contact/server/common/enums/SurveyType.java @@ -22,7 +22,7 @@ public enum SurveyType implements CodeEnum { return null; } for (SurveyType s : values()) { - if (s.code == code) { + if (s.code.equals(code)) { return s; } } diff --git a/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java b/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java index 76ceb21..c8373bf 100644 --- a/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java +++ b/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java @@ -28,6 +28,8 @@ public enum SystemEventType implements CodeEnum { UPDATE_ROLE((short) 412), // 권한 수정 DELETE_ROLE((short) 413), // 권한 삭제 + UPSERT_LIST_HEADER((short) 1011), + DUMMY((short) 9999); private final Short code; diff --git a/src/main/java/com/kri/contact/server/common/external/intranet/IntranetExtensionApiClient.java b/src/main/java/com/kri/contact/server/common/external/intranet/IntranetExtensionApiClient.java index 98481c4..dacd806 100644 --- a/src/main/java/com/kri/contact/server/common/external/intranet/IntranetExtensionApiClient.java +++ b/src/main/java/com/kri/contact/server/common/external/intranet/IntranetExtensionApiClient.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.kri.common.http.ExternalApiClient; import com.kri.common.http.ExternalApiResponse; -import com.kri.contact.server.dto.LoginRequestDto; +import com.kri.contact.server.dto.auth.LoginRequestDto; import java.util.Collections; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/kri/contact/server/common/util/ExcelUploadResultUtil.java b/src/main/java/com/kri/contact/server/common/util/ExcelUploadResultUtil.java index 694e72b..6590692 100644 --- a/src/main/java/com/kri/contact/server/common/util/ExcelUploadResultUtil.java +++ b/src/main/java/com/kri/contact/server/common/util/ExcelUploadResultUtil.java @@ -1,7 +1,7 @@ package com.kri.contact.server.common.util; import com.kri.common.excel.ExcelMapper; -import com.kri.contact.server.dto.ExcelUploadResponseDto; +import com.kri.contact.server.dto.excel.ExcelUploadResponseDto; import java.io.ByteArrayOutputStream; import java.util.Base64; import java.util.List; diff --git a/src/main/java/com/kri/contact/server/controller/AuthController.java b/src/main/java/com/kri/contact/server/controller/AuthController.java index b347b85..c579fda 100644 --- a/src/main/java/com/kri/contact/server/controller/AuthController.java +++ b/src/main/java/com/kri/contact/server/controller/AuthController.java @@ -2,8 +2,8 @@ package com.kri.contact.server.controller; import com.kri.common.datetime.DateTimeUtil; import com.kri.common.webmvc.RequestUserContext; -import com.kri.contact.server.dto.LoginRequestDto; -import com.kri.contact.server.dto.LoginResponseDto; +import com.kri.contact.server.dto.auth.LoginRequestDto; +import com.kri.contact.server.dto.auth.LoginResponseDto; import com.kri.contact.server.service.AuthService; import com.kri.contact.server.service.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/kri/contact/server/controller/ListHeaderController.java b/src/main/java/com/kri/contact/server/controller/ListHeaderController.java new file mode 100644 index 0000000..f1d3016 --- /dev/null +++ b/src/main/java/com/kri/contact/server/controller/ListHeaderController.java @@ -0,0 +1,41 @@ +package com.kri.contact.server.controller; + +import com.kri.common.webmvc.RequestUserContext; +import com.kri.contact.server.dto.list.ListHeaderDto; +import com.kri.contact.server.service.ListHeaderService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/list-header") +@RequiredArgsConstructor +@Tag(name = "ListHeader", description = "리스트 헤더 API") +public class ListHeaderController { + + ListHeaderService listHeaderService; + + @Operation(summary = "리스트 헤더 조회") + @GetMapping("/{prjctIdx}") + public List getListHeader (@PathVariable Long prjctIdx) { + return listHeaderService.getHeader(prjctIdx); + } + + @Operation(summary = "리스트 헤더 수정") + @PatchMapping("/{prjctIdx}") + public void updateListHeader ( + @PathVariable Long prjctIdx, + @Valid @RequestBody List headerList, + RequestUserContext ctx + ) { + listHeaderService.upsertHeader(prjctIdx, headerList, ctx.getUserId()); + } +} diff --git a/src/main/java/com/kri/contact/server/controller/ProjectController.java b/src/main/java/com/kri/contact/server/controller/ProjectController.java index 84fe7ff..0393608 100644 --- a/src/main/java/com/kri/contact/server/controller/ProjectController.java +++ b/src/main/java/com/kri/contact/server/controller/ProjectController.java @@ -4,12 +4,12 @@ import com.kri.common.datetime.DateTimeUtil; import com.kri.common.webmvc.RequestUserContext; import com.kri.common.webmvc.page.PageResponseDto; import com.kri.contact.server.common.enums.ChannelType; -import com.kri.contact.server.dto.ProjectCreateRequestDto; -import com.kri.contact.server.dto.ProjectInfoDto; -import com.kri.contact.server.dto.ProjectMainTemplateUpdateRequestDto; -import com.kri.contact.server.dto.ProjectOwnerResponseDto; -import com.kri.contact.server.dto.ProjectSearchRequestDto; -import com.kri.contact.server.dto.ProjectUpdateRequestDto; +import com.kri.contact.server.dto.project.ProjectCreateRequestDto; +import com.kri.contact.server.dto.project.ProjectInfoDto; +import com.kri.contact.server.dto.project.ProjectMainTemplateUpdateRequestDto; +import com.kri.contact.server.dto.project.ProjectOwnerResponseDto; +import com.kri.contact.server.dto.project.ProjectSearchRequestDto; +import com.kri.contact.server.dto.project.ProjectUpdateRequestDto; import com.kri.contact.server.service.FileService; import com.kri.contact.server.service.ProjectService; import com.kri.contact.server.service.SystemEventLogService; diff --git a/src/main/java/com/kri/contact/server/controller/ResultCodeController.java b/src/main/java/com/kri/contact/server/controller/ResultCodeController.java index f957bae..80517ef 100644 --- a/src/main/java/com/kri/contact/server/controller/ResultCodeController.java +++ b/src/main/java/com/kri/contact/server/controller/ResultCodeController.java @@ -1,7 +1,7 @@ package com.kri.contact.server.controller; import com.kri.contact.server.common.enums.ResultCodeType; -import com.kri.contact.server.dto.ResultCodeDto; +import com.kri.contact.server.dto.project.ResultCodeDto; import com.kri.contact.server.service.ResultCodeService; import com.kri.contact.server.service.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/kri/contact/server/controller/RoleController.java b/src/main/java/com/kri/contact/server/controller/RoleController.java index fedb1ee..a230c50 100644 --- a/src/main/java/com/kri/contact/server/controller/RoleController.java +++ b/src/main/java/com/kri/contact/server/controller/RoleController.java @@ -1,7 +1,7 @@ package com.kri.contact.server.controller; import com.kri.common.webmvc.RequestUserContext; -import com.kri.contact.server.dto.RoleInfoDto; +import com.kri.contact.server.dto.user.RoleInfoDto; import com.kri.contact.server.service.RoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/kri/contact/server/controller/UserController.java b/src/main/java/com/kri/contact/server/controller/UserController.java index 5a12036..b2a203c 100644 --- a/src/main/java/com/kri/contact/server/controller/UserController.java +++ b/src/main/java/com/kri/contact/server/controller/UserController.java @@ -3,9 +3,9 @@ package com.kri.contact.server.controller; import com.kri.common.datetime.DateTimeUtil; import com.kri.common.webmvc.RequestUserContext; import com.kri.contact.server.common.consts.ContactConstant; -import com.kri.contact.server.dto.DataVerificationDto; -import com.kri.contact.server.dto.ExcelUploadResponseDto; -import com.kri.contact.server.dto.UserInfoDto; +import com.kri.contact.server.dto.common.DataVerificationDto; +import com.kri.contact.server.dto.excel.ExcelUploadResponseDto; +import com.kri.contact.server.dto.user.UserInfoDto; import com.kri.contact.server.dto.systemlog.UploadUserContentDto; import com.kri.contact.server.service.SystemEventLogService; import com.kri.contact.server.service.UserService; diff --git a/src/main/java/com/kri/contact/server/dto/LoginRequestDto.java b/src/main/java/com/kri/contact/server/dto/auth/LoginRequestDto.java similarity index 88% rename from src/main/java/com/kri/contact/server/dto/LoginRequestDto.java rename to src/main/java/com/kri/contact/server/dto/auth/LoginRequestDto.java index b36a193..45e386e 100644 --- a/src/main/java/com/kri/contact/server/dto/LoginRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/auth/LoginRequestDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.auth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/src/main/java/com/kri/contact/server/dto/LoginResponseDto.java b/src/main/java/com/kri/contact/server/dto/auth/LoginResponseDto.java similarity index 93% rename from src/main/java/com/kri/contact/server/dto/LoginResponseDto.java rename to src/main/java/com/kri/contact/server/dto/auth/LoginResponseDto.java index 1b6977b..ce14bbe 100644 --- a/src/main/java/com/kri/contact/server/dto/LoginResponseDto.java +++ b/src/main/java/com/kri/contact/server/dto/auth/LoginResponseDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.auth; import com.kri.common.auth.dto.JwtUserClaimsDto; diff --git a/src/main/java/com/kri/contact/server/dto/DataVerificationDto.java b/src/main/java/com/kri/contact/server/dto/common/DataVerificationDto.java similarity index 93% rename from src/main/java/com/kri/contact/server/dto/DataVerificationDto.java rename to src/main/java/com/kri/contact/server/dto/common/DataVerificationDto.java index 4518dd8..9fdb2e9 100644 --- a/src/main/java/com/kri/contact/server/dto/DataVerificationDto.java +++ b/src/main/java/com/kri/contact/server/dto/common/DataVerificationDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.common; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/kri/contact/server/dto/ExcelUploadResponseDto.java b/src/main/java/com/kri/contact/server/dto/excel/ExcelUploadResponseDto.java similarity index 95% rename from src/main/java/com/kri/contact/server/dto/ExcelUploadResponseDto.java rename to src/main/java/com/kri/contact/server/dto/excel/ExcelUploadResponseDto.java index dcf5cb8..b8be008 100644 --- a/src/main/java/com/kri/contact/server/dto/ExcelUploadResponseDto.java +++ b/src/main/java/com/kri/contact/server/dto/excel/ExcelUploadResponseDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.excel; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java b/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java new file mode 100644 index 0000000..d754b9c --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java @@ -0,0 +1,96 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.common.enums.ListHeaderGrade; +import com.kri.contact.server.common.enums.ListHeaderType; +import com.kri.contact.server.persistence.entity.TListHeaderEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull.List; +import java.util.Objects; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "리스트 헤더") +public class ListHeaderDto { + + @NotNull + @Schema(description = "프로젝트 기본키") + private Long prjctIdx; + + @NotNull + @Schema(description = "리스트 헤더 기본키") + private Integer listHderId; + + @NotNull + @Schema(description = "리스트 헤더 순서") + private Short listHderOrder; + + @NotNull + @Schema(description = "헤더 등급") + private ListHeaderGrade listHderGrad; + + @NotNull + @Schema(description = "헤더 명") + private String listHderNm; + + @NotNull + @Schema(description = "헤더 타입") + private ListHeaderType listHderTy; + + @Schema(description = "|로 이어 붙은 필터 값") + private String filterValue; + + @NotNull + @Schema(description = "필터 사용 여부") + private Boolean useFilter = false; + + @NotNull + @Schema(description = "리스트 노출 여부") + private Boolean useColView = false; + + @NotNull + @Schema(description = "면접원 노출 여부") + private Boolean useIntrvwerView = false; + + @NotNull + @Schema(description = "면접원 수정가능 여부") + private Boolean useIntrvwerEdit = false; + + public static ListHeaderDto fromEntity(TListHeaderEntity entity) { + return ListHeaderDto.builder() + .prjctIdx(entity.getPrjctIdx()) + .listHderId(entity.getListHderId()) + .listHderOrder(entity.getListHderOrder()) + .listHderGrad(ListHeaderGrade.fromCode(entity.getListHderGrad())) + .listHderNm(entity.getListHderNm()) + .listHderTy(ListHeaderType.fromCode(entity.getListHderTy())) + .filterValue(entity.getFilterValue()) + .useFilter(entity.getUseFilter()) + .useColView(entity.getUseColView()) + .useIntrvwerView(entity.getUseIntrvwerView()) + .useIntrvwerEdit(entity.getUseIntrvwerEdit()) + .build(); + } + + public boolean isEqualHard(ListHeaderDto dto) { + return Objects.equals(listHderId, dto.listHderId) && + Objects.equals(listHderOrder, dto.listHderOrder) && + Objects.equals(listHderGrad, dto.listHderGrad) && + Objects.equals(listHderNm, dto.listHderNm) && + Objects.equals(listHderTy, dto.listHderTy); + } + + public boolean isEqualSimple(ListHeaderDto dto) { + return Objects.equals(listHderId, dto.listHderId) && + Objects.equals(listHderGrad, dto.listHderGrad) && + Objects.equals(listHderNm, dto.listHderNm); + } +} diff --git a/src/main/java/com/kri/contact/server/dto/ProjectCreateRequestDto.java b/src/main/java/com/kri/contact/server/dto/project/ProjectCreateRequestDto.java similarity index 94% rename from src/main/java/com/kri/contact/server/dto/ProjectCreateRequestDto.java rename to src/main/java/com/kri/contact/server/dto/project/ProjectCreateRequestDto.java index 6367c04..b393130 100644 --- a/src/main/java/com/kri/contact/server/dto/ProjectCreateRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ProjectCreateRequestDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.project; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/kri/contact/server/dto/ProjectInfoDto.java b/src/main/java/com/kri/contact/server/dto/project/ProjectInfoDto.java similarity index 98% rename from src/main/java/com/kri/contact/server/dto/ProjectInfoDto.java rename to src/main/java/com/kri/contact/server/dto/project/ProjectInfoDto.java index ac81cdb..0126233 100644 --- a/src/main/java/com/kri/contact/server/dto/ProjectInfoDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ProjectInfoDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.project; import com.fasterxml.jackson.annotation.JsonProperty; import com.kri.contact.server.common.enums.ProjectStatus; diff --git a/src/main/java/com/kri/contact/server/dto/ProjectMainTemplateUpdateRequestDto.java b/src/main/java/com/kri/contact/server/dto/project/ProjectMainTemplateUpdateRequestDto.java similarity index 93% rename from src/main/java/com/kri/contact/server/dto/ProjectMainTemplateUpdateRequestDto.java rename to src/main/java/com/kri/contact/server/dto/project/ProjectMainTemplateUpdateRequestDto.java index e5d20e8..410f727 100644 --- a/src/main/java/com/kri/contact/server/dto/ProjectMainTemplateUpdateRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ProjectMainTemplateUpdateRequestDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.project; import com.kri.contact.server.common.enums.ChannelType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/kri/contact/server/dto/ProjectOwnerResponseDto.java b/src/main/java/com/kri/contact/server/dto/project/ProjectOwnerResponseDto.java similarity index 91% rename from src/main/java/com/kri/contact/server/dto/ProjectOwnerResponseDto.java rename to src/main/java/com/kri/contact/server/dto/project/ProjectOwnerResponseDto.java index fb60327..3674290 100644 --- a/src/main/java/com/kri/contact/server/dto/ProjectOwnerResponseDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ProjectOwnerResponseDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.project; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; diff --git a/src/main/java/com/kri/contact/server/dto/ProjectSearchRequestDto.java b/src/main/java/com/kri/contact/server/dto/project/ProjectSearchRequestDto.java similarity index 94% rename from src/main/java/com/kri/contact/server/dto/ProjectSearchRequestDto.java rename to src/main/java/com/kri/contact/server/dto/project/ProjectSearchRequestDto.java index 7dc0c05..b40bbff 100644 --- a/src/main/java/com/kri/contact/server/dto/ProjectSearchRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ProjectSearchRequestDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.project; import com.kri.common.webmvc.page.PageRequestDto; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/kri/contact/server/dto/ProjectUpdateRequestDto.java b/src/main/java/com/kri/contact/server/dto/project/ProjectUpdateRequestDto.java similarity index 93% rename from src/main/java/com/kri/contact/server/dto/ProjectUpdateRequestDto.java rename to src/main/java/com/kri/contact/server/dto/project/ProjectUpdateRequestDto.java index db36844..4abe747 100644 --- a/src/main/java/com/kri/contact/server/dto/ProjectUpdateRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ProjectUpdateRequestDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.project; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/kri/contact/server/dto/ResultCodeDto.java b/src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java similarity index 96% rename from src/main/java/com/kri/contact/server/dto/ResultCodeDto.java rename to src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java index a8df039..ba1a3b4 100644 --- a/src/main/java/com/kri/contact/server/dto/ResultCodeDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.project; import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.persistence.entity.TResultCodeEntity; diff --git a/src/main/java/com/kri/contact/server/dto/RoleInfoDto.java b/src/main/java/com/kri/contact/server/dto/user/RoleInfoDto.java similarity index 97% rename from src/main/java/com/kri/contact/server/dto/RoleInfoDto.java rename to src/main/java/com/kri/contact/server/dto/user/RoleInfoDto.java index e6bb11c..ce2fad9 100644 --- a/src/main/java/com/kri/contact/server/dto/RoleInfoDto.java +++ b/src/main/java/com/kri/contact/server/dto/user/RoleInfoDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.user; import com.fasterxml.jackson.annotation.JsonProperty; import com.kri.contact.server.persistence.entity.TRoleEntity; diff --git a/src/main/java/com/kri/contact/server/dto/UserInfoDto.java b/src/main/java/com/kri/contact/server/dto/user/UserInfoDto.java similarity index 98% rename from src/main/java/com/kri/contact/server/dto/UserInfoDto.java rename to src/main/java/com/kri/contact/server/dto/user/UserInfoDto.java index bc15541..457231c 100644 --- a/src/main/java/com/kri/contact/server/dto/UserInfoDto.java +++ b/src/main/java/com/kri/contact/server/dto/user/UserInfoDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.user; import com.fasterxml.jackson.annotation.JsonProperty; import com.kri.common.datetime.DateTimeUtil; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java new file mode 100644 index 0000000..b0e6d43 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java @@ -0,0 +1,105 @@ +package com.kri.contact.server.persistence.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.time.Instant; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.ColumnDefault; + +@Getter +@Setter +@Entity +@Table(name = "t_list_call_hist") +public class TListCallHistEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "list_tel_hist_idx", nullable = false) + private Long id; + + @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") + private Long prjctIdx; + + @NotNull + @Column(name = "sid", nullable = false) + private Integer sid; + + @NotNull + @Column(name = "list_hder_id", nullable = false) + private Integer listHderId; + + @Size(max = 64) + @NotNull + @Column(name = "dest_num", nullable = false, length = 64) + private String destNum; + + @Size(max = 64) + @NotNull + @Column(name = "agent_num", nullable = false, length = 64) + private String agentNum; + + @Size(max = 64) + @NotNull + @Column(name = "ani_num", nullable = false, length = 64) + private String aniNum; + + @Size(max = 64) + @NotNull + @Column(name = "agent_session_id", nullable = false, length = 64) + private String agentSessionId; + + @Size(max = 64) + @NotNull + @Column(name = "dest_session_id", nullable = false, length = 64) + private String destSessionId; + + @Size(max = 64) + @NotNull + @Column(name = "call_ty", nullable = false, length = 64) + private String callTy; + + @NotNull + @Column(name = "start_dt", nullable = false) + private Instant startDt; + + @NotNull + @Column(name = "total_time", nullable = false) + private Integer totalTime; + + @NotNull + @Column(name = "talk_time", nullable = false) + private Integer talkTime; + + @NotNull + @Column(name = "media_server_id", nullable = false) + private Integer mediaServerId; + + @Size(max = 64) + @NotNull + @Column(name = "media_server_name", nullable = false, length = 64) + private String mediaServerName; + + @Size(max = 256) + @NotNull + @Column(name = "record_file_name", nullable = false, length = 256) + private String recordFileName; + + @Size(max = 32) + @NotNull + @Column(name = "reg_user", nullable = false, length = 32) + private String regUser; + + @NotNull + @ColumnDefault("CURRENT_TIMESTAMP") + @Column(name = "reg_dt", nullable = false) + private Instant regDt; + + +} \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java index 6487129..7fad52e 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java @@ -15,7 +15,9 @@ import org.hibernate.Hibernate; public class TListEntityId implements Serializable { private static final long serialVersionUID = 7012247084434778447L; - @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") + + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") private Long prjctIdx; @NotNull diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java index feddb9f..7fdf345 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java @@ -1,25 +1,37 @@ package com.kri.contact.server.persistence.entity; +import com.kri.contact.server.dto.list.ListHeaderDto; import jakarta.persistence.Column; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; +import jakarta.persistence.Lob; import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.ColumnDefault; +@Builder @Getter @Setter @Entity +@NoArgsConstructor +@AllArgsConstructor @Table(name = "t_list_header") public class TListHeaderEntity { @EmbeddedId private TListHeaderEntityId id; + @NotNull + @Column(name = "list_hder_order", nullable = false) + private Short listHderOrder; + @NotNull @Column(name = "list_hder_grad", nullable = false) private Short listHderGrad; @@ -33,21 +45,29 @@ public class TListHeaderEntity { @Column(name = "list_hder_ty", nullable = false) private Short listHderTy; + @Lob + @Column(name = "filter_value", columnDefinition = "TEXT") + private String filterValue; // |로 이어 붙은 값들 + @NotNull + @ColumnDefault("0") @Column(name = "use_filter", nullable = false) - private Boolean useFilter = false; + private Boolean useFilter; @NotNull - @Column(name = "use_view", nullable = false) - private Boolean useView = false; + @ColumnDefault("0") + @Column(name = "use_col_view", nullable = false) + private Boolean useColView; @NotNull + @ColumnDefault("0") @Column(name = "use_intrvwer_view", nullable = false) - private Boolean useIntrvwerView = false; + private Boolean useIntrvwerView; @NotNull + @ColumnDefault("0") @Column(name = "use_intrvwer_edit", nullable = false) - private Boolean useIntrvwerEdit = false; + private Boolean useIntrvwerEdit; @Size(max = 32) @NotNull @@ -73,4 +93,45 @@ public class TListHeaderEntity { public Integer getListHderId() { return id.getListHderId(); } + + public static TListHeaderEntity copyFromDefault( + TListHeaderEntity src, + Long prjctIdx, + String regUser, + LocalDateTime regDt + ) { + return TListHeaderEntity.builder() + .id(TListHeaderEntityId.create(prjctIdx, src.getListHderId())) + .listHderOrder(src.getListHderOrder()) + .listHderGrad(src.getListHderGrad()) + .listHderNm(src.getListHderNm()) + .listHderTy(src.getListHderTy()) + .filterValue(src.getFilterValue()) + .useFilter(src.getUseFilter()) + .useColView(src.getUseColView()) + .useIntrvwerView(src.getUseIntrvwerView()) + .useIntrvwerEdit(src.getUseIntrvwerEdit()) + .regUser(regUser) + .regDt(regDt) + .build(); + } + + public static TListHeaderEntity fromDto(ListHeaderDto dto, String regUser, LocalDateTime regDt) { + return TListHeaderEntity.builder() + .id(TListHeaderEntityId.create(dto.getPrjctIdx(), dto.getListHderId())) + .listHderOrder(dto.getListHderOrder()) + .listHderGrad(dto.getListHderGrad().getCode()) + .listHderNm(dto.getListHderNm()) + .listHderTy(dto.getListHderTy().getCode()) + .filterValue(dto.getFilterValue()) + .useFilter(dto.getUseFilter()) + .useColView(dto.getUseColView()) + .useIntrvwerView(dto.getUseIntrvwerView()) + .useIntrvwerEdit(dto.getUseIntrvwerEdit()) + .regUser(regUser) + .regDt(regDt) + .modUser(regUser) + .modDt(regDt) + .build(); + } } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java index 8ca264b..1f0dbc6 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java @@ -15,13 +15,22 @@ import org.hibernate.Hibernate; public class TListHeaderEntityId implements Serializable { private static final long serialVersionUID = -1296812261527497087L; - @Column(name = "prjct_idx", insertable = false, updatable = false, columnDefinition = "int UNSIGNED not null") + + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") private Long prjctIdx; @NotNull @Column(name = "list_hder_id", nullable = false) private Integer listHderId; + public static TListHeaderEntityId create(Long prjctIdx, Integer listHderId) { + TListHeaderEntityId id = new TListHeaderEntityId(); + id.setPrjctIdx(prjctIdx); + id.setListHderId(listHderId); + return id; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java index 3a4e5fe..8f3e3d0 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java @@ -15,7 +15,9 @@ import org.hibernate.Hibernate; public class TListItemEntityId implements Serializable { private static final long serialVersionUID = -3478285652359764540L; - @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") + + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") private Long prjctIdx; @NotNull diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntityId.java index e13f51b..4998995 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntityId.java @@ -15,7 +15,9 @@ import org.hibernate.Hibernate; public class TListItemUploadEntityId implements Serializable { private static final long serialVersionUID = -8073832649114843758L; - @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") + + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") private Long prjctIdx; @NotNull diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java index 74154a6..b505a2c 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java @@ -22,7 +22,9 @@ import org.hibernate.Hibernate; public class TPrjctAssignEntityId implements Serializable { private static final long serialVersionUID = -263674621497298216L; - @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") + + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") private Long prjctIdx; @Size(max = 32) diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java index e837373..0d278a4 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java @@ -3,8 +3,8 @@ package com.kri.contact.server.persistence.entity; import com.kri.common.datetime.DateTimeUtil; import com.kri.contact.server.common.enums.ProjectStatus; import com.kri.contact.server.common.enums.SurveyType; -import com.kri.contact.server.dto.ProjectCreateRequestDto; -import com.kri.contact.server.dto.ProjectInfoDto; +import com.kri.contact.server.dto.project.ProjectCreateRequestDto; +import com.kri.contact.server.dto.project.ProjectInfoDto; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntity.java index 2b3fa88..b104803 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntity.java @@ -1,6 +1,6 @@ package com.kri.contact.server.persistence.entity; -import com.kri.contact.server.dto.ProjectMainTemplateUpdateRequestDto; +import com.kri.contact.server.dto.project.ProjectMainTemplateUpdateRequestDto; import jakarta.persistence.Column; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java index a8118cb..b12af57 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java @@ -2,6 +2,7 @@ package com.kri.contact.server.persistence.entity; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.Objects; import lombok.AllArgsConstructor; @@ -21,7 +22,8 @@ public class TPrjctMainTmplatEntityId implements Serializable { private static final long serialVersionUID = -263674621497298216L; - @Column(name = "prjct_idx", nullable = false, columnDefinition = "INT UNSIGNED") + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") private Long prjctIdx; @Column(name = "chnnl_ty", nullable = false) diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java index 69742b7..ca25a52 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java @@ -1,7 +1,7 @@ package com.kri.contact.server.persistence.entity; import com.kri.contact.server.common.enums.ResultCodeType; -import com.kri.contact.server.dto.ResultCodeDto; +import com.kri.contact.server.dto.project.ResultCodeDto; import jakarta.persistence.Column; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java index f4f4df0..e9dbedf 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java @@ -24,7 +24,9 @@ import org.hibernate.Hibernate; public class TResultCodeEntityId implements Serializable { private static final long serialVersionUID = -1984612223940078355L; - @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") + + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") private Long prjctIdx; @NotNull diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java index 326724d..b147e24 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java @@ -15,6 +15,7 @@ import org.hibernate.Hibernate; public class TRoleFuncMapEntityId implements Serializable { private static final long serialVersionUID = 5430666726716009453L; + @NotNull @Column(name = "role_cd", nullable = false) private Integer roleCd; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TUserEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TUserEntity.java index d97483b..2984dfc 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TUserEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TUserEntity.java @@ -1,7 +1,7 @@ package com.kri.contact.server.persistence.entity; import com.kri.contact.server.common.consts.ContactConstant; -import com.kri.contact.server.dto.UserInfoDto; +import com.kri.contact.server.dto.user.UserInfoDto; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListHeaderRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListHeaderRepository.java new file mode 100644 index 0000000..4598ea1 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListHeaderRepository.java @@ -0,0 +1,23 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.common.enums.ListHeaderGrade; +import com.kri.contact.server.persistence.entity.TListHeaderEntity; +import com.kri.contact.server.persistence.entity.TListHeaderEntityId; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ListHeaderRepository extends JpaRepository { + + List findAllByIdPrjctIdx(Long prjctIdx); + + List findAllByIdPrjctIdxAndListHderGradNot(Long prjctIdx, Short listHderGrad); + + default List findDefaultHeader(){ + return findAllByIdPrjctIdxAndListHderGradNot(0L, ListHeaderGrade.COMMON.getCode()); + } + + long deleteAllByIdPrjctIdx(Long prjctIdx); + + long deleteAllByIdPrjctIdxAndIdListHderIdNotIn(Long prjctIdx, List listHderId); + +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java new file mode 100644 index 0000000..3637bf5 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java @@ -0,0 +1,11 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TListItemEntity; +import com.kri.contact.server.persistence.entity.TListItemEntityId; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ListItemRepository extends JpaRepository { + + long deleteAllByIdPrjctIdxAndIdListHderIdNotIn(Long prjctIdx, List listHderId); +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java new file mode 100644 index 0000000..f2408cb --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java @@ -0,0 +1,12 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TListEntity; +import com.kri.contact.server.persistence.entity.TListEntityId; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +public interface ListRepository extends JpaRepository, + JpaSpecificationExecutor { + +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignRepository.java index a6f201a..7ce46d9 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignRepository.java @@ -4,13 +4,10 @@ import com.kri.contact.server.persistence.entity.TPrjctAssignEntity; import com.kri.contact.server.persistence.entity.TPrjctAssignEntityId; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; -public interface ProjectAssignRepository extends - JpaRepository, - JpaSpecificationExecutor { +public interface ProjectAssignRepository extends JpaRepository { @Query(""" select a.id.userId diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ProjectMainTemplateRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ProjectMainTemplateRepository.java index bc2c52b..1c7eb5d 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ProjectMainTemplateRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ProjectMainTemplateRepository.java @@ -4,11 +4,8 @@ import com.kri.contact.server.persistence.entity.TPrjctMainTmplatEntity; import com.kri.contact.server.persistence.entity.TPrjctMainTmplatEntityId; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -public interface ProjectMainTemplateRepository extends - JpaRepository, - JpaSpecificationExecutor { +public interface ProjectMainTemplateRepository extends JpaRepository { Optional findByIdPrjctIdxAndIdChnnlTy(Long prjctIdx, Short chnnlTy); 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 7a17ea5..fdeff1c 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 @@ -8,6 +8,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; +//JpaSpecificationExecutor Specification spec, Pageable pageable 사용시 필요 public interface ProjectRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ResultCodeRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ResultCodeRepository.java index 192d9cf..23a35bf 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ResultCodeRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ResultCodeRepository.java @@ -6,11 +6,9 @@ import com.kri.contact.server.persistence.entity.TResultCodeEntity; import com.kri.contact.server.persistence.entity.TResultCodeEntityId; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; -public interface ResultCodeRepository extends JpaRepository, - JpaSpecificationExecutor { +public interface ResultCodeRepository extends JpaRepository { @Query(""" select r diff --git a/src/main/java/com/kri/contact/server/persistence/repository/RoleRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/RoleRepository.java index 2e4ef7b..7af6a85 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/RoleRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/RoleRepository.java @@ -3,10 +3,8 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.persistence.entity.TRoleEntity; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -public interface RoleRepository extends JpaRepository, - JpaSpecificationExecutor { +public interface RoleRepository extends JpaRepository { List findByRoleCdGreaterThanEqual(Integer roleCd); } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/SystemEventLogRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/SystemEventLogRepository.java index 6e3a587..54c5363 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/SystemEventLogRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/SystemEventLogRepository.java @@ -2,9 +2,7 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.persistence.entity.TSysEventLogEntity; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -public interface SystemEventLogRepository extends JpaRepository, - JpaSpecificationExecutor { +public interface SystemEventLogRepository extends JpaRepository { } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java index 11ab8ba..5fa6aa6 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java @@ -5,12 +5,10 @@ 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; import org.springframework.data.jpa.repository.Query; -public interface UserRepository extends JpaRepository, - JpaSpecificationExecutor { +public interface UserRepository extends JpaRepository { Optional findByUserIdAndUserPwAndDelFalse(String userId, String userPw); @@ -20,8 +18,7 @@ public interface UserRepository extends JpaRepository, List findByUserRoleGreaterThanEqualAndDelFalse(Integer userRoleCd); - List findByUserCmpnAndUserRoleGreaterThanEqualAndDelFalse(String userCmpn, - Integer userRoleCd); + List findByUserCmpnAndUserRoleGreaterThanEqualAndDelFalse(String userCmpn, Integer userRoleCd); @Query(""" select u diff --git a/src/main/java/com/kri/contact/server/service/AuthService.java b/src/main/java/com/kri/contact/server/service/AuthService.java index 7850f66..e4bb852 100644 --- a/src/main/java/com/kri/contact/server/service/AuthService.java +++ b/src/main/java/com/kri/contact/server/service/AuthService.java @@ -4,8 +4,8 @@ import com.kri.common.auth.dto.JwtUserClaimsDto; import com.kri.common.auth.jwt.JwtService; import com.kri.contact.server.common.external.intranet.IntranetExtensionApiClient; import com.kri.contact.server.common.external.intranet.SearchLoginInfoResponseDto; -import com.kri.contact.server.dto.LoginRequestDto; -import com.kri.contact.server.dto.LoginResponseDto; +import com.kri.contact.server.dto.auth.LoginRequestDto; +import com.kri.contact.server.dto.auth.LoginResponseDto; import com.kri.contact.server.persistence.entity.TUserEntity; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/kri/contact/server/service/ListHeaderService.java b/src/main/java/com/kri/contact/server/service/ListHeaderService.java new file mode 100644 index 0000000..0f7f1bd --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/ListHeaderService.java @@ -0,0 +1,98 @@ +package com.kri.contact.server.service; + +import com.kri.common.datetime.DateTimeUtil; +import com.kri.common.web.BusinessException; +import com.kri.contact.server.common.enums.ListHeaderGrade; +import com.kri.contact.server.dto.list.ListHeaderDto; +import com.kri.contact.server.persistence.entity.TListHeaderEntity; +import com.kri.contact.server.persistence.repository.ListHeaderRepository; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Objects; +import java.util.function.Function; +import java.util.function.Predicate; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ListHeaderService { + + private final ListHeaderRepository listHeaderRepository; + private final ListItemService listItemService; + + @Transactional + public void copyDefaultHeader(Long prjctIdx, String regUser, LocalDateTime regDt) { + + listHeaderRepository.deleteAllByIdPrjctIdx(prjctIdx); + + List defaultHeaderList = listHeaderRepository.findDefaultHeader() + .stream() + .map(src -> TListHeaderEntity.copyFromDefault(src, prjctIdx, regUser, regDt)) + .toList(); + + listHeaderRepository.saveAll(defaultHeaderList); + } + + public List getHeader(Long prjctIdx) { + List headerEntityList = listHeaderRepository.findAllByIdPrjctIdx(prjctIdx); + + return headerEntityList.stream() + .map(ListHeaderDto::fromEntity) + .toList(); + } + + @Transactional + public void upsertHeader(Long prjctIdx, List headerList, String regUser) { + LocalDateTime regDt = DateTimeUtil.nowKstLocalDateTime(); + + //headerList에 ListHeaderGrade.IMMUTABLE, ListHeaderGrade.DEFAULT 헤더가 있는지 확인 + List defaultHeaderList = listHeaderRepository.findDefaultHeader() + .stream().map(ListHeaderDto::fromEntity).toList(); + + List extractDefault = headerList.stream() + .filter(h -> !Objects.equals(h.getListHderGrad(), ListHeaderGrade.COMMON)) + .toList(); + + if(!isEqualHeader(defaultHeaderList, extractDefault, true)){ + throw BusinessException.badRequest("WRONG_DEFAULT","기본 헤더가 잘못 됐습니다."); + } + + //headerList에 없는 헤더는 삭제 + List headerIdList = headerList.stream().map(ListHeaderDto::getListHderId).toList(); + listHeaderRepository.deleteAllByIdPrjctIdxAndIdListHderIdNotIn(prjctIdx, headerIdList); + + //없는 정보에 대해서 리스트 아이템 삭제 + listItemService.deleteHderIdNotIn(prjctIdx, headerIdList); + + //ListHeaderGrade.IMMUTABLE 헤더를 제외한 헤더 저장 + List headerEntityList = headerList.stream() + .filter(h -> !Objects.equals(h.getListHderGrad(), ListHeaderGrade.IMMUTABLE)) + .map((ListHeaderDto dto) -> TListHeaderEntity.fromDto(dto, regUser, regDt)) + .toList(); + + listHeaderRepository.saveAll(headerEntityList); + } + + public boolean isEqualHeader(List origin, List target, boolean simpleMode){ + + if(origin.size() != target.size()){ + return false; + } + + Function> predFunc = + simpleMode + ? o -> t -> t.isEqualSimple(o) + : o -> t -> t.isEqualHard(o); + + for(ListHeaderDto o : origin){ + if (target.stream().noneMatch(predFunc.apply(o))) { + return false; + } + } + + return true; + } + +} diff --git a/src/main/java/com/kri/contact/server/service/ListItemService.java b/src/main/java/com/kri/contact/server/service/ListItemService.java new file mode 100644 index 0000000..5803dc6 --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/ListItemService.java @@ -0,0 +1,18 @@ +package com.kri.contact.server.service; + +import com.kri.contact.server.persistence.repository.ListItemRepository; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ListItemService { + + private final ListItemRepository listItemRepository; + + public long deleteHderIdNotIn(Long prjctIdx, List listHderId){ + return listItemRepository.deleteAllByIdPrjctIdxAndIdListHderIdNotIn(prjctIdx, listHderId); + } + +} diff --git a/src/main/java/com/kri/contact/server/service/ListService.java b/src/main/java/com/kri/contact/server/service/ListService.java new file mode 100644 index 0000000..1a6b146 --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/ListService.java @@ -0,0 +1,15 @@ +package com.kri.contact.server.service; + +import com.kri.contact.server.persistence.repository.ListRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ListService { + + private final ListRepository listRepository; + private final ListItemService listItemService; + private final ListHeaderService listHeaderService; + +} 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 546591f..860fd1e 100644 --- a/src/main/java/com/kri/contact/server/service/ProjectService.java +++ b/src/main/java/com/kri/contact/server/service/ProjectService.java @@ -5,12 +5,12 @@ import com.kri.common.webmvc.page.PageRequestDto; import com.kri.common.webmvc.page.PageResponseDto; import com.kri.common.webmvc.page.Pageables; import com.kri.contact.server.common.consts.ContactConstant; -import com.kri.contact.server.dto.ProjectCreateRequestDto; -import com.kri.contact.server.dto.ProjectInfoDto; -import com.kri.contact.server.dto.ProjectMainTemplateUpdateRequestDto; -import com.kri.contact.server.dto.ProjectOwnerResponseDto; -import com.kri.contact.server.dto.ProjectSearchRequestDto; -import com.kri.contact.server.dto.ProjectUpdateRequestDto; +import com.kri.contact.server.dto.project.ProjectCreateRequestDto; +import com.kri.contact.server.dto.project.ProjectInfoDto; +import com.kri.contact.server.dto.project.ProjectMainTemplateUpdateRequestDto; +import com.kri.contact.server.dto.project.ProjectOwnerResponseDto; +import com.kri.contact.server.dto.project.ProjectSearchRequestDto; +import com.kri.contact.server.dto.project.ProjectUpdateRequestDto; import com.kri.contact.server.persistence.entity.TPrjctEntity; import com.kri.contact.server.persistence.entity.TPrjctMainTmplatEntity; import com.kri.contact.server.persistence.query.ProjectSpecs; @@ -39,12 +39,16 @@ public class ProjectService { private static final List STATUS_1 = List.of((short) 1); private final AssignService assignService; private final ResultCodeService resultCodeService; + private final ListHeaderService listHeaderService; private final ProjectRepository projectRepository; private final ProjectMainTemplateRepository projectMainTemplateRepository; @Transactional - public ProjectInfoDto createProject(ProjectCreateRequestDto req, String regUser, - LocalDateTime regDt) { + public ProjectInfoDto createProject( + ProjectCreateRequestDto req, + String regUser, + LocalDateTime regDt + ) { String itrnt = req.getItrntPrjctCd(); try { @@ -54,6 +58,8 @@ public class ProjectService { ProjectInfoDto savedProject = ProjectInfoDto.from(projectRepository.save(entity)); resultCodeService.copyResultCodeFromDefault(savedProject.getPrjctIdx(), regUser, regDt); + listHeaderService.copyDefaultHeader(savedProject.getPrjctIdx(), regUser, regDt); + return savedProject; } catch (DataIntegrityViolationException e) { throw BusinessException.conflict( diff --git a/src/main/java/com/kri/contact/server/service/ResultCodeService.java b/src/main/java/com/kri/contact/server/service/ResultCodeService.java index 883b821..3b02832 100644 --- a/src/main/java/com/kri/contact/server/service/ResultCodeService.java +++ b/src/main/java/com/kri/contact/server/service/ResultCodeService.java @@ -1,7 +1,7 @@ package com.kri.contact.server.service; import com.kri.contact.server.common.enums.ResultCodeType; -import com.kri.contact.server.dto.ResultCodeDto; +import com.kri.contact.server.dto.project.ResultCodeDto; import com.kri.contact.server.persistence.entity.TResultCodeEntity; import com.kri.contact.server.persistence.repository.ResultCodeRepository; import java.time.LocalDateTime; diff --git a/src/main/java/com/kri/contact/server/service/RoleService.java b/src/main/java/com/kri/contact/server/service/RoleService.java index 4a47efa..5cacb1b 100644 --- a/src/main/java/com/kri/contact/server/service/RoleService.java +++ b/src/main/java/com/kri/contact/server/service/RoleService.java @@ -1,7 +1,7 @@ package com.kri.contact.server.service; import com.kri.contact.server.common.consts.ContactConstant; -import com.kri.contact.server.dto.RoleInfoDto; +import com.kri.contact.server.dto.user.RoleInfoDto; import com.kri.contact.server.persistence.repository.RoleRepository; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kri/contact/server/service/SystemEventLogService.java b/src/main/java/com/kri/contact/server/service/SystemEventLogService.java index 5eeb3f6..138517e 100644 --- a/src/main/java/com/kri/contact/server/service/SystemEventLogService.java +++ b/src/main/java/com/kri/contact/server/service/SystemEventLogService.java @@ -4,10 +4,11 @@ import static com.kri.common.json.JsonUtil.toMap; import com.fasterxml.jackson.databind.ObjectMapper; import com.kri.contact.server.common.enums.SystemEventType; -import com.kri.contact.server.dto.ProjectCreateRequestDto; -import com.kri.contact.server.dto.ProjectMainTemplateUpdateRequestDto; -import com.kri.contact.server.dto.ProjectUpdateRequestDto; -import com.kri.contact.server.dto.UserInfoDto; +import com.kri.contact.server.dto.list.ListHeaderDto; +import com.kri.contact.server.dto.project.ProjectCreateRequestDto; +import com.kri.contact.server.dto.project.ProjectMainTemplateUpdateRequestDto; +import com.kri.contact.server.dto.project.ProjectUpdateRequestDto; +import com.kri.contact.server.dto.user.UserInfoDto; import com.kri.contact.server.dto.systemlog.UploadUserContentDto; import com.kri.contact.server.persistence.entity.TSysEventLogEntity; import com.kri.contact.server.persistence.repository.SystemEventLogRepository; @@ -128,6 +129,20 @@ public class SystemEventLogService { ); } + public void writeUpsertListHeader(String regId, LocalDateTime regDt, String clientIp, + Long prjctIdx, List headerList) { + writeSystemLog( + SystemEventType.UPSERT_LIST_HEADER, + "Upsert List Header", + prjctIdx, + regId, + regDt, + clientIp, + "listHeader", + headerList + ); + } + protected void writeSystemLog( SystemEventType eventType, String title, diff --git a/src/main/java/com/kri/contact/server/service/UserService.java b/src/main/java/com/kri/contact/server/service/UserService.java index 48aa6eb..23d1cc2 100644 --- a/src/main/java/com/kri/contact/server/service/UserService.java +++ b/src/main/java/com/kri/contact/server/service/UserService.java @@ -6,10 +6,10 @@ import com.kri.common.web.BusinessException; import com.kri.contact.server.common.consts.ContactConstant; import com.kri.contact.server.common.external.intranet.IntranetExtensionApiClient; import com.kri.contact.server.common.util.ExcelUploadResultUtil; -import com.kri.contact.server.dto.DataVerificationDto; -import com.kri.contact.server.dto.ExcelUploadResponseDto; -import com.kri.contact.server.dto.RoleInfoDto; -import com.kri.contact.server.dto.UserInfoDto; +import com.kri.contact.server.dto.common.DataVerificationDto; +import com.kri.contact.server.dto.excel.ExcelUploadResponseDto; +import com.kri.contact.server.dto.user.RoleInfoDto; +import com.kri.contact.server.dto.user.UserInfoDto; import com.kri.contact.server.dto.excel.UserUploadDto; import com.kri.contact.server.dto.excel.UserUploadErrorDto; import com.kri.contact.server.persistence.entity.TUserEntity; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index d07301c..bd243c7 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -5,7 +5,7 @@ kri: spring: datasource: #private 도메인 - url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8 + url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8&rewriteBatchedStatements=true username: kri_contact password: contact#51304 driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 4322d07..6b187ba 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -6,7 +6,7 @@ kri: spring: datasource: #public 도메인 - url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8 + url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8&rewriteBatchedStatements=true username: kri_contact password: contact#51304 driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index d07301c..bd243c7 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -5,7 +5,7 @@ kri: spring: datasource: #private 도메인 - url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8 + url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8&rewriteBatchedStatements=true username: kri_contact password: contact#51304 driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5943a6a..6ca635a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -5,6 +5,13 @@ server: spring: application: name: contact-server + jpa: + properties: + hibernate: + jdbc: + batch_size: 1000 + order_inserts: true + order_updates: true profiles: # 아무 설정 없을 때 기본으로 쓸 프로파일 -- 2.49.0.windows.1 From 5b6d187dcdd7c7c883066f851c66bc7db2d2763a Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 11 Mar 2026 09:20:34 +0900 Subject: [PATCH 3/9] =?UTF-8?q?260311=5F01=5FENH:=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=A0=80=EC=9E=A5=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=20=EB=B0=8F=20=EC=BB=A8=ED=83=9D=20=EC=8B=9C=EB=82=98?= =?UTF-8?q?=EB=A6=AC=EC=98=A4=20=ED=8C=8C=EC=9D=BC=20=EC=B2=A8=EB=B6=80=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/ContactServerApplication.java | 2 + .../server/common/enums/SurveyType.java | 1 + .../server/common/enums/SystemEventType.java | 5 +- .../server/config/FileStorageProperties.java | 14 ++ .../server/controller/ProjectController.java | 8 +- .../dto/project/ProjectSearchRequestDto.java | 4 + .../scheduler/TempFileCleanupScheduler.java | 20 +- .../contact/server/service/FileService.java | 180 ------------------ .../file/ContactScenarioFileService.java | 151 +++++++++++++++ src/main/resources/application.yml | 6 +- 10 files changed, 194 insertions(+), 197 deletions(-) create mode 100644 src/main/java/com/kri/contact/server/config/FileStorageProperties.java delete mode 100644 src/main/java/com/kri/contact/server/service/FileService.java create mode 100644 src/main/java/com/kri/contact/server/service/file/ContactScenarioFileService.java diff --git a/src/main/java/com/kri/contact/server/ContactServerApplication.java b/src/main/java/com/kri/contact/server/ContactServerApplication.java index b5f6606..428a262 100644 --- a/src/main/java/com/kri/contact/server/ContactServerApplication.java +++ b/src/main/java/com/kri/contact/server/ContactServerApplication.java @@ -4,11 +4,13 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.ConfigurationPropertiesScan; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; @Slf4j @SpringBootApplication +@ConfigurationPropertiesScan public class ContactServerApplication { public static void main(String[] args) { diff --git a/src/main/java/com/kri/contact/server/common/enums/SurveyType.java b/src/main/java/com/kri/contact/server/common/enums/SurveyType.java index eb50514..8adace3 100644 --- a/src/main/java/com/kri/contact/server/common/enums/SurveyType.java +++ b/src/main/java/com/kri/contact/server/common/enums/SurveyType.java @@ -9,6 +9,7 @@ import lombok.RequiredArgsConstructor; @Getter(onMethod_ = @JsonValue) @RequiredArgsConstructor public enum SurveyType implements CodeEnum { + NONE((short) 0), // 없음 KON((short) 1), // KON KIWI((short) 2), // KIWI diff --git a/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java b/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java index c8373bf..a1c9c1d 100644 --- a/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java +++ b/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java @@ -28,7 +28,10 @@ public enum SystemEventType implements CodeEnum { UPDATE_ROLE((short) 412), // 권한 수정 DELETE_ROLE((short) 413), // 권한 삭제 - UPSERT_LIST_HEADER((short) 1011), + UPSERT_LIST_HEADER((short) 1011), //리스트 헤더 수정 + UPLOAD_LIST((short) 1021), //리스트 업로드 + UPDATE_LIST((short) 1022), //리스트 수정 + DELETE_LIST((short) 1023), //리스트 삭제 DUMMY((short) 9999); diff --git a/src/main/java/com/kri/contact/server/config/FileStorageProperties.java b/src/main/java/com/kri/contact/server/config/FileStorageProperties.java new file mode 100644 index 0000000..e6a6939 --- /dev/null +++ b/src/main/java/com/kri/contact/server/config/FileStorageProperties.java @@ -0,0 +1,14 @@ +package com.kri.contact.server.config; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; + +@Getter +@Setter +@ConfigurationProperties(prefix = "kri.file") +public class FileStorageProperties { + private String listBaseDir; + private String listItemBaseDir; + private String contactSenarioBaseDir; +} \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/controller/ProjectController.java b/src/main/java/com/kri/contact/server/controller/ProjectController.java index 0393608..138b0fd 100644 --- a/src/main/java/com/kri/contact/server/controller/ProjectController.java +++ b/src/main/java/com/kri/contact/server/controller/ProjectController.java @@ -10,7 +10,7 @@ import com.kri.contact.server.dto.project.ProjectMainTemplateUpdateRequestDto; import com.kri.contact.server.dto.project.ProjectOwnerResponseDto; import com.kri.contact.server.dto.project.ProjectSearchRequestDto; import com.kri.contact.server.dto.project.ProjectUpdateRequestDto; -import com.kri.contact.server.service.FileService; +import com.kri.contact.server.service.file.ContactScenarioFileService; import com.kri.contact.server.service.ProjectService; import com.kri.contact.server.service.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; @@ -39,7 +39,7 @@ public class ProjectController { private final SystemEventLogService systemEventLogService; private final ProjectService projectService; - private final FileService fileService; + private final ContactScenarioFileService contactScenarioFileService; @Operation(summary = "프로젝트 조회") @GetMapping("/{prjctIdx}") @@ -101,7 +101,7 @@ public class ProjectController { @PutMapping("/senario-image/{prjctCd}") public String uploadContactSenarioImage(@PathVariable String prjctCd, @RequestParam("file") MultipartFile file) { - return fileService.storeTempFile(prjctCd, file); + return contactScenarioFileService.storeTempFile(prjctCd, file); } @Operation(summary = "프로젝트 수정") @@ -113,7 +113,7 @@ public class ProjectController { ) { final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); - String newHtml = fileService.syncOnSave( + String newHtml = contactScenarioFileService.syncOnSave( req.getProjectInfo().getPrjctCd(), req.getProjectInfo().getContactSenario() ); diff --git a/src/main/java/com/kri/contact/server/dto/project/ProjectSearchRequestDto.java b/src/main/java/com/kri/contact/server/dto/project/ProjectSearchRequestDto.java index b40bbff..59ce1e6 100644 --- a/src/main/java/com/kri/contact/server/dto/project/ProjectSearchRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ProjectSearchRequestDto.java @@ -13,12 +13,16 @@ public class ProjectSearchRequestDto { @Schema(description = "검색 텍스트") private String prjctText; // like 대상 + @Schema(description = "프로젝트 상태 리스트") private List prjctStatusList; // in (0,1,10) + @Schema(description = "담당 부서 리스트") private List ownerDeptList; // in ('S101','P101') + @Schema(description = "담당 실사 리스트") private List ownerFwList; // in ('jspark','jhchae') + @Schema(description = "페이지네이션 정보") private PageRequestDto pageRequest; } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/scheduler/TempFileCleanupScheduler.java b/src/main/java/com/kri/contact/server/scheduler/TempFileCleanupScheduler.java index 50fb713..d450803 100644 --- a/src/main/java/com/kri/contact/server/scheduler/TempFileCleanupScheduler.java +++ b/src/main/java/com/kri/contact/server/scheduler/TempFileCleanupScheduler.java @@ -1,5 +1,6 @@ package com.kri.contact.server.scheduler; +import com.kri.contact.server.service.file.ContactScenarioFileService; import java.io.IOException; import java.nio.file.DirectoryStream; import java.nio.file.Files; @@ -17,14 +18,14 @@ import org.springframework.stereotype.Component; @Component public class TempFileCleanupScheduler { - private final Path uploadBaseDir; + private final ContactScenarioFileService contactScenarioFileService; private final Duration expireDuration; public TempFileCleanupScheduler( - @Value("${kri.contact-senario.upload-base-dir}") String uploadBaseDirStr, + ContactScenarioFileService contactScenarioFileService, @Value("${kri.contact-senario.temp-expire-hours:24}") long expireHours ) { - this.uploadBaseDir = Paths.get(uploadBaseDirStr); + this.contactScenarioFileService = contactScenarioFileService; this.expireDuration = Duration.ofHours(expireHours); } @@ -33,14 +34,14 @@ public class TempFileCleanupScheduler { */ @Scheduled(cron = "${kri.contact-senario.temp-cleanup-cron:0 0 0 * * *}") public void cleanupOldTempFiles() { + Path uploadBaseDir = contactScenarioFileService.getUploadBaseDir(); + if (!Files.isDirectory(uploadBaseDir)) { log.warn("[TempCleanup] uploadBaseDir({}) 가 디렉토리가 아닙니다.", uploadBaseDir); return; } - Instant now = Instant.now(); - Instant threshold = now.minus(expireDuration); - + Instant threshold = Instant.now().minus(expireDuration); log.info("[TempCleanup] 시작 - baseDir={}, threshold={}", uploadBaseDir, threshold); try (DirectoryStream projectDirs = Files.newDirectoryStream(uploadBaseDir)) { @@ -69,16 +70,13 @@ public class TempFileCleanupScheduler { } try { - BasicFileAttributes attrs = - Files.readAttributes(file, BasicFileAttributes.class); - - // 생성 시간(지원 안 하면 마지막 수정 시간)을 기준으로 비교 + BasicFileAttributes attrs = Files.readAttributes(file, BasicFileAttributes.class); Instant created = attrs.creationTime() != null ? attrs.creationTime().toInstant() : attrs.lastModifiedTime().toInstant(); if (created.isBefore(threshold)) { - Files.deleteIfExists(file); + contactScenarioFileService.deleteTempPath(file); log.debug("[TempCleanup] 삭제: {} (created={})", file, created); } } catch (IOException ex) { diff --git a/src/main/java/com/kri/contact/server/service/FileService.java b/src/main/java/com/kri/contact/server/service/FileService.java deleted file mode 100644 index 0e144de..0000000 --- a/src/main/java/com/kri/contact/server/service/FileService.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.kri.contact.server.service; - -import com.kri.common.file.FileUtil; -import com.kri.common.util.CommonUtil; -import java.io.IOException; -import java.nio.file.DirectoryStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.StandardCopyOption; -import java.util.HashSet; -import java.util.Optional; -import java.util.Set; -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; -import org.jsoup.nodes.Element; -import org.jsoup.select.Elements; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -@Service -public class FileService { - - private static final Logger log = LoggerFactory.getLogger(FileService.class); - private final Path uploadBaseDir; // ex) /data/upload-file/contact-senario - private final String publicBaseUrlPrefix; // ex) /upload-file/contact-senario - - public FileService( - @Value("${kri.contact-senario.upload-base-dir}") String uploadBaseDir, - @Value("${kri.contact-senario.public-base-url}") String publicBaseUrlPrefix - ) { - this.uploadBaseDir = Paths.get(uploadBaseDir).toAbsolutePath().normalize(); - this.publicBaseUrlPrefix = publicBaseUrlPrefix.endsWith("/") - ? publicBaseUrlPrefix.substring(0, publicBaseUrlPrefix.length() - 1) - : publicBaseUrlPrefix; - } - - /** - * Temp에 파일 저장 후, public URL 반환 - */ - public String storeTempFile(String prjctCd, MultipartFile file) { - try { - String original = Optional.ofNullable(file.getOriginalFilename()).orElse("file"); - String ext = ""; - - int dot = original.lastIndexOf('.'); - if (dot > 0 && dot < original.length() - 1) { - ext = original.substring(dot); - } - - String newName = CommonUtil.uuid32() + ext; - - Path tempDir = getTempDir(prjctCd); - Files.createDirectories(tempDir); - - Path target = tempDir.resolve(newName); - file.transferTo(target.toFile()); - - // 브라우저에서 사용할 URL - return publicBaseUrlPrefix + "/" + prjctCd + "/Temp/" + newName; - } catch (IOException e) { - throw new RuntimeException("파일 저장 실패", e); - } - } - - /** - * 컨택 시나리오 저장 시: 1) HTML 내 Temp 이미지 -> Asset으로 이동 & src 수정 2) Asset 디렉토리에서 더 이상 사용되지 않는 파일 삭제 3) - * 정리된 HTML 반환 - */ - public String syncOnSave(String prjctCd, String rawHtml) { - if (rawHtml == null) { - rawHtml = ""; - } - - String returnHtml = rawHtml; - try { - - // body fragment로 파싱 (KriEditor가 body 없이

...

형태 저장하므로) - Document doc = Jsoup.parseBodyFragment(rawHtml); - Elements imgs = doc.select("img[src]"); - - Set assetFileNamesToKeep = new HashSet<>(); - - for (Element img : imgs) { - String src = img.attr("src"); - if (src == null || src.isBlank()) { - continue; - } - if (!src.contains("/" + prjctCd + "/")) { - continue; - } - - if (src.contains("/" + prjctCd + "/Temp/")) { - // Temp → Asset 이동 - String fileName = FileUtil.extractFileNameFromPath(src); - moveTempToAsset(prjctCd, fileName); - - String assetSrc = src.replace("/Temp/", "/Asset/"); - img.attr("src", assetSrc); - - assetFileNamesToKeep.add(fileName); - } else if (src.contains("/" + prjctCd + "/Asset/")) { - String fileName = FileUtil.extractFileNameFromPath(src); - assetFileNamesToKeep.add(fileName); - } - } - - // Asset 디렉토리 정리 (본문에 없는 파일 삭제) - cleanupAssetDir(prjctCd, assetFileNamesToKeep); - - // body 안의 HTML만 반환 (불필요한 wrapper 제거) - returnHtml = doc.body().html(); - } catch (IOException e) { - log.warn("temp 파일 이동 실패: {}", rawHtml, e); - } - - return returnHtml; - } - - /***************************private************************************/ - private String normalizeBaseUrl(String url) { - if (url.endsWith("/")) { - return url.substring(0, url.length() - 1); - } - return url; - } - - private Path getTempDir(String prjctCd) { - return uploadBaseDir.resolve(prjctCd).resolve("Temp"); - } - - private Path getAssetDir(String prjctCd) { - return uploadBaseDir.resolve(prjctCd).resolve("Asset"); - } - - private void moveTempToAsset(String prjctCd, String fileName) throws IOException { - if (fileName == null || fileName.isBlank()) { - return; - } - - Path tempDir = getTempDir(prjctCd); - Path assetDir = getAssetDir(prjctCd); - Files.createDirectories(assetDir); - - Path source = tempDir.resolve(fileName).normalize(); - Path target = assetDir.resolve(fileName).normalize(); - - if (!source.startsWith(tempDir) || !target.startsWith(assetDir)) { - // 안전 체크 - return; - } - if (!Files.exists(source)) { - return; - } - - Files.move(source, target, StandardCopyOption.REPLACE_EXISTING); - } - - private void cleanupAssetDir(String prjctCd, Set keepFileNames) throws IOException { - Path assetDir = getAssetDir(prjctCd); - if (!Files.exists(assetDir)) { - return; - } - - try (DirectoryStream stream = Files.newDirectoryStream(assetDir)) { - for (Path path : stream) { - if (!Files.isRegularFile(path)) { - continue; - } - String fileName = path.getFileName().toString(); - if (!keepFileNames.contains(fileName)) { - Files.deleteIfExists(path); - } - } - } - } -} diff --git a/src/main/java/com/kri/contact/server/service/file/ContactScenarioFileService.java b/src/main/java/com/kri/contact/server/service/file/ContactScenarioFileService.java new file mode 100644 index 0000000..4b5ace4 --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/file/ContactScenarioFileService.java @@ -0,0 +1,151 @@ +package com.kri.contact.server.service.file; + +import com.kri.common.file.FileUtil; +import com.kri.contact.server.config.FileStorageProperties; +import java.io.IOException; +import java.nio.file.DirectoryStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.HashSet; +import java.util.Optional; +import java.util.Set; +import lombok.Getter; +import org.jsoup.Jsoup; +import org.jsoup.nodes.Document; +import org.jsoup.nodes.Element; +import org.jsoup.select.Elements; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +@Service +public class ContactScenarioFileService extends AbstractFileService { + + private static final Logger log = LoggerFactory.getLogger(ContactScenarioFileService.class); + + @Getter + private final Path uploadBaseDir; + private final String publicBaseUrlPrefix; + + public ContactScenarioFileService( + FileStorageProperties fileStorageProperties, + @Value("${kri.contact-senario.public-base-url}") String publicBaseUrlPrefix + ) { + this.uploadBaseDir = Paths.get(fileStorageProperties.getContactSenarioBaseDir()) + .toAbsolutePath() + .normalize(); + this.publicBaseUrlPrefix = normalizeBaseUrl(publicBaseUrlPrefix); + } + + @Override + protected Path getBaseDir() { + return uploadBaseDir; + } + + @Override + protected String buildFileName(MultipartFile file) { + String original = Optional.ofNullable(file.getOriginalFilename()).orElse("file"); + int dot = original.lastIndexOf('.'); + String ext = (dot > 0 && dot < original.length() - 1) ? original.substring(dot) : ""; + return "scenario_" + System.currentTimeMillis() + "_" + java.util.UUID.randomUUID().toString() + .replace("-", "") + ext; + } + + /** + * Temp에 파일 저장 후 public URL 반환 + */ + public String storeTempFile(String prjctCd, MultipartFile file) { + try { + String fileName = saveFile(getTempDir(prjctCd), file); + return publicBaseUrlPrefix + "/" + prjctCd + "/Temp/" + fileName; + } catch (IOException e) { + throw new RuntimeException("파일 저장 실패", e); + } + } + + /** + * 저장 시 Temp -> Asset 이동, html src 치환, 미사용 asset 삭제 + */ + public String syncOnSave(String prjctCd, String rawHtml) { + if (rawHtml == null) { + rawHtml = ""; + } + + try { + Document doc = Jsoup.parseBodyFragment(rawHtml); + Elements imgs = doc.select("img[src]"); + Set assetFileNamesToKeep = new HashSet<>(); + + for (Element img : imgs) { + String src = img.attr("src"); + if (src.isBlank()) { + continue; + } + if (!src.contains("/" + prjctCd + "/")) { + continue; + } + + if (src.contains("/" + prjctCd + "/Temp/")) { + String fileName = FileUtil.extractFileNameFromPath(src); + moveTempToAsset(prjctCd, fileName); + img.attr("src", src.replace("/Temp/", "/Asset/")); + assetFileNamesToKeep.add(fileName); + } else if (src.contains("/" + prjctCd + "/Asset/")) { + String fileName = FileUtil.extractFileNameFromPath(src); + assetFileNamesToKeep.add(fileName); + } + } + + cleanupAssetDir(prjctCd, assetFileNamesToKeep); + return doc.body().html(); + } catch (IOException e) { + log.warn("contact scenario asset sync 실패. prjctCd={}, rawHtml={}", prjctCd, rawHtml, e); + return rawHtml; + } + } + + public void deleteTempPath(Path file) throws IOException { + Files.deleteIfExists(file.toAbsolutePath().normalize()); + } + + public Path getTempDir(String prjctCd) { + return getBaseDir().resolve(prjctCd).resolve("Temp").toAbsolutePath().normalize(); + } + + private Path getAssetDir(String prjctCd) { + return getBaseDir().resolve(prjctCd).resolve("Asset").toAbsolutePath().normalize(); + } + + private void moveTempToAsset(String prjctCd, String fileName) throws IOException { + moveFile(getTempDir(prjctCd), getAssetDir(prjctCd), fileName); + } + + private void cleanupAssetDir(String prjctCd, Set keepFileNames) throws IOException { + Path assetDir = getAssetDir(prjctCd); + if (!Files.exists(assetDir)) { + return; + } + + try (DirectoryStream stream = Files.newDirectoryStream(assetDir)) { + for (Path path : stream) { + if (!Files.isRegularFile(path)) { + continue; + } + String fileName = path.getFileName().toString(); + if (!keepFileNames.contains(fileName)) { + Files.deleteIfExists(path); + } + } + } + } + + private String normalizeBaseUrl(String url) { + if (url == null || url.isBlank()) { + return ""; + } + return url.endsWith("/") ? url.substring(0, url.length() - 1) : url; + } +} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6ca635a..077e489 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -49,8 +49,12 @@ kri: version: "v1.0.0" base-package: "com.kri.contact.server" + file: + list-base-dir: ./upload-file/list + list-item-base-dir: ./upload-file/list-item + contact-senario-base-dir: ./upload-file/contact-senario + contact-senario: - upload-base-dir: ./upload-file/contact-senario public-base-url: /contact-senario temp-expire-hours: 24 temp-cleanup-cron: "0 0 0 * * *" # 매일 00:00(초 분 시 일 월 요일) -- 2.49.0.windows.1 From 88e8ef13c1b7bd6c81382ec6f7ca14737a81c623 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 11 Mar 2026 09:21:41 +0900 Subject: [PATCH 4/9] =?UTF-8?q?260311=5F02=5FENH:=20EqualsAndHashCode=20?= =?UTF-8?q?=EC=96=B4=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/entity/TListEntityId.java | 22 +------- .../entity/TListHeaderEntityId.java | 22 +------- .../persistence/entity/TListItemEntityId.java | 23 +-------- .../entity/TListItemFileEntityId.java | 31 ++++++++++++ .../entity/TListItemUploadEntityId.java | 50 ------------------- .../entity/TPrjctAssignEntityId.java | 21 +------- .../entity/TPrjctMainTmplatEntityId.java | 21 +------- .../entity/TResultCodeEntityId.java | 22 +------- .../entity/TRoleFuncMapEntityId.java | 22 +------- 9 files changed, 45 insertions(+), 189 deletions(-) create mode 100644 src/main/java/com/kri/contact/server/persistence/entity/TListItemFileEntityId.java delete mode 100644 src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntityId.java diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java index 7fad52e..dfd7da7 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java @@ -4,13 +4,13 @@ import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Objects; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.hibernate.Hibernate; @Getter @Setter +@EqualsAndHashCode @Embeddable public class TListEntityId implements Serializable { @@ -24,22 +24,4 @@ public class TListEntityId implements Serializable { @Column(name = "sid", nullable = false) private Integer sid; - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) { - return false; - } - TListEntityId entity = (TListEntityId) o; - return Objects.equals(this.prjctIdx, entity.prjctIdx) && - Objects.equals(this.sid, entity.sid); - } - - @Override - public int hashCode() { - return Objects.hash(prjctIdx, sid); - } - } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java index 1f0dbc6..ec22a99 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java @@ -4,13 +4,13 @@ import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Objects; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.hibernate.Hibernate; @Getter @Setter +@EqualsAndHashCode @Embeddable public class TListHeaderEntityId implements Serializable { @@ -31,22 +31,4 @@ public class TListHeaderEntityId implements Serializable { return id; } - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) { - return false; - } - TListHeaderEntityId entity = (TListHeaderEntityId) o; - return Objects.equals(this.prjctIdx, entity.prjctIdx) && - Objects.equals(this.listHderId, entity.listHderId); - } - - @Override - public int hashCode() { - return Objects.hash(prjctIdx, listHderId); - } - } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java index 8f3e3d0..2223b8f 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java @@ -4,13 +4,13 @@ import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Objects; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.hibernate.Hibernate; @Getter @Setter +@EqualsAndHashCode @Embeddable public class TListItemEntityId implements Serializable { @@ -28,23 +28,4 @@ public class TListItemEntityId implements Serializable { @Column(name = "list_hder_id", nullable = false) private Integer listHderId; - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) { - return false; - } - TListItemEntityId entity = (TListItemEntityId) o; - return Objects.equals(this.prjctIdx, entity.prjctIdx) && - Objects.equals(this.listHderId, entity.listHderId) && - Objects.equals(this.sid, entity.sid); - } - - @Override - public int hashCode() { - return Objects.hash(prjctIdx, listHderId, sid); - } - } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListItemFileEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListItemFileEntityId.java new file mode 100644 index 0000000..6a786ee --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListItemFileEntityId.java @@ -0,0 +1,31 @@ +package com.kri.contact.server.persistence.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.validation.constraints.NotNull; +import java.io.Serializable; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@EqualsAndHashCode +@Embeddable +public class TListItemFileEntityId implements Serializable { + + private static final long serialVersionUID = -8073832649114843758L; + + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") + private Long prjctIdx; + + @NotNull + @Column(name = "sid", nullable = false) + private Integer sid; + + @NotNull + @Column(name = "list_hder_id", nullable = false) + private Integer listHderId; + +} \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntityId.java deleted file mode 100644 index 4998995..0000000 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntityId.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.kri.contact.server.persistence.entity; - -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.Objects; -import lombok.Getter; -import lombok.Setter; -import org.hibernate.Hibernate; - -@Getter -@Setter -@Embeddable -public class TListItemUploadEntityId implements Serializable { - - private static final long serialVersionUID = -8073832649114843758L; - - @NotNull - @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") - private Long prjctIdx; - - @NotNull - @Column(name = "sid", nullable = false) - private Integer sid; - - @NotNull - @Column(name = "list_hder_id", nullable = false) - private Integer listHderId; - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) { - return false; - } - TListItemUploadEntityId entity = (TListItemUploadEntityId) o; - return Objects.equals(this.prjctIdx, entity.prjctIdx) && - Objects.equals(this.listHderId, entity.listHderId) && - Objects.equals(this.sid, entity.sid); - } - - @Override - public int hashCode() { - return Objects.hash(prjctIdx, listHderId, sid); - } - -} \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java index b505a2c..4e91bd5 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java @@ -5,16 +5,16 @@ import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import java.io.Serializable; -import java.util.Objects; import lombok.AllArgsConstructor; import lombok.Builder; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.hibernate.Hibernate; @Getter @Setter +@EqualsAndHashCode @Embeddable @Builder @NoArgsConstructor @@ -39,21 +39,4 @@ public class TPrjctAssignEntityId implements Serializable { .build(); } - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) { - return false; - } - TPrjctAssignEntityId entity = (TPrjctAssignEntityId) o; - return Objects.equals(this.prjctIdx, entity.prjctIdx) && - Objects.equals(this.userId, entity.userId); - } - - @Override - public int hashCode() { - return Objects.hash(prjctIdx, userId); - } } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java index b12af57..9732e00 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java @@ -4,16 +4,16 @@ import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Objects; import lombok.AllArgsConstructor; import lombok.Builder; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.hibernate.Hibernate; @Getter @Setter +@EqualsAndHashCode @Embeddable @Builder @NoArgsConstructor @@ -36,21 +36,4 @@ public class TPrjctMainTmplatEntityId implements Serializable { .build(); } - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) { - return false; - } - TPrjctMainTmplatEntityId entity = (TPrjctMainTmplatEntityId) o; - return Objects.equals(this.prjctIdx, entity.prjctIdx) && - Objects.equals(this.chnnlTy, entity.chnnlTy); - } - - @Override - public int hashCode() { - return Objects.hash(prjctIdx, chnnlTy); - } } diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java index e9dbedf..42a3012 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java @@ -7,16 +7,16 @@ import jakarta.persistence.Convert; import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Objects; import lombok.AllArgsConstructor; import lombok.Builder; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.hibernate.Hibernate; @Getter @Setter +@EqualsAndHashCode @Embeddable @Builder @NoArgsConstructor @@ -47,22 +47,4 @@ public class TResultCodeEntityId implements Serializable { .build(); } - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) { - return false; - } - TResultCodeEntityId entity = (TResultCodeEntityId) o; - return Objects.equals(this.prjctIdx, entity.prjctIdx) && - Objects.equals(this.resultCdTy, entity.resultCdTy) && - Objects.equals(this.resultCd, entity.resultCd); - } - - @Override - public int hashCode() { - return Objects.hash(prjctIdx, resultCdTy, resultCd); - } } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java index b147e24..1b6571f 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java @@ -4,13 +4,13 @@ import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotNull; import java.io.Serializable; -import java.util.Objects; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.hibernate.Hibernate; @Getter @Setter +@EqualsAndHashCode @Embeddable public class TRoleFuncMapEntityId implements Serializable { @@ -24,22 +24,4 @@ public class TRoleFuncMapEntityId implements Serializable { @Column(name = "func_cd", nullable = false) private Long funcCd; - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) { - return false; - } - TRoleFuncMapEntityId entity = (TRoleFuncMapEntityId) o; - return Objects.equals(this.roleCd, entity.roleCd) && - Objects.equals(this.funcCd, entity.funcCd); - } - - @Override - public int hashCode() { - return Objects.hash(roleCd, funcCd); - } - } \ No newline at end of file -- 2.49.0.windows.1 From 59e22cecb966ee96289e823a1f782952e7cbf753 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 8 Apr 2026 17:04:01 +0900 Subject: [PATCH 5/9] =?UTF-8?q?260408=5F01=5FENH:=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=97=85=EB=A1=9C=EB=93=9C,=20=EC=A1=B0=ED=9A=8C,?= =?UTF-8?q?=20=EC=82=AD=EC=A0=9C=201=EC=B0=A8=20=EA=B5=AC=ED=98=84=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 6 +- .../server/common/consts/ContactConstant.java | 23 + .../server/common/enums/ChannelType.java | 6 +- .../server/common/enums/ListHeaderGrade.java | 2 +- .../server/common/enums/ListHeaderType.java | 20 +- .../common/enums/ListHeaderTypeDefault.java | 33 ++ .../common/enums/ListHeaderTypeSpecific.java | 31 ++ .../server/common/enums/ListIsUse.java | 31 ++ .../server/common/enums/ListResetMode.java | 30 + .../server/common/enums/ListUploadMode.java | 31 ++ .../server/common/enums/ProjectStatus.java | 4 +- .../server/common/enums/ResultCodeType.java | 4 +- .../server/common/enums/SurveyType.java | 2 +- .../server/common/enums/SystemEventType.java | 2 +- .../intranet/IntranetExtensionApiClient.java | 4 +- .../common/jpa/ResultCodeTypeConverter.java | 4 +- .../common/util/ExcelUploadResultUtil.java | 26 +- .../kri/contact/server/config/JdbcConfig.java | 15 + .../server/config/WebResourceConfig.java | 2 +- .../server/controller/AssignController.java | 4 +- .../server/controller/AuthController.java | 4 +- .../server/controller/ListController.java | 79 +++ .../controller/ListHeaderController.java | 12 +- .../server/controller/ProjectController.java | 6 +- .../server/controller/RoleController.java | 4 +- .../server/controller/UserController.java | 28 +- .../server/dto/auth/LoginResponseDto.java | 2 +- .../server/dto/excel/ExcelErrorDto.java | 2 +- ...onseDto.java => ExcelUploadResultDto.java} | 12 +- .../server/dto/excel/ListUploadErrorDto.java | 18 + .../server/dto/excel/UserUploadDto.java | 2 +- .../server/dto/list/ListAssignInfoDto.java | 33 ++ .../server/dto/list/ListContactResultDto.java | 39 ++ .../server/dto/list/ListFilterDto.java | 30 + .../server/dto/list/ListHeaderDto.java | 35 +- .../server/dto/list/ListResultBaseDto.java | 37 ++ .../server/dto/list/ListSearchBaseDto.java | 49 ++ .../server/dto/list/ListSearchRequestDto.java | 23 + .../dto/list/ListSearchResponseDto.java | 23 + .../dto/list/ListSearchWithResultDto.java | 50 ++ .../server/dto/list/ListUploadRequestDto.java | 30 + .../dto/project/ProjectSearchRequestDto.java | 4 +- .../server/dto/project/ResultCodeDto.java | 4 +- .../contact/server/dto/user/UserInfoDto.java | 2 +- .../persistence/entity/TListAssignEntity.java | 4 - .../entity/TListCallHistEntity.java | 2 +- .../persistence/entity/TListEntity.java | 7 + .../entity/TListEventHistEntity.java | 14 +- .../persistence/entity/TListHeaderEntity.java | 8 +- .../persistence/entity/TListItemEntity.java | 6 +- ...adEntity.java => TListItemFileEntity.java} | 8 +- .../entity/TListResetLogEntity.java | 20 +- .../entity/TListUploadLogEntity.java | 48 +- .../entity/TPrjctAssignEntity.java | 2 + .../persistence/entity/TPrjctEntity.java | 4 +- .../entity/TPrjctMainTmplatEntity.java | 2 + .../persistence/entity/TResultCodeEntity.java | 2 + .../entity/TRoleFuncMapEntity.java | 2 + .../entity/{ => id}/TListEntityId.java | 2 +- .../entity/{ => id}/TListHeaderEntityId.java | 2 +- .../entity/{ => id}/TListItemEntityId.java | 2 +- .../{ => id}/TListItemFileEntityId.java | 2 +- .../entity/{ => id}/TPrjctAssignEntityId.java | 2 +- .../{ => id}/TPrjctMainTmplatEntityId.java | 2 +- .../entity/{ => id}/TResultCodeEntityId.java | 2 +- .../entity/{ => id}/TRoleFuncMapEntityId.java | 2 +- .../jdbc/ListResetJdbcSupport.java | 287 ++++++++++ .../jdbc/ListUploadJdbcSupport.java | 303 ++++++++++ .../repository/ListAssignRepository.java | 30 + .../repository/ListEventHistRepository.java | 68 +++ .../repository/ListHeaderRepository.java | 14 +- .../repository/ListItemFileRepository.java | 29 + .../repository/ListItemRepository.java | 51 +- .../repository/ListQueryRepository.java | 15 + .../repository/ListQueryRepositoryImpl.java | 192 +++++++ .../repository/ListRepository.java | 33 +- .../repository/ListResetLogRepository.java | 8 + .../repository/ListUploadLogRepository.java | 15 + .../repository/ProjectAssignRepository.java | 2 +- .../ProjectMainTemplateRepository.java | 2 +- .../repository/ResultCodeRepository.java | 2 +- .../contact/server/service/AssignService.java | 15 + .../contact/server/service/AuthService.java | 4 +- .../server/service/ListHeaderService.java | 182 +++++- .../server/service/ListItemService.java | 18 - .../server/service/ListResetService.java | 101 ++++ .../server/service/ListSearchService.java | 149 +++++ .../contact/server/service/ListService.java | 15 - .../server/service/ListUploadService.java | 518 ++++++++++++++++++ .../server/service/ProjectService.java | 8 +- .../server/service/SystemEventLogService.java | 18 +- .../contact/server/service/UserService.java | 33 +- .../service/file/AbstractFileService.java | 131 +++++ .../file/ContactScenarioFileService.java | 4 +- .../server/service/file/ListFileService.java | 35 ++ .../service/file/ListItemFileService.java | 19 + src/main/resources/application.yml | 1 - 97 files changed, 3038 insertions(+), 217 deletions(-) create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeDefault.java create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeSpecific.java create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListIsUse.java create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListResetMode.java create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListUploadMode.java create mode 100644 src/main/java/com/kri/contact/server/config/JdbcConfig.java create mode 100644 src/main/java/com/kri/contact/server/controller/ListController.java rename src/main/java/com/kri/contact/server/dto/excel/{ExcelUploadResponseDto.java => ExcelUploadResultDto.java} (72%) create mode 100644 src/main/java/com/kri/contact/server/dto/excel/ListUploadErrorDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListAssignInfoDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListContactResultDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListFilterDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListResultBaseDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListSearchBaseDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListSearchRequestDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListSearchResponseDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListSearchWithResultDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListUploadRequestDto.java rename src/main/java/com/kri/contact/server/persistence/entity/{TListItemUploadEntity.java => TListItemFileEntity.java} (88%) rename src/main/java/com/kri/contact/server/persistence/entity/{ => id}/TListEntityId.java (91%) rename src/main/java/com/kri/contact/server/persistence/entity/{ => id}/TListHeaderEntityId.java (94%) rename src/main/java/com/kri/contact/server/persistence/entity/{ => id}/TListItemEntityId.java (92%) rename src/main/java/com/kri/contact/server/persistence/entity/{ => id}/TListItemFileEntityId.java (92%) rename src/main/java/com/kri/contact/server/persistence/entity/{ => id}/TPrjctAssignEntityId.java (95%) rename src/main/java/com/kri/contact/server/persistence/entity/{ => id}/TPrjctMainTmplatEntityId.java (94%) rename src/main/java/com/kri/contact/server/persistence/entity/{ => id}/TResultCodeEntityId.java (96%) rename src/main/java/com/kri/contact/server/persistence/entity/{ => id}/TRoleFuncMapEntityId.java (91%) create mode 100644 src/main/java/com/kri/contact/server/persistence/jdbc/ListResetJdbcSupport.java create mode 100644 src/main/java/com/kri/contact/server/persistence/jdbc/ListUploadJdbcSupport.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListAssignRepository.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListItemFileRepository.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepository.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepositoryImpl.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListResetLogRepository.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListUploadLogRepository.java delete mode 100644 src/main/java/com/kri/contact/server/service/ListItemService.java create mode 100644 src/main/java/com/kri/contact/server/service/ListResetService.java create mode 100644 src/main/java/com/kri/contact/server/service/ListSearchService.java delete mode 100644 src/main/java/com/kri/contact/server/service/ListService.java create mode 100644 src/main/java/com/kri/contact/server/service/ListUploadService.java create mode 100644 src/main/java/com/kri/contact/server/service/file/AbstractFileService.java create mode 100644 src/main/java/com/kri/contact/server/service/file/ListFileService.java create mode 100644 src/main/java/com/kri/contact/server/service/file/ListItemFileService.java diff --git a/build.gradle b/build.gradle index 67b26a6..163c872 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ repositories { } dependencies { - implementation "com.kri.common:starter:beta.1.0.66" + implementation "com.kri.common:starter:beta.1.1.15" implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' @@ -56,7 +56,7 @@ dependencies { //MySQL runtimeOnly "com.mysql:mysql-connector-j" // QueryDSL JPA - implementation "com.querydsl:querydsl-jpa:5.0.0:jakarta" + implementation "io.github.openfeign.querydsl:querydsl-jpa:7.1" // QClass 생성용 annotationProcessor annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta" @@ -66,7 +66,7 @@ dependencies { compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' - implementation 'org.apache.poi:poi-ooxml:5.2.5' + implementation 'org.apache.poi:poi-ooxml:5.5.1' developmentOnly 'org.springframework.boot:spring-boot-devtools' diff --git a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java index e3e4687..91a4798 100644 --- a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java +++ b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java @@ -1,5 +1,11 @@ package com.kri.contact.server.common.consts; +import com.kri.contact.server.common.enums.ListHeaderType; +import com.kri.contact.server.common.enums.ListHeaderTypeDefault; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Stream; + public final class ContactConstant { public static final int INSERT_CHUNK_SIZE = 1_000; public static final String DEFAULT_COMPANY_NAME = "KRI"; @@ -7,6 +13,23 @@ public final class ContactConstant { public static final int OUTSOURCE_USER_ROLE = 4000; public static final int FIELDWORK_USER_ROLE = 9000; + + public static final String LIST_TEXT_REGEX = "^[가-힣a-zA-Z0-9()_\\-\\[\\] ]+$"; + + public static final List DEFAULT_AND_FILE_TYPE = Stream.concat( + Arrays.stream(ListHeaderTypeDefault.values()) + .map(defaultType -> ListHeaderType.fromCode(defaultType.getCode())), + Stream.of(ListHeaderType.FILE) + ).toList(); + public static final List ASSIGN_TYPE = List.of( + ListHeaderType.OUTSOURCE, + ListHeaderType.FIELDWORK + ); + public static final List EMAIL_TELNUM_TYPE = List.of( + ListHeaderType.EMAIL, + ListHeaderType.TEL_NUM + ); + private ContactConstant() { } } diff --git a/src/main/java/com/kri/contact/server/common/enums/ChannelType.java b/src/main/java/com/kri/contact/server/common/enums/ChannelType.java index 60a2f70..f304dc1 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ChannelType.java +++ b/src/main/java/com/kri/contact/server/common/enums/ChannelType.java @@ -2,15 +2,19 @@ package com.kri.contact.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.kri.common.enums.CodeEnum; +import com.kri.common.feature.enums.CodeEnum; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.RequiredArgsConstructor; @Getter(onMethod_ = @JsonValue) @RequiredArgsConstructor +@Schema(description = "발송 채널") public enum ChannelType implements CodeEnum { + @Schema(description = "이메일") EMAIL((short) 1), + @Schema(description = "문자") SMS((short) 2); private final Short code; diff --git a/src/main/java/com/kri/contact/server/common/enums/ListHeaderGrade.java b/src/main/java/com/kri/contact/server/common/enums/ListHeaderGrade.java index 0d3b7eb..8f483a2 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ListHeaderGrade.java +++ b/src/main/java/com/kri/contact/server/common/enums/ListHeaderGrade.java @@ -2,7 +2,7 @@ package com.kri.contact.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.kri.common.enums.CodeEnum; +import com.kri.common.feature.enums.CodeEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java b/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java index 9df6253..770cc61 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java +++ b/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java @@ -2,7 +2,7 @@ package com.kri.contact.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.kri.common.enums.CodeEnum; +import com.kri.common.feature.enums.CodeEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -10,16 +10,20 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor public enum ListHeaderType implements CodeEnum { - SID((short) 11), //11 : SID - IS_USE((short) 12), //12 : 사용여부 - MEMO((short) 19), //19 : 메모 - TEL_NUM((short) 21), //21 : 전화번호 - EMAIL((short) 31), //31 : 이메일 - FILE((short) 81), //81 : 파일업로드 + SID(ListHeaderTypeDefault.SID), //11 : SID + IS_USE(ListHeaderTypeDefault.IS_USE), //12 : 사용여부 + OUTSOURCE(ListHeaderTypeDefault.OUTSOURCE), //13 : 외주사 + FIELDWORK(ListHeaderTypeDefault.FIELDWORK), //14 : 컨택원/면접원 + MEMO(ListHeaderTypeDefault.MEMO), //19 : 메모 + TEL_NUM(ListHeaderTypeSpecific.TEL_NUM), //21 : 전화번호 + EMAIL(ListHeaderTypeSpecific.EMAIL), //31 : 이메일 + FILE(ListHeaderTypeSpecific.FILE), //81 : 파일업로드 TEXT((short) 91); //91 : 텍스트 private final Short code; + ListHeaderType(CodeEnum source) { this.code = source.getCode();} + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static ListHeaderType fromCode(Short code) { if (code == null) { @@ -32,4 +36,4 @@ public enum ListHeaderType implements CodeEnum { } throw new IllegalArgumentException("Unknown ListHeaderType code: " + code); } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeDefault.java b/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeDefault.java new file mode 100644 index 0000000..f99ad33 --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeDefault.java @@ -0,0 +1,33 @@ +package com.kri.contact.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.kri.common.feature.enums.CodeEnum; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +public enum ListHeaderTypeDefault implements CodeEnum { + + SID((short) 11), //11 : SID + IS_USE((short) 12), //12 : 사용여부 + OUTSOURCE((short) 13), //13 : 외주사 + FIELDWORK((short) 14), //14 : 컨택원/면접원 + MEMO((short) 19); //19 : 메모 + + private final Short code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ListHeaderTypeDefault fromCode(Short code) { + if (code == null) { + return null; + } + for (ListHeaderTypeDefault s : values()) { + if (s.code.equals(code)) { + return s; + } + } + throw new IllegalArgumentException("Unknown ListHeaderType code: " + code); + } +} diff --git a/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeSpecific.java b/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeSpecific.java new file mode 100644 index 0000000..0c95b78 --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeSpecific.java @@ -0,0 +1,31 @@ +package com.kri.contact.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.kri.common.feature.enums.CodeEnum; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +public enum ListHeaderTypeSpecific implements CodeEnum { + + TEL_NUM((short) 21), //21 : 전화번호 + EMAIL((short) 31), //31 : 이메일 + FILE((short) 81); //81 : 파일업로드 + + private final Short code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ListHeaderTypeSpecific fromCode(Short code) { + if (code == null) { + return null; + } + for (ListHeaderTypeSpecific s : values()) { + if (s.code.equals(code)) { + return s; + } + } + throw new IllegalArgumentException("Unknown ListHeaderSpecificType code: " + code); + } +} diff --git a/src/main/java/com/kri/contact/server/common/enums/ListIsUse.java b/src/main/java/com/kri/contact/server/common/enums/ListIsUse.java new file mode 100644 index 0000000..e2feaf8 --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListIsUse.java @@ -0,0 +1,31 @@ +package com.kri.contact.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.kri.common.feature.enums.CodeEnum; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +public enum ListIsUse implements CodeEnum { + + UNUSABLE((short) 0), //0 : 사용 안함 + USABLE((short) 1), //1 : 사용 + TEST((short) 9); //9 : TEST + + private final Short code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ListIsUse fromCode(Short code) { + if (code == null) { + return null; + } + for (ListIsUse s : values()) { + if (s.code.equals(code)) { + return s; + } + } + throw new IllegalArgumentException("Unknown ListIsUse code: " + code); + } +} diff --git a/src/main/java/com/kri/contact/server/common/enums/ListResetMode.java b/src/main/java/com/kri/contact/server/common/enums/ListResetMode.java new file mode 100644 index 0000000..fe30095 --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListResetMode.java @@ -0,0 +1,30 @@ +package com.kri.contact.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +public enum ListResetMode { + + ALL((short) 0), + HIST((short) 1), + LIST_UPLOAD((short) 2); + + private final Short code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ListResetMode fromCode(Short code) { + if (code == null) { + return null; + } + for (ListResetMode s : values()) { + if (s.code.equals(code)) { + return s; + } + } + throw new IllegalArgumentException("Unknown ListResetMode code: " + code); + } +} diff --git a/src/main/java/com/kri/contact/server/common/enums/ListUploadMode.java b/src/main/java/com/kri/contact/server/common/enums/ListUploadMode.java new file mode 100644 index 0000000..c9c61ab --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListUploadMode.java @@ -0,0 +1,31 @@ +package com.kri.contact.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.kri.common.feature.enums.CodeEnum; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +public enum ListUploadMode implements CodeEnum { + + CHANGE((short) 0), + ADD((short) 1); + + private final Short code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ListUploadMode fromCode(Short code) { + if (code == null) { + return null; + } + for (ListUploadMode s : values()) { + if (s.code.equals(code)) { + return s; + } + } + throw new IllegalArgumentException("Unknown ListUploadMode code: " + code); + } +} diff --git a/src/main/java/com/kri/contact/server/common/enums/ProjectStatus.java b/src/main/java/com/kri/contact/server/common/enums/ProjectStatus.java index 8ecbde9..5ff9620 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ProjectStatus.java +++ b/src/main/java/com/kri/contact/server/common/enums/ProjectStatus.java @@ -2,7 +2,7 @@ package com.kri.contact.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.kri.common.enums.CodeEnum; +import com.kri.common.feature.enums.CodeEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -27,4 +27,4 @@ public enum ProjectStatus implements CodeEnum { } throw new IllegalArgumentException("Unknown ProjectStatus code: " + code); } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/contact/server/common/enums/ResultCodeType.java b/src/main/java/com/kri/contact/server/common/enums/ResultCodeType.java index 8208841..a74ade3 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ResultCodeType.java +++ b/src/main/java/com/kri/contact/server/common/enums/ResultCodeType.java @@ -2,7 +2,7 @@ package com.kri.contact.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.kri.common.enums.CodeEnum; +import com.kri.common.feature.enums.CodeEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -28,4 +28,4 @@ public enum ResultCodeType implements CodeEnum { } throw new IllegalArgumentException("Unknown ResultCodeType code: " + code); } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/contact/server/common/enums/SurveyType.java b/src/main/java/com/kri/contact/server/common/enums/SurveyType.java index 8adace3..889725f 100644 --- a/src/main/java/com/kri/contact/server/common/enums/SurveyType.java +++ b/src/main/java/com/kri/contact/server/common/enums/SurveyType.java @@ -2,7 +2,7 @@ package com.kri.contact.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.kri.common.enums.CodeEnum; +import com.kri.common.feature.enums.CodeEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java b/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java index a1c9c1d..f80b454 100644 --- a/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java +++ b/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java @@ -1,6 +1,6 @@ package com.kri.contact.server.common.enums; -import com.kri.common.enums.CodeEnum; +import com.kri.common.feature.enums.CodeEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kri/contact/server/common/external/intranet/IntranetExtensionApiClient.java b/src/main/java/com/kri/contact/server/common/external/intranet/IntranetExtensionApiClient.java index dacd806..623f909 100644 --- a/src/main/java/com/kri/contact/server/common/external/intranet/IntranetExtensionApiClient.java +++ b/src/main/java/com/kri/contact/server/common/external/intranet/IntranetExtensionApiClient.java @@ -2,8 +2,8 @@ package com.kri.contact.server.common.external.intranet; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.kri.common.http.ExternalApiClient; -import com.kri.common.http.ExternalApiResponse; +import com.kri.common.feature.http.ExternalApiClient; +import com.kri.common.feature.http.ExternalApiResponse; import com.kri.contact.server.dto.auth.LoginRequestDto; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/com/kri/contact/server/common/jpa/ResultCodeTypeConverter.java b/src/main/java/com/kri/contact/server/common/jpa/ResultCodeTypeConverter.java index 093778d..dd2ed19 100644 --- a/src/main/java/com/kri/contact/server/common/jpa/ResultCodeTypeConverter.java +++ b/src/main/java/com/kri/contact/server/common/jpa/ResultCodeTypeConverter.java @@ -1,6 +1,6 @@ package com.kri.contact.server.common.jpa; -import com.kri.common.jpa.AbstractCodeEnumConverter; +import com.kri.common.feature.jpa.AbstractCodeEnumConverter; import com.kri.contact.server.common.enums.ResultCodeType; import jakarta.persistence.Converter; @@ -10,4 +10,4 @@ public class ResultCodeTypeConverter extends AbstractCodeEnumConverter ExcelUploadResponseDto buildUploadResult( + public static ExcelUploadResultDto buildUploadResult( int totalCount, int successCount, + int failCount, List errorList, Class errorClass, String errorFileName ) { - int failCount = (errorList != null) ? errorList.size() : 0; + int errorListCount = (errorList != null) ? errorList.size() : 0; // 1) 에러가 없으면 파일 없이 반환 - if (failCount == 0) { - return ExcelUploadResponseDto.builder() + if (errorListCount == 0) { + return ExcelUploadResultDto.builder() .totalCount(totalCount) .successCount(successCount) .failCount(0) @@ -41,23 +42,24 @@ public final class ExcelUploadResultUtil { } // 2) 에러가 있으면 에러 리스트를 엑셀로 생성 - try (Workbook errorWb = ExcelMapper.writeToWorkbook(errorList, errorClass); - ByteArrayOutputStream bos = new ByteArrayOutputStream()) { + try ( + Workbook errorWb = ExcelMapper.writeToWorkbook(errorList, errorClass); + ByteArrayOutputStream bos = new ByteArrayOutputStream() + ) { errorWb.write(bos); byte[] bytes = bos.toByteArray(); - String base64 = Base64.getEncoder().encodeToString(bytes); - return ExcelUploadResponseDto.builder() + return ExcelUploadResultDto.builder() .totalCount(totalCount) .successCount(successCount) .failCount(failCount) .hasErrorFile(true) .errorFileName(errorFileName) - .errorFileBase64(base64) + .errorFileBase64(Base64.getEncoder().encodeToString(bytes)) .build(); } catch (Exception e) { // 에러 파일 생성 실패해도 업로드 결과는 그대로 리턴 - return ExcelUploadResponseDto.builder() + return ExcelUploadResultDto.builder() .totalCount(totalCount) .successCount(successCount) .failCount(failCount) diff --git a/src/main/java/com/kri/contact/server/config/JdbcConfig.java b/src/main/java/com/kri/contact/server/config/JdbcConfig.java new file mode 100644 index 0000000..8bec85e --- /dev/null +++ b/src/main/java/com/kri/contact/server/config/JdbcConfig.java @@ -0,0 +1,15 @@ +package com.kri.contact.server.config; + +import javax.sql.DataSource; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.jdbc.core.JdbcTemplate; + +@Configuration +public class JdbcConfig { + + @Bean + public JdbcTemplate jdbcTemplate(DataSource dataSource) { + return new JdbcTemplate(dataSource); + } +} diff --git a/src/main/java/com/kri/contact/server/config/WebResourceConfig.java b/src/main/java/com/kri/contact/server/config/WebResourceConfig.java index c4c46a4..e60b92d 100644 --- a/src/main/java/com/kri/contact/server/config/WebResourceConfig.java +++ b/src/main/java/com/kri/contact/server/config/WebResourceConfig.java @@ -8,7 +8,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration public class WebResourceConfig implements WebMvcConfigurer { - @Value("${kri.contact-senario.upload-base-dir}") + @Value("${kri.file.contact-senario-base-dir}") private String uploadBaseDir; @Override diff --git a/src/main/java/com/kri/contact/server/controller/AssignController.java b/src/main/java/com/kri/contact/server/controller/AssignController.java index e9f6a45..439b467 100644 --- a/src/main/java/com/kri/contact/server/controller/AssignController.java +++ b/src/main/java/com/kri/contact/server/controller/AssignController.java @@ -1,7 +1,7 @@ package com.kri.contact.server.controller; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.webmvc.RequestUserContext; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.web.RequestUserContext; import com.kri.contact.server.service.AssignService; import com.kri.contact.server.service.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/kri/contact/server/controller/AuthController.java b/src/main/java/com/kri/contact/server/controller/AuthController.java index c579fda..2391ef5 100644 --- a/src/main/java/com/kri/contact/server/controller/AuthController.java +++ b/src/main/java/com/kri/contact/server/controller/AuthController.java @@ -1,7 +1,7 @@ package com.kri.contact.server.controller; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.webmvc.RequestUserContext; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.web.RequestUserContext; import com.kri.contact.server.dto.auth.LoginRequestDto; import com.kri.contact.server.dto.auth.LoginResponseDto; import com.kri.contact.server.service.AuthService; diff --git a/src/main/java/com/kri/contact/server/controller/ListController.java b/src/main/java/com/kri/contact/server/controller/ListController.java new file mode 100644 index 0000000..8169c1d --- /dev/null +++ b/src/main/java/com/kri/contact/server/controller/ListController.java @@ -0,0 +1,79 @@ +package com.kri.contact.server.controller; + +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.web.BusinessException; +import com.kri.common.feature.web.RequestUserContext; +import com.kri.contact.server.dto.excel.ExcelUploadResultDto; +import com.kri.contact.server.dto.list.ListUploadRequestDto; +import com.kri.contact.server.dto.project.ProjectInfoDto; +import com.kri.contact.server.service.ListUploadService; +import com.kri.contact.server.service.ProjectService; +import com.kri.contact.server.service.SystemEventLogService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.time.LocalDateTime; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +@RestController +@RequestMapping("/api/v1/list") +@RequiredArgsConstructor +@Tag(name = "List", description = "리스트 API") +public class ListController { + + private final ProjectService projectService; + private final ListUploadService listUploadService; + private final SystemEventLogService systemEventLogService; + + @Operation(summary = "리스트 파일 업로드 양식 다운로드") + @PostMapping("excel/template/{prjctIdx}") + public ResponseEntity downloadExcelTemplate( + @PathVariable Long prjctIdx, + RequestUserContext ctx + ) { + ProjectInfoDto projectInfoDto = projectService.getProject(prjctIdx); + if (projectInfoDto == null) throw BusinessException.internalError("프로젝트가 없습니다."); + + byte[] bytes = listUploadService.downloadExcelTemplate(prjctIdx); + String fileName = projectInfoDto.getPrjctName() + " upload_template.xlsx"; + String contentDisposition = "attachment; filename*=UTF-8''" + + URLEncoder.encode(fileName, StandardCharsets.UTF_8).replace("+", "%20"); + + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition) + .contentType(MediaType.parseMediaType( + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")) + .body(bytes); + } + + @Operation(summary = "리스트 파일 업로드") + @PostMapping(value = "excel/upload/{prjctIdx}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public ExcelUploadResultDto uploadExcel( + @PathVariable Long prjctIdx, + @RequestParam("file") MultipartFile file, + @Valid @RequestPart("request") ListUploadRequestDto request, + RequestUserContext ctx + ) { + ProjectInfoDto projectInfoDto = projectService.getProject(prjctIdx); + if (projectInfoDto == null) throw BusinessException.internalError("프로젝트가 없습니다."); + + final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + + ExcelUploadResultDto result = listUploadService.uploadExcel(prjctIdx, file, request, ctx.getUserId(), now); + systemEventLogService.writeUploadList(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, file.getOriginalFilename()); + + return result; + } +} diff --git a/src/main/java/com/kri/contact/server/controller/ListHeaderController.java b/src/main/java/com/kri/contact/server/controller/ListHeaderController.java index f1d3016..1c633c3 100644 --- a/src/main/java/com/kri/contact/server/controller/ListHeaderController.java +++ b/src/main/java/com/kri/contact/server/controller/ListHeaderController.java @@ -1,11 +1,14 @@ package com.kri.contact.server.controller; -import com.kri.common.webmvc.RequestUserContext; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.web.RequestUserContext; import com.kri.contact.server.dto.list.ListHeaderDto; import com.kri.contact.server.service.ListHeaderService; +import com.kri.contact.server.service.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; +import java.time.LocalDateTime; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; @@ -22,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; public class ListHeaderController { ListHeaderService listHeaderService; + SystemEventLogService systemEventLogService; @Operation(summary = "리스트 헤더 조회") @GetMapping("/{prjctIdx}") @@ -36,6 +40,10 @@ public class ListHeaderController { @Valid @RequestBody List headerList, RequestUserContext ctx ) { - listHeaderService.upsertHeader(prjctIdx, headerList, ctx.getUserId()); + final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + listHeaderService.upsertHeader(prjctIdx, headerList, ctx.getUserId(), now); + + systemEventLogService.writeUpsertListHeader(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, + headerList); } } diff --git a/src/main/java/com/kri/contact/server/controller/ProjectController.java b/src/main/java/com/kri/contact/server/controller/ProjectController.java index 138b0fd..7bcdd9e 100644 --- a/src/main/java/com/kri/contact/server/controller/ProjectController.java +++ b/src/main/java/com/kri/contact/server/controller/ProjectController.java @@ -1,8 +1,8 @@ package com.kri.contact.server.controller; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.webmvc.RequestUserContext; -import com.kri.common.webmvc.page.PageResponseDto; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.web.RequestUserContext; +import com.kri.common.feature.web.page.PageResponseDto; import com.kri.contact.server.common.enums.ChannelType; import com.kri.contact.server.dto.project.ProjectCreateRequestDto; import com.kri.contact.server.dto.project.ProjectInfoDto; diff --git a/src/main/java/com/kri/contact/server/controller/RoleController.java b/src/main/java/com/kri/contact/server/controller/RoleController.java index a230c50..c528821 100644 --- a/src/main/java/com/kri/contact/server/controller/RoleController.java +++ b/src/main/java/com/kri/contact/server/controller/RoleController.java @@ -1,6 +1,6 @@ package com.kri.contact.server.controller; -import com.kri.common.webmvc.RequestUserContext; +import com.kri.common.feature.web.RequestUserContext; import com.kri.contact.server.dto.user.RoleInfoDto; import com.kri.contact.server.service.RoleService; import io.swagger.v3.oas.annotations.Operation; @@ -24,4 +24,4 @@ public class RoleController { public List getRoleList(RequestUserContext ctx) { return roleService.getRoleList(ctx.getUserRole()); } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/contact/server/controller/UserController.java b/src/main/java/com/kri/contact/server/controller/UserController.java index b2a203c..dddadf7 100644 --- a/src/main/java/com/kri/contact/server/controller/UserController.java +++ b/src/main/java/com/kri/contact/server/controller/UserController.java @@ -1,12 +1,12 @@ package com.kri.contact.server.controller; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.webmvc.RequestUserContext; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.web.RequestUserContext; import com.kri.contact.server.common.consts.ContactConstant; import com.kri.contact.server.dto.common.DataVerificationDto; -import com.kri.contact.server.dto.excel.ExcelUploadResponseDto; -import com.kri.contact.server.dto.user.UserInfoDto; +import com.kri.contact.server.dto.excel.ExcelUploadResultDto; import com.kri.contact.server.dto.systemlog.UploadUserContentDto; +import com.kri.contact.server.dto.user.UserInfoDto; import com.kri.contact.server.service.SystemEventLogService; import com.kri.contact.server.service.UserService; import io.swagger.v3.oas.annotations.Operation; @@ -25,8 +25,8 @@ import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.annotation.RestController; @@ -64,7 +64,7 @@ public class UserController { } } - @Operation(summary = "컨택원/면접원 목록 조회") + @Operation(summary = "컨택트 면접원 목록 조회") @GetMapping("fieldwork") public List getFiledoworkUserList(RequestUserContext ctx) { String searchCmpn = ctx.getUserCmpn(); @@ -75,7 +75,7 @@ public class UserController { return userService.getFieldworkUserListWithCmpn(searchCmpn); } - @Operation(summary = "외주사 목록 조회") + @Operation(summary = "외주 목록 조회") @GetMapping("outsource") List getOutsourceList() { return userService.getOutsourceList(); @@ -105,20 +105,22 @@ public class UserController { systemEventLogService.writeCreateUserLog(regId, now, clientIp, userInfo); } - @Operation(summary = "사용자 일괄 생성(엑셀 업로드)") - @PostMapping("/excel") - public ExcelUploadResponseDto createUserFromExcel( - @RequestPart("file") MultipartFile file, + @Operation( + summary = "사용자 일괄 생성(엑셀 업로드)", + description = "성공하면 JSON, 실패가 있으면 실패 내역 엑셀(xlsx) 반환" + ) + @PostMapping(value = "/excel/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public ExcelUploadResultDto createUserFromExcel( + @RequestParam("file") MultipartFile file, RequestUserContext ctx ) { String regId = ctx.getUserId(); String clientIp = ctx.getClientIp(); final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); - //외주사급이 업로드로 계정을 생성하는 경우 자신의 회사명으로 고정 String forceCmpn = ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE ? "" : ctx.getUserCmpn(); - ExcelUploadResponseDto result = userService.createUsersFromExcel(file, regId, now, forceCmpn); + ExcelUploadResultDto result = userService.createUsersFromExcel(file, regId, now, forceCmpn); UploadUserContentDto content = new UploadUserContentDto( file.getOriginalFilename(), diff --git a/src/main/java/com/kri/contact/server/dto/auth/LoginResponseDto.java b/src/main/java/com/kri/contact/server/dto/auth/LoginResponseDto.java index ce14bbe..f84e3b1 100644 --- a/src/main/java/com/kri/contact/server/dto/auth/LoginResponseDto.java +++ b/src/main/java/com/kri/contact/server/dto/auth/LoginResponseDto.java @@ -1,7 +1,7 @@ package com.kri.contact.server.dto.auth; -import com.kri.common.auth.dto.JwtUserClaimsDto; +import com.kri.common.feature.auth.dto.JwtUserClaimsDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/kri/contact/server/dto/excel/ExcelErrorDto.java b/src/main/java/com/kri/contact/server/dto/excel/ExcelErrorDto.java index f50fa4e..2b56ce9 100644 --- a/src/main/java/com/kri/contact/server/dto/excel/ExcelErrorDto.java +++ b/src/main/java/com/kri/contact/server/dto/excel/ExcelErrorDto.java @@ -1,6 +1,6 @@ package com.kri.contact.server.dto.excel; -import com.kri.common.excel.ExcelColumn; +import com.kri.common.feature.excel.ExcelColumn; import lombok.Getter; import lombok.Setter; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/kri/contact/server/dto/excel/ExcelUploadResponseDto.java b/src/main/java/com/kri/contact/server/dto/excel/ExcelUploadResultDto.java similarity index 72% rename from src/main/java/com/kri/contact/server/dto/excel/ExcelUploadResponseDto.java rename to src/main/java/com/kri/contact/server/dto/excel/ExcelUploadResultDto.java index b8be008..afbbd18 100644 --- a/src/main/java/com/kri/contact/server/dto/excel/ExcelUploadResponseDto.java +++ b/src/main/java/com/kri/contact/server/dto/excel/ExcelUploadResultDto.java @@ -8,7 +8,7 @@ import lombok.Setter; @Getter @Setter @Builder -public class ExcelUploadResponseDto { +public class ExcelUploadResultDto { @Schema(description = "전체 읽은 행 수 (헤더 제외)") private int totalCount; @@ -27,4 +27,14 @@ public class ExcelUploadResponseDto { @Schema(description = "에러 엑셀 파일 (xlsx)의 Base64 문자열 (hasErrorFile == true일 때만 세팅)") private String errorFileBase64; + + public static ExcelUploadResultDto success(int totalCount, int successCount) { + return ExcelUploadResultDto.builder() + .totalCount(totalCount) + .successCount(successCount) + .failCount(0) + .hasErrorFile(false) + .build(); + } + } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/dto/excel/ListUploadErrorDto.java b/src/main/java/com/kri/contact/server/dto/excel/ListUploadErrorDto.java new file mode 100644 index 0000000..1c3c048 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/excel/ListUploadErrorDto.java @@ -0,0 +1,18 @@ +package com.kri.contact.server.dto.excel; + +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.SuperBuilder; + +@SuperBuilder +@Getter +@Setter +public class ListUploadErrorDto extends ExcelErrorDto { + public static ListUploadErrorDto of(int rowNumber, String fieldName, String errorMessage) { + return ListUploadErrorDto.builder() + .rowNumber(rowNumber) + .fieldName(fieldName) + .errorMessage(errorMessage) + .build(); + } +} diff --git a/src/main/java/com/kri/contact/server/dto/excel/UserUploadDto.java b/src/main/java/com/kri/contact/server/dto/excel/UserUploadDto.java index 6825da0..1a0754e 100644 --- a/src/main/java/com/kri/contact/server/dto/excel/UserUploadDto.java +++ b/src/main/java/com/kri/contact/server/dto/excel/UserUploadDto.java @@ -1,6 +1,6 @@ package com.kri.contact.server.dto.excel; -import com.kri.common.excel.ExcelColumn; +import com.kri.common.feature.excel.ExcelColumn; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/kri/contact/server/dto/list/ListAssignInfoDto.java b/src/main/java/com/kri/contact/server/dto/list/ListAssignInfoDto.java new file mode 100644 index 0000000..9881b8a --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListAssignInfoDto.java @@ -0,0 +1,33 @@ +package com.kri.contact.server.dto.list; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "") +public class ListAssignInfoDto { + + @NotNull + @Schema(description = "리스트 id") + private Integer sid; + + @NotNull + @Schema(description = "배정될 사용자 id") + private String userId; + + public static ListAssignInfoDto from(Integer sid, String userId) { + return ListAssignInfoDto.builder() + .sid(sid) + .userId(userId) + .build(); + } +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListContactResultDto.java b/src/main/java/com/kri/contact/server/dto/list/ListContactResultDto.java new file mode 100644 index 0000000..056862e --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListContactResultDto.java @@ -0,0 +1,39 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.persistence.entity.TListEventHistEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.experimental.SuperBuilder; + +@Getter +@Setter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "컨택/방문 면접 결과") +public class ListContactResultDto extends ListResultBaseDto { + + @Schema(description = "컨택/방문면접 시도 횟수") + private Integer attemptCount; + + @Schema(description = "마지막 컨택/방문면접 자") + private String lastUser; + + @Schema(description = "할당된 컨택/방문면접자") + private String assignUser; + + public static ListContactResultDto from(TListEventHistEntity entity) { + if (entity == null) { + return null; + } + + return ListContactResultDto.builder() + .lastResultCd(entity.getResultCd() == null ? null : entity.getResultCd().shortValue()) + .lastResultDt(entity.getRegDt()) + .lastUser(entity.getRegUser()) + .build(); + } +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListFilterDto.java b/src/main/java/com/kri/contact/server/dto/list/ListFilterDto.java new file mode 100644 index 0000000..2f70ca6 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListFilterDto.java @@ -0,0 +1,30 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.common.enums.ListIsUse; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import java.util.Map; +import java.util.Set; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Schema(description = "리스트 필터 Dto") +public class ListFilterDto { + + @NotNull + @Schema(description = "sid 목록") + private Set sidSet; + + @NotNull + @Schema(description = "리스트 사용 여부 목록") + private Set listUseSet; + + @Schema(description = "중요 메모") + private String memo; + + @NotNull + @Schema(description = "그 외 필터 정보") + private Map> otherItems; +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java b/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java index d754b9c..43293e7 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java @@ -6,6 +6,7 @@ import com.kri.contact.server.persistence.entity.TListHeaderEntity; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull.List; +import java.time.LocalDateTime; import java.util.Objects; import lombok.AllArgsConstructor; import lombok.Builder; @@ -45,9 +46,6 @@ public class ListHeaderDto { @Schema(description = "헤더 타입") private ListHeaderType listHderTy; - @Schema(description = "|로 이어 붙은 필터 값") - private String filterValue; - @NotNull @Schema(description = "필터 사용 여부") private Boolean useFilter = false; @@ -72,7 +70,6 @@ public class ListHeaderDto { .listHderGrad(ListHeaderGrade.fromCode(entity.getListHderGrad())) .listHderNm(entity.getListHderNm()) .listHderTy(ListHeaderType.fromCode(entity.getListHderTy())) - .filterValue(entity.getFilterValue()) .useFilter(entity.getUseFilter()) .useColView(entity.getUseColView()) .useIntrvwerView(entity.getUseIntrvwerView()) @@ -80,6 +77,36 @@ public class ListHeaderDto { .build(); } + public static ListHeaderDto fromDto(Long prjctIdx, ListHeaderDto src) { + return ListHeaderDto.builder() + .prjctIdx(prjctIdx) + .listHderId(src.getListHderId()) + .listHderOrder(src.getListHderOrder()) + .listHderGrad(src.getListHderGrad()) + .listHderNm(src.getListHderNm()) + .listHderTy(src.getListHderTy()) + .useFilter(src.getUseFilter()) + .useColView(src.getUseColView()) + .useIntrvwerView(src.getUseIntrvwerView()) + .useIntrvwerEdit(src.getUseIntrvwerEdit()) + .build(); + } + + public static ListHeaderDto newCommon(Long prjctIdx, int headerId, String headerName, ListHeaderType type){ + return ListHeaderDto.builder() + .prjctIdx(prjctIdx) + .listHderId(headerId) + .listHderOrder((short) headerId) + .listHderGrad(ListHeaderGrade.COMMON) + .listHderNm(headerName) + .listHderTy(type) + .useFilter(false) + .useColView(false) + .useIntrvwerView(false) + .useIntrvwerEdit(false) + .build(); + } + public boolean isEqualHard(ListHeaderDto dto) { return Objects.equals(listHderId, dto.listHderId) && Objects.equals(listHderOrder, dto.listHderOrder) && diff --git a/src/main/java/com/kri/contact/server/dto/list/ListResultBaseDto.java b/src/main/java/com/kri/contact/server/dto/list/ListResultBaseDto.java new file mode 100644 index 0000000..c42e8d4 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListResultBaseDto.java @@ -0,0 +1,37 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.persistence.entity.TListEventHistEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.experimental.SuperBuilder; + +@Getter +@Setter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "결과에 대한 기본 정보") +public class ListResultBaseDto { + + @Schema(description = "최종 결과값") + private Short lastResultCd; + + @Schema(description = "최종 결과값 일시") + private LocalDateTime lastResultDt; + + public static ListResultBaseDto from(TListEventHistEntity entity) { + if (entity == null) { + return null; + } + + return ListResultBaseDto.builder() + .lastResultCd(entity.getResultCd() == null ? null : entity.getResultCd().shortValue()) + .lastResultDt(entity.getRegDt()) + .build(); + } + +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListSearchBaseDto.java b/src/main/java/com/kri/contact/server/dto/list/ListSearchBaseDto.java new file mode 100644 index 0000000..3fc246c --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListSearchBaseDto.java @@ -0,0 +1,49 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.persistence.entity.TListEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.Map; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.experimental.SuperBuilder; + +@Getter +@Setter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "리스트 조회 기본") +public class ListSearchBaseDto { + + @Schema(description = "프로젝트 고유키") + private Long prjctIdx; + + @Schema(description = "SID") + private Integer sid; + + @Schema(description = "사용 여부") + private Short use; + + @Schema(description = "메모") + private String memo; + + @Schema(description = "리스트 값 정보") + private Map itemList; + + public static ListSearchBaseDto from(TListEntity entity, Map itemList) { + if (entity == null) { + return null; + } + + return ListSearchBaseDto.builder() + .prjctIdx(entity.getPrjctIdx()) + .sid(entity.getSid()) + .use(entity.getUse()) + .memo(entity.getMemo()) + .itemList(itemList) + .build(); + } + +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListSearchRequestDto.java b/src/main/java/com/kri/contact/server/dto/list/ListSearchRequestDto.java new file mode 100644 index 0000000..0f5305d --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListSearchRequestDto.java @@ -0,0 +1,23 @@ +package com.kri.contact.server.dto.list; + +import com.kri.common.feature.web.page.PageRequestDto; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import java.util.List; +import java.util.Map; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Schema(description = "리스트 검색 조건") +public class ListSearchRequestDto { + + @NotNull + @Schema(description = "리스트 필터") + private ListFilterDto listFilter; + + @NotNull + @Schema(description = "페이지네이션 정보") + private PageRequestDto pageRequest; +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListSearchResponseDto.java b/src/main/java/com/kri/contact/server/dto/list/ListSearchResponseDto.java new file mode 100644 index 0000000..73ee5b9 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListSearchResponseDto.java @@ -0,0 +1,23 @@ +package com.kri.contact.server.dto.list; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.experimental.SuperBuilder; + +@Getter +@Setter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "리스트 조회 응답(기본 + 결과 + 발송 결과)") +public class ListSearchResponseDto extends ListSearchWithResultDto { + + @Schema(description = "메일 발송 결과") + private ListResultBaseDto mailSendResult; + + @Schema(description = "문자 발송 결과") + private ListResultBaseDto smsSendResult; +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListSearchWithResultDto.java b/src/main/java/com/kri/contact/server/dto/list/ListSearchWithResultDto.java new file mode 100644 index 0000000..f568fe8 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListSearchWithResultDto.java @@ -0,0 +1,50 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.persistence.entity.TListEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.Map; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.experimental.SuperBuilder; + +@Getter +@Setter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "리스트 조회 기본 + 결과") +public class ListSearchWithResultDto extends ListSearchBaseDto { + @Schema(description = "컨택 결과") + private ListContactResultDto contactResult; + + @Schema(description = "대면 면접 결과") + private ListContactResultDto interviewResult; + + @Schema(description = "온라인 설문 결과") + private ListResultBaseDto surveyResult; + + public static ListSearchWithResultDto from( + TListEntity entity, + Map itemList, + ListContactResultDto contactResult, + ListContactResultDto interviewResult, + ListResultBaseDto surveyResult + ) { + if (entity == null) { + return null; + } + + return ListSearchWithResultDto.builder() + .prjctIdx(entity.getPrjctIdx()) + .sid(entity.getSid()) + .use(entity.getUse()) + .memo(entity.getMemo()) + .itemList(itemList) + .contactResult(contactResult) + .interviewResult(interviewResult) + .surveyResult(surveyResult) + .build(); + } +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListUploadRequestDto.java b/src/main/java/com/kri/contact/server/dto/list/ListUploadRequestDto.java new file mode 100644 index 0000000..22da982 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListUploadRequestDto.java @@ -0,0 +1,30 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.common.enums.ListHeaderTypeSpecific; +import com.kri.contact.server.common.enums.ListUploadMode; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import java.util.Map; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@Schema(description = "리스트 업로드 요청 DTO") +public class ListUploadRequestDto { + + @NotNull + @Schema(description = "업로드 모드") + private ListUploadMode uploadMode; + + @Schema(description = "이메일 중복 체크") + private boolean checkDuplicateEmail; + + @Schema(description = "전화번호 중복 체크") + private boolean checkDuplicatePhone; + + @Schema(description = "특수 헤더 정보") + private Map specificHeader; +} diff --git a/src/main/java/com/kri/contact/server/dto/project/ProjectSearchRequestDto.java b/src/main/java/com/kri/contact/server/dto/project/ProjectSearchRequestDto.java index 59ce1e6..d8f0f40 100644 --- a/src/main/java/com/kri/contact/server/dto/project/ProjectSearchRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ProjectSearchRequestDto.java @@ -1,6 +1,6 @@ package com.kri.contact.server.dto.project; -import com.kri.common.webmvc.page.PageRequestDto; +import com.kri.common.feature.web.page.PageRequestDto; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; import lombok.Getter; @@ -25,4 +25,4 @@ public class ProjectSearchRequestDto { @Schema(description = "페이지네이션 정보") private PageRequestDto pageRequest; -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java b/src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java index ba1a3b4..a7e725e 100644 --- a/src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java @@ -1,9 +1,9 @@ package com.kri.contact.server.dto.project; +import com.kri.common.feature.util.CommonUtil; import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.persistence.entity.TResultCodeEntity; import io.swagger.v3.oas.annotations.media.Schema; -import java.util.UUID; import lombok.Builder; import lombok.Getter; import lombok.Setter; @@ -31,7 +31,7 @@ public class ResultCodeDto { public static ResultCodeDto from(TResultCodeEntity entity) { return ResultCodeDto.builder() - .resultCdUUID(UUID.randomUUID().toString()) + .resultCdUUID(CommonUtil.uuid32()) .prjctIdx(entity.getPrjctIdx()) .resultCdTy(entity.getResultCdTy()) .resultCd(entity.getResultCd()) diff --git a/src/main/java/com/kri/contact/server/dto/user/UserInfoDto.java b/src/main/java/com/kri/contact/server/dto/user/UserInfoDto.java index 457231c..9ac133f 100644 --- a/src/main/java/com/kri/contact/server/dto/user/UserInfoDto.java +++ b/src/main/java/com/kri/contact/server/dto/user/UserInfoDto.java @@ -1,7 +1,7 @@ package com.kri.contact.server.dto.user; import com.fasterxml.jackson.annotation.JsonProperty; -import com.kri.common.datetime.DateTimeUtil; +import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.contact.server.dto.excel.UserUploadDto; import com.kri.contact.server.persistence.entity.TUserEntity; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListAssignEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListAssignEntity.java index 48980a4..fae4ed6 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListAssignEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListAssignEntity.java @@ -31,10 +31,6 @@ public class TListAssignEntity { @Column(name = "sid", nullable = false) private Integer sid; - @NotNull - @Column(name = "assign_ty", nullable = false) - private Short assignTy; - @Size(max = 32) @Column(name = "user_id", length = 32) private String userId; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java index b0e6d43..b408426 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java @@ -21,7 +21,7 @@ public class TListCallHistEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "list_tel_hist_idx", nullable = false) + @Column(name = "list_call_hist_idx", nullable = false) private Long id; @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListEntity.java index 0a23875..793bb3f 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListEntity.java @@ -1,5 +1,7 @@ package com.kri.contact.server.persistence.entity; +import com.kri.contact.server.persistence.entity.id.TListEntityId; + import jakarta.persistence.Column; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; @@ -20,6 +22,11 @@ public class TListEntity { @EmbeddedId private TListEntityId id; + @NotNull + @Size(max = 32) + @Column(name = "list_upload_log_id", nullable = false, length = 32) + private String listUploadLogId; + @NotNull @Column(name = "is_use", nullable = false) private Short use; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListEventHistEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListEventHistEntity.java index 7d837d8..0967570 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListEventHistEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListEventHistEntity.java @@ -26,6 +26,10 @@ public class TListEventHistEntity { @Column(name = "list_event_hist_idx", nullable = false) private Long listEventHistIdx; + @NotNull + @Column(name = "event_ty", nullable = false) + private Short eventTy; + @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") private Long prjctIdx; @@ -37,10 +41,16 @@ public class TListEventHistEntity { @Column(name = "result_cd", nullable = false) private Integer resultCd; + @Column(name = "meta_data") + private String metaData; + + @Column(name = "list_call_hist_idx") + private Long listCallHistIdx; + @NotNull @Lob - @Column(name = "contact_memo", nullable = false) - private String contactMemo; + @Column(name = "memo", nullable = false) + private String memo; @Size(max = 32) @NotNull diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java index 7fdf345..12082d5 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java @@ -1,5 +1,7 @@ package com.kri.contact.server.persistence.entity; +import com.kri.contact.server.persistence.entity.id.TListHeaderEntityId; + import com.kri.contact.server.dto.list.ListHeaderDto; import jakarta.persistence.Column; import jakarta.persistence.EmbeddedId; @@ -45,10 +47,6 @@ public class TListHeaderEntity { @Column(name = "list_hder_ty", nullable = false) private Short listHderTy; - @Lob - @Column(name = "filter_value", columnDefinition = "TEXT") - private String filterValue; // |로 이어 붙은 값들 - @NotNull @ColumnDefault("0") @Column(name = "use_filter", nullable = false) @@ -106,7 +104,6 @@ public class TListHeaderEntity { .listHderGrad(src.getListHderGrad()) .listHderNm(src.getListHderNm()) .listHderTy(src.getListHderTy()) - .filterValue(src.getFilterValue()) .useFilter(src.getUseFilter()) .useColView(src.getUseColView()) .useIntrvwerView(src.getUseIntrvwerView()) @@ -123,7 +120,6 @@ public class TListHeaderEntity { .listHderGrad(dto.getListHderGrad().getCode()) .listHderNm(dto.getListHderNm()) .listHderTy(dto.getListHderTy().getCode()) - .filterValue(dto.getFilterValue()) .useFilter(dto.getUseFilter()) .useColView(dto.getUseColView()) .useIntrvwerView(dto.getUseIntrvwerView()) diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntity.java index f28c4a0..a270444 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntity.java @@ -1,5 +1,7 @@ package com.kri.contact.server.persistence.entity; +import com.kri.contact.server.persistence.entity.id.TListItemEntityId; + import jakarta.persistence.Column; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; @@ -21,9 +23,9 @@ public class TListItemEntity { @EmbeddedId private TListItemEntityId id; + @Size(max = 2048) @NotNull - @Lob - @Column(name = "list_item_val", nullable = false) + @Column(name = "list_item_val", nullable = false, length = 2048) private String listItemVal; @Size(max = 32) diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListItemFileEntity.java similarity index 88% rename from src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntity.java rename to src/main/java/com/kri/contact/server/persistence/entity/TListItemFileEntity.java index 11a90aa..ad09740 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListItemFileEntity.java @@ -1,5 +1,7 @@ package com.kri.contact.server.persistence.entity; +import com.kri.contact.server.persistence.entity.id.TListItemFileEntityId; + import jakarta.persistence.Column; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; @@ -14,11 +16,11 @@ import org.hibernate.annotations.ColumnDefault; @Getter @Setter @Entity -@Table(name = "t_list_item_upload") -public class TListItemUploadEntity { +@Table(name = "t_list_item_file") +public class TListItemFileEntity { @EmbeddedId - private TListItemUploadEntityId id; + private TListItemFileEntityId id; @Size(max = 128) @Column(name = "file_nm", length = 128) diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListResetLogEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListResetLogEntity.java index 9d42583..cde62dc 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListResetLogEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListResetLogEntity.java @@ -23,9 +23,8 @@ import org.hibernate.annotations.Type; public class TListResetLogEntity { @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "list_reset_log_idx", columnDefinition = "int UNSIGNED not null") - private Long listResetLogIdx; + @Column(name = "list_reset_log_id", nullable = false, length = 32) + private String listResetLogId; @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") private Long prjctIdx; @@ -38,21 +37,6 @@ public class TListResetLogEntity { @Column(name = "list_cnt", nullable = false) private Integer listCnt; - @NotNull - @Type(JsonType.class) - @Column(name = "sid", nullable = false) - private Map sid; - - @Size(max = 128) - @NotNull - @Column(name = "backup_file_path", nullable = false, length = 128) - private String backupFilePath; - - @Size(max = 128) - @NotNull - @Column(name = "backup_file_nm", nullable = false, length = 128) - private String backupFileNm; - @Size(max = 32) @NotNull @Column(name = "reg_user", nullable = false, length = 32) diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListUploadLogEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListUploadLogEntity.java index aa71f3e..5583a1a 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListUploadLogEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListUploadLogEntity.java @@ -1,28 +1,36 @@ package com.kri.contact.server.persistence.entity; +import com.kri.common.feature.util.CommonUtil; +import io.hypersistence.utils.hibernate.type.json.JsonType; import jakarta.persistence.Column; import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import java.time.LocalDateTime; +import java.util.Map; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.Type; @Getter @Setter +@Builder @Entity +@NoArgsConstructor +@AllArgsConstructor @Table(name = "t_list_upload_log") public class TListUploadLogEntity { @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "list_upload_log_idx", nullable = false) - private Long listUploadLogIdx; + @Size(max = 32) + @Column(name = "list_upload_log_id", nullable = false, length = 32) + private String listUploadLogId; @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") private Long prjctIdx; @@ -44,10 +52,10 @@ public class TListUploadLogEntity { @Column(name = "mode", nullable = false) private Short mode; - @Size(max = 64) @NotNull - @Column(name = "optn", nullable = false, length = 64) - private String optn; + @Type(JsonType.class) + @Column(name = "request", nullable = false) + private Map request; @NotNull @Column(name = "is_success", nullable = false) @@ -63,4 +71,26 @@ public class TListUploadLogEntity { @Column(name = "reg_dt", nullable = false) private LocalDateTime regDt; -} \ No newline at end of file + public static TListUploadLogEntity create( + Long prjctIdx, + Integer wave, + String fileNm, + Short mode, + Map request, + String regUser, + LocalDateTime regDt + ) { + return TListUploadLogEntity.builder() + .listUploadLogId(CommonUtil.uuid32()) + .prjctIdx(prjctIdx) + .wave(wave) + .fileNm(fileNm) + .listCnt(0) + .mode(mode) + .request(request) + .success(false) + .regUser(regUser) + .regDt(regDt) + .build(); + } +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntity.java index d773ba5..ca3b7f6 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntity.java @@ -1,5 +1,7 @@ package com.kri.contact.server.persistence.entity; +import com.kri.contact.server.persistence.entity.id.TPrjctAssignEntityId; + import jakarta.persistence.Column; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java index 0d278a4..f3680db 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java @@ -1,6 +1,6 @@ package com.kri.contact.server.persistence.entity; -import com.kri.common.datetime.DateTimeUtil; +import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.contact.server.common.enums.ProjectStatus; import com.kri.contact.server.common.enums.SurveyType; import com.kri.contact.server.dto.project.ProjectCreateRequestDto; @@ -174,4 +174,4 @@ public class TPrjctEntity { this.modUser = modUser; this.modDt = modDt; } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntity.java index b104803..786ca41 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntity.java @@ -1,5 +1,7 @@ package com.kri.contact.server.persistence.entity; +import com.kri.contact.server.persistence.entity.id.TPrjctMainTmplatEntityId; + import com.kri.contact.server.dto.project.ProjectMainTemplateUpdateRequestDto; import jakarta.persistence.Column; import jakarta.persistence.EmbeddedId; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java index ca25a52..ff0d6e0 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java @@ -1,5 +1,7 @@ package com.kri.contact.server.persistence.entity; +import com.kri.contact.server.persistence.entity.id.TResultCodeEntityId; + import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.dto.project.ResultCodeDto; import jakarta.persistence.Column; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntity.java index 4cbd71c..65f00ff 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntity.java @@ -1,5 +1,7 @@ package com.kri.contact.server.persistence.entity; +import com.kri.contact.server.persistence.entity.id.TRoleFuncMapEntityId; + import jakarta.persistence.Column; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/id/TListEntityId.java similarity index 91% rename from src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java rename to src/main/java/com/kri/contact/server/persistence/entity/id/TListEntityId.java index dfd7da7..8c8c112 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/id/TListEntityId.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.persistence.entity; +package com.kri.contact.server.persistence.entity.id; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/id/TListHeaderEntityId.java similarity index 94% rename from src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java rename to src/main/java/com/kri/contact/server/persistence/entity/id/TListHeaderEntityId.java index ec22a99..5e9000b 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/id/TListHeaderEntityId.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.persistence.entity; +package com.kri.contact.server.persistence.entity.id; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/id/TListItemEntityId.java similarity index 92% rename from src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java rename to src/main/java/com/kri/contact/server/persistence/entity/id/TListItemEntityId.java index 2223b8f..768ae32 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/id/TListItemEntityId.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.persistence.entity; +package com.kri.contact.server.persistence.entity.id; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListItemFileEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/id/TListItemFileEntityId.java similarity index 92% rename from src/main/java/com/kri/contact/server/persistence/entity/TListItemFileEntityId.java rename to src/main/java/com/kri/contact/server/persistence/entity/id/TListItemFileEntityId.java index 6a786ee..ad826fa 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListItemFileEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/id/TListItemFileEntityId.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.persistence.entity; +package com.kri.contact.server.persistence.entity.id; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/id/TPrjctAssignEntityId.java similarity index 95% rename from src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java rename to src/main/java/com/kri/contact/server/persistence/entity/id/TPrjctAssignEntityId.java index 4e91bd5..9dda7f1 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/id/TPrjctAssignEntityId.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.persistence.entity; +package com.kri.contact.server.persistence.entity.id; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/id/TPrjctMainTmplatEntityId.java similarity index 94% rename from src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java rename to src/main/java/com/kri/contact/server/persistence/entity/id/TPrjctMainTmplatEntityId.java index 9732e00..60a0d5e 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/id/TPrjctMainTmplatEntityId.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.persistence.entity; +package com.kri.contact.server.persistence.entity.id; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/id/TResultCodeEntityId.java similarity index 96% rename from src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java rename to src/main/java/com/kri/contact/server/persistence/entity/id/TResultCodeEntityId.java index 42a3012..6d9cb83 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/id/TResultCodeEntityId.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.persistence.entity; +package com.kri.contact.server.persistence.entity.id; import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.common.jpa.ResultCodeTypeConverter; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/id/TRoleFuncMapEntityId.java similarity index 91% rename from src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java rename to src/main/java/com/kri/contact/server/persistence/entity/id/TRoleFuncMapEntityId.java index 1b6571f..64bab3a 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/id/TRoleFuncMapEntityId.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.persistence.entity; +package com.kri.contact.server.persistence.entity.id; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; diff --git a/src/main/java/com/kri/contact/server/persistence/jdbc/ListResetJdbcSupport.java b/src/main/java/com/kri/contact/server/persistence/jdbc/ListResetJdbcSupport.java new file mode 100644 index 0000000..320be42 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/jdbc/ListResetJdbcSupport.java @@ -0,0 +1,287 @@ +package com.kri.contact.server.persistence.jdbc; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class ListResetJdbcSupport { + + private final JdbcTemplate jdbcTemplate; + + public void backupHistories(String listResetLogId, Long prjctIdx, Collection sids, int chunkSize) { + forEachSidChunk(sids, chunkSize, sub -> { + backupListEventHist(listResetLogId, prjctIdx, sub); + backupListUpdateHist(listResetLogId, prjctIdx, sub); + backupListCallHist(listResetLogId, prjctIdx, sub); + }); + } + + public void deleteHistories(Long prjctIdx, Collection sids, int chunkSize) { + forEachSidChunk(sids, chunkSize, sub -> { + deleteBySids("t_list_event_hist", prjctIdx, sub); + deleteBySids("t_list_update_hist", prjctIdx, sub); + deleteBySids("t_list_call_hist", prjctIdx, sub); + }); + } + + public void backupListData( + String listResetLogId, + Long prjctIdx, + Collection sids, + boolean includeFile, + int chunkSize + ) { + forEachSidChunk(sids, chunkSize, sub -> { + backupList(listResetLogId, prjctIdx, sub); + backupListItem(listResetLogId, prjctIdx, sub); + if (includeFile) { + backupListItemFile(listResetLogId, prjctIdx, sub); + } + }); + } + + public long deleteListData( + Long prjctIdx, + Collection sids, + boolean includeFile, + boolean includeResve, + int chunkSize + ) { + long deletedCount = 0; + List sidList = new ArrayList<>(sids); + for (int i = 0; i < sidList.size(); i += chunkSize) { + List sub = sidList.subList(i, Math.min(sidList.size(), i + chunkSize)); + + if (includeFile) { + deleteBySids("t_list_item_file", prjctIdx, sub); + } + deleteBySids("t_list_item", prjctIdx, sub); + deleteBySids("t_list_assign", prjctIdx, sub); + if (includeResve) { + deleteBySids("t_list_resve", prjctIdx, sub); + } + deletedCount += deleteBySids("t_list", prjctIdx, sub); + } + return deletedCount; + } + + private void backupListEventHist(String listResetLogId, Long prjctIdx, List sids) { + String inSql = createInSql(sids); + List args = createArgs(listResetLogId, prjctIdx, sids); + jdbcTemplate.update( + """ + insert into del_list_event_hist ( + list_reset_log_id, + list_event_hist_idx, + event_ty, + prjct_idx, + sid, + result_cd, + meta_data, + list_call_hist_idx, + memo, + reg_user, + reg_dt + ) + select ?, list_event_hist_idx, event_ty, prjct_idx, sid, result_cd, meta_data, + list_call_hist_idx, memo, reg_user, reg_dt + from t_list_event_hist + where prjct_idx = ? + and sid in (%s) + """.formatted(inSql), + args.toArray() + ); + } + + private void backupListUpdateHist(String listResetLogId, Long prjctIdx, List sids) { + String inSql = createInSql(sids); + List args = createArgs(listResetLogId, prjctIdx, sids); + jdbcTemplate.update( + """ + insert into del_list_update_hist ( + list_reset_log_id, + list_update_hist_idx, + prjct_idx, + sid, + list_hder_id, + before_val, + after_val, + reg_user, + reg_dt + ) + select ?, list_update_hist_idx, prjct_idx, sid, list_hder_id, before_val, + after_val, reg_user, reg_dt + from t_list_update_hist + where prjct_idx = ? + and sid in (%s) + """.formatted(inSql), + args.toArray() + ); + } + + private void backupListCallHist(String listResetLogId, Long prjctIdx, List sids) { + String inSql = createInSql(sids); + List args = createArgs(listResetLogId, prjctIdx, sids); + jdbcTemplate.update( + """ + insert into del_list_call_hist ( + list_reset_log_id, + list_call_hist_idx, + prjct_idx, + sid, + list_hder_id, + dest_num, + agent_num, + ani_num, + agent_session_id, + dest_session_id, + call_ty, + start_dt, + total_time, + talk_time, + media_server_id, + media_server_name, + record_file_name, + reg_user, + reg_dt + ) + select ?, list_call_hist_idx, prjct_idx, sid, list_hder_id, dest_num, + agent_num, ani_num, agent_session_id, dest_session_id, call_ty, + start_dt, total_time, talk_time, media_server_id, media_server_name, + record_file_name, reg_user, reg_dt + from t_list_call_hist + where prjct_idx = ? + and sid in (%s) + """.formatted(inSql), + args.toArray() + ); + } + + private void backupList(String listResetLogId, Long prjctIdx, List sids) { + String inSql = createInSql(sids); + List args = createArgs(listResetLogId, prjctIdx, sids); + jdbcTemplate.update( + """ + insert into del_list ( + list_reset_log_id, + prjct_idx, + sid, + list_upload_log_id, + is_use, + memo, + reg_user, + reg_dt, + mod_user, + mod_dt + ) + select ?, prjct_idx, sid, list_upload_log_id, is_use, memo, reg_user, + reg_dt, mod_user, mod_dt + from t_list + where prjct_idx = ? + and sid in (%s) + """.formatted(inSql), + args.toArray() + ); + } + + private void backupListItem(String listResetLogId, Long prjctIdx, List sids) { + String inSql = createInSql(sids); + List args = createArgs(listResetLogId, prjctIdx, sids); + jdbcTemplate.update( + """ + insert into del_list_item ( + list_reset_log_id, + prjct_idx, + sid, + list_hder_id, + list_item_val, + reg_user, + reg_dt, + mod_user, + mod_dt + ) + select ?, prjct_idx, sid, list_hder_id, list_item_val, reg_user, + reg_dt, mod_user, mod_dt + from t_list_item + where prjct_idx = ? + and sid in (%s) + """.formatted(inSql), + args.toArray() + ); + } + + private void backupListItemFile(String listResetLogId, Long prjctIdx, List sids) { + String inSql = createInSql(sids); + List args = createArgs(listResetLogId, prjctIdx, sids); + jdbcTemplate.update( + """ + insert into del_list_item_file ( + list_reset_log_id, + prjct_idx, + sid, + list_hder_id, + file_nm, + file_size, + file_path, + reg_user, + reg_dt, + mod_user, + mod_dt + ) + select ?, prjct_idx, sid, list_hder_id, file_nm, file_size, file_path, + reg_user, reg_dt, mod_user, mod_dt + from t_list_item_file + where prjct_idx = ? + and sid in (%s) + """.formatted(inSql), + args.toArray() + ); + } + + private int deleteBySids(String tableName, Long prjctIdx, List sids) { + String inSql = createInSql(sids); + List args = new ArrayList<>(); + args.add(prjctIdx); + args.addAll(sids); + + return jdbcTemplate.update( + "delete from " + tableName + " where prjct_idx = ? and sid in (" + inSql + ")", + args.toArray() + ); + } + + private void forEachSidChunk(Collection sids, int chunkSize, ChunkConsumer consumer) { + if (sids == null || sids.isEmpty()) { + return; + } + if (chunkSize <= 0) { + throw new IllegalArgumentException("chunkSize must be greater than 0"); + } + + List sidList = new ArrayList<>(sids); + for (int i = 0; i < sidList.size(); i += chunkSize) { + consumer.accept(sidList.subList(i, Math.min(sidList.size(), i + chunkSize))); + } + } + + private List createArgs(String listResetLogId, Long prjctIdx, List sids) { + List args = new ArrayList<>(); + args.add(listResetLogId); + args.add(prjctIdx); + args.addAll(sids); + return args; + } + + private String createInSql(List sids) { + return String.join(",", java.util.Collections.nCopies(sids.size(), "?")); + } + + private interface ChunkConsumer { + void accept(List sids); + } +} diff --git a/src/main/java/com/kri/contact/server/persistence/jdbc/ListUploadJdbcSupport.java b/src/main/java/com/kri/contact/server/persistence/jdbc/ListUploadJdbcSupport.java new file mode 100644 index 0000000..5e97d1c --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/jdbc/ListUploadJdbcSupport.java @@ -0,0 +1,303 @@ +package com.kri.contact.server.persistence.jdbc; + +import com.kri.contact.server.common.enums.ListHeaderTypeSpecific; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.sql.Types; +import java.time.LocalDateTime; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.jspecify.annotations.NonNull; +import org.springframework.jdbc.core.BatchPreparedStatementSetter; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class ListUploadJdbcSupport { + private final JdbcTemplate jdbcTemplate; + + public void deleteTemp(String listUploadLogId) { + jdbcTemplate.update( + "delete from t_list_item_upload_tmp where list_upload_log_id = ?", + listUploadLogId + ); + } + + public void batchInsertTemp(List rows, int batchSize) { + if (rows == null || rows.isEmpty()) { + return; + } + + final String sql = """ + insert into t_list_item_upload_tmp ( + list_upload_log_id, + prjct_idx, + row_no, + sid, + list_hder_id, + specific_type, + raw_val, + normalized_val + ) values (?, ?, ?, ?, ?, ?, ?, ?) + """; + + for (int i = 0; i < rows.size(); i += batchSize) { + int to = Math.min(rows.size(), i + batchSize); + List sub = rows.subList(i, to); + + jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() { + @Override + public void setValues(@NonNull PreparedStatement ps, int index) throws SQLException { + TmpSpecialRow r = sub.get(index); + ps.setString(1, r.listUploadLogId()); + ps.setLong(2, r.prjctIdx()); + ps.setInt(3, r.rowNo()); + ps.setInt(4, r.sid()); + ps.setInt(5, r.listHderId()); + ps.setShort(6, r.specificType()); + setNullableString(ps, 7, r.rawVal()); + setNullableString(ps, 8, r.normalizedVal()); + } + + @Override + public int getBatchSize() { + return sub.size(); + } + }); + } + } + + public List findFileDuplicateRows(String listUploadLogId) { + String sql = """ + select t.row_no, t.list_hder_id, t.raw_val + from t_list_item_upload_tmp t + join ( + select list_upload_log_id, specific_type, normalized_val + from t_list_item_upload_tmp + where list_upload_log_id = ? + and normalized_val is not null + group by list_upload_log_id, specific_type, normalized_val + having count(*) > 1 + ) d + on d.list_upload_log_id = t.list_upload_log_id + and d.specific_type = t.specific_type + and d.normalized_val = t.normalized_val + where t.list_upload_log_id = ? + order by t.row_no, t.list_hder_id + """; + + return jdbcTemplate.query( + sql, + (rs, rowNum) -> new DuplicateHit( + rs.getInt("row_no"), + rs.getInt("list_hder_id"), + rs.getString("raw_val") + ), + listUploadLogId, listUploadLogId + ); + } + + public List findDbDuplicateRows( + String listUploadLogId, + Long prjctIdx, + boolean changeMode + ) { + String sql = """ + select distinct t.row_no, t.list_hder_id, t.raw_val + from t_list_item_upload_tmp t + join t_list_item i + on i.prjct_idx = t.prjct_idx + and i.list_hder_id = t.list_hder_id + where t.list_upload_log_id = ? + and t.prjct_idx = ? + and t.normalized_val is not null + and t.specific_type in (?, ?) + and lower(trim(i.list_item_val)) = t.normalized_val + and (? = false or i.sid <> t.sid) + order by t.row_no, t.list_hder_id + """; + + return jdbcTemplate.query( + sql, + (rs, rowNum) -> new DuplicateHit( + rs.getInt("row_no"), + rs.getInt("list_hder_id"), + rs.getString("raw_val") + ), + listUploadLogId, + prjctIdx, + ListHeaderTypeSpecific.EMAIL.getCode(), + ListHeaderTypeSpecific.TEL_NUM.getCode(), + changeMode + ); + } + + + public void batchInsertList(List rows, int batchSize) { + if (rows == null || rows.isEmpty()) { + return; + } + + String sql = """ + insert into t_list ( + prjct_idx, + sid, + list_upload_log_id, + is_use, + memo, + reg_user, + reg_dt + ) values (?, ?, ?, ?, ?, ?, ?) + """; + + for (int i = 0; i < rows.size(); i += batchSize) { + List sub = rows.subList(i, Math.min(rows.size(), i + batchSize)); + jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() { + @Override + public void setValues(@NonNull PreparedStatement ps, int index) throws SQLException { + ListRowInsert r = sub.get(index); + ps.setLong(1, r.prjctIdx()); + ps.setInt(2, r.sid()); + ps.setString(3, r.listUploadLogId()); + ps.setShort(4, r.isUse()); + setNullableString(ps, 5, r.memo()); + ps.setString(6, r.regUser()); + ps.setTimestamp(7, Timestamp.valueOf(r.regDt())); + } + + @Override + public int getBatchSize() { + return sub.size(); + } + }); + } + } + + public void batchInsertListItem(List rows, int batchSize) { + if (rows == null || rows.isEmpty()) { + return; + } + + String sql = """ + insert into t_list_item ( + prjct_idx, + sid, + list_hder_id, + list_item_val, + reg_user, + reg_dt + ) values (?, ?, ?, ?, ?, ?) + """; + + for (int i = 0; i < rows.size(); i += batchSize) { + List sub = rows.subList(i, Math.min(rows.size(), i + batchSize)); + jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() { + @Override + public void setValues(@NonNull PreparedStatement ps, int index) throws SQLException { + ListItemRowInsert r = sub.get(index); + ps.setLong(1, r.prjctIdx()); + ps.setInt(2, r.sid()); + ps.setInt(3, r.listHderId()); + setNullableString(ps, 4, r.listItemVal()); + ps.setString(5, r.regUser()); + ps.setTimestamp(6, Timestamp.valueOf(r.regDt())); + } + + @Override + public int getBatchSize() { + return sub.size(); + } + }); + } + } + + public void batchInsertListAssign(List rows, int batchSize) { + if (rows == null || rows.isEmpty()) { + return; + } + + String sql = """ + insert into t_list_assign ( + prjct_idx, + sid, + user_id, + reg_user, + reg_dt + ) values (?, ?, ?, ?, ?) + """; + + for (int i = 0; i < rows.size(); i += batchSize) { + List sub = rows.subList(i, Math.min(rows.size(), i + batchSize)); + jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() { + @Override + public void setValues(@NonNull PreparedStatement ps, int index) throws SQLException { + ListAssignRowInsert r = sub.get(index); + ps.setLong(1, r.prjctIdx()); + ps.setInt(2, r.sid()); + ps.setString(3, r.userId()); + ps.setString(4, r.regUser()); + ps.setTimestamp(5, Timestamp.valueOf(r.regDt())); + } + + @Override + public int getBatchSize() { + return sub.size(); + } + }); + } + } + + private void setNullableString(PreparedStatement ps, int index, String value) throws SQLException { + if (value == null) { + ps.setNull(index, Types.VARCHAR); + } else { + ps.setString(index, value); + } + } + + public record TmpSpecialRow( + String listUploadLogId, + Long prjctIdx, + int rowNo, + int sid, + int listHderId, + short specificType, + String rawVal, + String normalizedVal + ) {} + + public record DuplicateHit( + int rowNo, + int listHderId, + String rawVal + ) {} + + public record ListRowInsert( + Long prjctIdx, + int sid, + String listUploadLogId, + short isUse, + String memo, + String regUser, + LocalDateTime regDt + ) {} + + public record ListItemRowInsert( + Long prjctIdx, + int sid, + int listHderId, + String listItemVal, + String regUser, + LocalDateTime regDt + ) {} + + public record ListAssignRowInsert( + Long prjctIdx, + int sid, + String userId, + String regUser, + LocalDateTime regDt + ) {} +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListAssignRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListAssignRepository.java new file mode 100644 index 0000000..dd65e88 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListAssignRepository.java @@ -0,0 +1,30 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TListAssignEntity; +import java.util.Collection; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; + +public interface ListAssignRepository extends JpaRepository { + + long deleteByUserId(String userId); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TListAssignEntity a + where a.prjctIdx = :prjctIdx + """) + int deleteByPrjctIdx(Long prjctIdx); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TListAssignEntity a + where a.prjctIdx = :prjctIdx + and a.sid in :sids + """) + int deleteWithPrjctIdxAndSids( + Long prjctIdx, + Collection sids + ); +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java new file mode 100644 index 0000000..7d2c90e --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java @@ -0,0 +1,68 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TListEventHistEntity; +import java.util.List; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +public interface ListEventHistRepository extends JpaRepository { + + @Query(""" + select h + from TListEventHistEntity h + where h.prjctIdx = :prjctIdx + and h.eventTy = :eventTy + and h.sid = :sid + and h.listEventHistIdx = ( + select max(h2.listEventHistIdx) + from TListEventHistEntity h2 + where h2.prjctIdx = h.prjctIdx + and h2.eventTy = h.eventTy + and h2.sid = h.sid + ) + """) + Optional findLatest( + Long prjctIdx, + Short eventTy, + Integer sid + ); + + @Query(""" + select h + from TListEventHistEntity h + where h.prjctIdx = :prjctIdx + and h.eventTy = :eventTy + and h.sid in :sids + and h.listEventHistIdx = ( + select max(h2.listEventHistIdx) + from TListEventHistEntity h2 + where h2.prjctIdx = h.prjctIdx + and h2.eventTy = h.eventTy + and h2.sid = h.sid + ) + """) + List findLatestList( + Long prjctIdx, + Short eventTy, + List sids + ); + + @Query(""" + select h + from TListEventHistEntity h + where h.prjctIdx = :prjctIdx + and h.sid in :sids + and h.listEventHistIdx = ( + select max(h2.listEventHistIdx) + from TListEventHistEntity h2 + where h2.prjctIdx = h.prjctIdx + and h2.eventTy = h.eventTy + and h2.sid = h.sid + ) + """) + List findLatestListByEventTy( + Long prjctIdx, + List sids + ); +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListHeaderRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListHeaderRepository.java index 4598ea1..ef5cc1f 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListHeaderRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListHeaderRepository.java @@ -2,22 +2,24 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.common.enums.ListHeaderGrade; import com.kri.contact.server.persistence.entity.TListHeaderEntity; -import com.kri.contact.server.persistence.entity.TListHeaderEntityId; +import com.kri.contact.server.persistence.entity.id.TListHeaderEntityId; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; public interface ListHeaderRepository extends JpaRepository { - List findAllByIdPrjctIdx(Long prjctIdx); + List findByIdPrjctIdx(Long prjctIdx); - List findAllByIdPrjctIdxAndListHderGradNot(Long prjctIdx, Short listHderGrad); + List findByIdPrjctIdxAndListHderGradNot(Long prjctIdx, Short listHderGrad); + + List findIdListHderIdByIdPrjctIdxAndListHderTyIn(Long prjctIdx, List listHderTy); default List findDefaultHeader(){ - return findAllByIdPrjctIdxAndListHderGradNot(0L, ListHeaderGrade.COMMON.getCode()); + return findByIdPrjctIdxAndListHderGradNot(0L, ListHeaderGrade.COMMON.getCode()); } - long deleteAllByIdPrjctIdx(Long prjctIdx); + long deleteByIdPrjctIdx(Long prjctIdx); - long deleteAllByIdPrjctIdxAndIdListHderIdNotIn(Long prjctIdx, List listHderId); + long deleteByIdPrjctIdxAndIdListHderIdNotIn(Long prjctIdx, List listHderId); } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListItemFileRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListItemFileRepository.java new file mode 100644 index 0000000..36a6e4b --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListItemFileRepository.java @@ -0,0 +1,29 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TListItemFileEntity; +import com.kri.contact.server.persistence.entity.id.TListItemFileEntityId; +import java.util.Collection; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; + +public interface ListItemFileRepository extends JpaRepository { + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TListItemFileEntity f + where f.id.prjctIdx = :prjctIdx + """) + int deleteByPrjctIdx(Long prjctIdx); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TListItemFileEntity f + where f.id.prjctIdx = :prjctIdx + and f.id.sid in :sids + """) + int deleteWithPrjctIdxAndSids( + Long prjctIdx, + Collection sids + ); +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java index 3637bf5..4e0322d 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java @@ -1,11 +1,58 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.persistence.entity.TListItemEntity; -import com.kri.contact.server.persistence.entity.TListItemEntityId; +import com.kri.contact.server.persistence.entity.id.TListItemEntityId; +import java.util.Collection; import java.util.List; +import java.util.Set; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; public interface ListItemRepository extends JpaRepository { - long deleteAllByIdPrjctIdxAndIdListHderIdNotIn(Long prjctIdx, List listHderId); + long deleteByIdPrjctIdxAndIdListHderIdNotIn(Long prjctIdx, List listHderIds); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TListItemEntity i + where i.id.prjctIdx = :prjctIdx + """) + int deleteByPrjctIdx(Long prjctIdx); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TListItemEntity i + where i.id.prjctIdx = :prjctIdx + and i.id.sid in :sids + """) + int deleteByPrjctIdxAndSids( + Long prjctIdx, + Collection sids + ); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TListItemEntity i + where i.id.prjctIdx = :prjctIdx + and i.id.sid in :sids + and i.id.listHderId not in :rejectHeaderIds + """) + int deleteByPrjctIdxAndSidsExceptHeaderIds( + Long prjctIdx, + Collection sids, + Collection rejectHeaderIds + ); + + @Query(""" + select t + from TListItemEntity t + where t.id.prjctIdx = :prjctIdx + and t.id.sid in :sids + order by t.id.sid asc, t.id.listHderId asc + """) + List findByIdPrjctIdxAndIdSidIn( + Long prjctIdx, + Set sids + ); } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepository.java new file mode 100644 index 0000000..ac7b4f5 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepository.java @@ -0,0 +1,15 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.common.feature.web.page.PageRequestDto; +import com.kri.contact.server.dto.list.ListFilterDto; +import com.kri.contact.server.persistence.entity.TListEntity; +import java.util.List; + +public interface ListQueryRepository { + + List findPagedListEntities(Long prjctIdx, List emailTelnumHeaderIds, ListFilterDto listFilter, PageRequestDto pageRequest); + + List findAllListEntities(Long prjctIdx, List emailTelnumHeaderIds, ListFilterDto listFilter); + + List findAllSids(Long prjctIdx, List emailTelnumHeaderIds, ListFilterDto listFilter); +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepositoryImpl.java b/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepositoryImpl.java new file mode 100644 index 0000000..b2d9928 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepositoryImpl.java @@ -0,0 +1,192 @@ +package com.kri.contact.server.persistence.repository; + +import static com.kri.common.feature.util.StringUtil.normalizeBlank; + +import com.kri.common.feature.web.page.PageRequestDto; +import com.kri.contact.server.common.enums.ListIsUse; +import com.kri.contact.server.dto.list.ListFilterDto; +import com.kri.contact.server.persistence.entity.QTListEntity; +import com.kri.contact.server.persistence.entity.QTListItemEntity; +import com.kri.contact.server.persistence.entity.TListEntity; +import com.querydsl.core.BooleanBuilder; +import com.querydsl.core.types.Order; +import com.querydsl.core.types.OrderSpecifier; +import com.querydsl.jpa.JPAExpressions; +import com.querydsl.jpa.impl.JPAQueryFactory; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +public class ListQueryRepositoryImpl implements ListQueryRepository { + + private final JPAQueryFactory jpaQueryFactory; + + @Override + public List findPagedListEntities( + Long prjctIdx, + List emailTelnumHeaderIds, + ListFilterDto listFilter, + PageRequestDto pageRequest + ) { + QTListEntity list = QTListEntity.tListEntity; + BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, emailTelnumHeaderIds, listFilter, list); + + int pageIndex = pageRequest == null ? 0 : Math.max(pageRequest.getPageIndex(), 0); + int pageSize = pageRequest == null ? 10 : Math.max(pageRequest.getPageSize(), 1); + + return jpaQueryFactory.selectFrom(list) + .where(predicate) + .orderBy(resolveOrderSpecifier(list, pageRequest)) + .offset((long) pageIndex * pageSize) + .limit(pageSize) + .fetch(); + } + + @Override + public List findAllListEntities( + Long prjctIdx, + List emailTelnumHeaderIds, + ListFilterDto listFilter + ) { + QTListEntity list = QTListEntity.tListEntity; + BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, emailTelnumHeaderIds, listFilter, list); + + return jpaQueryFactory.selectFrom(list) + .where(predicate) + .orderBy(list.id.sid.asc()) + .fetch(); + } + + @Override + public List findAllSids( + Long prjctIdx, + List emailTelnumHeaderIds, + ListFilterDto listFilter + ) { + QTListEntity list = QTListEntity.tListEntity; + BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, emailTelnumHeaderIds, listFilter, list); + + return jpaQueryFactory.select(list.id.sid) + .from(list) + .where(predicate) + .orderBy(list.id.sid.asc()) + .fetch(); + } + + private BooleanBuilder buildListFilterPredicate( + Long prjctIdx, + List emailTelnumHeaderIds, + ListFilterDto listFilter, + QTListEntity list + ) { + BooleanBuilder predicate = new BooleanBuilder() + .and(list.id.prjctIdx.eq(prjctIdx)); + + if (listFilter == null) { + return predicate; + } + + if (listFilter.getSidSet() != null && !listFilter.getSidSet().isEmpty()) { + predicate.and(list.id.sid.in(listFilter.getSidSet())); + } + + Set useCodes = toUseCodes(listFilter.getListUseSet()); + if (!useCodes.isEmpty()) { + predicate.and(list.use.in(useCodes)); + } + + String memo = normalizeBlank(listFilter.getMemo()); + if (memo != null) { + predicate.and(list.memo.contains(memo)); + } + + appendOtherItemPredicates(predicate, prjctIdx, emailTelnumHeaderIds, list, listFilter.getOtherItems()); + return predicate; + } + + private void appendOtherItemPredicates( + BooleanBuilder predicate, + Long prjctIdx, + List emailTelnumHeaderIds, + QTListEntity list, + Map> otherItems + ) { + if (otherItems == null || otherItems.isEmpty()) { + return; + } + + for (Map.Entry> entry : otherItems.entrySet()) { + Integer listHderId = entry.getKey(); + Set values = normalizeFilterValues(entry.getValue()); + if (listHderId == null || values.isEmpty()) { + continue; + } + + //전화번호나 이메일은 Like 조회 + boolean isLike = emailTelnumHeaderIds != null + && emailTelnumHeaderIds.contains(listHderId) + && values.size() == 1; + String likeValue = values.iterator().next(); + + QTListItemEntity item = new QTListItemEntity("item_" + listHderId); + predicate.and(JPAExpressions.selectOne() + .from(item) + .where( + item.id.prjctIdx.eq(prjctIdx), + item.id.sid.eq(list.id.sid), + item.id.listHderId.eq(listHderId), + isLike + ? item.listItemVal.contains(likeValue) + : item.listItemVal.in(values) + ) + .exists()); + } + } + + private OrderSpecifier resolveOrderSpecifier(QTListEntity list, PageRequestDto pageRequest) { + String sortBy = pageRequest == null ? null : pageRequest.getSortBy(); + Order order = pageRequest != null && "desc".equalsIgnoreCase(pageRequest.getSortDir()) + ? Order.DESC + : Order.ASC; + + if ("use".equalsIgnoreCase(sortBy) || "is_use".equalsIgnoreCase(sortBy)) { + return new OrderSpecifier<>(order, list.use); + } + if ("memo".equalsIgnoreCase(sortBy)) { + return new OrderSpecifier<>(order, list.memo); + } + return new OrderSpecifier<>(order, list.id.sid); + } + + private Set toUseCodes(Set listUseSet) { + if (listUseSet == null || listUseSet.isEmpty()) { + return Collections.emptySet(); + } + + return listUseSet.stream() + .filter(Objects::nonNull) + .map(ListIsUse::getCode) + .collect(java.util.stream.Collectors.toCollection(LinkedHashSet::new)); + } + + private Set normalizeFilterValues(Set values) { + if (values == null || values.isEmpty()) { + return Collections.emptySet(); + } + + Set normalized = new HashSet<>(); + for (String value : values) { + String normalizedValue = normalizeBlank(value); + if (normalizedValue != null) { + normalized.add(normalizedValue); + } + } + return normalized; + } +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java index f2408cb..e4da194 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java @@ -1,12 +1,39 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.persistence.entity.TListEntity; -import com.kri.contact.server.persistence.entity.TListEntityId; -import java.util.List; +import com.kri.contact.server.persistence.entity.id.TListEntityId; +import java.util.Collection; +import java.util.Set; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; public interface ListRepository extends JpaRepository, - JpaSpecificationExecutor { + JpaSpecificationExecutor, ListQueryRepository { + @Query(""" + select l.id.sid + from TListEntity l + where l.id.prjctIdx = :prjctIdx + """) + Set findSidsByPrjctIdx(Long prjctIdx); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TListEntity l + where l.id.prjctIdx = :prjctIdx + """) + int deleteByPrjctIdx(Long prjctIdx); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TListEntity l + where l.id.prjctIdx = :prjctIdx + and l.id.sid in :sids + """) + int deleteWithPrjctIdxAndSids( + Long prjctIdx, + Collection sids + ); } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListResetLogRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListResetLogRepository.java new file mode 100644 index 0000000..60bb75f --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListResetLogRepository.java @@ -0,0 +1,8 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TListResetLogEntity; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ListResetLogRepository extends JpaRepository { + +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListUploadLogRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListUploadLogRepository.java new file mode 100644 index 0000000..f4f6567 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListUploadLogRepository.java @@ -0,0 +1,15 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TListUploadLogEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +public interface ListUploadLogRepository extends JpaRepository { + + @Query(""" + select coalesce(max(t.wave), 0) + from TListUploadLogEntity t + where t.prjctIdx = :prjctIdx + """) + Integer findMaxWaveByPrjctIdx(Long prjctIdx); +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignRepository.java index 7ce46d9..c89b04a 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignRepository.java @@ -1,7 +1,7 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.persistence.entity.TPrjctAssignEntity; -import com.kri.contact.server.persistence.entity.TPrjctAssignEntityId; +import com.kri.contact.server.persistence.entity.id.TPrjctAssignEntityId; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ProjectMainTemplateRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ProjectMainTemplateRepository.java index 1c7eb5d..ad4f03a 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ProjectMainTemplateRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ProjectMainTemplateRepository.java @@ -1,7 +1,7 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.persistence.entity.TPrjctMainTmplatEntity; -import com.kri.contact.server.persistence.entity.TPrjctMainTmplatEntityId; +import com.kri.contact.server.persistence.entity.id.TPrjctMainTmplatEntityId; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ResultCodeRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ResultCodeRepository.java index 23a35bf..ddfec7a 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ResultCodeRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ResultCodeRepository.java @@ -3,7 +3,7 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.persistence.entity.TResultCodeEntity; -import com.kri.contact.server.persistence.entity.TResultCodeEntityId; +import com.kri.contact.server.persistence.entity.id.TResultCodeEntityId; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/kri/contact/server/service/AssignService.java b/src/main/java/com/kri/contact/server/service/AssignService.java index 2c2a48c..b972ffd 100644 --- a/src/main/java/com/kri/contact/server/service/AssignService.java +++ b/src/main/java/com/kri/contact/server/service/AssignService.java @@ -2,6 +2,7 @@ package com.kri.contact.server.service; import com.kri.contact.server.common.consts.ContactConstant; import com.kri.contact.server.persistence.entity.TPrjctAssignEntity; +import com.kri.contact.server.persistence.repository.ListAssignRepository; import com.kri.contact.server.persistence.repository.ProjectAssignRepository; import java.time.LocalDateTime; import java.util.List; @@ -14,6 +15,15 @@ import org.springframework.transaction.annotation.Transactional; public class AssignService { private final ProjectAssignRepository projectAssignRepository; + private final ListAssignRepository listAssignRepository; + + public List getPrjctOutsourceAndFieldworkAssign(Long prjctIdx) { + List outsourceAssign = getPrjctOutsourceAssign(prjctIdx); + List fieldworkAssign = getPrjctFieldworkAssign(prjctIdx); + outsourceAssign.addAll(fieldworkAssign); + + return outsourceAssign; + } public List getPrjctOutsourceAssign(Long prjctIdx) { return projectAssignRepository.findAssignUserIdByPrjctIdxAndRoleRange( @@ -55,6 +65,11 @@ public class AssignService { insertPrjctAssign(prjctIdx, assignUserIdList, regUser, regDt); } + @Transactional + public void deleteListAssignWithUser(String userId) { + listAssignRepository.deleteByUserId(userId); + } + private void insertPrjctAssign(Long prjctIdx, List assignUserIdList, String regUser, LocalDateTime regDt) { if (assignUserIdList == null || assignUserIdList.isEmpty()) { diff --git a/src/main/java/com/kri/contact/server/service/AuthService.java b/src/main/java/com/kri/contact/server/service/AuthService.java index e4bb852..c0591dc 100644 --- a/src/main/java/com/kri/contact/server/service/AuthService.java +++ b/src/main/java/com/kri/contact/server/service/AuthService.java @@ -1,7 +1,7 @@ package com.kri.contact.server.service; -import com.kri.common.auth.dto.JwtUserClaimsDto; -import com.kri.common.auth.jwt.JwtService; +import com.kri.common.feature.auth.dto.JwtUserClaimsDto; +import com.kri.common.feature.auth.jwt.JwtService; import com.kri.contact.server.common.external.intranet.IntranetExtensionApiClient; import com.kri.contact.server.common.external.intranet.SearchLoginInfoResponseDto; import com.kri.contact.server.dto.auth.LoginRequestDto; diff --git a/src/main/java/com/kri/contact/server/service/ListHeaderService.java b/src/main/java/com/kri/contact/server/service/ListHeaderService.java index 0f7f1bd..f4be90a 100644 --- a/src/main/java/com/kri/contact/server/service/ListHeaderService.java +++ b/src/main/java/com/kri/contact/server/service/ListHeaderService.java @@ -1,14 +1,27 @@ package com.kri.contact.server.service; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.web.BusinessException; +import static com.kri.contact.server.common.consts.ContactConstant.EMAIL_TELNUM_TYPE; +import static com.kri.contact.server.common.consts.ContactConstant.LIST_TEXT_REGEX; + +import com.kri.common.feature.web.BusinessException; import com.kri.contact.server.common.enums.ListHeaderGrade; +import com.kri.contact.server.common.enums.ListHeaderType; +import com.kri.contact.server.common.enums.ListHeaderTypeSpecific; +import com.kri.contact.server.dto.excel.ListUploadErrorDto; import com.kri.contact.server.dto.list.ListHeaderDto; +import com.kri.contact.server.dto.list.ListUploadRequestDto; import com.kri.contact.server.persistence.entity.TListHeaderEntity; import com.kri.contact.server.persistence.repository.ListHeaderRepository; +import com.kri.contact.server.persistence.repository.ListItemRepository; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Map; import java.util.Objects; +import java.util.Set; import java.util.function.Function; import java.util.function.Predicate; import lombok.RequiredArgsConstructor; @@ -20,12 +33,11 @@ import org.springframework.transaction.annotation.Transactional; public class ListHeaderService { private final ListHeaderRepository listHeaderRepository; - private final ListItemService listItemService; + private final ListItemRepository listItemRepository; @Transactional public void copyDefaultHeader(Long prjctIdx, String regUser, LocalDateTime regDt) { - - listHeaderRepository.deleteAllByIdPrjctIdx(prjctIdx); + listHeaderRepository.deleteByIdPrjctIdx(prjctIdx); List defaultHeaderList = listHeaderRepository.findDefaultHeader() .stream() @@ -36,48 +48,132 @@ public class ListHeaderService { } public List getHeader(Long prjctIdx) { - List headerEntityList = listHeaderRepository.findAllByIdPrjctIdx(prjctIdx); + List headerEntityList = listHeaderRepository.findByIdPrjctIdx(prjctIdx); + + if (headerEntityList.isEmpty()) { + + } return headerEntityList.stream() .map(ListHeaderDto::fromEntity) .toList(); } - @Transactional - public void upsertHeader(Long prjctIdx, List headerList, String regUser) { - LocalDateTime regDt = DateTimeUtil.nowKstLocalDateTime(); + public List getEmailTelnumHeaderId(Long prjctIdx) { + List emailTelnumCodeList = EMAIL_TELNUM_TYPE.stream() + .map(ListHeaderType::getCode) + .toList(); - //headerList에 ListHeaderGrade.IMMUTABLE, ListHeaderGrade.DEFAULT 헤더가 있는지 확인 + return listHeaderRepository.findIdListHderIdByIdPrjctIdxAndListHderTyIn(prjctIdx, emailTelnumCodeList); + } + + public List resolveUploadHeaders( + Long prjctIdx, + List excelHeaders, + ListUploadRequestDto request, + List errors + ) { + if (excelHeaders == null || excelHeaders.isEmpty()) { + errors.add(ListUploadErrorDto.of(1, "헤더", "헤더가 없습니다.")); + return List.of(); + } + + List defaultHeaders = listHeaderRepository.findDefaultHeader().stream() + .map(ListHeaderDto::fromEntity) + .sorted(Comparator.comparing(ListHeaderDto::getListHderId)) + .toList(); + + Map defaultByName = new LinkedHashMap<>(); + for (ListHeaderDto dto : defaultHeaders) { + defaultByName.put(dto.getListHderNm(), dto); + } + + for (String defaultName : defaultByName.keySet()) { + if (!excelHeaders.contains(defaultName)) { + errors.add(ListUploadErrorDto.of(1, defaultName, "기본 헤더가 누락되었습니다.")); + } + } + + Set dupCheck = new LinkedHashSet<>(); + for (String h : excelHeaders) { + if (h == null || h.isBlank()) { + errors.add(ListUploadErrorDto.of(1, "헤더", "빈 헤더명이 있습니다.")); + } else if (!dupCheck.add(h)) { + errors.add(ListUploadErrorDto.of(1, h, "헤더명이 중복됩니다.")); + } else if (!h.matches(LIST_TEXT_REGEX)) { + errors.add(ListUploadErrorDto.of(1, h, "허용되지 않는 헤더명 입니다.")); + } + } + + if (!errors.isEmpty()) { + return List.of(); + } + + List result = new ArrayList<>(); + for (ListHeaderDto src : defaultHeaders) { + result.add(ListHeaderDto.fromDto(prjctIdx, src)); + } + + int nextId = defaultHeaders.size() + 1; + for (String headerName : excelHeaders) { + if (defaultByName.containsKey(headerName)) { + continue; + } + + int headerId = nextId++; + ListHeaderType type = resolveType(headerId, request.getSpecificHeader()); + + result.add(ListHeaderDto.newCommon(prjctIdx, headerId, headerName, type)); + } + + return result.stream() + .sorted(Comparator.comparing(ListHeaderDto::getListHderOrder)) + .toList(); + } + + @Transactional + public void upsertHeader(Long prjctIdx, List headerList, String regUser, LocalDateTime regDt) { List defaultHeaderList = listHeaderRepository.findDefaultHeader() - .stream().map(ListHeaderDto::fromEntity).toList(); + .stream() + .map(ListHeaderDto::fromEntity) + .toList(); List extractDefault = headerList.stream() .filter(h -> !Objects.equals(h.getListHderGrad(), ListHeaderGrade.COMMON)) .toList(); - if(!isEqualHeader(defaultHeaderList, extractDefault, true)){ - throw BusinessException.badRequest("WRONG_DEFAULT","기본 헤더가 잘못 됐습니다."); + if (!isEqualHeader(defaultHeaderList, extractDefault, true)) { + throw BusinessException.badRequest("WRONG_DEFAULT", "기본 헤더가 잘못 됐습니다."); } - //headerList에 없는 헤더는 삭제 + List invalidHeaderList = headerList.stream() + .map(ListHeaderDto::getListHderNm) + .filter(name -> name == null || !name.matches(LIST_TEXT_REGEX)) + .toList(); + + if (!invalidHeaderList.isEmpty()) { + throw BusinessException.badRequest("WRONG_HEADER_NAME", "허용되지 않는 헤더명이 있습니다.") + .with("invalidHeaderList", invalidHeaderList); + } + + // headerList에 없는 헤더는 삭제 List headerIdList = headerList.stream().map(ListHeaderDto::getListHderId).toList(); - listHeaderRepository.deleteAllByIdPrjctIdxAndIdListHderIdNotIn(prjctIdx, headerIdList); + listHeaderRepository.deleteByIdPrjctIdxAndIdListHderIdNotIn(prjctIdx, headerIdList); - //없는 정보에 대해서 리스트 아이템 삭제 - listItemService.deleteHderIdNotIn(prjctIdx, headerIdList); + // 없는 정보에 대해서 리스트 아이템 삭제 + listItemRepository.deleteByIdPrjctIdxAndIdListHderIdNotIn(prjctIdx, headerIdList); - //ListHeaderGrade.IMMUTABLE 헤더를 제외한 헤더 저장 + // ListHeaderGrade.IMMUTABLE 헤더를 제외한 헤더 저장 List headerEntityList = headerList.stream() .filter(h -> !Objects.equals(h.getListHderGrad(), ListHeaderGrade.IMMUTABLE)) - .map((ListHeaderDto dto) -> TListHeaderEntity.fromDto(dto, regUser, regDt)) + .map(dto -> TListHeaderEntity.fromDto(dto, regUser, regDt)) .toList(); listHeaderRepository.saveAll(headerEntityList); } - public boolean isEqualHeader(List origin, List target, boolean simpleMode){ - - if(origin.size() != target.size()){ + public boolean isEqualHeader(List origin, List target, boolean simpleMode) { + if (origin.size() != target.size()) { return false; } @@ -86,7 +182,7 @@ public class ListHeaderService { ? o -> t -> t.isEqualSimple(o) : o -> t -> t.isEqualHard(o); - for(ListHeaderDto o : origin){ + for (ListHeaderDto o : origin) { if (target.stream().noneMatch(predFunc.apply(o))) { return false; } @@ -95,4 +191,44 @@ public class ListHeaderService { return true; } + public List findHeaderIdsByType(List headers, ListHeaderType type) { + return headers.stream() + .filter(h -> h.getListHderTy() == type) + .map(ListHeaderDto::getListHderId) + .toList(); + } + + public String findHeaderNameByType(List headers, ListHeaderType type) { + return headers.stream() + .filter(h -> h.getListHderTy() == type) + .map(ListHeaderDto::getListHderNm) + .findFirst() + .orElseThrow(() -> BusinessException.badRequest("HEADER_NOT_FOUND", type + " 헤더를 찾을 수 없습니다.")); + } + + public List findHeaderNamesByTypes(List headers, List types) { + return headers.stream() + .filter(h -> types.contains(h.getListHderTy())) + .map(ListHeaderDto::getListHderNm) + .toList(); + } + + private ListHeaderType resolveType(Integer headerId, Map specificHeader) { + if (specificHeader == null || specificHeader.isEmpty()) { + return ListHeaderType.TEXT; + } + ListHeaderTypeSpecific specific = specificHeader.get(String.valueOf(headerId)); + if (specific == null) { + return ListHeaderType.TEXT; + } + return switch (specific) { + case EMAIL -> ListHeaderType.EMAIL; + case TEL_NUM -> ListHeaderType.TEL_NUM; + case FILE -> ListHeaderType.FILE; + }; + } + + private long deleteHderIdNotIn(Long prjctIdx, List listHderId){ + return listItemRepository.deleteByIdPrjctIdxAndIdListHderIdNotIn(prjctIdx, listHderId); + } } diff --git a/src/main/java/com/kri/contact/server/service/ListItemService.java b/src/main/java/com/kri/contact/server/service/ListItemService.java deleted file mode 100644 index 5803dc6..0000000 --- a/src/main/java/com/kri/contact/server/service/ListItemService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.kri.contact.server.service; - -import com.kri.contact.server.persistence.repository.ListItemRepository; -import java.util.List; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class ListItemService { - - private final ListItemRepository listItemRepository; - - public long deleteHderIdNotIn(Long prjctIdx, List listHderId){ - return listItemRepository.deleteAllByIdPrjctIdxAndIdListHderIdNotIn(prjctIdx, listHderId); - } - -} diff --git a/src/main/java/com/kri/contact/server/service/ListResetService.java b/src/main/java/com/kri/contact/server/service/ListResetService.java new file mode 100644 index 0000000..82a0a4a --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/ListResetService.java @@ -0,0 +1,101 @@ +package com.kri.contact.server.service; + +import com.kri.common.feature.util.CommonUtil; +import com.kri.contact.server.common.consts.ContactConstant; +import com.kri.contact.server.common.enums.ListResetMode; +import com.kri.contact.server.dto.list.ListFilterDto; +import com.kri.contact.server.persistence.entity.TListResetLogEntity; +import com.kri.contact.server.persistence.jdbc.ListResetJdbcSupport; +import com.kri.contact.server.persistence.repository.ListRepository; +import com.kri.contact.server.persistence.repository.ListResetLogRepository; +import java.time.LocalDateTime; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ListResetService { + + private final ListResetLogRepository listResetLogRepository; + private final ListRepository listRepository; + private final ListHeaderService listHeaderService; + private final ListResetJdbcSupport listResetJdbcSupport; + + @Transactional + public long resetByFilter( + Long prjctIdx, + ListFilterDto filter, + ListResetMode mode, + String regUser, + LocalDateTime regDt + ) { + List emailTelnumHeaderIds = listHeaderService.getEmailTelnumHeaderId(prjctIdx); + Set sids = new LinkedHashSet<>( + listRepository.findAllSids(prjctIdx, emailTelnumHeaderIds, filter) + ); + return resetBySids(prjctIdx, sids, mode, regUser, regDt); + } + + @Transactional + public long resetBySids( + Long prjctIdx, + Set sids, + ListResetMode mode, + String regUser, + LocalDateTime regDt + ) { + if (sids == null || sids.isEmpty()) { + return 0; + } + if (mode == null) { + throw new IllegalArgumentException("mode must not be null"); + } + + String listResetLogId = createResetLog(prjctIdx, mode, sids.size(), regUser, regDt); + int chunkSize = ContactConstant.INSERT_CHUNK_SIZE; + + switch (mode) { + case HIST -> { + listResetJdbcSupport.backupHistories(listResetLogId, prjctIdx, sids, chunkSize); + listResetJdbcSupport.deleteHistories(prjctIdx, sids, chunkSize); + } + case ALL -> { + listResetJdbcSupport.backupHistories(listResetLogId, prjctIdx, sids, chunkSize); + listResetJdbcSupport.backupListData(listResetLogId, prjctIdx, sids, true, chunkSize); + listResetJdbcSupport.deleteHistories(prjctIdx, sids, chunkSize); + listResetJdbcSupport.deleteListData(prjctIdx, sids, true, true, chunkSize); + } + case LIST_UPLOAD -> { + listResetJdbcSupport.backupListData(listResetLogId, prjctIdx, sids, false, chunkSize); + listResetJdbcSupport.deleteListData(prjctIdx, sids, false, false, chunkSize); + } + } + + return sids.size(); + } + + private String createResetLog( + Long prjctIdx, + ListResetMode mode, + int listCnt, + String regUser, + LocalDateTime regDt + ) { + String listResetLogId = CommonUtil.uuid32(); + + TListResetLogEntity log = new TListResetLogEntity(); + log.setListResetLogId(listResetLogId); + log.setPrjctIdx(prjctIdx); + log.setMode(mode.getCode()); + log.setListCnt(listCnt); + log.setRegUser(regUser); + log.setRegDt(regDt); + listResetLogRepository.saveAndFlush(log); + + return listResetLogId; + } +} diff --git a/src/main/java/com/kri/contact/server/service/ListSearchService.java b/src/main/java/com/kri/contact/server/service/ListSearchService.java new file mode 100644 index 0000000..40300b7 --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/ListSearchService.java @@ -0,0 +1,149 @@ +package com.kri.contact.server.service; + +import com.kri.contact.server.common.enums.ResultCodeType; +import com.kri.contact.server.dto.list.ListContactResultDto; +import com.kri.contact.server.dto.list.ListFilterDto; +import com.kri.contact.server.dto.list.ListResultBaseDto; +import com.kri.contact.server.dto.list.ListSearchBaseDto; +import com.kri.contact.server.dto.list.ListSearchRequestDto; +import com.kri.contact.server.dto.list.ListSearchWithResultDto; +import com.kri.contact.server.persistence.entity.TListEntity; +import com.kri.contact.server.persistence.entity.TListEventHistEntity; +import com.kri.contact.server.persistence.entity.TListItemEntity; +import com.kri.contact.server.persistence.repository.ListEventHistRepository; +import com.kri.contact.server.persistence.repository.ListItemRepository; +import com.kri.contact.server.persistence.repository.ListRepository; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ListSearchService { + + private final ListEventHistRepository listEventHistRepository; + private final ListItemRepository listItemRepository; + private final ListRepository listRepository; + private final ListHeaderService listHeaderService; + + @Transactional(readOnly = true) + public List getListSearchBaseList(Long prjctIdx, ListSearchRequestDto request) { + return createListSearchBase(prjctIdx, findPagedListEntities(prjctIdx, request)); + } + + @Transactional(readOnly = true) + public List getListSearchWithResultList(Long prjctIdx, ListSearchRequestDto request) { + return createListSearchWithResult(prjctIdx, findPagedListEntities(prjctIdx, request)); + } + + @Transactional(readOnly = true) + public List getAllListSearchBaseList(Long prjctIdx, ListFilterDto listFilter) { + List emailTelnumHeaderIds = listHeaderService.getEmailTelnumHeaderId(prjctIdx); + List listEntities = listRepository.findAllListEntities( + prjctIdx, + emailTelnumHeaderIds, + listFilter + ); + + return createListSearchBase(prjctIdx, listEntities); + } + + private List findPagedListEntities(Long prjctIdx, ListSearchRequestDto request) { + List emailTelnumHeaderIds = listHeaderService.getEmailTelnumHeaderId(prjctIdx); + + ListFilterDto listFilter = request == null ? null : request.getListFilter(); + return listRepository.findPagedListEntities( + prjctIdx, + emailTelnumHeaderIds, + listFilter, + request == null ? null : request.getPageRequest() + ); + } + + private List createListSearchBase(Long prjctIdx, List listEntities) { + return createListSearchRows(prjctIdx, listEntities).stream() + .map(row -> ListSearchBaseDto.from(row.listEntity(), row.itemList())) + .toList(); + } + + private List createListSearchWithResult(Long prjctIdx, List listEntities) { + List rows = createListSearchRows(prjctIdx, listEntities); + if (rows.isEmpty()) { + return Collections.emptyList(); + } + + List sids = rows.stream() + .map(row -> row.listEntity().getSid()) + .toList(); + + Map resultMap = listEventHistRepository + .findLatestListByEventTy(prjctIdx, sids) + .stream() + .collect(Collectors.toMap( + entity -> new ListResultKey(entity.getSid(), entity.getEventTy()), + entity -> entity, + (left, right) -> left + )); + + return rows.stream() + .map(row -> { + Integer sid = row.listEntity().getSid(); + return ListSearchWithResultDto.from( + row.listEntity(), + row.itemList(), + ListContactResultDto.from(resultMap.get(new ListResultKey(sid, ResultCodeType.CONTACT.getCode()))), + ListContactResultDto.from(resultMap.get(new ListResultKey(sid, ResultCodeType.INTERVIEW.getCode()))), + ListResultBaseDto.from(resultMap.get(new ListResultKey(sid, ResultCodeType.SURVEY.getCode()))) + ); + }) + .toList(); + } + + private List createListSearchRows(Long prjctIdx, List listEntities) { + if (listEntities.isEmpty()) { + return Collections.emptyList(); + } + + Set sidSet = listEntities.stream() + .map(TListEntity::getSid) + .collect(Collectors.toCollection(LinkedHashSet::new)); + + Map> itemMapBySid = listItemRepository + .findByIdPrjctIdxAndIdSidIn(prjctIdx, sidSet) + .stream() + .collect(Collectors.groupingBy( + TListItemEntity::getSid, + LinkedHashMap::new, + Collectors.toMap( + TListItemEntity::getListHderId, + TListItemEntity::getListItemVal, + (left, right) -> right, + LinkedHashMap::new + ) + )); + + return listEntities.stream() + .map(entity -> new ListSearchRow( + entity, + itemMapBySid.getOrDefault(entity.getSid(), Collections.emptyMap()) + )) + .toList(); + } + + private record ListSearchRow( + TListEntity listEntity, + Map itemList + ) {} + + private record ListResultKey( + Integer sid, + Short eventTy + ) {} +} diff --git a/src/main/java/com/kri/contact/server/service/ListService.java b/src/main/java/com/kri/contact/server/service/ListService.java deleted file mode 100644 index 1a6b146..0000000 --- a/src/main/java/com/kri/contact/server/service/ListService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.kri.contact.server.service; - -import com.kri.contact.server.persistence.repository.ListRepository; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class ListService { - - private final ListRepository listRepository; - private final ListItemService listItemService; - private final ListHeaderService listHeaderService; - -} diff --git a/src/main/java/com/kri/contact/server/service/ListUploadService.java b/src/main/java/com/kri/contact/server/service/ListUploadService.java new file mode 100644 index 0000000..61ff0fc --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/ListUploadService.java @@ -0,0 +1,518 @@ +package com.kri.contact.server.service; + +import static com.kri.common.feature.util.NumericUtil.parseOnlyInteger; +import static com.kri.common.feature.util.StringUtil.isBasicText; +import static com.kri.common.feature.util.StringUtil.isNullOrBlank; +import static com.kri.common.feature.util.StringUtil.normalizeBlank; +import static com.kri.common.feature.util.StringUtil.normalizeEmail; +import static com.kri.common.feature.util.StringUtil.normalizeOnlyNumber; +import static com.kri.contact.server.common.consts.ContactConstant.ASSIGN_TYPE; +import static com.kri.contact.server.common.consts.ContactConstant.DEFAULT_AND_FILE_TYPE; +import static com.kri.contact.server.common.consts.ContactConstant.LIST_TEXT_REGEX; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.kri.common.feature.excel.ExcelMapper; +import com.kri.common.feature.excel.StreamingReadOptions; +import com.kri.common.feature.web.BusinessException; +import com.kri.contact.server.common.consts.ContactConstant; +import com.kri.contact.server.common.enums.ListHeaderGrade; +import com.kri.contact.server.common.enums.ListHeaderType; +import com.kri.contact.server.common.enums.ListHeaderTypeSpecific; +import com.kri.contact.server.common.enums.ListIsUse; +import com.kri.contact.server.common.enums.ListResetMode; +import com.kri.contact.server.common.enums.ListUploadMode; +import com.kri.contact.server.common.util.ExcelUploadResultUtil; +import com.kri.contact.server.dto.excel.ExcelUploadResultDto; +import com.kri.contact.server.dto.excel.ListUploadErrorDto; +import com.kri.contact.server.dto.list.ListHeaderDto; +import com.kri.contact.server.dto.list.ListUploadRequestDto; +import com.kri.contact.server.persistence.entity.TListUploadLogEntity; +import com.kri.contact.server.persistence.jdbc.ListUploadJdbcSupport; +import com.kri.contact.server.persistence.jdbc.ListUploadJdbcSupport.ListAssignRowInsert; +import com.kri.contact.server.persistence.jdbc.ListUploadJdbcSupport.ListItemRowInsert; +import com.kri.contact.server.persistence.jdbc.ListUploadJdbcSupport.ListRowInsert; +import com.kri.contact.server.persistence.jdbc.ListUploadJdbcSupport.TmpSpecialRow; +import com.kri.contact.server.persistence.repository.ListRepository; +import com.kri.contact.server.persistence.repository.ListUploadLogRepository; +import com.kri.contact.server.service.file.ListFileService; +import java.io.ByteArrayOutputStream; +import java.nio.file.Path; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; +import lombok.RequiredArgsConstructor; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +@Service +@RequiredArgsConstructor +public class ListUploadService { + + private static final StreamingReadOptions LOWER_CASE_HEADER_OPTIONS = + new StreamingReadOptions(null, 0, 1, header -> header == null ? null : header.toLowerCase(Locale.ROOT)); + + private final ListRepository listRepository; + private final ListUploadJdbcSupport listUploadJdbcSupport; + private final ListUploadLogRepository listUploadLogRepository; + private final ListHeaderService listHeaderService; + private final ListResetService listResetService; + private final ListFileService listFileService; + private final AssignService assignService; + private final ObjectMapper objectMapper; + + public byte[] downloadExcelTemplate(Long prjctIdx) { + List listHeaderList = listHeaderService.getHeader(prjctIdx).stream() + .sorted(Comparator.comparing(ListHeaderDto::getListHderOrder)) + .toList(); + + Map headerRow = new LinkedHashMap<>(); + for (ListHeaderDto header : listHeaderList) { + headerRow.put(header.getListHderNm(), null); + } + + try ( + Workbook workbook = ExcelMapper.writeFromMapList(List.of(headerRow)); + ByteArrayOutputStream out = new ByteArrayOutputStream() + ) { + Sheet sheet = workbook.getSheetAt(0); + for (int i = 0; i < headerRow.size(); i++) { + sheet.autoSizeColumn(i); + sheet.setColumnWidth(i, Math.min(sheet.getColumnWidth(i) + 1024, 255 * 256)); + } + + workbook.write(out); + return out.toByteArray(); + } catch (Exception e) { + throw BusinessException.internalError("리스트 업로드 템플릿 엑셀 생성 중 오류"); + } + } + + @Transactional + public ExcelUploadResultDto uploadExcel( + Long prjctIdx, + MultipartFile file, + ListUploadRequestDto request, + String uploadUser, + LocalDateTime uploadDt + ) { + Path listFilePath = listFileService.saveListFile(file, prjctIdx); + + List excelHeaders = ExcelMapper.readHeaderStreaming(listFilePath, LOWER_CASE_HEADER_OPTIONS); + List headerErrorList = new ArrayList<>(); + + List resolvedHeaders = listHeaderService.resolveUploadHeaders( + prjctIdx, + excelHeaders, + request, + headerErrorList + ); + if (!headerErrorList.isEmpty()) { + return buildErrorResponse(0, headerErrorList, listFilePath); + } + + List existingHeaders = listHeaderService.getHeader(prjctIdx); + List existingCommon = existingHeaders.stream() + .filter(h -> Objects.equals(h.getListHderGrad(), ListHeaderGrade.COMMON)) + .sorted(Comparator.comparing(ListHeaderDto::getListHderOrder)) + .toList(); + + if (!existingCommon.isEmpty() && !listHeaderService.isEqualHeader(existingHeaders, resolvedHeaders, false)) { + headerErrorList.add(ListUploadErrorDto.of(1, "헤더", "기존 헤더와 업로드 헤더가 일치하지 않습니다.")); + return buildErrorResponse(0, headerErrorList, listFilePath); + } + + List prjctAssignList = assignService.getPrjctOutsourceAndFieldworkAssign(prjctIdx); + + TListUploadLogEntity uploadLog = createPendingLog( + prjctIdx, + listFilePath, + request, + uploadUser, + uploadDt + ); + + ValidationSummary validation = validateFile( + prjctIdx, + listFilePath, + request, + resolvedHeaders, + prjctAssignList, + uploadLog.getListUploadLogId() + ); + + markValidated(uploadLog, validation.totalCount()); + + if (!validation.errors().isEmpty()) { + listUploadJdbcSupport.deleteTemp(uploadLog.getListUploadLogId()); + return buildErrorResponse(validation.totalCount(), validation.errors(), listFilePath); + } + + persistUpload( + prjctIdx, + listFilePath, + request, + resolvedHeaders, + uploadLog.getListUploadLogId(), + validation.uploadedSids(), + uploadUser, + uploadDt + ); + + markSuccess(uploadLog, validation.totalCount()); + listUploadJdbcSupport.deleteTemp(uploadLog.getListUploadLogId()); + + return ExcelUploadResultDto.success(validation.totalCount(), validation.totalCount()); + } + + private TListUploadLogEntity createPendingLog( + Long prjctIdx, + Path listFilePath, + ListUploadRequestDto request, + String uploadUser, + LocalDateTime uploadDt + ) { + TListUploadLogEntity uploadLog = TListUploadLogEntity.create( + prjctIdx, + listUploadLogRepository.findMaxWaveByPrjctIdx(prjctIdx) + 1, + listFilePath.getFileName().toString(), + request.getUploadMode().getCode(), + objectMapper.convertValue(request, new TypeReference>() {}), + uploadUser, + uploadDt + ); + + return listUploadLogRepository.save(uploadLog); + } + + private void markValidated(TListUploadLogEntity uploadLog, int totalCount) { + uploadLog.setListCnt(totalCount); + uploadLog.setSuccess(false); + listUploadLogRepository.save(uploadLog); + } + + private void markSuccess(TListUploadLogEntity uploadLog, int totalCount) { + uploadLog.setListCnt(totalCount); + uploadLog.setSuccess(true); + listUploadLogRepository.save(uploadLog); + } + + private void persistUpload( + Long prjctIdx, + Path listFilePath, + ListUploadRequestDto request, + List resolvedHeaders, + String listUploadLogId, + Set uploadedSids, + String uploadUser, + LocalDateTime uploadDt + ) { + listHeaderService.upsertHeader(prjctIdx, resolvedHeaders, uploadUser, uploadDt); + + if (request.getUploadMode() == ListUploadMode.CHANGE) { + listResetService.resetByFilter( + prjctIdx, + null, + ListResetMode.ALL, + uploadUser, + uploadDt + ); + } + else if (request.getUploadMode() == ListUploadMode.ADD && !uploadedSids.isEmpty()) { + listResetService.resetBySids( + prjctIdx, + uploadedSids, + ListResetMode.LIST_UPLOAD, + uploadUser, + uploadDt + ); + } + + String sidHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.SID); + String isUseHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.IS_USE); + String memoHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.MEMO); + List assginHeaderNames = listHeaderService.findHeaderNamesByTypes(resolvedHeaders, ASSIGN_TYPE); + + List listRows = new ArrayList<>(); + List itemRows = new ArrayList<>(); + List assignRows = new ArrayList<>(); + + ExcelMapper.readStreaming(listFilePath, LOWER_CASE_HEADER_OPTIONS, (row, rowNo) -> { + Integer sid = parseOnlyInteger(row.get(sidHeaderName)); + short isUse = parseIsUseSafe(row.get(isUseHeaderName)); + String memo = normalizeBlank(row.get(memoHeaderName)); + + listRows.add(new ListRowInsert( + prjctIdx, + sid, + listUploadLogId, + isUse, + memo == null ? "" : memo, + uploadUser, + uploadDt + )); + + for (String assignHeaderName : assginHeaderNames) { + String userId = normalizeBlank(row.get(assignHeaderName)); + + assignRows.add(new ListAssignRowInsert( + prjctIdx, + sid, + userId, + uploadUser, + uploadDt + )); + } + + for (ListHeaderDto header : resolvedHeaders) { + if (DEFAULT_AND_FILE_TYPE.contains(header.getListHderTy())) { + continue; + } + + String raw = normalizeBlank(row.get(header.getListHderNm())); + if (header.getListHderTy() == ListHeaderType.EMAIL) { + raw = normalizeEmail(raw); + } + else if (header.getListHderTy() == ListHeaderType.TEL_NUM) { + raw = normalizeOnlyNumber(raw); + } + + itemRows.add(new ListItemRowInsert( + prjctIdx, + sid, + header.getListHderId(), + raw, + uploadUser, + uploadDt + )); + } + + if (listRows.size() >= ContactConstant.INSERT_CHUNK_SIZE) { + listUploadJdbcSupport.batchInsertList(listRows, ContactConstant.INSERT_CHUNK_SIZE); + listRows.clear(); + } + if (itemRows.size() >= ContactConstant.INSERT_CHUNK_SIZE) { + listUploadJdbcSupport.batchInsertListItem(itemRows, ContactConstant.INSERT_CHUNK_SIZE); + itemRows.clear(); + } + if (assignRows.size() >= ContactConstant.INSERT_CHUNK_SIZE) { + listUploadJdbcSupport.batchInsertListAssign(assignRows, ContactConstant.INSERT_CHUNK_SIZE); + assignRows.clear(); + } + }); + + if (!listRows.isEmpty()) { + listUploadJdbcSupport.batchInsertList(listRows, ContactConstant.INSERT_CHUNK_SIZE); + } + if (!itemRows.isEmpty()) { + listUploadJdbcSupport.batchInsertListItem(itemRows, ContactConstant.INSERT_CHUNK_SIZE); + } + if (!assignRows.isEmpty()) { + listUploadJdbcSupport.batchInsertListAssign(assignRows, ContactConstant.INSERT_CHUNK_SIZE); + } + } + + private ValidationSummary validateFile( + Long prjctIdx, + Path listFilePath, + ListUploadRequestDto request, + List resolvedHeaders, + List prjctAssignList, + String listUploadLogId + ) { + Map headerById = toHeaderById(resolvedHeaders); + + String sidHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.SID); + String isUseHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.IS_USE); + List assginHeaderNames = listHeaderService.findHeaderNamesByTypes(resolvedHeaders, ASSIGN_TYPE); + + Set existingSids = listRepository.findSidsByPrjctIdx(prjctIdx); + Set uploadedSids = new LinkedHashSet<>(); + List errors = new ArrayList<>(); + List tempBuffer = new ArrayList<>(); + AtomicInteger totalCount = new AtomicInteger(); + + listUploadJdbcSupport.deleteTemp(listUploadLogId); + + ExcelMapper.readStreaming(listFilePath, LOWER_CASE_HEADER_OPTIONS, (row, rowNo) -> { + totalCount.incrementAndGet(); + + Integer sid = parseOnlyInteger(row.get(sidHeaderName)); + if (sid == null) { + errors.add(ListUploadErrorDto.of(rowNo, sidHeaderName, "SID는 필수이며 정수여야 합니다.")); + return; + } + + Short isUse = parseIsUse(row.get(isUseHeaderName)); + if (isUse == null) { + errors.add(ListUploadErrorDto.of(rowNo, isUseHeaderName, "사용 여부는 O, X, TEST만 허용됩니다.")); + } + + if (request.getUploadMode() == ListUploadMode.ADD && existingSids.contains(sid)) { + errors.add(ListUploadErrorDto.of(rowNo, sidHeaderName, "이미 존재하는 SID입니다.")); + } + + if (!uploadedSids.add(sid)) { + errors.add(ListUploadErrorDto.of(rowNo, sidHeaderName, "업로드 파일 내 SID가 중복됩니다.")); + } + + for (String assignHeaderName : assginHeaderNames) { + String raw = normalizeBlank(row.get(assignHeaderName)); + if (!prjctAssignList.contains(raw)) { + errors.add(ListUploadErrorDto.of( + rowNo, + assignHeaderName, + "프로젝트에 배정되지 않은 사용자입니다." + )); + } + } + + for (ListHeaderDto header : resolvedHeaders) { + if (DEFAULT_AND_FILE_TYPE.contains(header.getListHderTy())) { + continue; + } + + String raw = normalizeBlank(row.get(header.getListHderNm())); + if (isNullOrBlank(raw)) { + continue; + } + + if (header.getListHderTy() == ListHeaderType.TEXT && !isBasicText(raw, LIST_TEXT_REGEX)) { + errors.add(ListUploadErrorDto.of( + rowNo, + header.getListHderNm(), + "데이터에 들어갈 수 없는 문자열이 있습니다. 한글, 영문, 숫자, 공백, 괄호(), 밑줄(_), 하이픈(-), 대괄호[]만 입력할 수 있습니다." + )); + + continue; + } + + if (header.getListHderTy() == ListHeaderType.EMAIL) { + String normalized = normalizeEmail(raw); + + if (normalized == null) { + errors.add(ListUploadErrorDto.of(rowNo, header.getListHderNm(), "이메일 형식이 올바르지 않습니다.")); + continue; + } + + if (request.isCheckDuplicateEmail()) { + tempBuffer.add(new TmpSpecialRow( + listUploadLogId, prjctIdx, rowNo, sid, header.getListHderId(), + ListHeaderTypeSpecific.EMAIL.getCode(), + raw, normalized + )); + } + } else if (header.getListHderTy() == ListHeaderType.TEL_NUM) { + String normalized = normalizeOnlyNumber(raw); + + if (normalized == null) { + errors.add(ListUploadErrorDto.of(rowNo, header.getListHderNm(), "전화번호 형식이 올바르지 않습니다.")); + continue; + } + + if (request.isCheckDuplicatePhone()) { + tempBuffer.add(new TmpSpecialRow( + listUploadLogId, prjctIdx, rowNo, sid, header.getListHderId(), + ListHeaderTypeSpecific.TEL_NUM.getCode(), + raw, normalized + )); + } + } + } + + if (tempBuffer.size() >= ContactConstant.INSERT_CHUNK_SIZE) { + listUploadJdbcSupport.batchInsertTemp(tempBuffer, ContactConstant.INSERT_CHUNK_SIZE); + tempBuffer.clear(); + } + }); + + if (!tempBuffer.isEmpty()) { + listUploadJdbcSupport.batchInsertTemp(tempBuffer, ContactConstant.INSERT_CHUNK_SIZE); + tempBuffer.clear(); + } + + for (ListUploadJdbcSupport.DuplicateHit hit : listUploadJdbcSupport.findFileDuplicateRows(listUploadLogId)) { + String fieldName = headerById.get(hit.listHderId()).getListHderNm(); + errors.add(ListUploadErrorDto.of(hit.rowNo(), fieldName, "업로드 파일 내 중복값입니다.")); + } + + if (request.isCheckDuplicateEmail() || request.isCheckDuplicatePhone()) { + boolean changeMode = request.getUploadMode() == ListUploadMode.CHANGE; + for (ListUploadJdbcSupport.DuplicateHit hit : listUploadJdbcSupport.findDbDuplicateRows( + listUploadLogId, prjctIdx, changeMode + )) { + String fieldName = headerById.get(hit.listHderId()).getListHderNm(); + errors.add(ListUploadErrorDto.of(hit.rowNo(), fieldName, "DB 내 중복값입니다.")); + } + } + + return new ValidationSummary(totalCount.get(), uploadedSids, errors); + } + + private ExcelUploadResultDto buildErrorResponse( + int totalCount, + List errorList, + Path sourceFile + ) { + String origin = sourceFile.getFileName().toString(); + String errorFileName = origin.endsWith(".xlsx") + ? origin.substring(0, origin.length() - 5) + "_error.xlsx" + : origin + "_error.xlsx"; + int failCount = errorList.stream() + .map(ListUploadErrorDto::getRowNumber) + .distinct() + .toList() + .size(); + + return ExcelUploadResultUtil.buildUploadResult( + totalCount, + 0, + failCount, + errorList, + ListUploadErrorDto.class, + errorFileName + ); + } + + private Map toHeaderById(List headers) { + Map map = new LinkedHashMap<>(); + for (ListHeaderDto h : headers) { + map.put(h.getListHderId(), h); + } + return map; + } + + private Short parseIsUse(String raw) { + String s = normalizeBlank(raw); + s = s == null ? "" : s.toUpperCase(); + + return switch (s) { + case "O" -> ListIsUse.USABLE.getCode(); + case "X" -> ListIsUse.UNUSABLE.getCode(); + case "TEST" -> ListIsUse.TEST.getCode(); + default -> null; + }; + } + + private short parseIsUseSafe(String raw) { + Short code = parseIsUse(raw); + return code == null ? ListIsUse.USABLE.getCode() : code; + } + + private record ValidationSummary( + int totalCount, + Set uploadedSids, + List errors + ) {} +} 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 860fd1e..173b56a 100644 --- a/src/main/java/com/kri/contact/server/service/ProjectService.java +++ b/src/main/java/com/kri/contact/server/service/ProjectService.java @@ -1,9 +1,9 @@ package com.kri.contact.server.service; -import com.kri.common.web.BusinessException; -import com.kri.common.webmvc.page.PageRequestDto; -import com.kri.common.webmvc.page.PageResponseDto; -import com.kri.common.webmvc.page.Pageables; +import com.kri.common.feature.web.BusinessException; +import com.kri.common.feature.web.page.PageRequestDto; +import com.kri.common.feature.web.page.PageResponseDto; +import com.kri.common.feature.web.page.Pageables; import com.kri.contact.server.common.consts.ContactConstant; import com.kri.contact.server.dto.project.ProjectCreateRequestDto; import com.kri.contact.server.dto.project.ProjectInfoDto; diff --git a/src/main/java/com/kri/contact/server/service/SystemEventLogService.java b/src/main/java/com/kri/contact/server/service/SystemEventLogService.java index 138517e..d62e43a 100644 --- a/src/main/java/com/kri/contact/server/service/SystemEventLogService.java +++ b/src/main/java/com/kri/contact/server/service/SystemEventLogService.java @@ -1,6 +1,6 @@ package com.kri.contact.server.service; -import static com.kri.common.json.JsonUtil.toMap; +import static com.kri.common.feature.json.JsonUtil.toMap; import com.fasterxml.jackson.databind.ObjectMapper; import com.kri.contact.server.common.enums.SystemEventType; @@ -138,11 +138,25 @@ public class SystemEventLogService { regId, regDt, clientIp, - "listHeader", + "headerList", headerList ); } + public void writeUploadList(String regId, LocalDateTime regDt, String clientIp, + Long prjctIdx, String uploadFileName){ + writeSystemLog( + SystemEventType.UPLOAD_LIST, + "Upload List", + prjctIdx, + regId, + regDt, + clientIp, + "uploadFileName", + uploadFileName + ); + } + protected void writeSystemLog( SystemEventType eventType, String title, diff --git a/src/main/java/com/kri/contact/server/service/UserService.java b/src/main/java/com/kri/contact/server/service/UserService.java index 23d1cc2..65105cc 100644 --- a/src/main/java/com/kri/contact/server/service/UserService.java +++ b/src/main/java/com/kri/contact/server/service/UserService.java @@ -1,13 +1,13 @@ package com.kri.contact.server.service; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.excel.ExcelMapper; -import com.kri.common.web.BusinessException; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.excel.ExcelMapper; +import com.kri.common.feature.web.BusinessException; import com.kri.contact.server.common.consts.ContactConstant; import com.kri.contact.server.common.external.intranet.IntranetExtensionApiClient; import com.kri.contact.server.common.util.ExcelUploadResultUtil; import com.kri.contact.server.dto.common.DataVerificationDto; -import com.kri.contact.server.dto.excel.ExcelUploadResponseDto; +import com.kri.contact.server.dto.excel.ExcelUploadResultDto; import com.kri.contact.server.dto.user.RoleInfoDto; import com.kri.contact.server.dto.user.UserInfoDto; import com.kri.contact.server.dto.excel.UserUploadDto; @@ -31,6 +31,7 @@ import org.springframework.web.multipart.MultipartFile; public class UserService { private final IntranetExtensionApiClient intranetExtensionApiClient; + private final AssignService assignService; private final RoleService roleService; private final UserRepository userRepository; @@ -54,19 +55,24 @@ public class UserService { } @Transactional - public ExcelUploadResponseDto createUsersFromExcel(MultipartFile file, String regUser, + public ExcelUploadResultDto createUsersFromExcel(MultipartFile file, String regUser, LocalDateTime regDt, String forceCmpn) { if (file == null || file.isEmpty()) { throw BusinessException.badRequest("EMPTY_FILE", "업로드된 파일이 없습니다."); } + String fileName = file.getOriginalFilename(); + String errorFileName = fileName != null && fileName.endsWith(".xlsx") + ? fileName.substring(0, fileName.length() - 5) + "_error.xlsx" + : fileName + "_error.xlsx"; + List rows; try (Workbook workbook = WorkbookFactory.create(file.getInputStream())) { // DTO 매핑 (스트리밍 X, 일반 방식) rows = ExcelMapper.readFromWorkbook(workbook, UserUploadDto.class); } catch (Exception e) { throw BusinessException.badRequest("INVALID_EXCEL", "엑셀 파일을 읽는 중 오류가 발생했습니다.") - .with("fileName", file.getOriginalFilename()); + .with("fileName", fileName); } int totalCount = rows.size(); @@ -114,12 +120,19 @@ public class UserService { } } + int failCount = errorList.stream() + .map(UserUploadErrorDto::getRowNumber) + .distinct() + .toList() + .size(); + return ExcelUploadResultUtil.buildUploadResult( totalCount, successCount, + failCount, errorList, UserUploadErrorDto.class, - "user_upload_errors.xlsx" + errorFileName ); } @@ -205,6 +218,10 @@ public class UserService { .with("userId", dto.getUserId()) ); + if(entity.getUserRole() != dto.getUserRole()) { + assignService.deleteListAssignWithUser(dto.getUserId()); + } + entity.updateFromDto(dto, modUser, modDt);// 기존 엔티티에 적용 } @@ -307,7 +324,7 @@ public class UserService { Integer userRole = dto.getUserRole(); if (roleList != null && !roleList.isEmpty()) { boolean exists = roleList.stream() - .anyMatch(r -> userRole.equals(r.getRoleCd())); + .anyMatch(r -> userRole != null && userRole.equals(r.getRoleCd())); if (!exists) { result.add(new DataVerificationDto( diff --git a/src/main/java/com/kri/contact/server/service/file/AbstractFileService.java b/src/main/java/com/kri/contact/server/service/file/AbstractFileService.java new file mode 100644 index 0000000..259a4ba --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/file/AbstractFileService.java @@ -0,0 +1,131 @@ +package com.kri.contact.server.service.file; + +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.util.CommonUtil; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.util.Optional; +import org.springframework.web.multipart.MultipartFile; + +public abstract class AbstractFileService { + + protected abstract Path getBaseDir(); + + protected String extractExtension(String originalFileName) { + if (originalFileName == null || originalFileName.isBlank()) { + return ""; + } + + int dot = originalFileName.lastIndexOf('.'); + if (dot > -1 && dot < originalFileName.length() - 1) { + return originalFileName.substring(dot); + } + + return ""; + } + + protected String extractBaseName(String originalFileName) { + if (originalFileName == null || originalFileName.isBlank()) { + return "file"; + } + + String fileName = java.nio.file.Paths.get(originalFileName).getFileName().toString(); + int dot = fileName.lastIndexOf('.'); + + if (dot > 0) { + return fileName.substring(0, dot); + } + + return fileName; + } + + protected String buildFileName(MultipartFile file) { + String original = Optional.ofNullable(file.getOriginalFilename()).orElse("file"); + return CommonUtil.uuid32() + extractExtension(original); + } + + protected String buildFileNameWithTime(MultipartFile file, String prefix) { + String original = Optional.ofNullable(file.getOriginalFilename()).orElse("file"); + String baseName = extractBaseName(original); + String ext = extractExtension(original); + + String timestamp = DateTimeUtil.nowKstLocalDateTime() + .format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss")); + + return prefix + "_" + timestamp + "_" + baseName + ext; + } + + protected Path createDirectories(Path dir) throws IOException { + return Files.createDirectories(dir.toAbsolutePath().normalize()); + } + + protected String saveFile(Path dir, MultipartFile file) throws IOException { + if (file == null || file.isEmpty()) { + throw new IllegalArgumentException("업로드할 파일이 없습니다."); + } + + Path normalizedDir = createDirectories(dir); + String fileName = buildFileName(file); + Path target = normalizedDir.resolve(fileName).normalize(); + + if (!target.startsWith(normalizedDir)) { + throw new IllegalStateException("잘못된 파일 경로입니다."); + } + + file.transferTo(target.toFile()); + return fileName; + } + + protected void saveFile(Path dir, MultipartFile file, String fileName) throws IOException { + if (file == null || file.isEmpty()) { + throw new IllegalArgumentException("업로드할 파일이 없습니다."); + } + + Path normalizedDir = createDirectories(dir); + Path target = normalizedDir.resolve(fileName).normalize(); + + if (!target.startsWith(normalizedDir)) { + throw new IllegalStateException("잘못된 파일 경로입니다."); + } + + file.transferTo(target.toFile()); + } + + protected void moveFile(Path sourceDir, Path targetDir, String fileName) throws IOException { + if (fileName == null || fileName.isBlank()) { + return; + } + + Path normalizedSourceDir = sourceDir.toAbsolutePath().normalize(); + Path normalizedTargetDir = createDirectories(targetDir); + + Path source = normalizedSourceDir.resolve(fileName).normalize(); + Path target = normalizedTargetDir.resolve(fileName).normalize(); + + if (!source.startsWith(normalizedSourceDir) || !target.startsWith(normalizedTargetDir)) { + throw new IllegalStateException("잘못된 파일 경로입니다."); + } + if (!Files.exists(source)) { + return; + } + + Files.move(source, target, StandardCopyOption.REPLACE_EXISTING); + } + + protected void deleteFile(Path dir, String fileName) throws IOException { + if (fileName == null || fileName.isBlank()) { + return; + } + + Path normalizedDir = dir.toAbsolutePath().normalize(); + Path target = normalizedDir.resolve(fileName).normalize(); + + if (!target.startsWith(normalizedDir)) { + throw new IllegalStateException("잘못된 파일 경로입니다."); + } + + Files.deleteIfExists(target); + } +} diff --git a/src/main/java/com/kri/contact/server/service/file/ContactScenarioFileService.java b/src/main/java/com/kri/contact/server/service/file/ContactScenarioFileService.java index 4b5ace4..dadae46 100644 --- a/src/main/java/com/kri/contact/server/service/file/ContactScenarioFileService.java +++ b/src/main/java/com/kri/contact/server/service/file/ContactScenarioFileService.java @@ -1,6 +1,6 @@ package com.kri.contact.server.service.file; -import com.kri.common.file.FileUtil; +import com.kri.common.feature.file.FileUtil; import com.kri.contact.server.config.FileStorageProperties; import java.io.IOException; import java.nio.file.DirectoryStream; @@ -148,4 +148,4 @@ public class ContactScenarioFileService extends AbstractFileService { } return url.endsWith("/") ? url.substring(0, url.length() - 1) : url; } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/contact/server/service/file/ListFileService.java b/src/main/java/com/kri/contact/server/service/file/ListFileService.java new file mode 100644 index 0000000..6355bb2 --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/file/ListFileService.java @@ -0,0 +1,35 @@ +package com.kri.contact.server.service.file; + +import com.kri.common.feature.web.BusinessException; +import com.kri.contact.server.config.FileStorageProperties; +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +@Service +@RequiredArgsConstructor +public class ListFileService extends AbstractFileService { + + private final FileStorageProperties properties; + + @Override + protected Path getBaseDir() { + return Paths.get(properties.getListBaseDir()).toAbsolutePath().normalize(); + } + + public Path saveListFile(MultipartFile file, Long prjctIdx) { + String newFileName = buildFileNameWithTime(file, prjctIdx.toString()); + Path dir = getBaseDir().resolve(prjctIdx.toString()).toAbsolutePath().normalize(); + Path savedPath = dir.resolve(newFileName).toAbsolutePath().normalize(); + + try { + saveFile(dir, file, newFileName); + return savedPath; + } catch (IOException e) { + throw BusinessException.internalError("FAIL_LIST_UPLOAD", e.getMessage()); + } + } +} diff --git a/src/main/java/com/kri/contact/server/service/file/ListItemFileService.java b/src/main/java/com/kri/contact/server/service/file/ListItemFileService.java new file mode 100644 index 0000000..4551d49 --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/file/ListItemFileService.java @@ -0,0 +1,19 @@ +package com.kri.contact.server.service.file; + +import com.kri.contact.server.config.FileStorageProperties; +import java.nio.file.Path; +import java.nio.file.Paths; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ListItemFileService extends AbstractFileService { + + private final FileStorageProperties properties; + + @Override + protected Path getBaseDir() { + return Paths.get(properties.getListBaseDir()); + } +} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 077e489..0205274 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -59,7 +59,6 @@ kri: temp-expire-hours: 24 temp-cleanup-cron: "0 0 0 * * *" # 매일 00:00(초 분 시 일 월 요일) -common: web: enabled: true # 공통 Web 구성 사용 여부 (기본 true) webmvc: -- 2.49.0.windows.1 From e303dc2989f333b21661ac7ea7e7fbab8ec1a202 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Fri, 10 Apr 2026 10:28:12 +0900 Subject: [PATCH 6/9] =?UTF-8?q?260410=5F01=5FENH:=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=97=85=EB=A1=9C=EB=93=9C,=20=EC=A1=B0=ED=9A=8C,?= =?UTF-8?q?=20=EC=82=AD=EC=A0=9C=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20Contro?= =?UTF-8?q?ller=20=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/common/enums/SystemEventType.java | 2 +- .../server/controller/ListController.java | 66 ++++- .../server/dto/list/ListFilterDto.java | 15 + .../server/dto/list/ListResetRequestDto.java | 23 ++ .../server/dto/list/ListUpdateRequestDto.java | 23 ++ .../jdbc/ListUpdateJdbcSupport.java | 198 ++++++++++++++ .../repository/ListItemRepository.java | 6 + .../repository/ListRepository.java | 3 + .../server/service/ListResetService.java | 15 +- .../server/service/ListSearchService.java | 122 +++++++-- .../server/service/ListUpdateService.java | 257 ++++++++++++++++++ .../server/service/SystemEventLogService.java | 14 + 12 files changed, 708 insertions(+), 36 deletions(-) create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListResetRequestDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListUpdateRequestDto.java create mode 100644 src/main/java/com/kri/contact/server/persistence/jdbc/ListUpdateJdbcSupport.java create mode 100644 src/main/java/com/kri/contact/server/service/ListUpdateService.java diff --git a/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java b/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java index f80b454..7bb7d9a 100644 --- a/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java +++ b/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java @@ -31,7 +31,7 @@ public enum SystemEventType implements CodeEnum { UPSERT_LIST_HEADER((short) 1011), //리스트 헤더 수정 UPLOAD_LIST((short) 1021), //리스트 업로드 UPDATE_LIST((short) 1022), //리스트 수정 - DELETE_LIST((short) 1023), //리스트 삭제 + RESET_LIST((short) 1023), //리스트 삭제 DUMMY((short) 9999); diff --git a/src/main/java/com/kri/contact/server/controller/ListController.java b/src/main/java/com/kri/contact/server/controller/ListController.java index 8169c1d..78b640b 100644 --- a/src/main/java/com/kri/contact/server/controller/ListController.java +++ b/src/main/java/com/kri/contact/server/controller/ListController.java @@ -3,9 +3,18 @@ package com.kri.contact.server.controller; import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.web.BusinessException; import com.kri.common.feature.web.RequestUserContext; +import com.kri.common.feature.web.page.PageResponseDto; import com.kri.contact.server.dto.excel.ExcelUploadResultDto; +import com.kri.contact.server.dto.list.ListResetRequestDto; +import com.kri.contact.server.dto.list.ListSearchRequestDto; +import com.kri.contact.server.dto.list.ListSearchResponseDto; +import com.kri.contact.server.dto.list.ListSearchWithResultDto; +import com.kri.contact.server.dto.list.ListUpdateRequestDto; import com.kri.contact.server.dto.list.ListUploadRequestDto; import com.kri.contact.server.dto.project.ProjectInfoDto; +import com.kri.contact.server.service.ListResetService; +import com.kri.contact.server.service.ListSearchService; +import com.kri.contact.server.service.ListUpdateService; import com.kri.contact.server.service.ListUploadService; import com.kri.contact.server.service.ProjectService; import com.kri.contact.server.service.SystemEventLogService; @@ -19,8 +28,11 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestPart; @@ -34,11 +46,32 @@ import org.springframework.web.multipart.MultipartFile; public class ListController { private final ProjectService projectService; + private final ListSearchService listSearchService; private final ListUploadService listUploadService; + private final ListUpdateService listUpdateService; + private final ListResetService listResetService; private final SystemEventLogService systemEventLogService; + @Operation(summary = "리스트 정보 조회 With Sid") + @GetMapping("/search/{prjctIdx}/{sid}") + public ListSearchWithResultDto getListSearchWithResult( + @PathVariable Long prjctIdx, + @PathVariable Integer sid + ){ + return listSearchService.getListSearchOne(prjctIdx, sid); + } + + @Operation(summary = "리스트 정보 조회 With Filter") + @PostMapping("/search/{prjctIdx}") + public PageResponseDto searchListWithFilter( + @PathVariable Long prjctIdx, + @Valid @RequestBody ListSearchRequestDto request + ){ + return listSearchService.getListSearchWithResultList(prjctIdx, request); + } + @Operation(summary = "리스트 파일 업로드 양식 다운로드") - @PostMapping("excel/template/{prjctIdx}") + @PostMapping("/excel/template/{prjctIdx}") public ResponseEntity downloadExcelTemplate( @PathVariable Long prjctIdx, RequestUserContext ctx @@ -59,7 +92,7 @@ public class ListController { } @Operation(summary = "리스트 파일 업로드") - @PostMapping(value = "excel/upload/{prjctIdx}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + @PostMapping(value = "/excel/upload/{prjctIdx}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public ExcelUploadResultDto uploadExcel( @PathVariable Long prjctIdx, @RequestParam("file") MultipartFile file, @@ -76,4 +109,33 @@ public class ListController { return result; } + + @Operation(summary = "리스트 수정") + @PostMapping("/update/{prjctIdx}") + public int updateList( + @PathVariable Long prjctIdx, + @Valid @RequestBody ListUpdateRequestDto request, + RequestUserContext ctx) { + final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + + int updateCount = listUpdateService.updateList(prjctIdx, request, ctx.getUserRole(), ctx.getUserId(), now); + systemEventLogService.writeUpdateList(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, request); + + return updateCount; + } + + @Operation(summary = "리스트 삭제") + @DeleteMapping("/{prjctIdx}") + public int resetList( + @PathVariable Long prjctIdx, + @Valid @RequestBody ListResetRequestDto request, + RequestUserContext ctx + ){ + final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + + int resetCount = listResetService.resetByFilter(prjctIdx, request.getListFilter(), request.getResetMode(), ctx.getUserId(), now); + systemEventLogService.writeResetList(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, request); + + return resetCount; + } } diff --git a/src/main/java/com/kri/contact/server/dto/list/ListFilterDto.java b/src/main/java/com/kri/contact/server/dto/list/ListFilterDto.java index 2f70ca6..defa81f 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListFilterDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListFilterDto.java @@ -5,11 +5,17 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import java.util.Map; import java.util.Set; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; @Getter @Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor @Schema(description = "리스트 필터 Dto") public class ListFilterDto { @@ -27,4 +33,13 @@ public class ListFilterDto { @NotNull @Schema(description = "그 외 필터 정보") private Map> otherItems; + + public static ListFilterDto onlyOneSid(Integer sid) { + return ListFilterDto.builder() + .sidSet(Set.of(sid)) + .listUseSet(Set.of()) + .memo("") + .otherItems(Map.of()) + .build(); + } } diff --git a/src/main/java/com/kri/contact/server/dto/list/ListResetRequestDto.java b/src/main/java/com/kri/contact/server/dto/list/ListResetRequestDto.java new file mode 100644 index 0000000..cbf1297 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListResetRequestDto.java @@ -0,0 +1,23 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.common.enums.ListResetMode; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@Schema(description = "리스트 초기화 요청 DTO") +public class ListResetRequestDto { + + @NotNull + @Schema(description = "초기화 범위") + private ListResetMode resetMode; + + @NotNull + @Schema(description = "리스트 필터") + private ListFilterDto listFilter; +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListUpdateRequestDto.java b/src/main/java/com/kri/contact/server/dto/list/ListUpdateRequestDto.java new file mode 100644 index 0000000..904b534 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListUpdateRequestDto.java @@ -0,0 +1,23 @@ +package com.kri.contact.server.dto.list; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import java.util.Map; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@Schema(description = "리스트 정보 수정 요청 DTO") +public class ListUpdateRequestDto { + + @NotNull + @Schema(description = "리스트 정보 수정내용 sid를 제외한 모든 내용, listHderId by listItemValue") + private Map updateContents; + + @NotNull + @Schema(description = "리스트 필터") + private ListFilterDto listFilter; +} diff --git a/src/main/java/com/kri/contact/server/persistence/jdbc/ListUpdateJdbcSupport.java b/src/main/java/com/kri/contact/server/persistence/jdbc/ListUpdateJdbcSupport.java new file mode 100644 index 0000000..4185e84 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/jdbc/ListUpdateJdbcSupport.java @@ -0,0 +1,198 @@ +package com.kri.contact.server.persistence.jdbc; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.time.LocalDateTime; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.jspecify.annotations.NonNull; +import org.springframework.jdbc.core.BatchPreparedStatementSetter; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class ListUpdateJdbcSupport { + + private final JdbcTemplate jdbcTemplate; + + public void batchInsertUpdateHist(List rows, int batchSize) { + if (rows == null || rows.isEmpty()) { + return; + } + + String sql = """ + insert into t_list_update_hist ( + prjct_idx, + sid, + list_hder_id, + before_val, + after_val, + reg_user, + reg_dt + ) values (?, ?, ?, ?, ?, ?, ?) + """; + + for (int i = 0; i < rows.size(); i += batchSize) { + List sub = rows.subList(i, Math.min(rows.size(), i + batchSize)); + jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() { + @Override + public void setValues(@NonNull PreparedStatement ps, int index) throws SQLException { + UpdateHistRow row = sub.get(index); + ps.setLong(1, row.prjctIdx()); + ps.setInt(2, row.sid()); + ps.setInt(3, row.listHderId()); + ps.setString(4, row.beforeVal()); + ps.setString(5, row.afterVal()); + ps.setString(6, row.regUser()); + ps.setTimestamp(7, Timestamp.valueOf(row.regDt())); + } + + @Override + public int getBatchSize() { + return sub.size(); + } + }); + } + } + + public void batchUpdateList(List rows, int batchSize) { + if (rows == null || rows.isEmpty()) { + return; + } + + String sql = """ + update t_list + set is_use = ?, + memo = ?, + mod_user = ?, + mod_dt = ? + where prjct_idx = ? + and sid = ? + """; + + batchUpdate(rows, batchSize, sql, (ps, row) -> { + ps.setShort(1, row.isUse()); + ps.setString(2, row.memo()); + ps.setString(3, row.modUser()); + ps.setTimestamp(4, Timestamp.valueOf(row.modDt())); + ps.setLong(5, row.prjctIdx()); + ps.setInt(6, row.sid()); + }); + } + + public void batchUpdateListItem(List rows, int batchSize) { + if (rows == null || rows.isEmpty()) { + return; + } + + String sql = """ + update t_list_item + set list_item_val = ?, + mod_user = ?, + mod_dt = ? + where prjct_idx = ? + and sid = ? + and list_hder_id = ? + """; + + batchUpdate(rows, batchSize, sql, (ps, row) -> { + ps.setString(1, row.listItemVal()); + ps.setString(2, row.modUser()); + ps.setTimestamp(3, Timestamp.valueOf(row.modDt())); + ps.setLong(4, row.prjctIdx()); + ps.setInt(5, row.sid()); + ps.setInt(6, row.listHderId()); + }); + } + + public void batchInsertListItem(List rows, int batchSize) { + if (rows == null || rows.isEmpty()) { + return; + } + + String sql = """ + insert into t_list_item ( + prjct_idx, + sid, + list_hder_id, + list_item_val, + reg_user, + reg_dt + ) values (?, ?, ?, ?, ?, ?) + """; + + batchUpdate(rows, batchSize, sql, (ps, row) -> { + ps.setLong(1, row.prjctIdx()); + ps.setInt(2, row.sid()); + ps.setInt(3, row.listHderId()); + ps.setString(4, row.listItemVal()); + ps.setString(5, row.regUser()); + ps.setTimestamp(6, Timestamp.valueOf(row.regDt())); + }); + } + + private void batchUpdate( + List rows, + int batchSize, + String sql, + PreparedStatementWriter writer + ) { + for (int i = 0; i < rows.size(); i += batchSize) { + List sub = rows.subList(i, Math.min(rows.size(), i + batchSize)); + jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() { + @Override + public void setValues(@NonNull PreparedStatement ps, int index) throws SQLException { + writer.write(ps, sub.get(index)); + } + + @Override + public int getBatchSize() { + return sub.size(); + } + }); + } + } + + public record UpdateHistRow( + Long prjctIdx, + Integer sid, + Integer listHderId, + String beforeVal, + String afterVal, + String regUser, + LocalDateTime regDt + ) {} + + public record ListUpdateRow( + Long prjctIdx, + Integer sid, + Short isUse, + String memo, + String modUser, + LocalDateTime modDt + ) {} + + public record ListItemUpdateRow( + Long prjctIdx, + Integer sid, + Integer listHderId, + String listItemVal, + String modUser, + LocalDateTime modDt + ) {} + + public record ListItemInsertRow( + Long prjctIdx, + Integer sid, + Integer listHderId, + String listItemVal, + String regUser, + LocalDateTime regDt + ) {} + + private interface PreparedStatementWriter { + void write(PreparedStatement ps, T row) throws SQLException; + } +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java index 4e0322d..51a2b5a 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java @@ -55,4 +55,10 @@ public interface ListItemRepository extends JpaRepository sids ); + + List findByIdPrjctIdxAndIdSidInAndIdListHderIdIn( + Long prjctIdx, + Set sids, + Collection listHderIds + ); } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java index e4da194..4160aff 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java @@ -3,6 +3,7 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.persistence.entity.TListEntity; import com.kri.contact.server.persistence.entity.id.TListEntityId; import java.util.Collection; +import java.util.List; import java.util.Set; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; @@ -12,6 +13,8 @@ import org.springframework.data.jpa.repository.Query; public interface ListRepository extends JpaRepository, JpaSpecificationExecutor, ListQueryRepository { + List findByIdPrjctIdxAndIdSidIn(Long prjctIdx, Collection sids); + @Query(""" select l.id.sid from TListEntity l diff --git a/src/main/java/com/kri/contact/server/service/ListResetService.java b/src/main/java/com/kri/contact/server/service/ListResetService.java index 82a0a4a..084ef6e 100644 --- a/src/main/java/com/kri/contact/server/service/ListResetService.java +++ b/src/main/java/com/kri/contact/server/service/ListResetService.java @@ -6,11 +6,8 @@ import com.kri.contact.server.common.enums.ListResetMode; import com.kri.contact.server.dto.list.ListFilterDto; import com.kri.contact.server.persistence.entity.TListResetLogEntity; import com.kri.contact.server.persistence.jdbc.ListResetJdbcSupport; -import com.kri.contact.server.persistence.repository.ListRepository; import com.kri.contact.server.persistence.repository.ListResetLogRepository; import java.time.LocalDateTime; -import java.util.LinkedHashSet; -import java.util.List; import java.util.Set; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -21,27 +18,23 @@ import org.springframework.transaction.annotation.Transactional; public class ListResetService { private final ListResetLogRepository listResetLogRepository; - private final ListRepository listRepository; - private final ListHeaderService listHeaderService; + private final ListSearchService listSearchService; private final ListResetJdbcSupport listResetJdbcSupport; @Transactional - public long resetByFilter( + public int resetByFilter( Long prjctIdx, ListFilterDto filter, ListResetMode mode, String regUser, LocalDateTime regDt ) { - List emailTelnumHeaderIds = listHeaderService.getEmailTelnumHeaderId(prjctIdx); - Set sids = new LinkedHashSet<>( - listRepository.findAllSids(prjctIdx, emailTelnumHeaderIds, filter) - ); + Set sids = listSearchService.findTargetSids(prjctIdx, filter); return resetBySids(prjctIdx, sids, mode, regUser, regDt); } @Transactional - public long resetBySids( + public int resetBySids( Long prjctIdx, Set sids, ListResetMode mode, 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 40300b7..df5a434 100644 --- a/src/main/java/com/kri/contact/server/service/ListSearchService.java +++ b/src/main/java/com/kri/contact/server/service/ListSearchService.java @@ -1,5 +1,8 @@ package com.kri.contact.server.service; +import com.kri.common.feature.web.BusinessException; +import com.kri.common.feature.web.page.PageRequestDto; +import com.kri.common.feature.web.page.PageResponseDto; import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.dto.list.ListContactResultDto; import com.kri.contact.server.dto.list.ListFilterDto; @@ -13,14 +16,19 @@ import com.kri.contact.server.persistence.entity.TListItemEntity; import com.kri.contact.server.persistence.repository.ListEventHistRepository; import com.kri.contact.server.persistence.repository.ListItemRepository; import com.kri.contact.server.persistence.repository.ListRepository; +import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.NoSuchElementException; import java.util.Set; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -34,25 +42,69 @@ public class ListSearchService { private final ListHeaderService listHeaderService; @Transactional(readOnly = true) - public List getListSearchBaseList(Long prjctIdx, ListSearchRequestDto request) { - return createListSearchBase(prjctIdx, findPagedListEntities(prjctIdx, request)); + public ListSearchWithResultDto getListSearchOne(Long prjctIdx, Integer sid) { + ListFilterDto filterDto = ListFilterDto.onlyOneSid(sid); + List result = createListSearchWithResult(prjctIdx, findAllListEntities(prjctIdx, filterDto)); + + if (result.isEmpty()) { + throw BusinessException.notFound("Not found list", "해당하는 List가 없습니다.") + .with("sid", sid); + } + + return result.get(0); } @Transactional(readOnly = true) - public List getListSearchWithResultList(Long prjctIdx, ListSearchRequestDto request) { - return createListSearchWithResult(prjctIdx, findPagedListEntities(prjctIdx, request)); + public PageResponseDto getListSearchWithResultList( + Long prjctIdx, + ListSearchRequestDto request + ) { + List listEntities = findPagedListEntities(prjctIdx, request); + List content = createListSearchWithResult(prjctIdx, listEntities); + long totalCount = findAllSids(prjctIdx, request == null ? null : request.getListFilter()).size(); + + PageRequestDto pageRequest = request == null ? null : request.getPageRequest(); + int pageIndex = pageRequest == null ? 0 : Math.max(pageRequest.getPageIndex(), 0); + int pageSize = pageRequest == null ? Math.max(content.size(), 1) : Math.max(pageRequest.getPageSize(), 1); + + return PageResponseDto.from(new PageImpl<>( + content, + PageRequest.of(pageIndex, pageSize), + totalCount + )); + } + @Transactional(readOnly = true) + public Set findTargetSids(Long prjctIdx, ListFilterDto listFilter) { + return new LinkedHashSet<>(findAllSids(prjctIdx, listFilter)); } @Transactional(readOnly = true) - public List getAllListSearchBaseList(Long prjctIdx, ListFilterDto listFilter) { - List emailTelnumHeaderIds = listHeaderService.getEmailTelnumHeaderId(prjctIdx); - List listEntities = listRepository.findAllListEntities( - prjctIdx, - emailTelnumHeaderIds, - listFilter - ); + public List findUpdateTargetRows( + Long prjctIdx, + Collection sids, + Collection headerIds + ) { + if (sids == null || sids.isEmpty()) { + return Collections.emptyList(); + } - return createListSearchBase(prjctIdx, listEntities); + Set sidSet = new LinkedHashSet<>(sids); + List listEntities = listRepository.findByIdPrjctIdxAndIdSidIn(prjctIdx, sidSet); + if (listEntities.isEmpty()) { + return Collections.emptyList(); + } + + Map> itemMapBySid = createItemMapBySid(prjctIdx, sidSet, headerIds); + List rows = new ArrayList<>(listEntities.size()); + for (TListEntity entity : listEntities) { + rows.add(new ListUpdateTargetRow( + entity.getSid(), + entity.getUse(), + entity.getMemo(), + itemMapBySid.getOrDefault(entity.getSid(), Collections.emptyMap()) + )); + } + return rows; } private List findPagedListEntities(Long prjctIdx, ListSearchRequestDto request) { @@ -67,6 +119,16 @@ public class ListSearchService { ); } + private List findAllListEntities(Long prjctIdx, ListFilterDto listFilter) { + List emailTelnumHeaderIds = listHeaderService.getEmailTelnumHeaderId(prjctIdx); + return listRepository.findAllListEntities(prjctIdx, emailTelnumHeaderIds, listFilter); + } + + private List findAllSids(Long prjctIdx, ListFilterDto listFilter) { + List emailTelnumHeaderIds = listHeaderService.getEmailTelnumHeaderId(prjctIdx); + return listRepository.findAllSids(prjctIdx, emailTelnumHeaderIds, listFilter); + } + private List createListSearchBase(Long prjctIdx, List listEntities) { return createListSearchRows(prjctIdx, listEntities).stream() .map(row -> ListSearchBaseDto.from(row.listEntity(), row.itemList())) @@ -114,10 +176,26 @@ public class ListSearchService { Set sidSet = listEntities.stream() .map(TListEntity::getSid) .collect(Collectors.toCollection(LinkedHashSet::new)); + Map> itemMapBySid = createItemMapBySid(prjctIdx, sidSet, null); - Map> itemMapBySid = listItemRepository - .findByIdPrjctIdxAndIdSidIn(prjctIdx, sidSet) - .stream() + return listEntities.stream() + .map(entity -> new ListSearchRow( + entity, + itemMapBySid.getOrDefault(entity.getSid(), Collections.emptyMap()) + )) + .toList(); + } + + private Map> createItemMapBySid( + Long prjctIdx, + Set sidSet, + Collection headerIds + ) { + List itemEntities = headerIds == null || headerIds.isEmpty() + ? listItemRepository.findByIdPrjctIdxAndIdSidIn(prjctIdx, sidSet) + : listItemRepository.findByIdPrjctIdxAndIdSidInAndIdListHderIdIn(prjctIdx, sidSet, headerIds); + + return itemEntities.stream() .collect(Collectors.groupingBy( TListItemEntity::getSid, LinkedHashMap::new, @@ -128,13 +206,6 @@ public class ListSearchService { LinkedHashMap::new ) )); - - return listEntities.stream() - .map(entity -> new ListSearchRow( - entity, - itemMapBySid.getOrDefault(entity.getSid(), Collections.emptyMap()) - )) - .toList(); } private record ListSearchRow( @@ -146,4 +217,11 @@ public class ListSearchService { Integer sid, Short eventTy ) {} + + public record ListUpdateTargetRow( + Integer sid, + Short isUse, + String memo, + Map itemMap + ) {} } diff --git a/src/main/java/com/kri/contact/server/service/ListUpdateService.java b/src/main/java/com/kri/contact/server/service/ListUpdateService.java new file mode 100644 index 0000000..48b3fd4 --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/ListUpdateService.java @@ -0,0 +1,257 @@ +package com.kri.contact.server.service; + +import static com.kri.common.feature.util.StringUtil.normalizeBlank; + +import com.kri.common.feature.web.BusinessException; +import com.kri.contact.server.common.consts.ContactConstant; +import com.kri.contact.server.common.enums.ListHeaderGrade; +import com.kri.contact.server.common.enums.ListHeaderType; +import com.kri.contact.server.common.enums.ListIsUse; +import com.kri.contact.server.dto.list.ListFilterDto; +import com.kri.contact.server.dto.list.ListUpdateRequestDto; +import com.kri.contact.server.persistence.entity.TListHeaderEntity; +import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport; +import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.ListItemInsertRow; +import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.ListItemUpdateRow; +import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.ListUpdateRow; +import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.UpdateHistRow; +import com.kri.contact.server.persistence.repository.ListHeaderRepository; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ListUpdateService { + + private final ListHeaderRepository listHeaderRepository; + private final ListSearchService listSearchService; + private final ListUpdateJdbcSupport listUpdateJdbcSupport; + + @Transactional + public int updateList( + Long prjctIdx, + ListUpdateRequestDto request, + Integer userRole, + String regUser, + LocalDateTime regDt + ) { + Map updateContents = request.getUpdateContents(); + if (updateContents == null || updateContents.isEmpty()) { + return 0; + } + + Set sids = resolveTargetSids(prjctIdx, request.getListFilter()); + if (sids.isEmpty()) { + return 0; + } + + Map headerMap = validateHeaders(prjctIdx, updateContents.keySet(), userRole); + List itemHeaderIds = updateContents.keySet().stream() + .filter(headerId -> !isListColumnHeader(headerId)) + .toList(); + + int chunkSize = ContactConstant.INSERT_CHUNK_SIZE; + int totalUpdatedCount = 0; + List sidList = new ArrayList<>(sids); + for (int i = 0; i < sidList.size(); i += chunkSize) { + List sidChunk = sidList.subList(i, Math.min(sidList.size(), i + chunkSize)); + List targetRows = listSearchService.findUpdateTargetRows( + prjctIdx, + sidChunk, + itemHeaderIds + ); + + if (targetRows.size() != sidChunk.size()) { + throw BusinessException.badRequest("LIST_NOT_FOUND", "?섏젙 ?€??由ъ뒪?몃? 李얠쓣 ???놁뒿?덈떎."); + } + + totalUpdatedCount += updateChunk( + prjctIdx, + targetRows, + updateContents, + headerMap, + regUser, + regDt + ); + } + + return totalUpdatedCount; + } + + private int updateChunk( + Long prjctIdx, + List targetRows, + Map updateContents, + Map headerMap, + String regUser, + LocalDateTime regDt + ) { + List updateHistRows = new ArrayList<>(); + Map listUpdates = new LinkedHashMap<>(); + Map itemUpdates = new LinkedHashMap<>(); + Map itemInserts = new LinkedHashMap<>(); + + for (ListSearchService.ListUpdateTargetRow targetRow : targetRows) { + Short currentIsUse = targetRow.isUse(); + String currentMemo = targetRow.memo(); + Map itemMap = new LinkedHashMap<>(targetRow.itemMap()); + + for (Map.Entry entry : updateContents.entrySet()) { + Integer headerId = entry.getKey(); + Integer sid = targetRow.sid(); + String newValue = normalizeUpdateValue(headerMap.get(headerId), entry.getValue()); + + if (ListHeaderType.IS_USE.getCode().intValue() == headerId.intValue()) { + String beforeVal = String.valueOf(currentIsUse); + if (!Objects.equals(beforeVal, newValue)) { + currentIsUse = Short.valueOf(newValue); + listUpdates.put(sid, new ListUpdateRow( + prjctIdx, + sid, + currentIsUse, + defaultString(currentMemo), + regUser, + regDt + )); + updateHistRows.add(new UpdateHistRow(prjctIdx, sid, headerId, beforeVal, newValue, regUser, regDt)); + } + continue; + } + + if (ListHeaderType.MEMO.getCode().intValue() == headerId.intValue()) { + String beforeVal = defaultString(currentMemo); + if (!Objects.equals(beforeVal, newValue)) { + currentMemo = newValue; + listUpdates.put(sid, new ListUpdateRow( + prjctIdx, + sid, + currentIsUse, + newValue, + regUser, + regDt + )); + updateHistRows.add(new UpdateHistRow(prjctIdx, sid, headerId, beforeVal, newValue, regUser, regDt)); + } + continue; + } + + String currentValue = itemMap.get(headerId); + String beforeVal = currentValue == null ? "" : defaultString(currentValue); + if (Objects.equals(beforeVal, newValue)) { + continue; + } + + ListItemKey itemKey = new ListItemKey(sid, headerId); + if (currentValue == null) { + itemInserts.put(itemKey, new ListItemInsertRow( + prjctIdx, + sid, + headerId, + newValue, + regUser, + regDt + )); + itemUpdates.remove(itemKey); + } else { + itemUpdates.put(itemKey, new ListItemUpdateRow( + prjctIdx, + sid, + headerId, + newValue, + regUser, + regDt + )); + } + itemMap.put(headerId, newValue); + updateHistRows.add(new UpdateHistRow(prjctIdx, sid, headerId, beforeVal, newValue, regUser, regDt)); + } + } + + if (updateHistRows.isEmpty()) { + return 0; + } + + listUpdateJdbcSupport.batchInsertUpdateHist(updateHistRows, ContactConstant.INSERT_CHUNK_SIZE); + listUpdateJdbcSupport.batchUpdateList(new ArrayList<>(listUpdates.values()), ContactConstant.INSERT_CHUNK_SIZE); + listUpdateJdbcSupport.batchUpdateListItem(new ArrayList<>(itemUpdates.values()), ContactConstant.INSERT_CHUNK_SIZE); + listUpdateJdbcSupport.batchInsertListItem(new ArrayList<>(itemInserts.values()), ContactConstant.INSERT_CHUNK_SIZE); + + return updateHistRows.size(); + } + + private Set resolveTargetSids(Long prjctIdx, ListFilterDto listFilter) { + return new LinkedHashSet<>(listSearchService.findTargetSids(prjctIdx, listFilter)); + } + + private Map validateHeaders( + Long prjctIdx, + Collection headerIds, + Integer userRole + ) { + Map headerMap = listHeaderRepository.findByIdPrjctIdx(prjctIdx).stream() + .filter(header -> headerIds.contains(header.getListHderId())) + .collect(LinkedHashMap::new, (map, entity) -> map.put(entity.getListHderId(), entity), Map::putAll); + + if (headerMap.size() != headerIds.size()) { + throw BusinessException.badRequest("HEADER_NOT_FOUND", "?섏젙 ?€???ㅻ뜑瑜?李얠쓣 ???놁뒿?덈떎."); + } + + for (Integer headerId : headerIds) { + TListHeaderEntity header = headerMap.get(headerId); + if (ListHeaderType.SID.getCode().intValue() == headerId.intValue()) { + throw BusinessException.badRequest("SID_UPDATE_NOT_ALLOWED", "SID???섏젙?????놁뒿?덈떎."); + } + if (header.getListHderGrad() < ListHeaderGrade.RESERVED.getCode()) { + throw BusinessException.badRequest("HEADER_UPDATE_NOT_ALLOWED", "?섏젙?????녿뒗 ?ㅻ뜑媛€ ?ы븿?섏뼱 ?덉뒿?덈떎."); + } + if (userRole != null + && userRole >= ContactConstant.FIELDWORK_USER_ROLE + && !Boolean.TRUE.equals(header.getUseIntrvwerEdit())) { + throw BusinessException.badRequest("INTERVIEWER_EDIT_NOT_ALLOWED", "硫댁젒???섏젙 沅뚰븳???녿뒗 ?ㅻ뜑媛€ ?ы븿?섏뼱 ?덉뒿?덈떎."); + } + } + + return headerMap; + } + + private String normalizeUpdateValue(TListHeaderEntity header, String value) { + if (header.getListHderTy().equals(ListHeaderType.IS_USE.getCode())) { + return String.valueOf(parseIsUseCode(value)); + } + return defaultString(normalizeBlank(value)); + } + + private short parseIsUseCode(String value) { + String normalized = defaultString(normalizeBlank(value)).toUpperCase(); + return switch (normalized) { + case "0", "X" -> ListIsUse.UNUSABLE.getCode(); + case "1", "O" -> ListIsUse.USABLE.getCode(); + case "9", "TEST" -> ListIsUse.TEST.getCode(); + default -> throw BusinessException.badRequest("INVALID_IS_USE", "?ъ슜 ?щ???0, 1, 9 ?먮뒗 O, X, TEST留??덉슜?⑸땲??"); + }; + } + + private boolean isListColumnHeader(Integer headerId) { + return ListHeaderType.IS_USE.getCode().intValue() == headerId.intValue() + || ListHeaderType.MEMO.getCode().intValue() == headerId.intValue(); + } + + private String defaultString(String value) { + return value == null ? "" : value; + } + + private record ListItemKey( + Integer sid, + Integer listHderId + ) {} +} diff --git a/src/main/java/com/kri/contact/server/service/SystemEventLogService.java b/src/main/java/com/kri/contact/server/service/SystemEventLogService.java index d62e43a..26c9224 100644 --- a/src/main/java/com/kri/contact/server/service/SystemEventLogService.java +++ b/src/main/java/com/kri/contact/server/service/SystemEventLogService.java @@ -5,6 +5,8 @@ import static com.kri.common.feature.json.JsonUtil.toMap; import com.fasterxml.jackson.databind.ObjectMapper; import com.kri.contact.server.common.enums.SystemEventType; import com.kri.contact.server.dto.list.ListHeaderDto; +import com.kri.contact.server.dto.list.ListResetRequestDto; +import com.kri.contact.server.dto.list.ListUpdateRequestDto; import com.kri.contact.server.dto.project.ProjectCreateRequestDto; import com.kri.contact.server.dto.project.ProjectMainTemplateUpdateRequestDto; import com.kri.contact.server.dto.project.ProjectUpdateRequestDto; @@ -157,6 +159,18 @@ public class SystemEventLogService { ); } + public void writeUpdateList(String regId, LocalDateTime regDt, String clientIp, + Long prjctIdx, ListUpdateRequestDto req){ + writeSystemLog(SystemEventType.UPDATE_LIST, + "Update List Info", prjctIdx, regId, regDt, clientIp, req); + } + + public void writeResetList(String regId, LocalDateTime regDt, String clientIp, + Long prjctIdx, ListResetRequestDto req){ + writeSystemLog(SystemEventType.RESET_LIST, + "Reset List", prjctIdx, regId, regDt, clientIp, req); + } + protected void writeSystemLog( SystemEventType eventType, String title, -- 2.49.0.windows.1 From 88d65bebe06b22cf982453eb370aa304267d4746 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Fri, 10 Apr 2026 16:39:50 +0900 Subject: [PATCH 7/9] =?UTF-8?q?260410=5F02=5FENH:=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8,=20=EC=BB=A8=ED=83=9D=EC=9D=B4=EB=A0=A5,=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=EC=9D=B4=EB=A0=A5=20=EB=8B=A4=EC=9A=B4=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=201=EC=B0=A8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/common/consts/ContactConstant.java | 7 + .../common/enums/ListSearchResponseType.java | 7 + .../common/util/ExcelResponseBuilder.java | 22 + .../common/util/ExcelUploadResultUtil.java | 5 +- .../server/controller/ListController.java | 108 +++-- .../controller/ListHistoryController.java | 53 +++ .../server/dto/common/DateRangeDto.java | 23 + .../list/ListEventHistDownloadRequestDto.java | 31 ++ .../server/dto/list/ListSearchRequestDto.java | 13 + .../dto/list/ListSearchResponseDto.java | 23 - .../dto/list/ListSearchWithFullResultDto.java | 52 +++ .../repository/ListAssignRepository.java | 13 + .../repository/ListEventHistRepository.java | 43 ++ .../repository/ListQueryRepository.java | 16 + .../repository/ListQueryRepositoryImpl.java | 43 ++ .../repository/ListUpdateHistRepository.java | 42 ++ .../repository/UserRepository.java | 5 +- .../server/service/ListDownloadService.java | 338 +++++++++++++++ .../server/service/ListSearchService.java | 394 +++++++++++++++++- .../server/service/ListUploadService.java | 6 +- 20 files changed, 1160 insertions(+), 84 deletions(-) create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListSearchResponseType.java create mode 100644 src/main/java/com/kri/contact/server/common/util/ExcelResponseBuilder.java create mode 100644 src/main/java/com/kri/contact/server/controller/ListHistoryController.java create mode 100644 src/main/java/com/kri/contact/server/dto/common/DateRangeDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListEventHistDownloadRequestDto.java delete mode 100644 src/main/java/com/kri/contact/server/dto/list/ListSearchResponseDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListSearchWithFullResultDto.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListUpdateHistRepository.java create mode 100644 src/main/java/com/kri/contact/server/service/ListDownloadService.java diff --git a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java index 91a4798..5c80113 100644 --- a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java +++ b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java @@ -1,19 +1,26 @@ package com.kri.contact.server.common.consts; +import com.kri.common.feature.excel.StreamingReadOptions; import com.kri.contact.server.common.enums.ListHeaderType; import com.kri.contact.server.common.enums.ListHeaderTypeDefault; import java.util.Arrays; import java.util.List; +import java.util.Locale; import java.util.stream.Stream; public final class ContactConstant { public static final int INSERT_CHUNK_SIZE = 1_000; + public static final int LIST_SELECT_CHUNK_SIZE = 1_000; public static final String DEFAULT_COMPANY_NAME = "KRI"; public static final String DEFAULT_USER_TEAM = "S101"; public static final int OUTSOURCE_USER_ROLE = 4000; public static final int FIELDWORK_USER_ROLE = 9000; + public static final StreamingReadOptions LOWER_CASE_HEADER_OPTIONS = + new StreamingReadOptions(null, 0, 1, header -> header == null ? null : header.toLowerCase( + Locale.ROOT)); + public static final String LIST_TEXT_REGEX = "^[가-힣a-zA-Z0-9()_\\-\\[\\] ]+$"; public static final List DEFAULT_AND_FILE_TYPE = Stream.concat( diff --git a/src/main/java/com/kri/contact/server/common/enums/ListSearchResponseType.java b/src/main/java/com/kri/contact/server/common/enums/ListSearchResponseType.java new file mode 100644 index 0000000..a6679db --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListSearchResponseType.java @@ -0,0 +1,7 @@ +package com.kri.contact.server.common.enums; + +public enum ListSearchResponseType { + BASE, + WITH_RESULT, + WITH_FULL_RESULT +} diff --git a/src/main/java/com/kri/contact/server/common/util/ExcelResponseBuilder.java b/src/main/java/com/kri/contact/server/common/util/ExcelResponseBuilder.java new file mode 100644 index 0000000..0e101cf --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/util/ExcelResponseBuilder.java @@ -0,0 +1,22 @@ +package com.kri.contact.server.common.util; + +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import lombok.NoArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; + +@NoArgsConstructor +public final class ExcelResponseBuilder { + public static ResponseEntity buildExcelResponse(String fileName, byte[] bytes) { + String contentDisposition = "attachment; filename*=UTF-8''" + + URLEncoder.encode(fileName, StandardCharsets.UTF_8).replace("+", "%20"); + + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition) + .contentType(MediaType.parseMediaType( + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")) + .body(bytes); + } +} diff --git a/src/main/java/com/kri/contact/server/common/util/ExcelUploadResultUtil.java b/src/main/java/com/kri/contact/server/common/util/ExcelUploadResultUtil.java index b5d1c87..2f33b9d 100644 --- a/src/main/java/com/kri/contact/server/common/util/ExcelUploadResultUtil.java +++ b/src/main/java/com/kri/contact/server/common/util/ExcelUploadResultUtil.java @@ -5,13 +5,12 @@ import com.kri.contact.server.dto.excel.ExcelUploadResultDto; import java.io.ByteArrayOutputStream; import java.util.Base64; import java.util.List; +import lombok.NoArgsConstructor; import org.apache.poi.ss.usermodel.Workbook; +@NoArgsConstructor public final class ExcelUploadResultUtil { - private ExcelUploadResultUtil() { - } - /** * 엑셀 업로드 결과 + 에러 엑셀 생성까지 공통 처리. * diff --git a/src/main/java/com/kri/contact/server/controller/ListController.java b/src/main/java/com/kri/contact/server/controller/ListController.java index 78b640b..42d700e 100644 --- a/src/main/java/com/kri/contact/server/controller/ListController.java +++ b/src/main/java/com/kri/contact/server/controller/ListController.java @@ -1,17 +1,21 @@ package com.kri.contact.server.controller; +import static com.kri.contact.server.common.util.ExcelResponseBuilder.buildExcelResponse; + import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.web.BusinessException; import com.kri.common.feature.web.RequestUserContext; import com.kri.common.feature.web.page.PageResponseDto; +import com.kri.contact.server.common.enums.ListSearchResponseType; import com.kri.contact.server.dto.excel.ExcelUploadResultDto; +import com.kri.contact.server.dto.list.ListFilterDto; import com.kri.contact.server.dto.list.ListResetRequestDto; import com.kri.contact.server.dto.list.ListSearchRequestDto; -import com.kri.contact.server.dto.list.ListSearchResponseDto; -import com.kri.contact.server.dto.list.ListSearchWithResultDto; +import com.kri.contact.server.dto.list.ListSearchWithFullResultDto; import com.kri.contact.server.dto.list.ListUpdateRequestDto; import com.kri.contact.server.dto.list.ListUploadRequestDto; import com.kri.contact.server.dto.project.ProjectInfoDto; +import com.kri.contact.server.service.ListDownloadService; import com.kri.contact.server.service.ListResetService; import com.kri.contact.server.service.ListSearchService; import com.kri.contact.server.service.ListUpdateService; @@ -21,15 +25,13 @@ import com.kri.contact.server.service.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -46,6 +48,7 @@ import org.springframework.web.multipart.MultipartFile; public class ListController { private final ProjectService projectService; + private final ListDownloadService listDownloadService; private final ListSearchService listSearchService; private final ListUploadService listUploadService; private final ListUpdateService listUpdateService; @@ -54,41 +57,54 @@ public class ListController { @Operation(summary = "리스트 정보 조회 With Sid") @GetMapping("/search/{prjctIdx}/{sid}") - public ListSearchWithResultDto getListSearchWithResult( + public ListSearchWithFullResultDto searchListWithSid( @PathVariable Long prjctIdx, @PathVariable Integer sid - ){ - return listSearchService.getListSearchOne(prjctIdx, sid); + ) { + return listSearchService.searchListWithSid(prjctIdx, sid); } @Operation(summary = "리스트 정보 조회 With Filter") @PostMapping("/search/{prjctIdx}") - public PageResponseDto searchListWithFilter( + public PageResponseDto searchListWithFilter( @PathVariable Long prjctIdx, @Valid @RequestBody ListSearchRequestDto request - ){ - return listSearchService.getListSearchWithResultList(prjctIdx, request); + ) { + return listSearchService.searchListWithPaging( + prjctIdx, + request, + ListSearchResponseType.WITH_FULL_RESULT + ); } @Operation(summary = "리스트 파일 업로드 양식 다운로드") @PostMapping("/excel/template/{prjctIdx}") - public ResponseEntity downloadExcelTemplate( - @PathVariable Long prjctIdx, - RequestUserContext ctx - ) { - ProjectInfoDto projectInfoDto = projectService.getProject(prjctIdx); - if (projectInfoDto == null) throw BusinessException.internalError("프로젝트가 없습니다."); - + public ResponseEntity downloadExcelTemplate(@PathVariable Long prjctIdx) { + ProjectInfoDto projectInfoDto = getProjectOrThrow(prjctIdx); byte[] bytes = listUploadService.downloadExcelTemplate(prjctIdx); - String fileName = projectInfoDto.getPrjctName() + " upload_template.xlsx"; - String contentDisposition = "attachment; filename*=UTF-8''" + - URLEncoder.encode(fileName, StandardCharsets.UTF_8).replace("+", "%20"); + return buildExcelResponse(projectInfoDto.getPrjctName() + " upload_template.xlsx", bytes); + } - return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition) - .contentType(MediaType.parseMediaType( - "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")) - .body(bytes); + @Operation(summary = "리스트 다운로드") + @PostMapping("/excel/download/{prjctIdx}") + public ResponseEntity downloadList( + @PathVariable Long prjctIdx, + @RequestBody(required = false) ListFilterDto listFilter + ) { + ProjectInfoDto projectInfoDto = getProjectOrThrow(prjctIdx); + byte[] bytes = listDownloadService.downloadList(prjctIdx, listFilter); + return buildExcelResponse(projectInfoDto.getPrjctName() + " list.xlsx", bytes); + } + + @Operation(summary = "리스트 수정 이력 다운로드") + @PostMapping("/excel/download/update/{prjctIdx}") + public ResponseEntity downloadListUpdateHistory( + @PathVariable Long prjctIdx, + @RequestBody(required = false) ListFilterDto listFilter + ) { + ProjectInfoDto projectInfoDto = getProjectOrThrow(prjctIdx); + byte[] bytes = listDownloadService.downloadSidWithUpdateHist(prjctIdx, listFilter); + return buildExcelResponse(projectInfoDto.getPrjctName() + " 수정 이력.xlsx", bytes); } @Operation(summary = "리스트 파일 업로드") @@ -99,43 +115,51 @@ public class ListController { @Valid @RequestPart("request") ListUploadRequestDto request, RequestUserContext ctx ) { - ProjectInfoDto projectInfoDto = projectService.getProject(prjctIdx); - if (projectInfoDto == null) throw BusinessException.internalError("프로젝트가 없습니다."); - - final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + getProjectOrThrow(prjctIdx); + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); ExcelUploadResultDto result = listUploadService.uploadExcel(prjctIdx, file, request, ctx.getUserId(), now); systemEventLogService.writeUploadList(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, file.getOriginalFilename()); - return result; } @Operation(summary = "리스트 수정") - @PostMapping("/update/{prjctIdx}") + @PatchMapping("/update/{prjctIdx}") public int updateList( @PathVariable Long prjctIdx, @Valid @RequestBody ListUpdateRequestDto request, - RequestUserContext ctx) { - final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); - + RequestUserContext ctx + ) { + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); int updateCount = listUpdateService.updateList(prjctIdx, request, ctx.getUserRole(), ctx.getUserId(), now); systemEventLogService.writeUpdateList(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, request); - return updateCount; } - @Operation(summary = "리스트 삭제") + @Operation(summary = "리스트 초기화") @DeleteMapping("/{prjctIdx}") public int resetList( @PathVariable Long prjctIdx, @Valid @RequestBody ListResetRequestDto request, RequestUserContext ctx - ){ - final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); - - int resetCount = listResetService.resetByFilter(prjctIdx, request.getListFilter(), request.getResetMode(), ctx.getUserId(), now); + ) { + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + int resetCount = listResetService.resetByFilter( + prjctIdx, + request.getListFilter(), + request.getResetMode(), + ctx.getUserId(), + now + ); systemEventLogService.writeResetList(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, request); - return resetCount; } + + private ProjectInfoDto getProjectOrThrow(Long prjctIdx) { + ProjectInfoDto projectInfoDto = projectService.getProject(prjctIdx); + if (projectInfoDto == null) { + throw BusinessException.internalError("프로젝트가 없습니다."); + } + return projectInfoDto; + } } diff --git a/src/main/java/com/kri/contact/server/controller/ListHistoryController.java b/src/main/java/com/kri/contact/server/controller/ListHistoryController.java new file mode 100644 index 0000000..6a3041c --- /dev/null +++ b/src/main/java/com/kri/contact/server/controller/ListHistoryController.java @@ -0,0 +1,53 @@ +package com.kri.contact.server.controller; + +import static com.kri.contact.server.common.util.ExcelResponseBuilder.buildExcelResponse; + +import com.kri.common.feature.web.BusinessException; +import com.kri.contact.server.dto.list.ListEventHistDownloadRequestDto; +import com.kri.contact.server.dto.project.ProjectInfoDto; +import com.kri.contact.server.service.ListDownloadService; +import com.kri.contact.server.service.ProjectService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/list") +@RequiredArgsConstructor +@Tag(name = "ListHistory", description = "리스트 이력 API") +public class ListHistoryController { + + private final ProjectService projectService; + private final ListDownloadService listDownloadService; + + @Operation(summary = "리스트 이벤트 이력 다운로드") + @PostMapping("/excel/download/event/{prjctIdx}") + public ResponseEntity downloadListWithEventHistory( + @PathVariable Long prjctIdx, + @Valid @RequestBody ListEventHistDownloadRequestDto request + ) { + ProjectInfoDto projectInfoDto = getProjectOrThrow(prjctIdx); + byte[] bytes = listDownloadService.downloadListWithEventHist( + prjctIdx, + request.getListFilter(), + request.getResultCodeTypes(), + request.getDateRange() + ); + return buildExcelResponse(projectInfoDto.getPrjctName() + " 컨택 이력.xlsx", bytes); + } + + private ProjectInfoDto getProjectOrThrow(Long prjctIdx) { + ProjectInfoDto projectInfoDto = projectService.getProject(prjctIdx); + if (projectInfoDto == null) { + throw BusinessException.internalError("프로젝트가 없습니다."); + } + return projectInfoDto; + } +} diff --git a/src/main/java/com/kri/contact/server/dto/common/DateRangeDto.java b/src/main/java/com/kri/contact/server/dto/common/DateRangeDto.java new file mode 100644 index 0000000..ff2ba65 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/common/DateRangeDto.java @@ -0,0 +1,23 @@ +package com.kri.contact.server.dto.common; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "날짜 범위 Dto") +public class DateRangeDto { + + @Schema(description = "시작 날짜") + private LocalDateTime startDate; + @Schema(description = "종료 날짜") + private LocalDateTime endDate; +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListEventHistDownloadRequestDto.java b/src/main/java/com/kri/contact/server/dto/list/ListEventHistDownloadRequestDto.java new file mode 100644 index 0000000..316f6b7 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListEventHistDownloadRequestDto.java @@ -0,0 +1,31 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.common.enums.ResultCodeType; +import com.kri.contact.server.dto.common.DateRangeDto; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import java.util.List; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@Schema(description = "리스트 + 컨택이력 다운로드 요청 DTO") +public class ListEventHistDownloadRequestDto { + + @NotNull + @Schema(description = "리스트 필터") + private ListFilterDto listFilter; + + @NotEmpty + @Schema(description = "조회할 ResultCodeType 목록") + private List resultCodeTypes; + + @Valid + @Schema(description = "조회 기간") + private DateRangeDto dateRange; +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListSearchRequestDto.java b/src/main/java/com/kri/contact/server/dto/list/ListSearchRequestDto.java index 0f5305d..f8c42ed 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListSearchRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListSearchRequestDto.java @@ -5,11 +5,17 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import java.util.List; import java.util.Map; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; @Getter @Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor @Schema(description = "리스트 검색 조건") public class ListSearchRequestDto { @@ -20,4 +26,11 @@ public class ListSearchRequestDto { @NotNull @Schema(description = "페이지네이션 정보") private PageRequestDto pageRequest; + + public static ListSearchRequestDto of(ListFilterDto listFilter, PageRequestDto pageRequest){ + return ListSearchRequestDto.builder() + .listFilter(listFilter) + .pageRequest(pageRequest) + .build(); + } } diff --git a/src/main/java/com/kri/contact/server/dto/list/ListSearchResponseDto.java b/src/main/java/com/kri/contact/server/dto/list/ListSearchResponseDto.java deleted file mode 100644 index 73ee5b9..0000000 --- a/src/main/java/com/kri/contact/server/dto/list/ListSearchResponseDto.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.kri.contact.server.dto.list; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.experimental.SuperBuilder; - -@Getter -@Setter -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@Schema(description = "리스트 조회 응답(기본 + 결과 + 발송 결과)") -public class ListSearchResponseDto extends ListSearchWithResultDto { - - @Schema(description = "메일 발송 결과") - private ListResultBaseDto mailSendResult; - - @Schema(description = "문자 발송 결과") - private ListResultBaseDto smsSendResult; -} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListSearchWithFullResultDto.java b/src/main/java/com/kri/contact/server/dto/list/ListSearchWithFullResultDto.java new file mode 100644 index 0000000..2a20978 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListSearchWithFullResultDto.java @@ -0,0 +1,52 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.persistence.entity.TListEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.Map; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.experimental.SuperBuilder; + +@Getter +@Setter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "리스트 조회 응답(기본 + 결과 + 발송 결과)") +public class ListSearchWithFullResultDto extends ListSearchWithResultDto { + + @Schema(description = "메일 발송 결과") + private ListResultBaseDto mailSendResult; + + @Schema(description = "문자 발송 결과") + private ListResultBaseDto smsSendResult; + + public static ListSearchWithFullResultDto from( + TListEntity entity, + Map itemList, + ListContactResultDto contactResult, + ListContactResultDto interviewResult, + ListResultBaseDto surveyResult, + ListResultBaseDto mailSendResult, + ListResultBaseDto smsSendResult + ) { + if (entity == null) { + return null; + } + + return ListSearchWithFullResultDto.builder() + .prjctIdx(entity.getPrjctIdx()) + .sid(entity.getSid()) + .use(entity.getUse()) + .memo(entity.getMemo()) + .itemList(itemList) + .contactResult(contactResult) + .interviewResult(interviewResult) + .surveyResult(surveyResult) + .mailSendResult(mailSendResult) + .smsSendResult(smsSendResult) + .build(); + } +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListAssignRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListAssignRepository.java index dd65e88..f32330b 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListAssignRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListAssignRepository.java @@ -2,6 +2,7 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.persistence.entity.TListAssignEntity; import java.util.Collection; +import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; @@ -27,4 +28,16 @@ public interface ListAssignRepository extends JpaRepository sids ); + + @Query(""" + select a + from TListAssignEntity a + where a.prjctIdx = :prjctIdx + and a.sid in :sids + order by a.sid asc, a.listAssignIdx asc + """) + List findByPrjctIdxAndSidIn( + Long prjctIdx, + Collection sids + ); } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java index 7d2c90e..d850331 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java @@ -1,6 +1,8 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.persistence.entity.TListEventHistEntity; +import java.time.LocalDateTime; +import java.util.Collection; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; @@ -65,4 +67,45 @@ public interface ListEventHistRepository extends JpaRepository sids ); + + @Query(""" + select h + from TListEventHistEntity h + where h.prjctIdx = :prjctIdx + and h.sid in :sids + and h.eventTy in :eventTypes + and (:startDate is null or h.regDt >= :startDate) + and (:endDate is null or h.regDt <= :endDate) + order by h.sid asc, h.regDt asc, h.listEventHistIdx asc + """) + List findDownloadHistories( + Long prjctIdx, + Collection sids, + Collection eventTypes, + LocalDateTime startDate, + LocalDateTime endDate + ); + + @Query(""" + select h.sid as sid, count(h) as historyCount + from TListEventHistEntity h + where h.prjctIdx = :prjctIdx + and h.sid in :sids + and h.eventTy in :eventTypes + and (:startDate is null or h.regDt >= :startDate) + and (:endDate is null or h.regDt <= :endDate) + group by h.sid + """) + List findDownloadHistoryCounts( + Long prjctIdx, + Collection sids, + Collection eventTypes, + LocalDateTime startDate, + LocalDateTime endDate + ); + + interface EventHistoryCountProjection { + Integer getSid(); + Long getHistoryCount(); + } } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepository.java index ac7b4f5..98db4a1 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepository.java @@ -12,4 +12,20 @@ public interface ListQueryRepository { List findAllListEntities(Long prjctIdx, List emailTelnumHeaderIds, ListFilterDto listFilter); List findAllSids(Long prjctIdx, List emailTelnumHeaderIds, ListFilterDto listFilter); + + List findChunkedListEntities( + Long prjctIdx, + List emailTelnumHeaderIds, + ListFilterDto listFilter, + Integer lastSid, + int limit + ); + + List findChunkedSids( + Long prjctIdx, + List emailTelnumHeaderIds, + ListFilterDto listFilter, + Integer lastSid, + int limit + ); } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepositoryImpl.java b/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepositoryImpl.java index b2d9928..8ae20cf 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepositoryImpl.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepositoryImpl.java @@ -79,6 +79,49 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { .fetch(); } + @Override + public List findChunkedListEntities( + Long prjctIdx, + List emailTelnumHeaderIds, + ListFilterDto listFilter, + Integer lastSid, + int limit + ) { + QTListEntity list = QTListEntity.tListEntity; + BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, emailTelnumHeaderIds, listFilter, list); + if (lastSid != null) { + predicate.and(list.id.sid.gt(lastSid)); + } + + return jpaQueryFactory.selectFrom(list) + .where(predicate) + .orderBy(list.id.sid.asc()) + .limit(limit) + .fetch(); + } + + @Override + public List findChunkedSids( + Long prjctIdx, + List emailTelnumHeaderIds, + ListFilterDto listFilter, + Integer lastSid, + int limit + ) { + QTListEntity list = QTListEntity.tListEntity; + BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, emailTelnumHeaderIds, listFilter, list); + if (lastSid != null) { + predicate.and(list.id.sid.gt(lastSid)); + } + + return jpaQueryFactory.select(list.id.sid) + .from(list) + .where(predicate) + .orderBy(list.id.sid.asc()) + .limit(limit) + .fetch(); + } + private BooleanBuilder buildListFilterPredicate( Long prjctIdx, List emailTelnumHeaderIds, diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListUpdateHistRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListUpdateHistRepository.java new file mode 100644 index 0000000..aed48d5 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListUpdateHistRepository.java @@ -0,0 +1,42 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TListUpdateHistEntity; +import java.time.LocalDateTime; +import java.util.Collection; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +public interface ListUpdateHistRepository extends JpaRepository { + + @Query(""" + select h + from TListUpdateHistEntity h + where h.prjctIdx = :prjctIdx + and h.sid in :sids + order by h.sid asc, h.regDt asc, h.regUser asc, h.listUpdateHistIdx asc + """) + List findDownloadHistories( + Long prjctIdx, + Collection sids + ); + + @Query(""" + select h.sid as sid, h.regDt as regDt, h.regUser as regUser + from TListUpdateHistEntity h + where h.prjctIdx = :prjctIdx + and h.sid in :sids + group by h.sid, h.regDt, h.regUser + order by h.sid asc, h.regDt asc, h.regUser asc + """) + List findDownloadHistoryGroups( + Long prjctIdx, + Collection sids + ); + + interface UpdateHistoryGroupProjection { + Integer getSid(); + LocalDateTime getRegDt(); + String getRegUser(); + } +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java index 5fa6aa6..e6e1461 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java @@ -2,6 +2,7 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.persistence.entity.TUserEntity; import java.time.LocalDateTime; +import java.util.Collection; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; @@ -20,6 +21,8 @@ public interface UserRepository extends JpaRepository { List findByUserCmpnAndUserRoleGreaterThanEqualAndDelFalse(String userCmpn, Integer userRoleCd); + List findByUserIdInAndDelFalse(Collection userIds); + @Query(""" select u from TUserEntity u @@ -59,4 +62,4 @@ public interface UserRepository extends JpaRepository { and u.del = false """) int softDeleteByUserId(String userId, String delUser, LocalDateTime delDt); -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/contact/server/service/ListDownloadService.java b/src/main/java/com/kri/contact/server/service/ListDownloadService.java new file mode 100644 index 0000000..ee309d9 --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/ListDownloadService.java @@ -0,0 +1,338 @@ +package com.kri.contact.server.service; + +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.excel.ExcelMapper; +import com.kri.common.feature.web.BusinessException; +import com.kri.contact.server.common.enums.ListHeaderType; +import com.kri.contact.server.common.enums.ListIsUse; +import com.kri.contact.server.common.enums.ResultCodeType; +import com.kri.contact.server.dto.common.DateRangeDto; +import com.kri.contact.server.dto.list.ListFilterDto; +import com.kri.contact.server.dto.list.ListHeaderDto; +import java.io.ByteArrayOutputStream; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ListDownloadService { + + private static final String HEADER_TYPE = "구분"; + private static final String HEADER_DATE = "일시"; + private static final String HEADER_USER = "사용자"; + private static final String HEADER_RESULT = "결과"; + private static final String HEADER_MEMO = "메모"; + private static final String HEADER_BEFORE = "변경전"; + private static final String HEADER_AFTER = "변경후"; + + private static final List EVENT_HISTORY_HEADERS = List.of( + HEADER_TYPE, + HEADER_DATE, + HEADER_USER, + HEADER_RESULT, + HEADER_MEMO + ); + private static final List UPDATE_HISTORY_HEADERS = List.of( + HEADER_DATE, + HEADER_USER, + HEADER_BEFORE, + HEADER_AFTER + ); + + private final ListHeaderService listHeaderService; + private final ListSearchService listSearchService; + + public byte[] downloadList(Long prjctIdx, ListFilterDto listFilter) { + List headers = getSortedHeaders(prjctIdx); + + try ( + ExcelMapper.StreamingMapWriter writer = ExcelMapper.openStreamingMapWriter(toBaseHeaderNames(headers), 100); + ByteArrayOutputStream out = new ByteArrayOutputStream() + ) { + Integer lastSid = null; + while (true) { + List rows = listSearchService.findDownloadListRows(prjctIdx, listFilter, lastSid); + if (rows.isEmpty()) { + break; + } + + for (ListSearchService.DownloadListRow row : rows) { + writer.append(createBaseRow(headers, row)); + lastSid = row.sid(); + } + } + + writer.writeTo(out); + return out.toByteArray(); + } catch (BusinessException e) { + throw e; + } catch (Exception e) { + throw BusinessException.internalError("리스트 다운로드 파일 생성 중 오류가 발생했습니다."); + } + } + + public byte[] downloadListWithEventHist( + Long prjctIdx, + ListFilterDto listFilter, + Collection resultCodeTypes, + DateRangeDto dateRange + ) { + validateDateRange(dateRange); + List headers = getSortedHeaders(prjctIdx); + int maxHistoryCount = findMaxEventHistoryCount(prjctIdx, listFilter, resultCodeTypes, dateRange); + List excelHeaders = new ArrayList<>(toBaseHeaderNames(headers)); + appendRepeatedHeaders(excelHeaders, EVENT_HISTORY_HEADERS, maxHistoryCount); + + try ( + ExcelMapper.StreamingMapWriter writer = ExcelMapper.openStreamingMapWriter(excelHeaders, 100); + ByteArrayOutputStream out = new ByteArrayOutputStream() + ) { + Integer lastSid = null; + while (true) { + List rows = listSearchService.findDownloadListRows(prjctIdx, listFilter, lastSid); + if (rows.isEmpty()) { + break; + } + + List sids = rows.stream().map(ListSearchService.DownloadListRow::sid).toList(); + Map> historyMap = listSearchService.findEventHistoriesForDownload( + prjctIdx, + sids, + resultCodeTypes, + dateRange + ); + + for (ListSearchService.DownloadListRow row : rows) { + writer.append(createEventHistoryRow( + headers, + row, + historyMap.getOrDefault(row.sid(), List.of()), + maxHistoryCount + )); + lastSid = row.sid(); + } + } + + writer.writeTo(out); + return out.toByteArray(); + } catch (BusinessException e) { + throw e; + } catch (Exception e) { + throw BusinessException.internalError("리스트 + 컨택이력 다운로드 파일 생성 중 오류가 발생했습니다."); + } + } + + public byte[] downloadSidWithUpdateHist(Long prjctIdx, ListFilterDto listFilter) { + int maxHistoryGroupCount = findMaxUpdateHistoryGroupCount(prjctIdx, listFilter); + List excelHeaders = new ArrayList<>(); + excelHeaders.add("sid"); + appendRepeatedHeaders(excelHeaders, UPDATE_HISTORY_HEADERS, maxHistoryGroupCount); + + try ( + ExcelMapper.StreamingMapWriter writer = ExcelMapper.openStreamingMapWriter(excelHeaders, 100); + ByteArrayOutputStream out = new ByteArrayOutputStream() + ) { + Integer lastSid = null; + while (true) { + List sids = listSearchService.findDownloadSids(prjctIdx, listFilter, lastSid); + if (sids.isEmpty()) { + break; + } + + Map> historyMap = + listSearchService.findUpdateHistoryGroupsForDownload(prjctIdx, sids); + + for (Integer sid : sids) { + writer.append(createUpdateHistoryRow( + sid, + historyMap.getOrDefault(sid, List.of()), + maxHistoryGroupCount + )); + lastSid = sid; + } + } + + writer.writeTo(out); + return out.toByteArray(); + } catch (BusinessException e) { + throw e; + } catch (Exception e) { + throw BusinessException.internalError("SID + 수정이력 다운로드 파일 생성 중 오류가 발생했습니다."); + } + } + + private int findMaxEventHistoryCount( + Long prjctIdx, + ListFilterDto listFilter, + Collection resultCodeTypes, + DateRangeDto dateRange + ) { + int maxCount = 0; + Integer lastSid = null; + while (true) { + List sids = listSearchService.findDownloadSids(prjctIdx, listFilter, lastSid); + if (sids.isEmpty()) { + return maxCount; + } + + Map countMap = listSearchService.findEventHistoryCountsForDownload( + prjctIdx, + sids, + resultCodeTypes, + dateRange + ); + for (Integer count : countMap.values()) { + maxCount = Math.max(maxCount, count); + } + lastSid = sids.get(sids.size() - 1); + } + } + + private int findMaxUpdateHistoryGroupCount(Long prjctIdx, ListFilterDto listFilter) { + int maxCount = 0; + Integer lastSid = null; + while (true) { + List sids = listSearchService.findDownloadSids(prjctIdx, listFilter, lastSid); + if (sids.isEmpty()) { + return maxCount; + } + + Map countMap = listSearchService.findUpdateHistoryGroupCountsForDownload(prjctIdx, sids); + for (Integer count : countMap.values()) { + maxCount = Math.max(maxCount, count); + } + lastSid = sids.get(sids.size() - 1); + } + } + + private List getSortedHeaders(Long prjctIdx) { + List headers = listHeaderService.getHeader(prjctIdx).stream() + .sorted(Comparator.comparing(ListHeaderDto::getListHderOrder)) + .toList(); + if (headers.isEmpty()) { + throw BusinessException.badRequest("LIST_HEADER_NOT_FOUND", "리스트 헤더가 없습니다."); + } + return headers; + } + + private List toBaseHeaderNames(List headers) { + return headers.stream() + .map(ListHeaderDto::getListHderNm) + .toList(); + } + + private Map createBaseRow(List headers, ListSearchService.DownloadListRow row) { + Map excelRow = new LinkedHashMap<>(); + for (ListHeaderDto header : headers) { + excelRow.put(header.getListHderNm(), resolveBaseCellValue(header, row)); + } + return excelRow; + } + + private Map createEventHistoryRow( + List headers, + ListSearchService.DownloadListRow row, + List histories, + int maxHistoryCount + ) { + Map excelRow = createBaseRow(headers, row); + for (int index = 0; index < maxHistoryCount; index++) { + ListSearchService.EventHistoryRow history = index < histories.size() ? histories.get(index) : null; + excelRow.put(createRepeatedHeaderName(HEADER_TYPE, index), history == null ? "" : defaultString(history.eventTy())); + excelRow.put(createRepeatedHeaderName(HEADER_DATE, index), history == null ? "" : formatDateTime(history.regDt())); + excelRow.put(createRepeatedHeaderName(HEADER_USER, index), history == null ? "" : defaultString(history.regUser())); + excelRow.put(createRepeatedHeaderName(HEADER_RESULT, index), history == null ? "" : defaultString(history.resultCd())); + excelRow.put(createRepeatedHeaderName(HEADER_MEMO, index), history == null ? "" : defaultString(history.memo())); + } + return excelRow; + } + + private Map createUpdateHistoryRow( + Integer sid, + List histories, + int maxHistoryCount + ) { + Map excelRow = new LinkedHashMap<>(); + excelRow.put("sid", sid); + for (int index = 0; index < maxHistoryCount; index++) { + ListSearchService.UpdateHistoryGroupRow history = index < histories.size() ? histories.get(index) : null; + excelRow.put(createRepeatedHeaderName(HEADER_DATE, index), history == null ? "" : formatDateTime(history.regDt())); + excelRow.put(createRepeatedHeaderName(HEADER_USER, index), history == null ? "" : defaultString(history.regUser())); + excelRow.put(createRepeatedHeaderName(HEADER_BEFORE, index), history == null ? "" : defaultString(history.beforeSummary())); + excelRow.put(createRepeatedHeaderName(HEADER_AFTER, index), history == null ? "" : defaultString(history.afterSummary())); + } + return excelRow; + } + + private Object resolveBaseCellValue(ListHeaderDto header, ListSearchService.DownloadListRow row) { + if (Objects.equals(header.getListHderTy(), ListHeaderType.SID)) { + return row.sid(); + } + if (Objects.equals(header.getListHderTy(), ListHeaderType.IS_USE)) { + return toUseValue(row.isUse()); + } + if (Objects.equals(header.getListHderTy(), ListHeaderType.MEMO)) { + return defaultString(row.memo()); + } + if (Objects.equals(header.getListHderTy(), ListHeaderType.OUTSOURCE)) { + return String.join(", ", row.assignValues().outsourceUserIds()); + } + if (Objects.equals(header.getListHderTy(), ListHeaderType.FIELDWORK)) { + return String.join(", ", row.assignValues().fieldworkUserIds()); + } + return defaultString(row.itemMap().get(header.getListHderId())); + } + + private void appendRepeatedHeaders(List headers, List repeatedHeaders, int repeatCount) { + for (int index = 0; index < repeatCount; index++) { + for (String repeatedHeader : repeatedHeaders) { + headers.add(createRepeatedHeaderName(repeatedHeader, index)); + } + } + } + + private String createRepeatedHeaderName(String headerName, int index) { + return index == 0 ? headerName : headerName + "\u200B".repeat(index); + } + + private void validateDateRange(DateRangeDto dateRange) { + if (dateRange == null) { + return; + } + + if (dateRange.getStartDate() != null + && dateRange.getEndDate() != null + && dateRange.getStartDate().isAfter(dateRange.getEndDate())) { + throw BusinessException.badRequest("INVALID_DATE_RANGE", "시작일은 종료일보다 늦을 수 없습니다."); + } + } + + private String formatDateTime(LocalDateTime dateTime) { + return dateTime == null ? "" : DateTimeUtil.DATETIME_FMT.format(dateTime); + } + + private String toUseValue(Short isUse) { + if (Objects.equals(isUse, ListIsUse.USABLE.getCode())) { + return "O"; + } + if (Objects.equals(isUse, ListIsUse.UNUSABLE.getCode())) { + return "X"; + } + if (Objects.equals(isUse, ListIsUse.TEST.getCode())) { + return "TEST"; + } + return defaultString(isUse); + } + + private String defaultString(Object value) { + return value == null ? "" : String.valueOf(value); + } +} 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 df5a434..9d91d01 100644 --- a/src/main/java/com/kri/contact/server/service/ListSearchService.java +++ b/src/main/java/com/kri/contact/server/service/ListSearchService.java @@ -3,27 +3,40 @@ package com.kri.contact.server.service; import com.kri.common.feature.web.BusinessException; import com.kri.common.feature.web.page.PageRequestDto; import com.kri.common.feature.web.page.PageResponseDto; +import com.kri.contact.server.common.consts.ContactConstant; +import com.kri.contact.server.common.enums.ListSearchResponseType; import com.kri.contact.server.common.enums.ResultCodeType; +import com.kri.contact.server.dto.common.DateRangeDto; import com.kri.contact.server.dto.list.ListContactResultDto; import com.kri.contact.server.dto.list.ListFilterDto; +import com.kri.contact.server.dto.list.ListHeaderDto; import com.kri.contact.server.dto.list.ListResultBaseDto; import com.kri.contact.server.dto.list.ListSearchBaseDto; import com.kri.contact.server.dto.list.ListSearchRequestDto; +import com.kri.contact.server.dto.list.ListSearchWithFullResultDto; import com.kri.contact.server.dto.list.ListSearchWithResultDto; +import com.kri.contact.server.persistence.entity.TListAssignEntity; import com.kri.contact.server.persistence.entity.TListEntity; import com.kri.contact.server.persistence.entity.TListEventHistEntity; import com.kri.contact.server.persistence.entity.TListItemEntity; +import com.kri.contact.server.persistence.entity.TListUpdateHistEntity; +import com.kri.contact.server.persistence.entity.TUserEntity; +import com.kri.contact.server.persistence.repository.ListAssignRepository; import com.kri.contact.server.persistence.repository.ListEventHistRepository; import com.kri.contact.server.persistence.repository.ListItemRepository; import com.kri.contact.server.persistence.repository.ListRepository; +import com.kri.contact.server.persistence.repository.ListUpdateHistRepository; +import com.kri.contact.server.persistence.repository.UserRepository; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.NoSuchElementException; +import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; @@ -36,18 +49,24 @@ import org.springframework.transaction.annotation.Transactional; @RequiredArgsConstructor public class ListSearchService { + private final ListAssignRepository listAssignRepository; private final ListEventHistRepository listEventHistRepository; private final ListItemRepository listItemRepository; private final ListRepository listRepository; + private final ListUpdateHistRepository listUpdateHistRepository; private final ListHeaderService listHeaderService; + private final UserRepository userRepository; @Transactional(readOnly = true) - public ListSearchWithResultDto getListSearchOne(Long prjctIdx, Integer sid) { + public ListSearchWithFullResultDto searchListWithSid(Long prjctIdx, Integer sid) { ListFilterDto filterDto = ListFilterDto.onlyOneSid(sid); - List result = createListSearchWithResult(prjctIdx, findAllListEntities(prjctIdx, filterDto)); + List result = createListSearchWithFullResult( + prjctIdx, + findAllListEntities(prjctIdx, filterDto) + ); if (result.isEmpty()) { - throw BusinessException.notFound("Not found list", "해당하는 List가 없습니다.") + throw BusinessException.notFound("LIST_NOT_FOUND", "해당하는 리스트가 없습니다.") .with("sid", sid); } @@ -55,17 +74,18 @@ public class ListSearchService { } @Transactional(readOnly = true) - public PageResponseDto getListSearchWithResultList( + public PageResponseDto searchListWithPaging( Long prjctIdx, - ListSearchRequestDto request + ListSearchRequestDto request, + ListSearchResponseType responseType ) { List listEntities = findPagedListEntities(prjctIdx, request); - List content = createListSearchWithResult(prjctIdx, listEntities); - long totalCount = findAllSids(prjctIdx, request == null ? null : request.getListFilter()).size(); + List content = createListSearch(prjctIdx, listEntities, responseType); + int totalCount = findAllSids(prjctIdx, request == null ? null : request.getListFilter()).size(); PageRequestDto pageRequest = request == null ? null : request.getPageRequest(); int pageIndex = pageRequest == null ? 0 : Math.max(pageRequest.getPageIndex(), 0); - int pageSize = pageRequest == null ? Math.max(content.size(), 1) : Math.max(pageRequest.getPageSize(), 1); + int pageSize = pageRequest == null ? Math.max(totalCount, 1) : Math.max(pageRequest.getPageSize(), 1); return PageResponseDto.from(new PageImpl<>( content, @@ -73,11 +93,207 @@ public class ListSearchService { totalCount )); } + + @Transactional(readOnly = true) + public List searchListWithPagingOnlyContents( + Long prjctIdx, + ListSearchRequestDto request, + ListSearchResponseType responseType + ) { + List listEntities = findPagedListEntities(prjctIdx, request); + return createListSearch(prjctIdx, listEntities, responseType); + } + @Transactional(readOnly = true) public Set findTargetSids(Long prjctIdx, ListFilterDto listFilter) { return new LinkedHashSet<>(findAllSids(prjctIdx, listFilter)); } + @Transactional(readOnly = true) + public List findDownloadListRows( + Long prjctIdx, + ListFilterDto listFilter, + Integer lastSid + ) { + List emailTelnumHeaderIds = listHeaderService.getEmailTelnumHeaderId(prjctIdx); + List listEntities = listRepository.findChunkedListEntities( + prjctIdx, + emailTelnumHeaderIds, + listFilter, + lastSid, + ContactConstant.LIST_SELECT_CHUNK_SIZE + ); + if (listEntities.isEmpty()) { + return Collections.emptyList(); + } + + Set sidSet = listEntities.stream() + .map(TListEntity::getSid) + .collect(Collectors.toCollection(LinkedHashSet::new)); + Map> itemMapBySid = createItemMapBySid(prjctIdx, sidSet, null); + Map assignMapBySid = createAssignMapBySid(prjctIdx, sidSet); + + return listEntities.stream() + .map(entity -> new DownloadListRow( + entity.getSid(), + entity.getUse(), + entity.getMemo(), + itemMapBySid.getOrDefault(entity.getSid(), Collections.emptyMap()), + assignMapBySid.getOrDefault(entity.getSid(), AssignValues.empty()) + )) + .toList(); + } + + @Transactional(readOnly = true) + public List findDownloadSids( + Long prjctIdx, + ListFilterDto listFilter, + Integer lastSid + ) { + List emailTelnumHeaderIds = listHeaderService.getEmailTelnumHeaderId(prjctIdx); + return listRepository.findChunkedSids( + prjctIdx, + emailTelnumHeaderIds, + listFilter, + lastSid, + ContactConstant.LIST_SELECT_CHUNK_SIZE + ); + } + + @Transactional(readOnly = true) + public Map findEventHistoryCountsForDownload( + Long prjctIdx, + Collection sids, + Collection resultCodeTypes, + DateRangeDto dateRange + ) { + if (sids == null || sids.isEmpty()) { + return Collections.emptyMap(); + } + + return listEventHistRepository.findDownloadHistoryCounts( + prjctIdx, + sids, + toEventTypeCodes(resultCodeTypes), + getStartDate(dateRange), + getEndDate(dateRange) + ) + .stream() + .collect(Collectors.toMap( + ListEventHistRepository.EventHistoryCountProjection::getSid, + projection -> projection.getHistoryCount().intValue(), + (left, right) -> right, + LinkedHashMap::new + )); + } + + @Transactional(readOnly = true) + public Map> findEventHistoriesForDownload( + Long prjctIdx, + Collection sids, + Collection resultCodeTypes, + DateRangeDto dateRange + ) { + if (sids == null || sids.isEmpty()) { + return Collections.emptyMap(); + } + + return listEventHistRepository.findDownloadHistories( + prjctIdx, + sids, + toEventTypeCodes(resultCodeTypes), + getStartDate(dateRange), + getEndDate(dateRange) + ) + .stream() + .collect(Collectors.groupingBy( + TListEventHistEntity::getSid, + LinkedHashMap::new, + Collectors.mapping( + entity -> new EventHistoryRow( + entity.getEventTy(), + entity.getRegDt(), + entity.getRegUser(), + entity.getResultCd(), + entity.getMemo() + ), + Collectors.toList() + ) + )); + } + + @Transactional(readOnly = true) + public Map findUpdateHistoryGroupCountsForDownload( + Long prjctIdx, + Collection sids + ) { + if (sids == null || sids.isEmpty()) { + return Collections.emptyMap(); + } + + Map counts = new LinkedHashMap<>(); + for (ListUpdateHistRepository.UpdateHistoryGroupProjection projection + : listUpdateHistRepository.findDownloadHistoryGroups(prjctIdx, sids)) { + counts.merge(projection.getSid(), 1, Integer::sum); + } + return counts; + } + + @Transactional(readOnly = true) + public Map> findUpdateHistoryGroupsForDownload( + Long prjctIdx, + Collection sids + ) { + if (sids == null || sids.isEmpty()) { + return Collections.emptyMap(); + } + + Map headerMap = listHeaderService.getHeader(prjctIdx).stream() + .collect(Collectors.toMap( + ListHeaderDto::getListHderId, + header -> header, + (left, right) -> left, + LinkedHashMap::new + )); + + List histories = listUpdateHistRepository.findDownloadHistories(prjctIdx, sids); + Map> grouped = histories.stream() + .collect(Collectors.groupingBy( + history -> new UpdateHistoryGroupKey(history.getSid(), history.getRegDt(), history.getRegUser()), + LinkedHashMap::new, + Collectors.toList() + )); + + Map> result = new LinkedHashMap<>(); + for (Map.Entry> entry : grouped.entrySet()) { + List groupHistories = entry.getValue().stream() + .sorted(Comparator.comparing( + (TListUpdateHistEntity history) -> headerMap.containsKey(history.getListHderId()) + ? headerMap.get(history.getListHderId()).getListHderOrder() + : Short.MAX_VALUE + ).thenComparing(TListUpdateHistEntity::getListUpdateHistIdx)) + .toList(); + + List beforeValues = new ArrayList<>(groupHistories.size()); + List afterValues = new ArrayList<>(groupHistories.size()); + for (TListUpdateHistEntity history : groupHistories) { + String headerName = resolveHeaderName(headerMap, history.getListHderId()); + beforeValues.add(headerName + ": " + defaultString(history.getBeforeVal())); + afterValues.add(headerName + ": " + defaultString(history.getAfterVal())); + } + + UpdateHistoryGroupKey key = entry.getKey(); + result.computeIfAbsent(key.sid(), ignored -> new ArrayList<>()) + .add(new UpdateHistoryGroupRow( + key.regDt(), + key.regUser(), + "[" + String.join(", ", beforeValues) + "]", + "[" + String.join(", ", afterValues) + "]" + )); + } + return result; + } + @Transactional(readOnly = true) public List findUpdateTargetRows( Long prjctIdx, @@ -109,8 +325,8 @@ public class ListSearchService { private List findPagedListEntities(Long prjctIdx, ListSearchRequestDto request) { List emailTelnumHeaderIds = listHeaderService.getEmailTelnumHeaderId(prjctIdx); - ListFilterDto listFilter = request == null ? null : request.getListFilter(); + return listRepository.findPagedListEntities( prjctIdx, emailTelnumHeaderIds, @@ -168,6 +384,61 @@ public class ListSearchService { .toList(); } + private List createListSearchWithFullResult(Long prjctIdx, List listEntities) { + List rows = createListSearchRows(prjctIdx, listEntities); + if (rows.isEmpty()) { + return Collections.emptyList(); + } + + List sids = rows.stream() + .map(row -> row.listEntity().getSid()) + .toList(); + + Map resultMap = listEventHistRepository + .findLatestListByEventTy(prjctIdx, sids) + .stream() + .collect(Collectors.toMap( + entity -> new ListResultKey(entity.getSid(), entity.getEventTy()), + entity -> entity, + (left, right) -> left + )); + + ListResultBaseDto mailSendResult = null; + ListResultBaseDto smsSendResult = null; + + return rows.stream() + .map(row -> { + Integer sid = row.listEntity().getSid(); + return ListSearchWithFullResultDto.from( + row.listEntity(), + row.itemList(), + ListContactResultDto.from(resultMap.get(new ListResultKey(sid, ResultCodeType.CONTACT.getCode()))), + ListContactResultDto.from(resultMap.get(new ListResultKey(sid, ResultCodeType.INTERVIEW.getCode()))), + ListResultBaseDto.from(resultMap.get(new ListResultKey(sid, ResultCodeType.SURVEY.getCode()))), + mailSendResult, + smsSendResult + ); + }) + .toList(); + } + + @SuppressWarnings("unchecked") + private List createListSearch( + Long prjctIdx, + List listEntities, + ListSearchResponseType responseType + ) { + if (responseType == null) { + throw BusinessException.badRequest("INVALID_RESPONSE_TYPE", "리스트 반환 타입은 필수입니다."); + } + + return switch (responseType) { + case BASE -> (List) createListSearchBase(prjctIdx, listEntities); + case WITH_RESULT -> (List) createListSearchWithResult(prjctIdx, listEntities); + case WITH_FULL_RESULT -> (List) createListSearchWithFullResult(prjctIdx, listEntities); + }; + } + private List createListSearchRows(Long prjctIdx, List listEntities) { if (listEntities.isEmpty()) { return Collections.emptyList(); @@ -208,6 +479,71 @@ public class ListSearchService { )); } + private Map createAssignMapBySid(Long prjctIdx, Set sidSet) { + List assignEntities = listAssignRepository.findByPrjctIdxAndSidIn(prjctIdx, sidSet); + if (assignEntities.isEmpty()) { + return Collections.emptyMap(); + } + + Set assignedUserIds = assignEntities.stream() + .map(TListAssignEntity::getUserId) + .filter(Objects::nonNull) + .filter(userId -> !userId.isBlank()) + .collect(Collectors.toCollection(LinkedHashSet::new)); + Map roleByUserId = userRepository.findByUserIdInAndDelFalse(assignedUserIds).stream() + .collect(Collectors.toMap( + TUserEntity::getUserId, + TUserEntity::getUserRole, + (left, right) -> right, + LinkedHashMap::new + )); + + Map result = new LinkedHashMap<>(); + for (TListAssignEntity assignEntity : assignEntities) { + Integer role = roleByUserId.get(assignEntity.getUserId()); + if (role == null) { + continue; + } + + AssignValues assignValues = result.computeIfAbsent(assignEntity.getSid(), ignored -> AssignValues.empty()); + if (role >= ContactConstant.FIELDWORK_USER_ROLE) { + assignValues.fieldworkUserIds().add(assignEntity.getUserId()); + } else if (role >= ContactConstant.OUTSOURCE_USER_ROLE) { + assignValues.outsourceUserIds().add(assignEntity.getUserId()); + } + } + return result; + } + + private List toEventTypeCodes(Collection resultCodeTypes) { + if (resultCodeTypes == null || resultCodeTypes.isEmpty()) { + throw BusinessException.badRequest("INVALID_RESULT_CODE_TYPE", "조회할 결과 구분은 1개 이상이어야 합니다."); + } + + return resultCodeTypes.stream() + .filter(Objects::nonNull) + .map(ResultCodeType::getCode) + .distinct() + .toList(); + } + + private LocalDateTime getStartDate(DateRangeDto dateRange) { + return dateRange == null ? null : dateRange.getStartDate(); + } + + private LocalDateTime getEndDate(DateRangeDto dateRange) { + return dateRange == null ? null : dateRange.getEndDate(); + } + + private String resolveHeaderName(Map headerMap, Integer headerId) { + ListHeaderDto header = headerMap.get(headerId); + return header == null ? String.valueOf(headerId) : header.getListHderNm(); + } + + private String defaultString(String value) { + return value == null ? "" : value; + } + private record ListSearchRow( TListEntity listEntity, Map itemList @@ -218,6 +554,44 @@ public class ListSearchService { Short eventTy ) {} + private record UpdateHistoryGroupKey( + Integer sid, + LocalDateTime regDt, + String regUser + ) {} + + public record AssignValues( + List outsourceUserIds, + List fieldworkUserIds + ) { + public static AssignValues empty() { + return new AssignValues(new ArrayList<>(), new ArrayList<>()); + } + } + + public record DownloadListRow( + Integer sid, + Short isUse, + String memo, + Map itemMap, + AssignValues assignValues + ) {} + + public record EventHistoryRow( + Short eventTy, + LocalDateTime regDt, + String regUser, + Integer resultCd, + String memo + ) {} + + public record UpdateHistoryGroupRow( + LocalDateTime regDt, + String regUser, + String beforeSummary, + String afterSummary + ) {} + public record ListUpdateTargetRow( Integer sid, Short isUse, diff --git a/src/main/java/com/kri/contact/server/service/ListUploadService.java b/src/main/java/com/kri/contact/server/service/ListUploadService.java index 61ff0fc..743c881 100644 --- a/src/main/java/com/kri/contact/server/service/ListUploadService.java +++ b/src/main/java/com/kri/contact/server/service/ListUploadService.java @@ -9,11 +9,11 @@ import static com.kri.common.feature.util.StringUtil.normalizeOnlyNumber; import static com.kri.contact.server.common.consts.ContactConstant.ASSIGN_TYPE; import static com.kri.contact.server.common.consts.ContactConstant.DEFAULT_AND_FILE_TYPE; import static com.kri.contact.server.common.consts.ContactConstant.LIST_TEXT_REGEX; +import static com.kri.contact.server.common.consts.ContactConstant.LOWER_CASE_HEADER_OPTIONS; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.kri.common.feature.excel.ExcelMapper; -import com.kri.common.feature.excel.StreamingReadOptions; import com.kri.common.feature.web.BusinessException; import com.kri.contact.server.common.consts.ContactConstant; import com.kri.contact.server.common.enums.ListHeaderGrade; @@ -44,7 +44,6 @@ import java.util.Comparator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.Set; @@ -60,9 +59,6 @@ import org.springframework.web.multipart.MultipartFile; @RequiredArgsConstructor public class ListUploadService { - private static final StreamingReadOptions LOWER_CASE_HEADER_OPTIONS = - new StreamingReadOptions(null, 0, 1, header -> header == null ? null : header.toLowerCase(Locale.ROOT)); - private final ListRepository listRepository; private final ListUploadJdbcSupport listUploadJdbcSupport; private final ListUploadLogRepository listUploadLogRepository; -- 2.49.0.windows.1 From 50ecd6bf6badf5d5904d3dd3f263369e514c1005 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Tue, 14 Jul 2026 10:01:05 +0900 Subject: [PATCH 8/9] =?UTF-8?q?260714=5F01=5FENH:=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=84=9C=EB=B2=84=EC=97=90=EC=84=9C=20=EA=B8=B0?= =?UTF-8?q?=EB=8F=99=20=ED=9B=84=20=EC=A4=91=EA=B0=84=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EB=A5=BC=20=EC=9C=84=ED=95=9C=20=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + build.gradle | 2 +- .../server/common/consts/ContactConstant.java | 26 +- .../server/common/enums/ChannelType.java | 4 - .../server/common/enums/ListAssignType.java | 35 + .../common/enums/ListEventHistoryBase.java | 29 + .../ListEventHistoryExternalEntryType.java | 29 + .../enums/ListEventHistorySurveyType.java | 31 + .../common/enums/ListFilterMatchType.java | 30 + .../common/enums/ListFilterOperator.java | 29 + .../server/common/enums/ListHeaderGrade.java | 2 + .../server/common/enums/ListHeaderType.java | 8 +- .../common/enums/ListHeaderTypeAssign.java | 32 + .../common/enums/ListHeaderTypeDefault.java | 11 +- .../common/enums/ListHeaderTypeSpecific.java | 5 +- .../server/common/enums/ListIsUse.java | 2 + .../server/common/enums/ListResetMode.java | 2 + .../common/enums/ListSearchResponseType.java | 3 + .../server/common/enums/ListUploadMode.java | 5 +- .../server/common/enums/ProjectStatus.java | 4 +- .../server/common/enums/ResultCodeType.java | 8 +- .../server/common/enums/SurveyType.java | 2 + .../server/common/enums/SystemEventType.java | 16 +- .../external/notihub/NotiHubApiClient.java | 125 ++++ .../NotiHubBulkSendCreateRequestDto.java | 19 + .../notihub/NotiHubBulkSendResponseDto.java | 18 + .../external/notihub/NotiHubDestInfoDto.java | 16 + .../notihub/NotiHubSendRequestBulkDto.java | 16 + .../notihub/NotiHubSendRequestSingleDto.java | 20 + .../external/notihub/NotiHubTemplateDto.java | 19 + .../ListFilterConditionValidator.java | 30 + .../validation/ValidListFilterCondition.java | 20 + .../server/controller/AssignController.java | 63 +- .../server/controller/AuthController.java | 2 +- .../server/controller/CmpnController.java | 68 ++ .../controller/ListCallHistController.java | 38 ++ .../server/controller/ListController.java | 94 ++- .../controller/ListHeaderController.java | 11 +- .../controller/ListHistoryController.java | 77 ++- .../server/controller/MessageController.java | 65 ++ .../server/controller/ProgressController.java | 54 ++ .../server/controller/ProjectController.java | 7 +- .../server/controller/ReserveController.java | 56 ++ .../controller/ResultCodeController.java | 2 +- .../server/controller/UserController.java | 21 +- .../contact/server/dto/cmpn/CmpnInfoDto.java | 76 +++ .../list/ListAssignFilterConditionDto.java | 21 + .../server/dto/list/ListAssignInfoDto.java | 33 - .../server/dto/list/ListAssignRequestDto.java | 35 + .../dto/list/ListAssignResetRequestDto.java | 30 + .../server/dto/list/ListCallHistDto.java | 54 ++ .../dto/list/ListCallHistRequestDto.java | 63 ++ .../server/dto/list/ListContactResultDto.java | 10 +- .../list/ListEventHistDownloadRequestDto.java | 6 + .../dto/list/ListEventHistFromSurveyDto.java | 33 + .../list/ListEventHistInsertRequestDto.java | 41 ++ .../list/ListEventHistInternalMetaDto.java | 54 ++ .../dto/list/ListEventHistSurveyMetaDto.java | 52 ++ .../server/dto/list/ListEventHistoryDto.java | 37 + .../dto/list/ListFilterConditionDto.java | 32 + .../server/dto/list/ListFilterDto.java | 43 +- .../server/dto/list/ListHeaderDto.java | 12 +- .../list/ListHeaderWithFilterContentDto.java | 41 ++ .../list/ListOtherItemFilterConditionDto.java | 20 + .../server/dto/list/ListResetRequestDto.java | 2 + .../server/dto/list/ListResultBaseDto.java | 9 +- .../server/dto/list/ListSearchBaseDto.java | 33 +- .../server/dto/list/ListSearchRequestDto.java | 2 + .../dto/list/ListSearchWithFullResultDto.java | 15 +- .../dto/list/ListSearchWithResultDto.java | 7 +- .../server/dto/list/ListSendResultDto.java | 36 + .../server/dto/list/ListUpdateHistoryDto.java | 33 + .../server/dto/list/ListUpdateRequestDto.java | 7 +- .../dto/list/ListUploadFileInfoDto.java | 17 + .../server/dto/list/ListUploadHistoryDto.java | 47 ++ .../message/MessageBulkSendResponseDto.java | 19 + .../dto/message/MessageFailedChunkDto.java | 15 + .../message/MessageSendBulkRequestDto.java | 35 + .../message/MessageSendSingleRequestDto.java | 33 + .../dto/progress/ProgressDateResponseDto.java | 24 + .../progress/ProgressSearchRequestDto.java | 23 + .../dto/progress/ProgressUserResponseDto.java | 20 + .../server/dto/project/ProjectInfoDto.java | 5 + .../dto/project/ProjectUpdateRequestDto.java | 6 +- .../server/dto/project/ResultCodeDto.java | 3 + .../server/dto/reserve/ListReserveDto.java | 35 + .../dto/reserve/ListReserveRequestDto.java | 26 + .../dto/systemlog/UploadContentDto.java | 28 + .../dto/systemlog/UploadUserContentDto.java | 16 - .../persistence/entity/TCmpnEntity.java | 92 +++ .../persistence/entity/TFuncEntity.java | 48 -- ...Entity.java => TListAssignCmpnEntity.java} | 10 +- .../entity/TListAssignUserEntity.java | 49 ++ .../entity/TListAssignUserRoleMapEntity.java | 49 ++ .../entity/TListCallHistEntity.java | 7 +- .../entity/TListContentEntity.java | 44 ++ .../persistence/entity/TListEntity.java | 5 +- .../entity/TListEventHistEntity.java | 48 +- ...ntity.java => TListEventLatestEntity.java} | 33 +- .../entity/TListItemFileEntity.java | 26 +- .../entity/TListUploadLogEntity.java | 3 + .../entity/TPrjctAssignCmpnEntity.java | 56 ++ ...ntity.java => TPrjctAssignUserEntity.java} | 17 +- .../persistence/entity/TPrjctEntity.java | 10 + .../persistence/entity/TResultCodeEntity.java | 10 +- .../entity/id/TListEventLatestEntityId.java | 30 + .../entity/id/TListItemFileEntityId.java | 9 +- .../entity/id/TPrjctAssignCmpnEntityId.java | 41 ++ ...yId.java => TPrjctAssignUserEntityId.java} | 9 +- .../entity/id/TRoleFuncMapEntityId.java | 27 - .../jdbc/ListAssignJdbcSupport.java | 171 +++++ .../jdbc/ListResetJdbcSupport.java | 366 ++++------ .../jdbc/ListUpdateJdbcSupport.java | 71 ++ .../jdbc/ListUploadJdbcSupport.java | 55 +- .../query/ProgressQuerySupport.java | 234 +++++++ .../persistence/query/ProjectSpecs.java | 25 +- .../repository/CmpnRepository.java | 18 + .../repository/ListAssignCmpnRepository.java | 45 ++ .../repository/ListAssignRepository.java | 43 -- .../repository/ListAssignUserRepository.java | 62 ++ .../ListAssignUserRoleMapRepository.java | 12 + .../repository/ListCallHistRepository.java | 7 + .../repository/ListContentRepository.java | 13 + .../repository/ListEventHistRepository.java | 122 ++-- .../repository/ListHeaderRepository.java | 16 + .../repository/ListItemFileRepository.java | 7 + .../repository/ListItemRepository.java | 21 + .../repository/ListQueryRepositoryImpl.java | 637 ++++++++++++++++-- .../repository/ListRepository.java | 3 + .../repository/ListReserveRepository.java | 18 + .../repository/ListUpdateHistRepository.java | 5 + .../repository/ListUploadLogRepository.java | 12 + .../ProjectAssignCmpnRepository.java | 38 ++ ....java => ProjectAssignUserRepository.java} | 29 +- .../repository/ResultCodeRepository.java | 23 +- .../repository/UserRepository.java | 14 + .../ListUploadFileCleanupScheduler.java | 74 ++ .../contact/server/service/AssignService.java | 377 +++++++++-- .../contact/server/service/CmpnService.java | 81 +++ .../server/service/ListCallHistService.java | 62 ++ .../service/ListContentItemService.java | 75 +++ .../server/service/ListDownloadService.java | 93 ++- .../server/service/ListHeaderService.java | 72 +- .../service/ListHistoryQueryService.java | 34 + .../server/service/ListResetService.java | 72 +- .../server/service/ListSearchService.java | 178 +++-- .../server/service/ListUpdateService.java | 241 +++++-- .../server/service/ListUploadService.java | 363 +++++++++- .../server/service/MessageService.java | 426 ++++++++++++ .../server/service/ProgressService.java | 224 ++++++ .../server/service/ProjectService.java | 14 +- .../server/service/ReserveService.java | 58 ++ .../server/service/ResultCodeService.java | 31 +- .../contact/server/service/UserService.java | 6 +- .../{ => common}/SystemEventLogService.java | 48 +- .../service/file/AbstractFileService.java | 7 +- .../server/service/file/ListFileService.java | 62 ++ .../service/file/ListItemFileService.java | 47 +- src/main/resources/application-dev.yml | 1 + src/main/resources/application-local.yml | 2 + src/main/resources/application-prod.yml | 1 + src/main/resources/application.yml | 12 +- 162 files changed, 6790 insertions(+), 907 deletions(-) create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListAssignType.java create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListEventHistoryBase.java create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListEventHistoryExternalEntryType.java create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListEventHistorySurveyType.java create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListFilterMatchType.java create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListFilterOperator.java create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeAssign.java create mode 100644 src/main/java/com/kri/contact/server/common/external/notihub/NotiHubApiClient.java create mode 100644 src/main/java/com/kri/contact/server/common/external/notihub/NotiHubBulkSendCreateRequestDto.java create mode 100644 src/main/java/com/kri/contact/server/common/external/notihub/NotiHubBulkSendResponseDto.java create mode 100644 src/main/java/com/kri/contact/server/common/external/notihub/NotiHubDestInfoDto.java create mode 100644 src/main/java/com/kri/contact/server/common/external/notihub/NotiHubSendRequestBulkDto.java create mode 100644 src/main/java/com/kri/contact/server/common/external/notihub/NotiHubSendRequestSingleDto.java create mode 100644 src/main/java/com/kri/contact/server/common/external/notihub/NotiHubTemplateDto.java create mode 100644 src/main/java/com/kri/contact/server/common/validation/ListFilterConditionValidator.java create mode 100644 src/main/java/com/kri/contact/server/common/validation/ValidListFilterCondition.java create mode 100644 src/main/java/com/kri/contact/server/controller/CmpnController.java create mode 100644 src/main/java/com/kri/contact/server/controller/ListCallHistController.java create mode 100644 src/main/java/com/kri/contact/server/controller/MessageController.java create mode 100644 src/main/java/com/kri/contact/server/controller/ProgressController.java create mode 100644 src/main/java/com/kri/contact/server/controller/ReserveController.java create mode 100644 src/main/java/com/kri/contact/server/dto/cmpn/CmpnInfoDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListAssignFilterConditionDto.java delete mode 100644 src/main/java/com/kri/contact/server/dto/list/ListAssignInfoDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListAssignRequestDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListAssignResetRequestDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListCallHistDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListCallHistRequestDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListEventHistFromSurveyDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListEventHistInsertRequestDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListEventHistInternalMetaDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListEventHistSurveyMetaDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListEventHistoryDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListFilterConditionDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListHeaderWithFilterContentDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListOtherItemFilterConditionDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListSendResultDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListUpdateHistoryDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListUploadFileInfoDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListUploadHistoryDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/message/MessageBulkSendResponseDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/message/MessageFailedChunkDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/message/MessageSendBulkRequestDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/message/MessageSendSingleRequestDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/progress/ProgressDateResponseDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/progress/ProgressSearchRequestDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/progress/ProgressUserResponseDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/reserve/ListReserveDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/reserve/ListReserveRequestDto.java create mode 100644 src/main/java/com/kri/contact/server/dto/systemlog/UploadContentDto.java delete mode 100644 src/main/java/com/kri/contact/server/dto/systemlog/UploadUserContentDto.java create mode 100644 src/main/java/com/kri/contact/server/persistence/entity/TCmpnEntity.java delete mode 100644 src/main/java/com/kri/contact/server/persistence/entity/TFuncEntity.java rename src/main/java/com/kri/contact/server/persistence/entity/{TListAssignEntity.java => TListAssignCmpnEntity.java} (88%) create mode 100644 src/main/java/com/kri/contact/server/persistence/entity/TListAssignUserEntity.java create mode 100644 src/main/java/com/kri/contact/server/persistence/entity/TListAssignUserRoleMapEntity.java create mode 100644 src/main/java/com/kri/contact/server/persistence/entity/TListContentEntity.java rename src/main/java/com/kri/contact/server/persistence/entity/{TRoleFuncMapEntity.java => TListEventLatestEntity.java} (52%) create mode 100644 src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignCmpnEntity.java rename src/main/java/com/kri/contact/server/persistence/entity/{TPrjctAssignEntity.java => TPrjctAssignUserEntity.java} (77%) create mode 100644 src/main/java/com/kri/contact/server/persistence/entity/id/TListEventLatestEntityId.java create mode 100644 src/main/java/com/kri/contact/server/persistence/entity/id/TPrjctAssignCmpnEntityId.java rename src/main/java/com/kri/contact/server/persistence/entity/id/{TPrjctAssignEntityId.java => TPrjctAssignUserEntityId.java} (82%) delete mode 100644 src/main/java/com/kri/contact/server/persistence/entity/id/TRoleFuncMapEntityId.java create mode 100644 src/main/java/com/kri/contact/server/persistence/jdbc/ListAssignJdbcSupport.java create mode 100644 src/main/java/com/kri/contact/server/persistence/query/ProgressQuerySupport.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/CmpnRepository.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListAssignCmpnRepository.java delete mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListAssignRepository.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListAssignUserRepository.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListAssignUserRoleMapRepository.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListCallHistRepository.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListContentRepository.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListReserveRepository.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignCmpnRepository.java rename src/main/java/com/kri/contact/server/persistence/repository/{ProjectAssignRepository.java => ProjectAssignUserRepository.java} (55%) create mode 100644 src/main/java/com/kri/contact/server/scheduler/ListUploadFileCleanupScheduler.java create mode 100644 src/main/java/com/kri/contact/server/service/CmpnService.java create mode 100644 src/main/java/com/kri/contact/server/service/ListCallHistService.java create mode 100644 src/main/java/com/kri/contact/server/service/ListContentItemService.java create mode 100644 src/main/java/com/kri/contact/server/service/ListHistoryQueryService.java create mode 100644 src/main/java/com/kri/contact/server/service/MessageService.java create mode 100644 src/main/java/com/kri/contact/server/service/ProgressService.java create mode 100644 src/main/java/com/kri/contact/server/service/ReserveService.java rename src/main/java/com/kri/contact/server/service/{ => common}/SystemEventLogService.java (79%) diff --git a/.gitignore b/.gitignore index 4b0e1ba..c6c74f5 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ bin/ ### IntelliJ IDEA ### .idea +.idea_bak *.iws *.iml *.ipr diff --git a/build.gradle b/build.gradle index 163c872..22d3b28 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ repositories { } dependencies { - implementation "com.kri.common:starter:beta.1.1.15" + implementation "com.kri.common:starter:latest.release" implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' diff --git a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java index 5c80113..949dee9 100644 --- a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java +++ b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java @@ -7,36 +7,40 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; import java.util.stream.Stream; +import lombok.NoArgsConstructor; +@NoArgsConstructor public final class ContactConstant { public static final int INSERT_CHUNK_SIZE = 1_000; public static final int LIST_SELECT_CHUNK_SIZE = 1_000; + public static final String SYSTEM_USER_NAME = "SYSTEM"; public static final String DEFAULT_COMPANY_NAME = "KRI"; public static final String DEFAULT_USER_TEAM = "S101"; public static final int OUTSOURCE_USER_ROLE = 4000; public static final int FIELDWORK_USER_ROLE = 9000; - - public static final StreamingReadOptions LOWER_CASE_HEADER_OPTIONS = - new StreamingReadOptions(null, 0, 1, header -> header == null ? null : header.toLowerCase( + public static final int CONTACT_INTERVIEWER_ROLE = 9002; + public static final int FIELD_INTERVIEWER_ROLE = 9003; + public static final StreamingReadOptions UPPER_CASE_HEADER_OPTIONS = + new StreamingReadOptions(null, 0, 1, header -> header == null ? null : header.toUpperCase( Locale.ROOT)); - public static final String LIST_TEXT_REGEX = "^[가-힣a-zA-Z0-9()_\\-\\[\\] ]+$"; + public static final String LIST_HEADER_ACCEPT_REGEX = "^[가-힣a-zA-Z0-9()_\\-\\[\\] ]+$"; public static final List DEFAULT_AND_FILE_TYPE = Stream.concat( Arrays.stream(ListHeaderTypeDefault.values()) .map(defaultType -> ListHeaderType.fromCode(defaultType.getCode())), Stream.of(ListHeaderType.FILE) ).toList(); + public static final List ASSIGN_TYPE = List.of( ListHeaderType.OUTSOURCE, - ListHeaderType.FIELDWORK - ); - public static final List EMAIL_TELNUM_TYPE = List.of( - ListHeaderType.EMAIL, - ListHeaderType.TEL_NUM + ListHeaderType.CONTACT_INTERVIEWER, + ListHeaderType.FIELD_INTERVIEWER ); - private ContactConstant() { - } + public static final List EXACT_MATCH_HEADER_TYPE = List.of( + ListHeaderType.CONTENT_ITEM + ); + } diff --git a/src/main/java/com/kri/contact/server/common/enums/ChannelType.java b/src/main/java/com/kri/contact/server/common/enums/ChannelType.java index f304dc1..e558e91 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ChannelType.java +++ b/src/main/java/com/kri/contact/server/common/enums/ChannelType.java @@ -19,10 +19,6 @@ public enum ChannelType implements CodeEnum { private final Short code; - ChannelType(CodeEnum source) { - this.code = source.getCode(); - } - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static ChannelType fromCode(Short code) { if (code == null) { diff --git a/src/main/java/com/kri/contact/server/common/enums/ListAssignType.java b/src/main/java/com/kri/contact/server/common/enums/ListAssignType.java new file mode 100644 index 0000000..8fd6b3c --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListAssignType.java @@ -0,0 +1,35 @@ +package com.kri.contact.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.kri.common.feature.enums.CodeEnum; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +@Schema(description = "리스트 배정 타입") +public enum ListAssignType implements CodeEnum { + @Schema(description = "외주사") + OUTSOURCE(ListHeaderType.OUTSOURCE.getCode()), + @Schema(description = "컨택원") + CONTACT_INTERVIEWER(ListHeaderType.CONTACT_INTERVIEWER.getCode()), + @Schema(description = "현장 면접원") + FIELD_INTERVIEWER(ListHeaderType.FIELD_INTERVIEWER.getCode()); + + private final Short code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ListAssignType fromCode(Short code) { + if (code == null) { + return null; + } + for (ListAssignType value : values()) { + if (value.code.equals(code)) { + return value; + } + } + throw new IllegalArgumentException("Unknown ListAssignType code: " + code); + } +} diff --git a/src/main/java/com/kri/contact/server/common/enums/ListEventHistoryBase.java b/src/main/java/com/kri/contact/server/common/enums/ListEventHistoryBase.java new file mode 100644 index 0000000..09b0003 --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListEventHistoryBase.java @@ -0,0 +1,29 @@ +package com.kri.contact.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.kri.common.feature.enums.CodeEnum; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +public enum ListEventHistoryBase implements CodeEnum { + ALL((short) 1), + LATEST((short) 2); + + private final Short code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ListEventHistoryBase fromCode(Short code) { + if (code == null) { + return null; + } + for (ListEventHistoryBase value : values()) { + if (value.code.equals(code)) { + return value; + } + } + throw new IllegalArgumentException("Unknown ListEventHistoryBase code: " + code); + } +} \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/common/enums/ListEventHistoryExternalEntryType.java b/src/main/java/com/kri/contact/server/common/enums/ListEventHistoryExternalEntryType.java new file mode 100644 index 0000000..34beeea --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListEventHistoryExternalEntryType.java @@ -0,0 +1,29 @@ +package com.kri.contact.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.kri.common.feature.enums.CodeEnum; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +public enum ListEventHistoryExternalEntryType implements CodeEnum { + REDIRECT((short) 10), + API((short) 20); + + private final Short code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ListEventHistoryExternalEntryType fromCode(Short code) { + if (code == null) { + return null; + } + for (ListEventHistoryExternalEntryType value : values()) { + if (value.code.equals(code)) { + return value; + } + } + throw new IllegalArgumentException("Unknown ListEventHistoryExternalEntryType code: " + code); + } +} diff --git a/src/main/java/com/kri/contact/server/common/enums/ListEventHistorySurveyType.java b/src/main/java/com/kri/contact/server/common/enums/ListEventHistorySurveyType.java new file mode 100644 index 0000000..1955eed --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListEventHistorySurveyType.java @@ -0,0 +1,31 @@ +package com.kri.contact.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.kri.common.feature.enums.CodeEnum; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +public enum ListEventHistorySurveyType implements CodeEnum { + START((short) 1), + COMPLETE((short) 10), + SCREEN((short) 99), + QUOTA((short) 98); + + private final Short code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ListEventHistorySurveyType fromCode(Short code) { + if (code == null) { + return null; + } + for (ListEventHistorySurveyType value : values()) { + if (value.code.equals(code)) { + return value; + } + } + throw new IllegalArgumentException("Unknown ListEventHistorySurveyType code: " + code); + } +} diff --git a/src/main/java/com/kri/contact/server/common/enums/ListFilterMatchType.java b/src/main/java/com/kri/contact/server/common/enums/ListFilterMatchType.java new file mode 100644 index 0000000..fbdf77d --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListFilterMatchType.java @@ -0,0 +1,30 @@ +package com.kri.contact.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.kri.common.feature.enums.CodeEnum; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +public enum ListFilterMatchType implements CodeEnum { + EXACT((short) 1), + CONTAINS((short) 2), + EMPTY((short) 3); + + private final Short code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ListFilterMatchType fromCode(Short code) { + if (code == null) { + return null; + } + for (ListFilterMatchType value : values()) { + if (value.code.equals(code)) { + return value; + } + } + throw new IllegalArgumentException("Unknown ListFilterMatchType code: " + code); + } +} diff --git a/src/main/java/com/kri/contact/server/common/enums/ListFilterOperator.java b/src/main/java/com/kri/contact/server/common/enums/ListFilterOperator.java new file mode 100644 index 0000000..3e30bad --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListFilterOperator.java @@ -0,0 +1,29 @@ +package com.kri.contact.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.kri.common.feature.enums.CodeEnum; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +public enum ListFilterOperator implements CodeEnum { + POSITIVE((short) 1), + NEGATIVE((short) 2); + + private final Short code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ListFilterOperator fromCode(Short code) { + if (code == null) { + return null; + } + for (ListFilterOperator value : values()) { + if (value.code.equals(code)) { + return value; + } + } + throw new IllegalArgumentException("Unknown ListFilterOperator code: " + code); + } +} diff --git a/src/main/java/com/kri/contact/server/common/enums/ListHeaderGrade.java b/src/main/java/com/kri/contact/server/common/enums/ListHeaderGrade.java index 8f483a2..565f80d 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ListHeaderGrade.java +++ b/src/main/java/com/kri/contact/server/common/enums/ListHeaderGrade.java @@ -3,11 +3,13 @@ package com.kri.contact.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import com.kri.common.feature.enums.CodeEnum; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.RequiredArgsConstructor; @Getter(onMethod_ = @JsonValue) @RequiredArgsConstructor +@Schema(description = "리스트 헤더 등급") public enum ListHeaderGrade implements CodeEnum { IMMUTABLE((short) 0), // 불변 헤더 (옵션 변경 불가) diff --git a/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java b/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java index 770cc61..c200185 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java +++ b/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java @@ -3,22 +3,26 @@ package com.kri.contact.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import com.kri.common.feature.enums.CodeEnum; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.RequiredArgsConstructor; @Getter(onMethod_ = @JsonValue) @RequiredArgsConstructor +@Schema(description = "리스트 헤더 타입") public enum ListHeaderType implements CodeEnum { SID(ListHeaderTypeDefault.SID), //11 : SID IS_USE(ListHeaderTypeDefault.IS_USE), //12 : 사용여부 OUTSOURCE(ListHeaderTypeDefault.OUTSOURCE), //13 : 외주사 - FIELDWORK(ListHeaderTypeDefault.FIELDWORK), //14 : 컨택원/면접원 + CONTACT_INTERVIEWER(ListHeaderTypeDefault.CONTACT_INTERVIEWER), //14 : 면접원 + FIELD_INTERVIEWER(ListHeaderTypeDefault.FIELD_INTERVIEWER), //15 : 컨택원 MEMO(ListHeaderTypeDefault.MEMO), //19 : 메모 TEL_NUM(ListHeaderTypeSpecific.TEL_NUM), //21 : 전화번호 EMAIL(ListHeaderTypeSpecific.EMAIL), //31 : 이메일 FILE(ListHeaderTypeSpecific.FILE), //81 : 파일업로드 - TEXT((short) 91); //91 : 텍스트 + CONTENT_ITEM(ListHeaderTypeSpecific.CONTENT_ITEM), //91 : 목록형 + TEXT((short) 99); //99 : 텍스트 private final Short code; diff --git a/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeAssign.java b/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeAssign.java new file mode 100644 index 0000000..742ca48 --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeAssign.java @@ -0,0 +1,32 @@ +package com.kri.contact.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.kri.common.feature.enums.CodeEnum; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +@Schema(description = "리스트 헤더 타입(배정 관련)") +public enum ListHeaderTypeAssign implements CodeEnum { + OUTSOURCE((short) 13), //13 : 외주사 + CONTACT_INTERVIEWER((short) 14), //14 : 면접원 + FIELD_INTERVIEWER((short) 15); //15 : 컨택원 + + private final Short code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ListHeaderTypeAssign fromCode(Short code) { + if (code == null) { + return null; + } + for (ListHeaderTypeAssign s : values()) { + if (s.code.equals(code)) { + return s; + } + } + throw new IllegalArgumentException("Unknown ListHeaderTypeAssign code: " + code); + } +} \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeDefault.java b/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeDefault.java index f99ad33..a485d31 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeDefault.java +++ b/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeDefault.java @@ -3,21 +3,26 @@ package com.kri.contact.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import com.kri.common.feature.enums.CodeEnum; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.RequiredArgsConstructor; @Getter(onMethod_ = @JsonValue) @RequiredArgsConstructor +@Schema(description = "리스트 헤더 타입(기본)") public enum ListHeaderTypeDefault implements CodeEnum { SID((short) 11), //11 : SID IS_USE((short) 12), //12 : 사용여부 - OUTSOURCE((short) 13), //13 : 외주사 - FIELDWORK((short) 14), //14 : 컨택원/면접원 + OUTSOURCE(ListHeaderTypeAssign.OUTSOURCE), //13 : 외주사 + CONTACT_INTERVIEWER(ListHeaderTypeAssign.CONTACT_INTERVIEWER), //14 : 면접원 + FIELD_INTERVIEWER(ListHeaderTypeAssign.FIELD_INTERVIEWER), //15 : 컨택원 MEMO((short) 19); //19 : 메모 private final Short code; + ListHeaderTypeDefault(CodeEnum source) { this.code = source.getCode();} + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) public static ListHeaderTypeDefault fromCode(Short code) { if (code == null) { @@ -28,6 +33,6 @@ public enum ListHeaderTypeDefault implements CodeEnum { return s; } } - throw new IllegalArgumentException("Unknown ListHeaderType code: " + code); + throw new IllegalArgumentException("Unknown ListHeaderTypeDefault code: " + code); } } diff --git a/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeSpecific.java b/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeSpecific.java index 0c95b78..39dd6ab 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeSpecific.java +++ b/src/main/java/com/kri/contact/server/common/enums/ListHeaderTypeSpecific.java @@ -3,16 +3,19 @@ package com.kri.contact.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import com.kri.common.feature.enums.CodeEnum; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.RequiredArgsConstructor; @Getter(onMethod_ = @JsonValue) @RequiredArgsConstructor +@Schema(description = "리스트 헤더 타입(특수)") public enum ListHeaderTypeSpecific implements CodeEnum { TEL_NUM((short) 21), //21 : 전화번호 EMAIL((short) 31), //31 : 이메일 - FILE((short) 81); //81 : 파일업로드 + FILE((short) 81), //81 : 파일업로드 + CONTENT_ITEM((short) 91); //목록형 private final Short code; diff --git a/src/main/java/com/kri/contact/server/common/enums/ListIsUse.java b/src/main/java/com/kri/contact/server/common/enums/ListIsUse.java index e2feaf8..9c7ebe7 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ListIsUse.java +++ b/src/main/java/com/kri/contact/server/common/enums/ListIsUse.java @@ -3,11 +3,13 @@ package com.kri.contact.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import com.kri.common.feature.enums.CodeEnum; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.RequiredArgsConstructor; @Getter(onMethod_ = @JsonValue) @RequiredArgsConstructor +@Schema(description = "리스트 사용 여부") public enum ListIsUse implements CodeEnum { UNUSABLE((short) 0), //0 : 사용 안함 diff --git a/src/main/java/com/kri/contact/server/common/enums/ListResetMode.java b/src/main/java/com/kri/contact/server/common/enums/ListResetMode.java index fe30095..83adadf 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ListResetMode.java +++ b/src/main/java/com/kri/contact/server/common/enums/ListResetMode.java @@ -2,11 +2,13 @@ package com.kri.contact.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.RequiredArgsConstructor; @Getter(onMethod_ = @JsonValue) @RequiredArgsConstructor +@Schema(description = "리스트 초기화 모드") public enum ListResetMode { ALL((short) 0), diff --git a/src/main/java/com/kri/contact/server/common/enums/ListSearchResponseType.java b/src/main/java/com/kri/contact/server/common/enums/ListSearchResponseType.java index a6679db..851f389 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ListSearchResponseType.java +++ b/src/main/java/com/kri/contact/server/common/enums/ListSearchResponseType.java @@ -1,5 +1,8 @@ package com.kri.contact.server.common.enums; +import io.swagger.v3.oas.annotations.media.Schema; + +@Schema(description = "리스트 조회 응답 타입") public enum ListSearchResponseType { BASE, WITH_RESULT, diff --git a/src/main/java/com/kri/contact/server/common/enums/ListUploadMode.java b/src/main/java/com/kri/contact/server/common/enums/ListUploadMode.java index c9c61ab..9acfdf8 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ListUploadMode.java +++ b/src/main/java/com/kri/contact/server/common/enums/ListUploadMode.java @@ -9,10 +9,11 @@ import lombok.RequiredArgsConstructor; @Getter(onMethod_ = @JsonValue) @RequiredArgsConstructor +@Schema(description = "리스트 업로드 모드") public enum ListUploadMode implements CodeEnum { - CHANGE((short) 0), - ADD((short) 1); + RESET_AND_INSERT((short) 0), + ADD_AND_CHANGE((short) 1); private final Short code; diff --git a/src/main/java/com/kri/contact/server/common/enums/ProjectStatus.java b/src/main/java/com/kri/contact/server/common/enums/ProjectStatus.java index 5ff9620..5ef0f63 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ProjectStatus.java +++ b/src/main/java/com/kri/contact/server/common/enums/ProjectStatus.java @@ -3,15 +3,17 @@ package com.kri.contact.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import com.kri.common.feature.enums.CodeEnum; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.RequiredArgsConstructor; @Getter(onMethod_ = @JsonValue) // Lombok이 생성하는 getCode()에 @JsonValue 부착 @RequiredArgsConstructor +@Schema(description = "프로젝트 상태") public enum ProjectStatus implements CodeEnum { STANDBY((short) 0), // 대기 PROGRESS((short) 1), // 진행 - COMPELETE((short) 10); // 완료 + COMPLETE((short) 10); // 완료 private final Short code; diff --git a/src/main/java/com/kri/contact/server/common/enums/ResultCodeType.java b/src/main/java/com/kri/contact/server/common/enums/ResultCodeType.java index a74ade3..0b10bc8 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ResultCodeType.java +++ b/src/main/java/com/kri/contact/server/common/enums/ResultCodeType.java @@ -3,16 +3,18 @@ package com.kri.contact.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import com.kri.common.feature.enums.CodeEnum; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.RequiredArgsConstructor; @Getter(onMethod_ = @JsonValue) @RequiredArgsConstructor +@Schema(description = "결과값") public enum ResultCodeType implements CodeEnum { - CONTACT((short) 0), // 컨택 결과코드 - INTERVIEW((short) 1), // 면접 결과코드 - SURVEY((short) 2); // 설문 결과코드 + CONTACT((short) 21), // 컨택 결과코드 + INTERVIEW((short) 22), // 면접 결과코드 + SURVEY((short) 99); // 설문 결과코드 private final Short code; diff --git a/src/main/java/com/kri/contact/server/common/enums/SurveyType.java b/src/main/java/com/kri/contact/server/common/enums/SurveyType.java index 889725f..72c6228 100644 --- a/src/main/java/com/kri/contact/server/common/enums/SurveyType.java +++ b/src/main/java/com/kri/contact/server/common/enums/SurveyType.java @@ -3,11 +3,13 @@ package com.kri.contact.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import com.kri.common.feature.enums.CodeEnum; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.RequiredArgsConstructor; @Getter(onMethod_ = @JsonValue) @RequiredArgsConstructor +@Schema(description = "설문 타입") public enum SurveyType implements CodeEnum { NONE((short) 0), // 없음 diff --git a/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java b/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java index 7bb7d9a..fa2336b 100644 --- a/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java +++ b/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java @@ -1,11 +1,13 @@ package com.kri.contact.server.common.enums; import com.kri.common.feature.enums.CodeEnum; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.RequiredArgsConstructor; @Getter @RequiredArgsConstructor +@Schema(description = "시스템 이벤트 타입") public enum SystemEventType implements CodeEnum { //1의 자리 1 insert, 2 update, 3 delete, 4 upload //100의 자리 대분류, 10의 자리 소분류 @@ -16,7 +18,7 @@ public enum SystemEventType implements CodeEnum { CREATE_PROJECT((short) 211), // 프로젝트 생성 UPDATE_PROJECT((short) 212), // 프로젝트 수정 DELETE_PROJECT((short) 213), // 프로젝트 삭제 - ASSIGN_PROJECT_USER((short) 222), // 프로젝트 배정 + ASSIGN_PROJECT((short) 222), // 프로젝트 배정 UPDATE_PROJECT_DEFAULT_TEMPLATE((short) 232), // 기본 템플릿 수정 CREATE_USER((short) 311), // 사용자 생성 @@ -28,10 +30,14 @@ public enum SystemEventType implements CodeEnum { UPDATE_ROLE((short) 412), // 권한 수정 DELETE_ROLE((short) 413), // 권한 삭제 - UPSERT_LIST_HEADER((short) 1011), //리스트 헤더 수정 - UPLOAD_LIST((short) 1021), //리스트 업로드 - UPDATE_LIST((short) 1022), //리스트 수정 - RESET_LIST((short) 1023), //리스트 삭제 + UPSERT_LIST_HEADER((short) 1012), //리스트 헤더 수정 + + UPLOAD_LIST((short) 1111), //리스트 업로드 + UPDATE_LIST((short) 1112), //리스트 수정 + RESET_LIST((short) 1113), //리스트 삭제 + LIST_ASSIGN((short) 1122), //리스트 배정 + LIST_ASSIGN_RESET((short) 1123), //리스트 배정 초기화 + UPLOAD_LIST_ITEM_FILE((short) 1211), //리스트별 파일 업로드 DUMMY((short) 9999); diff --git a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubApiClient.java b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubApiClient.java new file mode 100644 index 0000000..ec4bcda --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubApiClient.java @@ -0,0 +1,125 @@ +package com.kri.contact.server.common.external.notihub; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.kri.common.feature.http.ExternalApiClient; +import com.kri.common.feature.http.ExternalApiResponse; +import com.kri.common.feature.web.BusinessException; +import com.kri.common.feature.web.RequestUserContext; +import java.util.HashMap; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.springframework.web.util.UriComponentsBuilder; + +@Component +@RequiredArgsConstructor +public class NotiHubApiClient { + + private final ExternalApiClient externalApiClient = new ExternalApiClient(); + private final ObjectMapper objectMapper; + + @Value("${kri.api-url.noti-hub}") + private String notiHubBaseUrl; + + @Value("${kri.auth.apikey.header-name:X-API-Key}") + private String apiKeyHeaderName; + + @Value("${kri.auth.apikey.key}") + private String apiKey; + + public NotiHubTemplateDto getTemplate(Long tmplatIdx) { + String url = notiHubBaseUrl + "/template/" + tmplatIdx; + try { + ExternalApiResponse response = externalApiClient.get(url, headers()); + return objectMapper.readValue(response.getBody(), NotiHubTemplateDto.class); + } catch (JsonProcessingException e) { + throw BusinessException.badRequest("NOTI_HUB_RESPONSE_PARSE_FAILED", "noti-hub 응답을 해석할 수 없습니다.") + .with("url", url); + } + } + + public void sendEmailSingle(NotiHubSendRequestSingleDto request, RequestUserContext ctx) { + postSingle("/send-email/single", request, ctx); + } + + public void sendSmsSingle(NotiHubSendRequestSingleDto request, RequestUserContext ctx) { + postSingle("/send-sms/single", request, ctx); + } + + public String createEmailBulk(NotiHubBulkSendCreateRequestDto request) { + return createBulk("/send-email/create/bulk", request); + } + + public String createSmsBulk(NotiHubBulkSendCreateRequestDto request) { + return createBulk("/send-sms/create/bulk", request); + } + + public NotiHubBulkSendResponseDto sendEmailBulk(NotiHubSendRequestBulkDto request) { + return sendBulk("/send-email/bulk", request); + } + + public NotiHubBulkSendResponseDto sendSmsBulk(NotiHubSendRequestBulkDto request) { + return sendBulk("/send-sms/bulk", request); + } + + private void postSingle(String path, NotiHubSendRequestSingleDto request, RequestUserContext ctx) { + post(urlWithContext(path, ctx), request); + } + + private String createBulk(String path, NotiHubBulkSendCreateRequestDto request) { + ExternalApiResponse response = put(notiHubBaseUrl + path, request); + return response.getBody(); + } + + private NotiHubBulkSendResponseDto sendBulk(String path, NotiHubSendRequestBulkDto request) { + String url = notiHubBaseUrl + path; + try { + ExternalApiResponse response = post(url, request); + return objectMapper.readValue(response.getBody(), NotiHubBulkSendResponseDto.class); + } catch (JsonProcessingException e) { + throw BusinessException.badRequest("NOTI_HUB_RESPONSE_PARSE_FAILED", "noti-hub 응답을 해석할 수 없습니다.") + .with("url", url); + } + } + + private ExternalApiResponse post(String url, Object request) { + try { + return externalApiClient.post(url, headers(), objectMapper.writeValueAsString(request)); + } catch (JsonProcessingException e) { + throw BusinessException.badRequest("NOTI_HUB_REQUEST_SERIALIZE_FAILED", "noti-hub 요청을 생성할 수 없습니다.") + .with("url", url); + } + } + + private ExternalApiResponse put(String url, Object request) { + try { + return externalApiClient.put(url, headers(), objectMapper.writeValueAsString(request)); + } catch (JsonProcessingException e) { + throw BusinessException.badRequest("NOTI_HUB_REQUEST_SERIALIZE_FAILED", "noti-hub 요청을 생성할 수 없습니다.") + .with("url", url); + } + } + + private String urlWithContext(String path, RequestUserContext ctx) { + UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(notiHubBaseUrl + path); + if (ctx != null) { + builder.queryParam("userId", ctx.getUserId()); + builder.queryParam("userCmpn", ctx.getUserCmpn()); + builder.queryParam("userTeam", ctx.getUserTeam()); + builder.queryParam("userName", ctx.getUserName()); + builder.queryParam("userRole", ctx.getUserRole()); + builder.queryParam("clientIp", ctx.getClientIp()); + builder.queryParam("authenticated", ctx.isAuthenticated()); + } + return builder.build().toUriString(); + } + + private Map headers() { + Map headers = new HashMap<>(); + headers.put(apiKeyHeaderName, apiKey); + headers.put("Content-Type", "application/json"); + return headers; + } +} diff --git a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubBulkSendCreateRequestDto.java b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubBulkSendCreateRequestDto.java new file mode 100644 index 0000000..ab2dfd0 --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubBulkSendCreateRequestDto.java @@ -0,0 +1,19 @@ +package com.kri.contact.server.common.external.notihub; + +import java.time.LocalDateTime; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class NotiHubBulkSendCreateRequestDto { + + private String reqstCmpn; + private String reqstUser; + private String reqstSvc; + private String prjctCd; + private Long tmplatIdx; + private Boolean resve; + private LocalDateTime sendDt; + private Integer trgtCnt; +} diff --git a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubBulkSendResponseDto.java b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubBulkSendResponseDto.java new file mode 100644 index 0000000..a2343fc --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubBulkSendResponseDto.java @@ -0,0 +1,18 @@ +package com.kri.contact.server.common.external.notihub; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@JsonIgnoreProperties(ignoreUnknown = true) +public class NotiHubBulkSendResponseDto { + + private String bulkSendKey; + private Integer requestCount; + private Integer acceptCount; + private Integer failCount; +} diff --git a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubDestInfoDto.java b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubDestInfoDto.java new file mode 100644 index 0000000..3dd9436 --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubDestInfoDto.java @@ -0,0 +1,16 @@ +package com.kri.contact.server.common.external.notihub; + +import java.util.Map; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class NotiHubDestInfoDto { + + private String sid; + private String destEml; + private String destTel; + private String destNm; + private Map msgParam; +} diff --git a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubSendRequestBulkDto.java b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubSendRequestBulkDto.java new file mode 100644 index 0000000..2ab90d4 --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubSendRequestBulkDto.java @@ -0,0 +1,16 @@ +package com.kri.contact.server.common.external.notihub; + +import java.util.List; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class NotiHubSendRequestBulkDto { + + private String sendEml; + private String sendTel; + private String sendNm; + private String bulkSendKey; + private List destInfoList; +} diff --git a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubSendRequestSingleDto.java b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubSendRequestSingleDto.java new file mode 100644 index 0000000..bf5e1d4 --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubSendRequestSingleDto.java @@ -0,0 +1,20 @@ +package com.kri.contact.server.common.external.notihub; + +import java.time.LocalDateTime; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class NotiHubSendRequestSingleDto { + + private String sendEml; + private String sendTel; + private String sendNm; + private NotiHubDestInfoDto destInfo; + private Long tmplatIdx; + private String reqstSvc; + private String prjctCd; + private Boolean resve; + private LocalDateTime sendDt; +} diff --git a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubTemplateDto.java b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubTemplateDto.java new file mode 100644 index 0000000..09f2e06 --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubTemplateDto.java @@ -0,0 +1,19 @@ +package com.kri.contact.server.common.external.notihub; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@JsonIgnoreProperties(ignoreUnknown = true) +public class NotiHubTemplateDto { + + private Long tmplatIdx; + private String tmplatBody; + private String sendTel; + private String sendEml; + private String sendNm; +} diff --git a/src/main/java/com/kri/contact/server/common/validation/ListFilterConditionValidator.java b/src/main/java/com/kri/contact/server/common/validation/ListFilterConditionValidator.java new file mode 100644 index 0000000..0828b36 --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/validation/ListFilterConditionValidator.java @@ -0,0 +1,30 @@ +package com.kri.contact.server.common.validation; + +import static com.kri.common.feature.util.StringUtil.normalizeBlank; + +import com.kri.contact.server.common.enums.ListFilterMatchType; +import com.kri.contact.server.dto.list.ListFilterConditionDto; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; + +public class ListFilterConditionValidator + implements ConstraintValidator { + + @Override + public boolean isValid(ListFilterConditionDto value, ConstraintValidatorContext context) { + if (value == null || value.getMatchType() == null) { + return true; + } + + if (value.getMatchType() == ListFilterMatchType.EMPTY) { + return value.getValues() == null || value.getValues().isEmpty(); + } + + if (value.getValues() == null || value.getValues().isEmpty()) { + return false; + } + + return value.getValues().stream() + .anyMatch(raw -> normalizeBlank(raw) != null); + } +} diff --git a/src/main/java/com/kri/contact/server/common/validation/ValidListFilterCondition.java b/src/main/java/com/kri/contact/server/common/validation/ValidListFilterCondition.java new file mode 100644 index 0000000..86a71d4 --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/validation/ValidListFilterCondition.java @@ -0,0 +1,20 @@ +package com.kri.contact.server.common.validation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Constraint(validatedBy = ListFilterConditionValidator.class) +public @interface ValidListFilterCondition { + + String message() default "Invalid list filter condition."; + + Class[] groups() default {}; + + Class[] payload() default {}; +} diff --git a/src/main/java/com/kri/contact/server/controller/AssignController.java b/src/main/java/com/kri/contact/server/controller/AssignController.java index 439b467..7309c4b 100644 --- a/src/main/java/com/kri/contact/server/controller/AssignController.java +++ b/src/main/java/com/kri/contact/server/controller/AssignController.java @@ -2,14 +2,17 @@ package com.kri.contact.server.controller; import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.web.RequestUserContext; +import com.kri.contact.server.dto.list.ListAssignRequestDto; +import com.kri.contact.server.dto.list.ListAssignResetRequestDto; import com.kri.contact.server.service.AssignService; -import com.kri.contact.server.service.SystemEventLogService; +import com.kri.contact.server.service.common.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import java.time.LocalDateTime; import java.util.List; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PutMapping; @@ -26,19 +29,19 @@ public class AssignController { private final SystemEventLogService systemEventLogService; private final AssignService assignService; - @Operation(summary = "배정된 외주사 조회") - @GetMapping("/prjct-outsource/{prjctIdx}") - public List getPrjctOutsourceAssign(@PathVariable Long prjctIdx) { - return assignService.getPrjctOutsourceAssign(prjctIdx); - } - - @Operation(summary = "배정된 컨택원/면접원 조회") + @Operation(summary = "프로젝트 fieldwork 배정 조회") @GetMapping("/prjct-fieldwork/{prjctIdx}") public List getPrjctFieldworkAssign(@PathVariable Long prjctIdx) { return assignService.getPrjctFieldworkAssign(prjctIdx); } - @Operation(summary = "컨택원/면접원 배정") + @Operation(summary = "프로젝트 회사 배정 조회") + @GetMapping("/prjct-cmpn/{prjctIdx}") + public List getPrjctCmpnAssign(@PathVariable Long prjctIdx) { + return assignService.getPrjctCmpnAssign(prjctIdx); + } + + @Operation(summary = "프로젝트 fieldwork 배정") @PutMapping("/prjct-fieldwork/{prjctIdx}") public void upsertPrjctFieldworkAssign( @PathVariable Long prjctIdx, @@ -50,4 +53,46 @@ public class AssignController { systemEventLogService.writeAssignUserProject(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, assignUserIdList); } + + @Operation(summary = "프로젝트 회사 배정") + @PutMapping("/prjct-cmpn/{prjctIdx}") + public void upsertPrjctCmpnAssign( + @PathVariable Long prjctIdx, + @Valid @RequestBody List assignCmpnIdList, + RequestUserContext ctx + ) { + final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + assignService.upsertPrjctCmpnAssign(prjctIdx, assignCmpnIdList, ctx.getUserId(), now); + systemEventLogService.writeAssignCmpnProject(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, + assignCmpnIdList); + } + + @Operation(summary = "리스트 배정") + @PutMapping("/list/{prjctIdx}/{assignId}") + public Integer upsertListAssign( + @PathVariable Long prjctIdx, + @PathVariable String assignId, + @Valid @RequestBody ListAssignRequestDto req, + RequestUserContext ctx + ) { + final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + Integer assignCnt = assignService.upsertListAssign(prjctIdx, assignId, req, ctx.getUserId(), now); + systemEventLogService.writeAssignList(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, req); + + return assignCnt; + } + + @Operation(summary = "리스트 배정 초기화") + @DeleteMapping("/list/reset/{prjctIdx}") + public Integer resetListAssign( + @PathVariable Long prjctIdx, + @Valid @RequestBody ListAssignResetRequestDto req, + RequestUserContext ctx + ) { + final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + Integer resetCnt = assignService.resetListAssign(prjctIdx, req); + systemEventLogService.writeAssignListReset(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, req); + + return resetCnt; + } } diff --git a/src/main/java/com/kri/contact/server/controller/AuthController.java b/src/main/java/com/kri/contact/server/controller/AuthController.java index 2391ef5..4adf2f4 100644 --- a/src/main/java/com/kri/contact/server/controller/AuthController.java +++ b/src/main/java/com/kri/contact/server/controller/AuthController.java @@ -5,7 +5,7 @@ import com.kri.common.feature.web.RequestUserContext; import com.kri.contact.server.dto.auth.LoginRequestDto; import com.kri.contact.server.dto.auth.LoginResponseDto; import com.kri.contact.server.service.AuthService; -import com.kri.contact.server.service.SystemEventLogService; +import com.kri.contact.server.service.common.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/src/main/java/com/kri/contact/server/controller/CmpnController.java b/src/main/java/com/kri/contact/server/controller/CmpnController.java new file mode 100644 index 0000000..369d3c1 --- /dev/null +++ b/src/main/java/com/kri/contact/server/controller/CmpnController.java @@ -0,0 +1,68 @@ +package com.kri.contact.server.controller; + +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.web.RequestUserContext; +import com.kri.contact.server.dto.cmpn.CmpnInfoDto; +import com.kri.contact.server.dto.common.DataVerificationDto; +import com.kri.contact.server.service.CmpnService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import java.time.LocalDateTime; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/cmpn") +@RequiredArgsConstructor +@Tag(name = "Cmpn", description = "회사 관리 API") +public class CmpnController { + + private final CmpnService cmpnService; + + @Operation(summary = "회사 ID 사용 가능 여부 확인") + @GetMapping("/check-cmpn-id") + public DataVerificationDto checkCmpnId(@RequestParam String cmpnId) { + return cmpnService.checkCmpnId(cmpnId); + } + + @Operation(summary = "회사 정보 조회") + @GetMapping("/{cmpnId}") + public CmpnInfoDto getCmpn(@PathVariable String cmpnId) { + return cmpnService.getCmpn(cmpnId); + } + + @Operation(summary = "회사 목록 조회") + @GetMapping + public List getCmpnList() { + return cmpnService.getCmpnList(); + } + + @Operation(summary = "회사 생성") + @PutMapping + public void createCmpn( + @Valid @RequestBody CmpnInfoDto cmpnInfo, + RequestUserContext ctx + ) { + final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + cmpnService.createCmpn(cmpnInfo, ctx.getUserId(), now); + } + + @Operation(summary = "회사 정보 수정") + @PatchMapping + public void updateCmpn( + @Valid @RequestBody CmpnInfoDto dto, + RequestUserContext ctx + ) { + final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + cmpnService.updateCmpn(dto, ctx.getUserId(), now); + } +} diff --git a/src/main/java/com/kri/contact/server/controller/ListCallHistController.java b/src/main/java/com/kri/contact/server/controller/ListCallHistController.java new file mode 100644 index 0000000..144b16a --- /dev/null +++ b/src/main/java/com/kri/contact/server/controller/ListCallHistController.java @@ -0,0 +1,38 @@ +package com.kri.contact.server.controller; + +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.web.RequestUserContext; +import com.kri.contact.server.dto.list.ListCallHistDto; +import com.kri.contact.server.dto.list.ListCallHistRequestDto; +import com.kri.contact.server.service.ListCallHistService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import java.time.LocalDateTime; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/list-call-hist") +@RequiredArgsConstructor +@Tag(name = "ListCallHistory", description = "List call history API") +public class ListCallHistController { + + private final ListCallHistService listCallHistService; + + @Operation(summary = "Save list call history") + @PutMapping("/{prjctIdx}/{sid}") + public ListCallHistDto saveCallHistory( + @PathVariable Long prjctIdx, + @PathVariable Integer sid, + @Valid @RequestBody ListCallHistRequestDto request, + RequestUserContext ctx + ) { + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + return listCallHistService.saveCallHistory(prjctIdx, sid, request, ctx.getUserId(), now); + } +} diff --git a/src/main/java/com/kri/contact/server/controller/ListController.java b/src/main/java/com/kri/contact/server/controller/ListController.java index 42d700e..3b87df1 100644 --- a/src/main/java/com/kri/contact/server/controller/ListController.java +++ b/src/main/java/com/kri/contact/server/controller/ListController.java @@ -3,6 +3,7 @@ package com.kri.contact.server.controller; import static com.kri.contact.server.common.util.ExcelResponseBuilder.buildExcelResponse; import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.util.CollectionUtil; import com.kri.common.feature.web.BusinessException; import com.kri.common.feature.web.RequestUserContext; import com.kri.common.feature.web.page.PageResponseDto; @@ -13,20 +14,30 @@ import com.kri.contact.server.dto.list.ListResetRequestDto; import com.kri.contact.server.dto.list.ListSearchRequestDto; import com.kri.contact.server.dto.list.ListSearchWithFullResultDto; import com.kri.contact.server.dto.list.ListUpdateRequestDto; +import com.kri.contact.server.dto.list.ListUploadFileInfoDto; +import com.kri.contact.server.dto.list.ListUploadHistoryDto; import com.kri.contact.server.dto.list.ListUploadRequestDto; import com.kri.contact.server.dto.project.ProjectInfoDto; +import com.kri.contact.server.dto.systemlog.UploadContentDto; import com.kri.contact.server.service.ListDownloadService; import com.kri.contact.server.service.ListResetService; import com.kri.contact.server.service.ListSearchService; import com.kri.contact.server.service.ListUpdateService; import com.kri.contact.server.service.ListUploadService; import com.kri.contact.server.service.ProjectService; -import com.kri.contact.server.service.SystemEventLogService; +import com.kri.contact.server.service.common.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; @@ -56,7 +67,7 @@ public class ListController { private final SystemEventLogService systemEventLogService; @Operation(summary = "리스트 정보 조회 With Sid") - @GetMapping("/search/{prjctIdx}/{sid}") + @GetMapping("/search-sid/{prjctIdx}/{sid}") public ListSearchWithFullResultDto searchListWithSid( @PathVariable Long prjctIdx, @PathVariable Integer sid @@ -65,7 +76,7 @@ public class ListController { } @Operation(summary = "리스트 정보 조회 With Filter") - @PostMapping("/search/{prjctIdx}") + @PostMapping("/search-filter/{prjctIdx}") public PageResponseDto searchListWithFilter( @PathVariable Long prjctIdx, @Valid @RequestBody ListSearchRequestDto request @@ -85,11 +96,29 @@ public class ListController { return buildExcelResponse(projectInfoDto.getPrjctName() + " upload_template.xlsx", bytes); } + @Operation(summary = "리스트 업로드 이력 조회") + @GetMapping("/excel/upload-history/{prjctIdx}") + public List findUploadHistories(@PathVariable Long prjctIdx) { + getProjectOrThrow(prjctIdx); + return listUploadService.findUploadHistories(prjctIdx); + } + + @Operation(summary = "리스트 업로드 파일 다운로드") + @PostMapping("/excel/upload-history/file/{prjctIdx}/{listUploadLogId}") + public ResponseEntity downloadUploadFile( + @PathVariable Long prjctIdx, + @PathVariable String listUploadLogId + ) { + getProjectOrThrow(prjctIdx); + ListUploadFileInfoDto uploadFile = listUploadService.downloadUploadFile(prjctIdx, listUploadLogId); + return buildExcelResponse(uploadFile.getFileName(), uploadFile.getBytes()); + } + @Operation(summary = "리스트 다운로드") @PostMapping("/excel/download/{prjctIdx}") public ResponseEntity downloadList( @PathVariable Long prjctIdx, - @RequestBody(required = false) ListFilterDto listFilter + @Valid @RequestBody(required = false) ListFilterDto listFilter ) { ProjectInfoDto projectInfoDto = getProjectOrThrow(prjctIdx); byte[] bytes = listDownloadService.downloadList(prjctIdx, listFilter); @@ -100,7 +129,7 @@ public class ListController { @PostMapping("/excel/download/update/{prjctIdx}") public ResponseEntity downloadListUpdateHistory( @PathVariable Long prjctIdx, - @RequestBody(required = false) ListFilterDto listFilter + @Valid @RequestBody(required = false) ListFilterDto listFilter ) { ProjectInfoDto projectInfoDto = getProjectOrThrow(prjctIdx); byte[] bytes = listDownloadService.downloadSidWithUpdateHist(prjctIdx, listFilter); @@ -119,7 +148,7 @@ public class ListController { LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); ExcelUploadResultDto result = listUploadService.uploadExcel(prjctIdx, file, request, ctx.getUserId(), now); - systemEventLogService.writeUploadList(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, file.getOriginalFilename()); + systemEventLogService.writeUploadList(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, UploadContentDto.from(file)); return result; } @@ -130,12 +159,46 @@ public class ListController { @Valid @RequestBody ListUpdateRequestDto request, RequestUserContext ctx ) { + validateListUpdateRequest(request); + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); int updateCount = listUpdateService.updateList(prjctIdx, request, ctx.getUserRole(), ctx.getUserId(), now); systemEventLogService.writeUpdateList(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, request); return updateCount; } + @Operation(summary = "리스트 별 파일 업로드") + @PostMapping(value = "/item-file/upload/{prjctIdx}/{sid}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public void uploadItemFile( + @PathVariable Long prjctIdx, + @PathVariable Integer sid, + @RequestParam Map files, + RequestUserContext ctx + ) { + getProjectOrThrow(prjctIdx); + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + listUploadService.uploadItemFile(prjctIdx, sid, files, ctx.getUserRole(), ctx.getUserId(), now); + + Map contents = files.entrySet().stream() + .filter(e -> e.getValue() != null) + .collect(Collectors.toMap( + Map.Entry::getKey, + e -> UploadContentDto.from(e.getValue()) + )); + systemEventLogService.writeUploadListItemFiles(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, contents); + } + + @Operation(summary = "리스트 별 업로드 파일 다운로드") + @PostMapping("/item-file/download/{prjctIdx}") + public ResponseEntity downloadItemFile( + @PathVariable Long prjctIdx, + @Valid @RequestBody(required = false) ListFilterDto listFilter + ){ + ProjectInfoDto projectInfoDto = getProjectOrThrow(prjctIdx); + byte[] bytes = listDownloadService.downloadItemFile(prjctIdx, listFilter); + return buildZipResponse(projectInfoDto.getPrjctName() + " item_files.zip", bytes); + } + @Operation(summary = "리스트 초기화") @DeleteMapping("/{prjctIdx}") public int resetList( @@ -162,4 +225,23 @@ public class ListController { } return projectInfoDto; } + + private void validateListUpdateRequest(ListUpdateRequestDto request){ + if( + CollectionUtil.isEmpty(request.getUpdateContents()) && + CollectionUtil.isEmpty(request.getUpdateResultCodes()) + ){ + throw BusinessException.badRequest("EMPTY_UPDATE_CONTENT","리스트 수정내용이 없습니다."); + } + } + + private ResponseEntity buildZipResponse(String fileName, byte[] bytes) { + String contentDisposition = "attachment; filename*=UTF-8''" + + URLEncoder.encode(fileName, StandardCharsets.UTF_8).replace("+", "%20"); + + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition) + .contentType(MediaType.parseMediaType("application/zip")) + .body(bytes); + } } diff --git a/src/main/java/com/kri/contact/server/controller/ListHeaderController.java b/src/main/java/com/kri/contact/server/controller/ListHeaderController.java index 1c633c3..8e5dba4 100644 --- a/src/main/java/com/kri/contact/server/controller/ListHeaderController.java +++ b/src/main/java/com/kri/contact/server/controller/ListHeaderController.java @@ -3,8 +3,9 @@ package com.kri.contact.server.controller; import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.web.RequestUserContext; import com.kri.contact.server.dto.list.ListHeaderDto; +import com.kri.contact.server.dto.list.ListHeaderWithFilterContentDto; import com.kri.contact.server.service.ListHeaderService; -import com.kri.contact.server.service.SystemEventLogService; +import com.kri.contact.server.service.common.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -24,12 +25,12 @@ import org.springframework.web.bind.annotation.RestController; @Tag(name = "ListHeader", description = "리스트 헤더 API") public class ListHeaderController { - ListHeaderService listHeaderService; - SystemEventLogService systemEventLogService; + private final ListHeaderService listHeaderService; + private final SystemEventLogService systemEventLogService; @Operation(summary = "리스트 헤더 조회") @GetMapping("/{prjctIdx}") - public List getListHeader (@PathVariable Long prjctIdx) { + public List getListHeader (@PathVariable Long prjctIdx) { return listHeaderService.getHeader(prjctIdx); } @@ -41,7 +42,7 @@ public class ListHeaderController { RequestUserContext ctx ) { final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); - listHeaderService.upsertHeader(prjctIdx, headerList, ctx.getUserId(), now); + listHeaderService.updateListHeader(prjctIdx, headerList, ctx.getUserId(), now); systemEventLogService.writeUpsertListHeader(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, headerList); diff --git a/src/main/java/com/kri/contact/server/controller/ListHistoryController.java b/src/main/java/com/kri/contact/server/controller/ListHistoryController.java index 6a3041c..bd9e4dd 100644 --- a/src/main/java/com/kri/contact/server/controller/ListHistoryController.java +++ b/src/main/java/com/kri/contact/server/controller/ListHistoryController.java @@ -2,30 +2,64 @@ package com.kri.contact.server.controller; import static com.kri.contact.server.common.util.ExcelResponseBuilder.buildExcelResponse; +import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.web.BusinessException; +import com.kri.common.feature.web.RequestUserContext; +import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.dto.list.ListEventHistDownloadRequestDto; +import com.kri.contact.server.dto.list.ListEventHistFromSurveyDto; +import com.kri.contact.server.dto.list.ListEventHistInsertRequestDto; +import com.kri.contact.server.dto.list.ListEventHistSurveyMetaDto; +import com.kri.contact.server.dto.list.ListEventHistoryDto; +import com.kri.contact.server.dto.list.ListUpdateHistoryDto; import com.kri.contact.server.dto.project.ProjectInfoDto; import com.kri.contact.server.service.ListDownloadService; +import com.kri.contact.server.service.ListHistoryQueryService; +import com.kri.contact.server.service.ListUpdateService; import com.kri.contact.server.service.ProjectService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; +import java.time.LocalDateTime; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController -@RequestMapping("/api/v1/list") +@RequestMapping("/api/v1/list-hist") @RequiredArgsConstructor @Tag(name = "ListHistory", description = "리스트 이력 API") public class ListHistoryController { private final ProjectService projectService; private final ListDownloadService listDownloadService; + private final ListHistoryQueryService listHistoryQueryService; + private final ListUpdateService listUpdateService; + + @Operation(summary = "List event history") + @GetMapping("/event/{prjctIdx}/{sid}") + public List findListEventHistories( + @PathVariable Long prjctIdx, + @PathVariable Integer sid + ) { + return listHistoryQueryService.findEventHistories(prjctIdx, sid); + } + + @Operation(summary = "List update history") + @GetMapping("/update/{prjctIdx}/{sid}") + public List findListUpdateHistories( + @PathVariable Long prjctIdx, + @PathVariable Integer sid + ) { + return listHistoryQueryService.findUpdateHistories(prjctIdx, sid); + } @Operation(summary = "리스트 이벤트 이력 다운로드") @PostMapping("/excel/download/event/{prjctIdx}") @@ -38,11 +72,52 @@ public class ListHistoryController { prjctIdx, request.getListFilter(), request.getResultCodeTypes(), + request.getSearchBase(), request.getDateRange() ); return buildExcelResponse(projectInfoDto.getPrjctName() + " 컨택 이력.xlsx", bytes); } + @Operation(description = "설문 상태 추가") + @PostMapping("/survey") + public void putSurveyHistory( + @Valid @RequestBody ListEventHistFromSurveyDto request, + RequestUserContext ctx + ) { + if (request.getMeta().getRemoteAddr() == null) { + request.getMeta().setRemoteAddr(ctx.getClientIp()); + } + String regUser = resolveRegUser(request, ctx); + final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + listUpdateService.putSurveyHistory(request, regUser, now); + } + + @Operation(description = "리스트 이벤트 이력 추가") + @PutMapping("/event") + public void putInternalEventHistory( + @Valid @RequestBody ListEventHistInsertRequestDto request, + RequestUserContext ctx + ) { + final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + listUpdateService.putInternalEventHistory( + request, + ctx.getClientIp(), + ctx.getUserId(), + now + ); + } + + private String resolveRegUser(ListEventHistFromSurveyDto request, RequestUserContext ctx) { + if (ctx.getUserId() != null) { + return ctx.getUserId(); + } + ListEventHistSurveyMetaDto meta = request.getMeta(); + if (meta != null && meta.getEntryType() != null) { + return meta.getEntryType().name(); + } + return "SYSTEM"; + } + private ProjectInfoDto getProjectOrThrow(Long prjctIdx) { ProjectInfoDto projectInfoDto = projectService.getProject(prjctIdx); if (projectInfoDto == null) { diff --git a/src/main/java/com/kri/contact/server/controller/MessageController.java b/src/main/java/com/kri/contact/server/controller/MessageController.java new file mode 100644 index 0000000..dd04dda --- /dev/null +++ b/src/main/java/com/kri/contact/server/controller/MessageController.java @@ -0,0 +1,65 @@ +package com.kri.contact.server.controller; + +import com.kri.common.feature.web.RequestUserContext; +import com.kri.contact.server.dto.message.MessageBulkSendResponseDto; +import com.kri.contact.server.dto.message.MessageSendBulkRequestDto; +import com.kri.contact.server.dto.message.MessageSendSingleRequestDto; +import com.kri.contact.server.service.MessageService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/message") +@RequiredArgsConstructor +@Tag(name = "Message", description = "Message send API") +public class MessageController { + + private final MessageService messageService; + + @Operation(summary = "Email single send") + @PostMapping("/email/single/{prjctIdx}") + public void sendEmailSingle( + @PathVariable Long prjctIdx, + @Valid @RequestBody MessageSendSingleRequestDto request, + RequestUserContext ctx + ) { + messageService.sendEmailSingle(prjctIdx, request, ctx); + } + + @Operation(summary = "Email bulk send") + @PostMapping("/email/bulk/{prjctIdx}") + public MessageBulkSendResponseDto sendEmailBulk( + @PathVariable Long prjctIdx, + @Valid @RequestBody MessageSendBulkRequestDto request, + RequestUserContext ctx + ) { + return messageService.sendEmailBulk(prjctIdx, request, ctx); + } + + @Operation(summary = "SMS single send") + @PostMapping("/sms/single/{prjctIdx}") + public void sendSmsSingle( + @PathVariable Long prjctIdx, + @Valid @RequestBody MessageSendSingleRequestDto request, + RequestUserContext ctx + ) { + messageService.sendSmsSingle(prjctIdx, request, ctx); + } + + @Operation(summary = "SMS bulk send") + @PostMapping("/sms/bulk/{prjctIdx}") + public MessageBulkSendResponseDto sendSmsBulk( + @PathVariable Long prjctIdx, + @Valid @RequestBody MessageSendBulkRequestDto request, + RequestUserContext ctx + ) { + return messageService.sendSmsBulk(prjctIdx, request, ctx); + } +} diff --git a/src/main/java/com/kri/contact/server/controller/ProgressController.java b/src/main/java/com/kri/contact/server/controller/ProgressController.java new file mode 100644 index 0000000..e2c0a1d --- /dev/null +++ b/src/main/java/com/kri/contact/server/controller/ProgressController.java @@ -0,0 +1,54 @@ +package com.kri.contact.server.controller; + +import com.kri.contact.server.dto.progress.ProgressDateResponseDto; +import com.kri.contact.server.dto.progress.ProgressSearchRequestDto; +import com.kri.contact.server.dto.progress.ProgressUserResponseDto; +import com.kri.contact.server.service.ProgressService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/progress") +@RequiredArgsConstructor +@Tag(name = "Progress", description = "진행 현황 API") +public class ProgressController { + + private final ProgressService progressService; + + @Operation(summary = "사용자별 컨택 진행 현황") + @PostMapping("/user/{prjctIdx}/{eventTy}") + public List getUserProgress( + @PathVariable Long prjctIdx, + @PathVariable Short eventTy, + @RequestBody(required = false) ProgressSearchRequestDto request + ) { + return progressService.getUserProgress(prjctIdx, eventTy, request); + } + + @Operation(summary = "날짜별 전체 컨택 진행 현황") + @PostMapping("/date/{prjctIdx}/{eventTy}") + public List getDateProgress( + @PathVariable Long prjctIdx, + @PathVariable Short eventTy, + @RequestBody(required = false) ProgressSearchRequestDto request + ) { + return progressService.getDateProgress(prjctIdx, eventTy, request); + } + + @Operation(summary = "날짜별 마지막 컨택 진행 현황") + @PostMapping("/last-date/{prjctIdx}/{eventTy}") + public List getLastDateProgress( + @PathVariable Long prjctIdx, + @PathVariable Short eventTy, + @RequestBody(required = false) ProgressSearchRequestDto request + ) { + return progressService.getLastDateProgress(prjctIdx, eventTy, request); + } +} diff --git a/src/main/java/com/kri/contact/server/controller/ProjectController.java b/src/main/java/com/kri/contact/server/controller/ProjectController.java index 7bcdd9e..0fa5068 100644 --- a/src/main/java/com/kri/contact/server/controller/ProjectController.java +++ b/src/main/java/com/kri/contact/server/controller/ProjectController.java @@ -12,7 +12,7 @@ import com.kri.contact.server.dto.project.ProjectSearchRequestDto; import com.kri.contact.server.dto.project.ProjectUpdateRequestDto; import com.kri.contact.server.service.file.ContactScenarioFileService; import com.kri.contact.server.service.ProjectService; -import com.kri.contact.server.service.SystemEventLogService; +import com.kri.contact.server.service.common.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -54,7 +54,8 @@ public class ProjectController { @RequestParam(required = false) String keyword, RequestUserContext ctx ) { - return projectService.getTopProject(topCount, keyword, ctx.getUserId(), ctx.getUserRole()); + return projectService.getTopProject(topCount, keyword, ctx.getUserId(), ctx.getUserCmpn(), + ctx.getUserRole()); } @Operation(summary = "프로젝트 목록 조회") @@ -63,7 +64,7 @@ public class ProjectController { @Valid @RequestBody ProjectSearchRequestDto req, RequestUserContext ctx ) { - return projectService.searchProject(req, ctx.getUserId(), ctx.getUserRole()); + return projectService.searchProject(req, ctx.getUserId(), ctx.getUserCmpn(), ctx.getUserRole()); } @Operation(summary = "프로젝트를 소유하고 있는 모든 부서/실사 목록 조회") diff --git a/src/main/java/com/kri/contact/server/controller/ReserveController.java b/src/main/java/com/kri/contact/server/controller/ReserveController.java new file mode 100644 index 0000000..dddf3f1 --- /dev/null +++ b/src/main/java/com/kri/contact/server/controller/ReserveController.java @@ -0,0 +1,56 @@ +package com.kri.contact.server.controller; + +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.web.RequestUserContext; +import com.kri.contact.server.dto.reserve.ListReserveDto; +import com.kri.contact.server.dto.reserve.ListReserveRequestDto; +import com.kri.contact.server.service.ReserveService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import java.time.LocalDateTime; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/reserve") +@RequiredArgsConstructor +@Tag(name = "Reserve", description = "List reserve API") +public class ReserveController { + + private final ReserveService reserveService; + + @Operation(summary = "Reserve list") + @PutMapping + public ListReserveDto reserve( + @Valid @RequestBody ListReserveRequestDto request, + RequestUserContext ctx + ) { + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + return reserveService.reserve(request, ctx.getUserId(), now); + } + + @Operation(summary = "Find reserves by user") + @GetMapping("/{prjctIdx}/user/{userId}") + public List findByUser( + @PathVariable Long prjctIdx, + @PathVariable String userId + ) { + return reserveService.findByUser(prjctIdx, userId); + } + + @Operation(summary = "Find reserves by sid") + @GetMapping("/{prjctIdx}/sid/{sid}") + public List findBySid( + @PathVariable Long prjctIdx, + @PathVariable Integer sid + ) { + return reserveService.findBySid(prjctIdx, sid); + } +} diff --git a/src/main/java/com/kri/contact/server/controller/ResultCodeController.java b/src/main/java/com/kri/contact/server/controller/ResultCodeController.java index 80517ef..5c2bd9b 100644 --- a/src/main/java/com/kri/contact/server/controller/ResultCodeController.java +++ b/src/main/java/com/kri/contact/server/controller/ResultCodeController.java @@ -3,7 +3,7 @@ package com.kri.contact.server.controller; import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.dto.project.ResultCodeDto; import com.kri.contact.server.service.ResultCodeService; -import com.kri.contact.server.service.SystemEventLogService; +import com.kri.contact.server.service.common.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import java.util.List; diff --git a/src/main/java/com/kri/contact/server/controller/UserController.java b/src/main/java/com/kri/contact/server/controller/UserController.java index dddadf7..297e510 100644 --- a/src/main/java/com/kri/contact/server/controller/UserController.java +++ b/src/main/java/com/kri/contact/server/controller/UserController.java @@ -1,13 +1,15 @@ package com.kri.contact.server.controller; +import static com.kri.contact.server.common.util.ExcelResponseBuilder.buildExcelResponse; + import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.web.RequestUserContext; import com.kri.contact.server.common.consts.ContactConstant; import com.kri.contact.server.dto.common.DataVerificationDto; import com.kri.contact.server.dto.excel.ExcelUploadResultDto; -import com.kri.contact.server.dto.systemlog.UploadUserContentDto; +import com.kri.contact.server.dto.systemlog.UploadContentDto; import com.kri.contact.server.dto.user.UserInfoDto; -import com.kri.contact.server.service.SystemEventLogService; +import com.kri.contact.server.service.common.SystemEventLogService; import com.kri.contact.server.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -28,7 +30,6 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @@ -122,12 +123,7 @@ public class UserController { ExcelUploadResultDto result = userService.createUsersFromExcel(file, regId, now, forceCmpn); - UploadUserContentDto content = new UploadUserContentDto( - file.getOriginalFilename(), - file.getContentType(), - file.getSize() - ); - systemEventLogService.writeUploadUserLog(regId, now, clientIp, content); + systemEventLogService.writeUploadUserLog(regId, now, clientIp, UploadContentDto.from(file)); return result; } @@ -137,12 +133,7 @@ public class UserController { public ResponseEntity exportUserTemplate() { byte[] bytes = userService.exportUserTemplate(); - return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, - "attachment; filename=\"user_upload_template.xlsx\"") - .contentType(MediaType.parseMediaType( - "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")) - .body(bytes); + return buildExcelResponse("user_upload_template.xlsx", bytes); } @Operation(summary = "사용자 정보 수정") diff --git a/src/main/java/com/kri/contact/server/dto/cmpn/CmpnInfoDto.java b/src/main/java/com/kri/contact/server/dto/cmpn/CmpnInfoDto.java new file mode 100644 index 0000000..57fedd4 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/cmpn/CmpnInfoDto.java @@ -0,0 +1,76 @@ +package com.kri.contact.server.dto.cmpn; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.kri.contact.server.persistence.entity.TCmpnEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "회사 정보") +public class CmpnInfoDto { + + @Size(max = 32) + @NotBlank + @Schema(description = "회사 id(회사이름)") + private String cmpnId; + + @Size(max = 32) + @NotBlank + @Schema(description = "회사 별칭") + private String cmpnAlias; + + @Size(max = 16) + @Schema(description = "회사 전화번호") + private String cmpnTel; + + @NotNull + @Schema(description = "자사 여부") + private Boolean ownCmpn; + + @Schema(description = "메모") + private String memo; + + @Size(max = 32) + @Schema(description = "등록자", accessMode = Schema.AccessMode.READ_ONLY) + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private String regUser; + + @Schema(description = "등록일시", accessMode = Schema.AccessMode.READ_ONLY) + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private LocalDateTime regDt; + + @Size(max = 32) + @Schema(description = "수정자", accessMode = Schema.AccessMode.READ_ONLY) + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private String modUser; + + @Schema(description = "수정일시", accessMode = Schema.AccessMode.READ_ONLY) + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private LocalDateTime modDt; + + public static CmpnInfoDto from(TCmpnEntity entity) { + return CmpnInfoDto.builder() + .cmpnId(entity.getCmpnId()) + .cmpnAlias(entity.getCmpnAlias()) + .cmpnTel(entity.getCmpnTel()) + .ownCmpn(entity.getOwnCmpn()) + .memo(entity.getMemo()) + .regUser(entity.getRegUser()) + .regDt(entity.getRegDt()) + .modUser(entity.getModUser()) + .modDt(entity.getModDt()) + .build(); + } +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListAssignFilterConditionDto.java b/src/main/java/com/kri/contact/server/dto/list/ListAssignFilterConditionDto.java new file mode 100644 index 0000000..3aa8483 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListAssignFilterConditionDto.java @@ -0,0 +1,21 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.common.enums.ListHeaderTypeAssign; +import com.kri.contact.server.common.validation.ValidListFilterCondition; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@ValidListFilterCondition +@Schema(description = "배정 필터 조건") +public class ListAssignFilterConditionDto extends ListFilterConditionDto { + + @NotNull + @Schema(description = "배정 타입") + private ListHeaderTypeAssign assignType; +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListAssignInfoDto.java b/src/main/java/com/kri/contact/server/dto/list/ListAssignInfoDto.java deleted file mode 100644 index 9881b8a..0000000 --- a/src/main/java/com/kri/contact/server/dto/list/ListAssignInfoDto.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.kri.contact.server.dto.list; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Schema(description = "") -public class ListAssignInfoDto { - - @NotNull - @Schema(description = "리스트 id") - private Integer sid; - - @NotNull - @Schema(description = "배정될 사용자 id") - private String userId; - - public static ListAssignInfoDto from(Integer sid, String userId) { - return ListAssignInfoDto.builder() - .sid(sid) - .userId(userId) - .build(); - } -} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListAssignRequestDto.java b/src/main/java/com/kri/contact/server/dto/list/ListAssignRequestDto.java new file mode 100644 index 0000000..5ad4eda --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListAssignRequestDto.java @@ -0,0 +1,35 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.common.enums.ListAssignType; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "리스트 배정 요청 Dto") +public class ListAssignRequestDto { + + @Valid + @NotNull + @Schema(description = "배정 타입") + private ListAssignType assignType; + + @Valid + @NotNull + @Schema(description = "배정시 예약 이관 여부") + private Boolean transferResve; + + @Valid + @Schema(description = "리스트 필터") + private ListFilterDto listFilter; +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListAssignResetRequestDto.java b/src/main/java/com/kri/contact/server/dto/list/ListAssignResetRequestDto.java new file mode 100644 index 0000000..70a5493 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListAssignResetRequestDto.java @@ -0,0 +1,30 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.common.enums.ListAssignType; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "리스트 배정 초기화 요청 Dto") +public class ListAssignResetRequestDto { + + @Valid + @NotNull + @Schema(description = "배정 타입") + private ListAssignType assignType; + + @Valid + @Schema(description = "리스트 필터") + private ListFilterDto listFilter; +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListCallHistDto.java b/src/main/java/com/kri/contact/server/dto/list/ListCallHistDto.java new file mode 100644 index 0000000..cc50e62 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListCallHistDto.java @@ -0,0 +1,54 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.persistence.entity.TListCallHistEntity; +import java.time.Instant; +import java.time.LocalDateTime; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class ListCallHistDto { + + private Long listCallHistIdx; + private Long prjctIdx; + private Integer sid; + private Integer listHderId; + private String destNum; + private String agentNum; + private String aniNum; + private String agentSessionId; + private String destSessionId; + private String callTy; + private LocalDateTime startDt; + private Integer totalTime; + private Integer talkTime; + private Integer mediaServerId; + private String mediaServerName; + private String recordFileName; + private String regUser; + private LocalDateTime regDt; + + public static ListCallHistDto from(TListCallHistEntity entity) { + return ListCallHistDto.builder() + .listCallHistIdx(entity.getId()) + .prjctIdx(entity.getPrjctIdx()) + .sid(entity.getSid()) + .listHderId(entity.getListHderId()) + .destNum(entity.getDestNum()) + .agentNum(entity.getAgentNum()) + .aniNum(entity.getAniNum()) + .agentSessionId(entity.getAgentSessionId()) + .destSessionId(entity.getDestSessionId()) + .callTy(entity.getCallTy()) + .startDt(entity.getStartDt()) + .totalTime(entity.getTotalTime()) + .talkTime(entity.getTalkTime()) + .mediaServerId(entity.getMediaServerId()) + .mediaServerName(entity.getMediaServerName()) + .recordFileName(entity.getRecordFileName()) + .regUser(entity.getRegUser()) + .regDt(entity.getRegDt()) + .build(); + } +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListCallHistRequestDto.java b/src/main/java/com/kri/contact/server/dto/list/ListCallHistRequestDto.java new file mode 100644 index 0000000..6a31565 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListCallHistRequestDto.java @@ -0,0 +1,63 @@ +package com.kri.contact.server.dto.list; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.time.Instant; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +public class ListCallHistRequestDto { + + @NotNull + private Integer listHderId; + + @NotBlank + @Size(max = 64) + private String destNum; + + @NotBlank + @Size(max = 64) + private String agentNum; + + @NotBlank + @Size(max = 64) + private String aniNum; + + @NotBlank + @Size(max = 64) + private String agentSessionId; + + @NotBlank + @Size(max = 64) + private String destSessionId; + + @NotBlank + @Size(max = 64) + private String callTy; + + @NotNull + private LocalDateTime startDt; + + @NotNull + private Integer totalTime; + + @NotNull + private Integer talkTime; + + @NotNull + private Integer mediaServerId; + + @NotBlank + @Size(max = 64) + private String mediaServerName; + + @NotBlank + @Size(max = 256) + private String recordFileName; +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListContactResultDto.java b/src/main/java/com/kri/contact/server/dto/list/ListContactResultDto.java index 056862e..56697e8 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListContactResultDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListContactResultDto.java @@ -16,16 +16,13 @@ import lombok.experimental.SuperBuilder; @Schema(description = "컨택/방문 면접 결과") public class ListContactResultDto extends ListResultBaseDto { - @Schema(description = "컨택/방문면접 시도 횟수") - private Integer attemptCount; - - @Schema(description = "마지막 컨택/방문면접 자") + @Schema(description = "마지막 컨택/방문면접원") private String lastUser; - @Schema(description = "할당된 컨택/방문면접자") + @Schema(description = "할당된 컨택/방문면접원") private String assignUser; - public static ListContactResultDto from(TListEventHistEntity entity) { + public static ListContactResultDto from(TListEventHistEntity entity, Integer attemptCount) { if (entity == null) { return null; } @@ -33,6 +30,7 @@ public class ListContactResultDto extends ListResultBaseDto { return ListContactResultDto.builder() .lastResultCd(entity.getResultCd() == null ? null : entity.getResultCd().shortValue()) .lastResultDt(entity.getRegDt()) + .attemptCount(attemptCount) .lastUser(entity.getRegUser()) .build(); } diff --git a/src/main/java/com/kri/contact/server/dto/list/ListEventHistDownloadRequestDto.java b/src/main/java/com/kri/contact/server/dto/list/ListEventHistDownloadRequestDto.java index 316f6b7..cdb824b 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListEventHistDownloadRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListEventHistDownloadRequestDto.java @@ -1,5 +1,6 @@ package com.kri.contact.server.dto.list; +import com.kri.contact.server.common.enums.ListEventHistoryBase; import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.dto.common.DateRangeDto; import io.swagger.v3.oas.annotations.media.Schema; @@ -17,6 +18,7 @@ import lombok.Setter; @Schema(description = "리스트 + 컨택이력 다운로드 요청 DTO") public class ListEventHistDownloadRequestDto { + @Valid @NotNull @Schema(description = "리스트 필터") private ListFilterDto listFilter; @@ -25,6 +27,10 @@ public class ListEventHistDownloadRequestDto { @Schema(description = "조회할 ResultCodeType 목록") private List resultCodeTypes; + @NotNull + @Schema(description = "조회 기준") + private ListEventHistoryBase searchBase; + @Valid @Schema(description = "조회 기간") private DateRangeDto dateRange; diff --git a/src/main/java/com/kri/contact/server/dto/list/ListEventHistFromSurveyDto.java b/src/main/java/com/kri/contact/server/dto/list/ListEventHistFromSurveyDto.java new file mode 100644 index 0000000..1d1eae1 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListEventHistFromSurveyDto.java @@ -0,0 +1,33 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.common.enums.ListEventHistorySurveyType; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@Schema(description = "설문 결과 입력 Dto") +public class ListEventHistFromSurveyDto { + + @NotNull + @Schema(description = "입력 action 코드") + private ListEventHistorySurveyType action; + + @NotNull + @Schema(description = "프로젝트 고유 번호") + private Long prjctIdx; + + @NotNull + @Schema(description = "리스트 고유 번호") + private Integer sid; + + @NotNull + @Schema(description = "메타 데이터") + @Valid + private ListEventHistSurveyMetaDto meta; +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListEventHistInsertRequestDto.java b/src/main/java/com/kri/contact/server/dto/list/ListEventHistInsertRequestDto.java new file mode 100644 index 0000000..3c7cf77 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListEventHistInsertRequestDto.java @@ -0,0 +1,41 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.common.enums.ResultCodeType; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@Schema(description = "내부 리스트 이벤트 이력 추가 요청 DTO") +public class ListEventHistInsertRequestDto { + + @NotNull + @Schema(description = "프로젝트 고유 번호") + private Long prjctIdx; + + @NotNull + @Schema(description = "리스트 고유 번호") + private Integer sid; + + @NotNull + @Schema(description = "결과 코드 타입") + private ResultCodeType resultCodeType; + + @NotNull + @Schema(description = "결과 코드") + private Integer resultCd; + + @Valid + @Schema(description = "메타 데이터") + private ListEventHistInternalMetaDto meta; + + @NotNull + @Schema(description = "사용자 메모") + private String memo; +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListEventHistInternalMetaDto.java b/src/main/java/com/kri/contact/server/dto/list/ListEventHistInternalMetaDto.java new file mode 100644 index 0000000..c488c16 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListEventHistInternalMetaDto.java @@ -0,0 +1,54 @@ +package com.kri.contact.server.dto.list; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +public class ListEventHistInternalMetaDto { + + @Schema(description = "GPS 위도") + private Double latitude; + + @Schema(description = "GPS 경도") + private Double longitude; + + @Schema(description = "GPS 위치 정확도(미터)") + private Double accuracy; + + @Schema(description = "요청 클라이언트 IP 주소") + private String remoteAddr; + + @Builder(access = AccessLevel.PRIVATE) + private ListEventHistInternalMetaDto( + Double latitude, + Double longitude, + Double accuracy, + String remoteAddr + ) { + this.latitude = latitude; + this.longitude = longitude; + this.accuracy = accuracy; + this.remoteAddr = remoteAddr; + } + + public static ListEventHistInternalMetaDto withRemoteAddr( + ListEventHistInternalMetaDto meta, + String remoteAddr + ) { + if (meta == null) { + meta = new ListEventHistInternalMetaDto(); + } + return ListEventHistInternalMetaDto.builder() + .latitude(meta.getLatitude()) + .longitude(meta.getLongitude()) + .accuracy(meta.getAccuracy()) + .remoteAddr(remoteAddr) + .build(); + } +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListEventHistSurveyMetaDto.java b/src/main/java/com/kri/contact/server/dto/list/ListEventHistSurveyMetaDto.java new file mode 100644 index 0000000..b1f89b3 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListEventHistSurveyMetaDto.java @@ -0,0 +1,52 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.common.enums.ListEventHistoryExternalEntryType; +import com.kri.contact.server.common.enums.ListEventHistorySurveyType; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +public class ListEventHistSurveyMetaDto { + @NotNull + @Schema(description = "진입 유형") + private ListEventHistoryExternalEntryType entryType; + + @NotNull + @Schema(description = "입력 action 코드") + private ListEventHistorySurveyType action; + + @Schema(description = "프로젝트 고유 번호") + private String pid; + + @Schema(description = "리스트 고유 번호") + private String sid; + + @Schema(description = "요청 클라이언트 IP 주소") + private String remoteAddr; + + @Schema(description = "요청 URI 경로") + private String uri; + + @Schema(description = "쿼리스트링을 포함한 전체 요청 URL") + private String url; + + @Schema(description = "요청 User-Agent 헤더") + private String userAgent; + + @Schema(description = "요청 Referer 헤더") + private String referer; + + @Schema(description = "요청 Origin 헤더") + private String origin; + + @Schema(description = "프록시 또는 로드밸런서를 통해 전달된 X-Forwarded-For 헤더") + private String xForwardedFor; + + @Schema(description = "프록시 표준 전달 정보인 Forwarded 헤더") + private String forwarded; +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListEventHistoryDto.java b/src/main/java/com/kri/contact/server/dto/list/ListEventHistoryDto.java new file mode 100644 index 0000000..f2735f3 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListEventHistoryDto.java @@ -0,0 +1,37 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.persistence.entity.TListEventHistEntity; +import java.time.LocalDateTime; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class ListEventHistoryDto { + + private Long listEventHistIdx; + private Short eventTy; + private Long prjctIdx; + private Integer sid; + private Integer resultCd; + private String metaData; + private Long listCallHistIdx; + private String memo; + private String regUser; + private LocalDateTime regDt; + + public static ListEventHistoryDto from(TListEventHistEntity entity) { + return ListEventHistoryDto.builder() + .listEventHistIdx(entity.getListEventHistIdx()) + .eventTy(entity.getEventTy()) + .prjctIdx(entity.getPrjctIdx()) + .sid(entity.getSid()) + .resultCd(entity.getResultCd()) + .metaData(entity.getMetaData()) + .listCallHistIdx(entity.getListCallHistIdx()) + .memo(entity.getMemo()) + .regUser(entity.getRegUser()) + .regDt(entity.getRegDt()) + .build(); + } +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListFilterConditionDto.java b/src/main/java/com/kri/contact/server/dto/list/ListFilterConditionDto.java new file mode 100644 index 0000000..4a45a80 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListFilterConditionDto.java @@ -0,0 +1,32 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.common.enums.ListFilterMatchType; +import com.kri.contact.server.common.enums.ListFilterOperator; +import com.kri.contact.server.common.validation.ValidListFilterCondition; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@ValidListFilterCondition +@Schema(description = "List filter condition") +public class ListFilterConditionDto { + + @NotNull + @Schema(description = "Filter operator") + private ListFilterOperator operator; + + @NotNull + @Schema(description = "Filter match type") + private ListFilterMatchType matchType; + + @Schema(description = "Filter values") + private List values; +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListFilterDto.java b/src/main/java/com/kri/contact/server/dto/list/ListFilterDto.java index defa81f..eff4d1b 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListFilterDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListFilterDto.java @@ -1,8 +1,12 @@ package com.kri.contact.server.dto.list; +import com.kri.contact.server.common.enums.ListHeaderTypeAssign; import com.kri.contact.server.common.enums.ListIsUse; +import com.kri.contact.server.common.enums.ResultCodeType; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; +import java.util.List; import java.util.Map; import java.util.Set; import lombok.AllArgsConstructor; @@ -20,26 +24,47 @@ import lombok.Setter; public class ListFilterDto { @NotNull - @Schema(description = "sid 목록") - private Set sidSet; + @Schema(description = "SID 목록. 숫자 또는 숫자~숫자 형식") + private Set sidSet; @NotNull @Schema(description = "리스트 사용 여부 목록") private Set listUseSet; - @Schema(description = "중요 메모") - private String memo; + @NotNull + @Schema(description = "List use filter conditions") + private List<@Valid ListFilterConditionDto> listUseConditions; @NotNull - @Schema(description = "그 외 필터 정보") - private Map> otherItems; + @Schema(description = "배정 사용자 필터. key: ListHeaderTypeAssign 코드") + private Map> assignUserMap; + + @NotNull + @Schema(description = "배정 필터 조건") + private List<@Valid ListAssignFilterConditionDto> assignConditions; + + @NotNull + @Schema(description = "List 결과값 필터 key: ResultCodeType code, value: result code list") + private Map> resultCodeMap; + + @NotNull + @Schema(description = "메모 필터 조건") + private List<@Valid ListFilterConditionDto> memoConditions; + + @NotNull + @Schema(description = "기타 항목 필터 조건") + private List<@Valid ListOtherItemFilterConditionDto> otherItemConditions; public static ListFilterDto onlyOneSid(Integer sid) { return ListFilterDto.builder() - .sidSet(Set.of(sid)) + .sidSet(Set.of(String.valueOf(sid))) .listUseSet(Set.of()) - .memo("") - .otherItems(Map.of()) + .listUseConditions(List.of()) + .assignUserMap(Map.of()) + .assignConditions(List.of()) + .resultCodeMap(Map.of()) + .memoConditions(List.of()) + .otherItemConditions(List.of()) .build(); } } diff --git a/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java b/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java index 43293e7..cf1443a 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java @@ -5,18 +5,16 @@ import com.kri.contact.server.common.enums.ListHeaderType; import com.kri.contact.server.persistence.entity.TListHeaderEntity; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.NotNull.List; -import java.time.LocalDateTime; import java.util.Objects; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.experimental.SuperBuilder; @Getter @Setter -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @Schema(description = "리스트 헤더") @@ -100,9 +98,9 @@ public class ListHeaderDto { .listHderGrad(ListHeaderGrade.COMMON) .listHderNm(headerName) .listHderTy(type) - .useFilter(false) - .useColView(false) - .useIntrvwerView(false) + .useFilter(true) + .useColView(true) + .useIntrvwerView(true) .useIntrvwerEdit(false) .build(); } diff --git a/src/main/java/com/kri/contact/server/dto/list/ListHeaderWithFilterContentDto.java b/src/main/java/com/kri/contact/server/dto/list/ListHeaderWithFilterContentDto.java new file mode 100644 index 0000000..4136089 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListHeaderWithFilterContentDto.java @@ -0,0 +1,41 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.common.enums.ListHeaderGrade; +import com.kri.contact.server.common.enums.ListHeaderType; +import com.kri.contact.server.persistence.entity.TListHeaderEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.experimental.SuperBuilder; + +@Getter +@Setter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "리스트 헤더 (필터 목록 포함)") +public class ListHeaderWithFilterContentDto extends ListHeaderDto { + private List filterContents; + + public static ListHeaderWithFilterContentDto fromEntity( + TListHeaderEntity entity, + List filterContents + ) { + return ListHeaderWithFilterContentDto.builder() + .prjctIdx(entity.getPrjctIdx()) + .listHderId(entity.getListHderId()) + .listHderOrder(entity.getListHderOrder()) + .listHderGrad(ListHeaderGrade.fromCode(entity.getListHderGrad())) + .listHderNm(entity.getListHderNm()) + .listHderTy(ListHeaderType.fromCode(entity.getListHderTy())) + .useFilter(entity.getUseFilter()) + .useColView(entity.getUseColView()) + .useIntrvwerView(entity.getUseIntrvwerView()) + .useIntrvwerEdit(entity.getUseIntrvwerEdit()) + .filterContents(filterContents) + .build(); + } +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListOtherItemFilterConditionDto.java b/src/main/java/com/kri/contact/server/dto/list/ListOtherItemFilterConditionDto.java new file mode 100644 index 0000000..8892662 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListOtherItemFilterConditionDto.java @@ -0,0 +1,20 @@ +package com.kri.contact.server.dto.list; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "기타 항목 필터 조건") +public class ListOtherItemFilterConditionDto extends ListFilterConditionDto { + + @NotNull + @Schema(description = "리스트 헤더 ID") + private Integer listHderId; +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListResetRequestDto.java b/src/main/java/com/kri/contact/server/dto/list/ListResetRequestDto.java index cbf1297..7c5beb2 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListResetRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListResetRequestDto.java @@ -2,6 +2,7 @@ package com.kri.contact.server.dto.list; import com.kri.contact.server.common.enums.ListResetMode; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.NoArgsConstructor; @@ -17,6 +18,7 @@ public class ListResetRequestDto { @Schema(description = "초기화 범위") private ListResetMode resetMode; + @Valid @NotNull @Schema(description = "리스트 필터") private ListFilterDto listFilter; diff --git a/src/main/java/com/kri/contact/server/dto/list/ListResultBaseDto.java b/src/main/java/com/kri/contact/server/dto/list/ListResultBaseDto.java index c42e8d4..1f6b0c1 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListResultBaseDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListResultBaseDto.java @@ -14,7 +14,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @NoArgsConstructor @AllArgsConstructor -@Schema(description = "결과에 대한 기본 정보") +@Schema(description = "결과 코드 기본 정보") public class ListResultBaseDto { @Schema(description = "최종 결과값") @@ -23,7 +23,10 @@ public class ListResultBaseDto { @Schema(description = "최종 결과값 일시") private LocalDateTime lastResultDt; - public static ListResultBaseDto from(TListEventHistEntity entity) { + @Schema(description = "시도 횟수") + private Integer attemptCount; + + public static ListResultBaseDto from(TListEventHistEntity entity, Integer attemptCount) { if (entity == null) { return null; } @@ -31,7 +34,7 @@ public class ListResultBaseDto { return ListResultBaseDto.builder() .lastResultCd(entity.getResultCd() == null ? null : entity.getResultCd().shortValue()) .lastResultDt(entity.getRegDt()) + .attemptCount(attemptCount) .build(); } - } diff --git a/src/main/java/com/kri/contact/server/dto/list/ListSearchBaseDto.java b/src/main/java/com/kri/contact/server/dto/list/ListSearchBaseDto.java index 3fc246c..aeafe3d 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListSearchBaseDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListSearchBaseDto.java @@ -1,7 +1,12 @@ package com.kri.contact.server.dto.list; +import com.kri.contact.server.common.enums.ListHeaderTypeAssign; +import com.kri.contact.server.common.enums.ListIsUse; import com.kri.contact.server.persistence.entity.TListEntity; +import com.kri.contact.server.service.ListSearchService.AssignValues; import io.swagger.v3.oas.annotations.media.Schema; +import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import lombok.AllArgsConstructor; import lombok.Getter; @@ -24,7 +29,10 @@ public class ListSearchBaseDto { private Integer sid; @Schema(description = "사용 여부") - private Short use; + private ListIsUse use; + + @Schema(description = "배정 사용자 목록. key: ListHeaderTypeAssign 코드(13=외주사, 14=컨택원, 15=면접원)") + private Map assignList; @Schema(description = "메모") private String memo; @@ -32,18 +40,37 @@ public class ListSearchBaseDto { @Schema(description = "리스트 값 정보") private Map itemList; - public static ListSearchBaseDto from(TListEntity entity, Map itemList) { + public static ListSearchBaseDto from(TListEntity entity, Map itemList, AssignValues assignValues) { if (entity == null) { return null; } + AssignValues values = assignValues == null ? AssignValues.empty() : assignValues; return ListSearchBaseDto.builder() .prjctIdx(entity.getPrjctIdx()) .sid(entity.getSid()) - .use(entity.getUse()) + .use(ListIsUse.fromCode(entity.getUse())) + .assignList(toAssignList(values)) .memo(entity.getMemo()) .itemList(itemList) .build(); } + protected static Map toAssignList(AssignValues values) { + Map assignList = new LinkedHashMap<>(); + putFirst(assignList, ListHeaderTypeAssign.OUTSOURCE, values.outsourceUserIds()); + putFirst(assignList, ListHeaderTypeAssign.CONTACT_INTERVIEWER, values.contactInterviewerIds()); + putFirst(assignList, ListHeaderTypeAssign.FIELD_INTERVIEWER, values.fieldInterviewerIds()); + return assignList; + } + + private static void putFirst( + Map assignList, + ListHeaderTypeAssign type, + List values + ) { + if (values != null && !values.isEmpty()) { + assignList.put(type, values.get(0)); + } + } } diff --git a/src/main/java/com/kri/contact/server/dto/list/ListSearchRequestDto.java b/src/main/java/com/kri/contact/server/dto/list/ListSearchRequestDto.java index f8c42ed..c5a5292 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListSearchRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListSearchRequestDto.java @@ -2,6 +2,7 @@ package com.kri.contact.server.dto.list; import com.kri.common.feature.web.page.PageRequestDto; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import java.util.List; import java.util.Map; @@ -19,6 +20,7 @@ import lombok.Setter; @Schema(description = "리스트 검색 조건") public class ListSearchRequestDto { + @Valid @NotNull @Schema(description = "리스트 필터") private ListFilterDto listFilter; diff --git a/src/main/java/com/kri/contact/server/dto/list/ListSearchWithFullResultDto.java b/src/main/java/com/kri/contact/server/dto/list/ListSearchWithFullResultDto.java index 2a20978..caffdf0 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListSearchWithFullResultDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListSearchWithFullResultDto.java @@ -1,6 +1,8 @@ package com.kri.contact.server.dto.list; +import com.kri.contact.server.common.enums.ListIsUse; import com.kri.contact.server.persistence.entity.TListEntity; +import com.kri.contact.server.service.ListSearchService.AssignValues; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Map; import lombok.AllArgsConstructor; @@ -18,28 +20,31 @@ import lombok.experimental.SuperBuilder; public class ListSearchWithFullResultDto extends ListSearchWithResultDto { @Schema(description = "메일 발송 결과") - private ListResultBaseDto mailSendResult; + private ListSendResultDto mailSendResult; @Schema(description = "문자 발송 결과") - private ListResultBaseDto smsSendResult; + private ListSendResultDto smsSendResult; public static ListSearchWithFullResultDto from( TListEntity entity, Map itemList, + AssignValues assignValues, ListContactResultDto contactResult, ListContactResultDto interviewResult, ListResultBaseDto surveyResult, - ListResultBaseDto mailSendResult, - ListResultBaseDto smsSendResult + ListSendResultDto mailSendResult, + ListSendResultDto smsSendResult ) { if (entity == null) { return null; } + AssignValues values = assignValues == null ? AssignValues.empty() : assignValues; return ListSearchWithFullResultDto.builder() .prjctIdx(entity.getPrjctIdx()) .sid(entity.getSid()) - .use(entity.getUse()) + .use(ListIsUse.fromCode(entity.getUse())) + .assignList(toAssignList(values)) .memo(entity.getMemo()) .itemList(itemList) .contactResult(contactResult) diff --git a/src/main/java/com/kri/contact/server/dto/list/ListSearchWithResultDto.java b/src/main/java/com/kri/contact/server/dto/list/ListSearchWithResultDto.java index f568fe8..b721d9d 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListSearchWithResultDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListSearchWithResultDto.java @@ -1,6 +1,8 @@ package com.kri.contact.server.dto.list; +import com.kri.contact.server.common.enums.ListIsUse; import com.kri.contact.server.persistence.entity.TListEntity; +import com.kri.contact.server.service.ListSearchService.AssignValues; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Map; import lombok.AllArgsConstructor; @@ -28,6 +30,7 @@ public class ListSearchWithResultDto extends ListSearchBaseDto { public static ListSearchWithResultDto from( TListEntity entity, Map itemList, + AssignValues assignValues, ListContactResultDto contactResult, ListContactResultDto interviewResult, ListResultBaseDto surveyResult @@ -36,10 +39,12 @@ public class ListSearchWithResultDto extends ListSearchBaseDto { return null; } + AssignValues values = assignValues == null ? AssignValues.empty() : assignValues; return ListSearchWithResultDto.builder() .prjctIdx(entity.getPrjctIdx()) .sid(entity.getSid()) - .use(entity.getUse()) + .use(ListIsUse.fromCode(entity.getUse())) + .assignList(toAssignList(values)) .memo(entity.getMemo()) .itemList(itemList) .contactResult(contactResult) diff --git a/src/main/java/com/kri/contact/server/dto/list/ListSendResultDto.java b/src/main/java/com/kri/contact/server/dto/list/ListSendResultDto.java new file mode 100644 index 0000000..054a321 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListSendResultDto.java @@ -0,0 +1,36 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.persistence.entity.TListEventHistEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.experimental.SuperBuilder; + +@Getter +@Setter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "발송 결과") +public class ListSendResultDto extends ListResultBaseDto { + + @Schema(description = "마지막 컨택/방문면접원") + private String lastResultLabel; + + /* Todo Noti hub로 부터 받아서 생성하는 static 메소드 필요 + public static ListSendResultDto from(TListEventHistEntity entity, String resultLabel, Integer attemptCount) { + if (entity == null) { + return null; + } + + return ListSendResultDto.builder() + .lastResultCd(entity.getResultCd() == null ? null : entity.getResultCd().shortValue()) + .lastResultDt(entity.getRegDt()) + .attemptCount(attemptCount) + .lastResultLabel(resultLabel) + .build(); + } + */ +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListUpdateHistoryDto.java b/src/main/java/com/kri/contact/server/dto/list/ListUpdateHistoryDto.java new file mode 100644 index 0000000..44659c7 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListUpdateHistoryDto.java @@ -0,0 +1,33 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.persistence.entity.TListUpdateHistEntity; +import java.time.LocalDateTime; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class ListUpdateHistoryDto { + + private Long listUpdateHistIdx; + private Long prjctIdx; + private Integer sid; + private Integer listHderId; + private String beforeVal; + private String afterVal; + private String regUser; + private LocalDateTime regDt; + + public static ListUpdateHistoryDto from(TListUpdateHistEntity entity) { + return ListUpdateHistoryDto.builder() + .listUpdateHistIdx(entity.getListUpdateHistIdx()) + .prjctIdx(entity.getPrjctIdx()) + .sid(entity.getSid()) + .listHderId(entity.getListHderId()) + .beforeVal(entity.getBeforeVal()) + .afterVal(entity.getAfterVal()) + .regUser(entity.getRegUser()) + .regDt(entity.getRegDt()) + .build(); + } +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListUpdateRequestDto.java b/src/main/java/com/kri/contact/server/dto/list/ListUpdateRequestDto.java index 904b534..6b9e66c 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListUpdateRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListUpdateRequestDto.java @@ -1,6 +1,8 @@ package com.kri.contact.server.dto.list; +import com.kri.contact.server.common.enums.ResultCodeType; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import java.util.Map; import lombok.Getter; @@ -13,10 +15,13 @@ import lombok.Setter; @Schema(description = "리스트 정보 수정 요청 DTO") public class ListUpdateRequestDto { - @NotNull @Schema(description = "리스트 정보 수정내용 sid를 제외한 모든 내용, listHderId by listItemValue") private Map updateContents; + @Schema(description = "리스트 결과 코드 수정내용") + private Map updateResultCodes; + + @Valid @NotNull @Schema(description = "리스트 필터") private ListFilterDto listFilter; diff --git a/src/main/java/com/kri/contact/server/dto/list/ListUploadFileInfoDto.java b/src/main/java/com/kri/contact/server/dto/list/ListUploadFileInfoDto.java new file mode 100644 index 0000000..42bd0a9 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListUploadFileInfoDto.java @@ -0,0 +1,17 @@ +package com.kri.contact.server.dto.list; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +@Schema(description = "리스트 업로드 파일 정보") +public class ListUploadFileInfoDto { + + @Schema(description = "파일명") + private String fileName; + + @Schema(description = "파일 바이트") + private byte[] bytes; +} diff --git a/src/main/java/com/kri/contact/server/dto/list/ListUploadHistoryDto.java b/src/main/java/com/kri/contact/server/dto/list/ListUploadHistoryDto.java new file mode 100644 index 0000000..025d34c --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListUploadHistoryDto.java @@ -0,0 +1,47 @@ +package com.kri.contact.server.dto.list; + +import com.kri.contact.server.common.enums.ListUploadMode; +import com.kri.contact.server.persistence.entity.TListUploadLogEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDateTime; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +@Schema(description = "리스트 업로드 이력") +public class ListUploadHistoryDto { + + @Schema(description = "리스트 업로드 로그 ID") + private String listUploadLogId; + + @Schema(description = "업로드 차수") + private Integer wave; + + @Schema(description = "업로드 파일명") + private String fileName; + + @Schema(description = "업로드 리스트 수") + private Integer listCount; + + @Schema(description = "업로드 모드") + private ListUploadMode uploadMode; + + @Schema(description = "등록 사용자") + private String regUser; + + @Schema(description = "등록 일시") + private LocalDateTime regDt; + + public static ListUploadHistoryDto fromEntity(TListUploadLogEntity entity) { + return ListUploadHistoryDto.builder() + .listUploadLogId(entity.getListUploadLogId()) + .wave(entity.getWave()) + .fileName(entity.getFileNm()) + .listCount(entity.getListCnt()) + .uploadMode(ListUploadMode.fromCode(entity.getMode())) + .regUser(entity.getRegUser()) + .regDt(entity.getRegDt()) + .build(); + } +} diff --git a/src/main/java/com/kri/contact/server/dto/message/MessageBulkSendResponseDto.java b/src/main/java/com/kri/contact/server/dto/message/MessageBulkSendResponseDto.java new file mode 100644 index 0000000..e41cc12 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/message/MessageBulkSendResponseDto.java @@ -0,0 +1,19 @@ +package com.kri.contact.server.dto.message; + +import java.util.ArrayList; +import java.util.List; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class MessageBulkSendResponseDto { + + private String bulkSendKey; + private int targetCount; + private int requestCount; + private int acceptCount; + private int failCount; + @Builder.Default + private List failedChunks = new ArrayList<>(); +} diff --git a/src/main/java/com/kri/contact/server/dto/message/MessageFailedChunkDto.java b/src/main/java/com/kri/contact/server/dto/message/MessageFailedChunkDto.java new file mode 100644 index 0000000..34b951a --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/message/MessageFailedChunkDto.java @@ -0,0 +1,15 @@ +package com.kri.contact.server.dto.message; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class MessageFailedChunkDto { + + private int chunkIndex; + private int from; + private int to; + private int targetCount; + private String errorMessage; +} diff --git a/src/main/java/com/kri/contact/server/dto/message/MessageSendBulkRequestDto.java b/src/main/java/com/kri/contact/server/dto/message/MessageSendBulkRequestDto.java new file mode 100644 index 0000000..ac39d17 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/message/MessageSendBulkRequestDto.java @@ -0,0 +1,35 @@ +package com.kri.contact.server.dto.message; + +import com.kri.contact.server.dto.list.ListFilterDto; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDateTime; +import java.util.List; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@Schema(description = "Message bulk send request") +public class MessageSendBulkRequestDto { + + @NotNull + private Long tmplatIdx; + + @NotNull + private Boolean resve; + + private LocalDateTime sendDt; + + @Valid + private ListFilterDto listFilter; + + @NotEmpty + private List destHeaderIds; + + private Integer destNameHeaderId; +} diff --git a/src/main/java/com/kri/contact/server/dto/message/MessageSendSingleRequestDto.java b/src/main/java/com/kri/contact/server/dto/message/MessageSendSingleRequestDto.java new file mode 100644 index 0000000..71970ab --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/message/MessageSendSingleRequestDto.java @@ -0,0 +1,33 @@ +package com.kri.contact.server.dto.message; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDateTime; +import java.util.List; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@Schema(description = "Message single send request") +public class MessageSendSingleRequestDto { + + @NotNull + private Long tmplatIdx; + + @NotNull + private Boolean resve; + + private LocalDateTime sendDt; + + @NotNull + private Integer sid; + + @NotEmpty + private List destHeaderIds; + + private Integer destNameHeaderId; +} diff --git a/src/main/java/com/kri/contact/server/dto/progress/ProgressDateResponseDto.java b/src/main/java/com/kri/contact/server/dto/progress/ProgressDateResponseDto.java new file mode 100644 index 0000000..61b2e2f --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/progress/ProgressDateResponseDto.java @@ -0,0 +1,24 @@ +package com.kri.contact.server.dto.progress; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.LinkedHashMap; +import java.util.Map; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +@Schema(description = "날짜별 진행 현황") +public class ProgressDateResponseDto { + + private String contactDate; + + private String startTime; + + private String endTime; + + private long totalCount; + + @Builder.Default + private Map resultCodeCountMap = new LinkedHashMap<>(); +} diff --git a/src/main/java/com/kri/contact/server/dto/progress/ProgressSearchRequestDto.java b/src/main/java/com/kri/contact/server/dto/progress/ProgressSearchRequestDto.java new file mode 100644 index 0000000..8ebe3f5 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/progress/ProgressSearchRequestDto.java @@ -0,0 +1,23 @@ +package com.kri.contact.server.dto.progress; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Schema(description = "진행 현황 조회 요청") +public class ProgressSearchRequestDto { + + @Schema(description = "사용자 ID") + private String userId; + + @Schema(description = "회사 ID") + private String cmpnId; + + @Schema(description = "시작일시") + private String startDt; + + @Schema(description = "종료일시") + private String endDt; +} diff --git a/src/main/java/com/kri/contact/server/dto/progress/ProgressUserResponseDto.java b/src/main/java/com/kri/contact/server/dto/progress/ProgressUserResponseDto.java new file mode 100644 index 0000000..259aeaa --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/progress/ProgressUserResponseDto.java @@ -0,0 +1,20 @@ +package com.kri.contact.server.dto.progress; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.LinkedHashMap; +import java.util.Map; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +@Schema(description = "사용자별 진행 현황") +public class ProgressUserResponseDto { + + private String userId; + + private long totalCount; + + @Builder.Default + private Map resultCodeCountMap = new LinkedHashMap<>(); +} diff --git a/src/main/java/com/kri/contact/server/dto/project/ProjectInfoDto.java b/src/main/java/com/kri/contact/server/dto/project/ProjectInfoDto.java index 0126233..7bafdd9 100644 --- a/src/main/java/com/kri/contact/server/dto/project/ProjectInfoDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ProjectInfoDto.java @@ -68,6 +68,10 @@ public class ProjectInfoDto { @Schema(description = "설문 URL") private String surveyUrl; + @Size(max = 128) + @Schema(description = "외부 설문 대시보드 URL. surveyTy가 99(EXTERNAL)일 때만 사용") + private String surveyDashboardUrl; + @NotNull @Schema(description = "면접원 확인사항 여부") private Boolean ff; @@ -109,6 +113,7 @@ public class ProjectInfoDto { .surveyTy(SurveyType.fromCode(entity.getSurveyTy())) .surveyPrjctCd(entity.getSurveyPrjctCd()) .surveyUrl(entity.getSurveyUrl()) + .surveyDashboardUrl(entity.getSurveyDashboardUrl()) .ff(entity.getFf()) .useContactSenario(entity.getUseContactSenario()) .contactSenario(entity.getContactSenario()) diff --git a/src/main/java/com/kri/contact/server/dto/project/ProjectUpdateRequestDto.java b/src/main/java/com/kri/contact/server/dto/project/ProjectUpdateRequestDto.java index 4abe747..018aaf2 100644 --- a/src/main/java/com/kri/contact/server/dto/project/ProjectUpdateRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ProjectUpdateRequestDto.java @@ -15,9 +15,9 @@ public class ProjectUpdateRequestDto { @Schema(description = "프로젝트 정보") private ProjectInfoDto projectInfo; - @Schema(description = "프로젝트 수정 되야 할 결과코드") + @Schema(description = "프로젝트 수정 대상 결과 코드") private List resultCodeList; - @Schema(description = "배정될 외주 업체 목록") - private List assignUserIdList; + @Schema(description = "프로젝트 배정 회사 목록") + private List assignCmpnIdList; } diff --git a/src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java b/src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java index a7e725e..f3d7fce 100644 --- a/src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java @@ -29,6 +29,8 @@ public class ResultCodeDto { @Schema(description = "결과 코드 라벨") private String resultCdLbl; + private Boolean isDefault; + public static ResultCodeDto from(TResultCodeEntity entity) { return ResultCodeDto.builder() .resultCdUUID(CommonUtil.uuid32()) @@ -36,6 +38,7 @@ public class ResultCodeDto { .resultCdTy(entity.getResultCdTy()) .resultCd(entity.getResultCd()) .resultCdLbl(entity.getResultCdLbl()) + .isDefault(Boolean.TRUE.equals(entity.getDefaultCode())) .build(); } } diff --git a/src/main/java/com/kri/contact/server/dto/reserve/ListReserveDto.java b/src/main/java/com/kri/contact/server/dto/reserve/ListReserveDto.java new file mode 100644 index 0000000..824d6b8 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/reserve/ListReserveDto.java @@ -0,0 +1,35 @@ +package com.kri.contact.server.dto.reserve; + +import com.kri.contact.server.persistence.entity.TListResveEntity; +import java.time.LocalDateTime; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class ListReserveDto { + + private Long listResveIdx; + private Long prjctIdx; + private Integer sid; + private String memo; + private Boolean cnfirm; + private LocalDateTime resveDt; + private String resveUser; + private String regUser; + private LocalDateTime regDt; + + public static ListReserveDto from(TListResveEntity entity) { + return ListReserveDto.builder() + .listResveIdx(entity.getListResveIdx()) + .prjctIdx(entity.getPrjctIdx()) + .sid(entity.getSid()) + .memo(entity.getMemo()) + .cnfirm(entity.getCnfirm()) + .resveDt(entity.getResveDt()) + .resveUser(entity.getResveUser()) + .regUser(entity.getRegUser()) + .regDt(entity.getRegDt()) + .build(); + } +} diff --git a/src/main/java/com/kri/contact/server/dto/reserve/ListReserveRequestDto.java b/src/main/java/com/kri/contact/server/dto/reserve/ListReserveRequestDto.java new file mode 100644 index 0000000..3a11557 --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/reserve/ListReserveRequestDto.java @@ -0,0 +1,26 @@ +package com.kri.contact.server.dto.reserve; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +public class ListReserveRequestDto { + + @NotNull + private Long prjctIdx; + + @NotNull + private Integer sid; + + @NotBlank + private String userId; + + @NotNull + private LocalDateTime resveDt; +} diff --git a/src/main/java/com/kri/contact/server/dto/systemlog/UploadContentDto.java b/src/main/java/com/kri/contact/server/dto/systemlog/UploadContentDto.java new file mode 100644 index 0000000..bdb6aba --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/systemlog/UploadContentDto.java @@ -0,0 +1,28 @@ +package com.kri.contact.server.dto.systemlog; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.springframework.web.multipart.MultipartFile; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class UploadContentDto { + String fileName; + String fileType; + Long fileSize; + + public static UploadContentDto from(MultipartFile file){ + return UploadContentDto.builder() + .fileName(file.getOriginalFilename()) + .fileType(file.getContentType()) + .fileSize(file.getSize()) + .build(); + } +} + diff --git a/src/main/java/com/kri/contact/server/dto/systemlog/UploadUserContentDto.java b/src/main/java/com/kri/contact/server/dto/systemlog/UploadUserContentDto.java deleted file mode 100644 index 0a08268..0000000 --- a/src/main/java/com/kri/contact/server/dto/systemlog/UploadUserContentDto.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.kri.contact.server.dto.systemlog; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@Setter -@Getter -@AllArgsConstructor -public class UploadUserContentDto { - - String fileName; - String fileType; - Long fileSize; -} - diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TCmpnEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TCmpnEntity.java new file mode 100644 index 0000000..8011827 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/entity/TCmpnEntity.java @@ -0,0 +1,92 @@ +package com.kri.contact.server.persistence.entity; + +import com.kri.contact.server.dto.cmpn.CmpnInfoDto; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.Comment; + +@Getter +@Setter +@Entity +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "t_cmpn") +public class TCmpnEntity { + + @Id + @Size(max = 32) + @Column(name = "cmpn_id", nullable = false, length = 32, updatable = false) + @Comment("회사 id(회사이름)") + private String cmpnId; + + @Size(max = 32) + @Column(name = "cmpn_alias", nullable = false, length = 32) + @Comment("회사 별칭") + private String cmpnAlias; + + @Size(max = 16) + @Column(name = "cmpn_tel", length = 16) + @Comment("회사 전화번호") + private String cmpnTel; + + @NotNull + @ColumnDefault("0") + @Builder.Default + @Column(name = "is_own_cmpn", nullable = false, columnDefinition = "tinyint(1)") + @Comment("자사 여부") + private Boolean ownCmpn = false; + + @Lob + @Column(name = "memo") + @Comment("메모") + private String memo; + + @Size(max = 32) + @Column(name = "reg_user", nullable = false, length = 32, updatable = false) + private String regUser; + + @ColumnDefault("CURRENT_TIMESTAMP") + @Column(name = "reg_dt", nullable = false, updatable = false) + private LocalDateTime regDt; + + @Size(max = 32) + @Column(name = "mod_user", length = 32, insertable = false) + private String modUser; + + @Column(name = "mod_dt", insertable = false) + private LocalDateTime modDt; + + public static TCmpnEntity fromDto(CmpnInfoDto dto, String regUser, LocalDateTime regDt) { + return TCmpnEntity.builder() + .cmpnId(dto.getCmpnId()) + .cmpnAlias(dto.getCmpnAlias()) + .cmpnTel(dto.getCmpnTel()) + .ownCmpn(Boolean.TRUE.equals(dto.getOwnCmpn())) + .memo(dto.getMemo()) + .regUser(regUser) + .regDt(regDt) + .build(); + } + + public void updateFromDto(CmpnInfoDto dto, String modUser, LocalDateTime modDt) { + this.cmpnAlias = dto.getCmpnAlias(); + this.cmpnTel = dto.getCmpnTel(); + this.ownCmpn = Boolean.TRUE.equals(dto.getOwnCmpn()); + this.memo = dto.getMemo(); + this.modUser = modUser; + this.modDt = modDt; + } +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TFuncEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TFuncEntity.java deleted file mode 100644 index 107ea86..0000000 --- a/src/main/java/com/kri/contact/server/persistence/entity/TFuncEntity.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.kri.contact.server.persistence.entity; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Lob; -import jakarta.persistence.Table; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Getter; -import lombok.Setter; -import org.hibernate.annotations.ColumnDefault; - -@Getter -@Setter -@Entity -@Table(name = "t_func") -public class TFuncEntity { - - @Id - @NotNull - @Column(name = "func_cd") - private Integer funcCd; - - @Size(max = 32) - @NotNull - @Column(name = "func_nm", nullable = false, length = 32) - private String funcNm; - - @NotNull - @ColumnDefault("1") - @Column(name = "is_menu", nullable = false) - private Boolean menu = false; - - @NotNull - @Column(name = "depth", nullable = false) - private Integer depth; - - @NotNull - @Column(name = "parent", nullable = false) - private Integer parent; - - @NotNull - @Lob - @Column(name = "func_memo", nullable = false) - private String funcMemo; - -} \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListAssignEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListAssignCmpnEntity.java similarity index 88% rename from src/main/java/com/kri/contact/server/persistence/entity/TListAssignEntity.java rename to src/main/java/com/kri/contact/server/persistence/entity/TListAssignCmpnEntity.java index fae4ed6..4fbe293 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListAssignEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListAssignCmpnEntity.java @@ -16,8 +16,8 @@ import org.hibernate.annotations.ColumnDefault; @Getter @Setter @Entity -@Table(name = "t_list_assign") -public class TListAssignEntity { +@Table(name = "t_list_assign_cmpn") +public class TListAssignCmpnEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -32,8 +32,8 @@ public class TListAssignEntity { private Integer sid; @Size(max = 32) - @Column(name = "user_id", length = 32) - private String userId; + @Column(name = "cmpn_id", length = 32) + private String cmpnId; @Size(max = 32) @Column(name = "reg_user", length = 32) @@ -42,4 +42,4 @@ public class TListAssignEntity { @ColumnDefault("CURRENT_TIMESTAMP") @Column(name = "reg_dt") private LocalDateTime regDt; -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListAssignUserEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListAssignUserEntity.java new file mode 100644 index 0000000..39bbd30 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListAssignUserEntity.java @@ -0,0 +1,49 @@ +package com.kri.contact.server.persistence.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.ColumnDefault; + +@Getter +@Setter +@Entity +@Table(name = "t_list_assign_user") +public class TListAssignUserEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "list_assign_idx", nullable = false) + private Long listAssignIdx; + + @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") + private Long prjctIdx; + + @NotNull + @Column(name = "sid", nullable = false) + private Integer sid; + + @Size(max = 32) + @Column(name = "user_id", length = 32) + private String userId; + + @NotNull + @Column(name = "assign_role", nullable = false) + private Short assignRole; + + @Size(max = 32) + @Column(name = "reg_user", length = 32) + private String regUser; + + @ColumnDefault("CURRENT_TIMESTAMP") + @Column(name = "reg_dt") + private LocalDateTime regDt; +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListAssignUserRoleMapEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListAssignUserRoleMapEntity.java new file mode 100644 index 0000000..69304ae --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListAssignUserRoleMapEntity.java @@ -0,0 +1,49 @@ +package com.kri.contact.server.persistence.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.ColumnDefault; + +@Getter +@Setter +@Entity +@Table(name = "t_list_assign_user_role_map") +public class TListAssignUserRoleMapEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id", nullable = false) + private Long id; + + @NotNull + @Column(name = "list_hder_ty", nullable = false) + private Integer listHderTy; + + @Size(max = 32) + @NotNull + @Column(name = "user_role", nullable = false, length = 32) + private String userRole; + + @Size(max = 32) + @NotNull + @Column(name = "reg_user", nullable = false, length = 32) + private String regUser; + + @NotNull + @ColumnDefault("CURRENT_TIMESTAMP") + @Column(name = "reg_dt", nullable = false) + private LocalDateTime regDt; + + public Short getAssignRole() { + return listHderTy == null ? null : listHderTy.shortValue(); + } +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java index b408426..0f662ab 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java @@ -9,6 +9,7 @@ import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import java.time.Instant; +import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.ColumnDefault; @@ -21,7 +22,7 @@ public class TListCallHistEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "list_call_hist_idx", nullable = false) + @Column(name = "list_call_hist_idx", nullable = false, insertable = false) private Long id; @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") @@ -67,7 +68,7 @@ public class TListCallHistEntity { @NotNull @Column(name = "start_dt", nullable = false) - private Instant startDt; + private LocalDateTime startDt; @NotNull @Column(name = "total_time", nullable = false) @@ -99,7 +100,7 @@ public class TListCallHistEntity { @NotNull @ColumnDefault("CURRENT_TIMESTAMP") @Column(name = "reg_dt", nullable = false) - private Instant regDt; + private LocalDateTime regDt; } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListContentEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListContentEntity.java new file mode 100644 index 0000000..7d28eab --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListContentEntity.java @@ -0,0 +1,44 @@ +package com.kri.contact.server.persistence.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "t_list_content") +public class TListContentEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "list_content_idx", nullable = false) + private Long id; + + @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") + private Long prjctIdx; + + @NotNull + @Column(name = "list_hder_id", nullable = false) + private Integer listHderId; + + @Size(max = 2048) + @NotNull + @Column(name = "list_content_item", nullable = false, length = 2048) + private String listContentItem; + + public static TListContentEntity create(Long prjctIdx, Integer listHderId, String listContentItem) { + TListContentEntity entity = new TListContentEntity(); + entity.setPrjctIdx(prjctIdx); + entity.setListHderId(listHderId); + entity.setListContentItem(listContentItem); + return entity; + } +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListEntity.java index 793bb3f..d82e39a 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListEntity.java @@ -32,7 +32,8 @@ public class TListEntity { private Short use; @Size(max = 2048) - @Column(name = "memo", length = 2048) + @NotNull + @Column(name = "memo", nullable = false, length = 2048) private String memo; @Size(max = 32) @@ -59,4 +60,4 @@ public class TListEntity { public Integer getSid() { return id.getSid(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListEventHistEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListEventHistEntity.java index 0967570..aea9099 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListEventHistEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListEventHistEntity.java @@ -1,5 +1,8 @@ package com.kri.contact.server.persistence.entity; +import com.kri.contact.server.common.enums.ResultCodeType; +import com.kri.contact.server.dto.list.ListEventHistFromSurveyDto; +import com.kri.contact.server.dto.list.ListEventHistInsertRequestDto; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -10,13 +13,20 @@ import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import java.time.LocalDateTime; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.ColumnDefault; @Getter @Setter +@Builder(access = AccessLevel.PRIVATE) +@NoArgsConstructor +@AllArgsConstructor(access = AccessLevel.PRIVATE) @Entity @Table(name = "t_list_event_hist") public class TListEventHistEntity { @@ -62,4 +72,40 @@ public class TListEventHistEntity { @Column(name = "reg_dt", nullable = false) private LocalDateTime regDt; -} \ No newline at end of file + public static TListEventHistEntity fromSurveyHistory( + ListEventHistFromSurveyDto request, + String metaData, + String regUser, + LocalDateTime regDt + ) { + return TListEventHistEntity.builder() + .eventTy(ResultCodeType.SURVEY.getCode()) + .prjctIdx(request.getPrjctIdx()) + .sid(request.getSid()) + .resultCd(request.getAction().getCode().intValue()) + .metaData(metaData) + .memo(request.getAction().name()) + .regUser(regUser) + .regDt(regDt) + .build(); + } + + public static TListEventHistEntity fromInternalHistory( + ListEventHistInsertRequestDto request, + String metaData, + String regUser, + LocalDateTime regDt + ) { + return TListEventHistEntity.builder() + .eventTy(request.getResultCodeType().getCode()) + .prjctIdx(request.getPrjctIdx()) + .sid(request.getSid()) + .resultCd(request.getResultCd()) + .metaData(metaData) + .memo(request.getMemo()) + .regUser(regUser) + .regDt(regDt) + .build(); + } + +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListEventLatestEntity.java similarity index 52% rename from src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntity.java rename to src/main/java/com/kri/contact/server/persistence/entity/TListEventLatestEntity.java index 65f00ff..95a1ebe 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListEventLatestEntity.java @@ -1,7 +1,6 @@ package com.kri.contact.server.persistence.entity; -import com.kri.contact.server.persistence.entity.id.TRoleFuncMapEntityId; - +import com.kri.contact.server.persistence.entity.id.TListEventLatestEntityId; import jakarta.persistence.Column; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; @@ -11,16 +10,23 @@ import jakarta.validation.constraints.Size; import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; -import org.hibernate.annotations.ColumnDefault; @Getter @Setter @Entity -@Table(name = "t_role_func_map") -public class TRoleFuncMapEntity { +@Table(name = "t_list_event_latest") +public class TListEventLatestEntity { @EmbeddedId - private TRoleFuncMapEntityId id; + private TListEventLatestEntityId id; + + @NotNull + @Column(name = "list_event_hist_idx", nullable = false) + private Long listEventHistIdx; + + @NotNull + @Column(name = "result_cd", nullable = false) + private Integer resultCd; @Size(max = 32) @NotNull @@ -28,15 +34,18 @@ public class TRoleFuncMapEntity { private String regUser; @NotNull - @ColumnDefault("CURRENT_TIMESTAMP") @Column(name = "reg_dt", nullable = false) private LocalDateTime regDt; - public Integer getRoleCd() { - return id.getRoleCd(); + public Long getPrjctIdx() { + return id.getPrjctIdx(); } - public Long getFuncCd() { - return id.getFuncCd(); + public Integer getSid() { + return id.getSid(); } -} \ No newline at end of file + + public Short getEventTy() { + return id.getEventTy(); + } +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListItemFileEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListItemFileEntity.java index ad09740..5f1d6c7 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListItemFileEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListItemFileEntity.java @@ -1,7 +1,6 @@ package com.kri.contact.server.persistence.entity; import com.kri.contact.server.persistence.entity.id.TListItemFileEntityId; - import jakarta.persistence.Column; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; @@ -9,6 +8,7 @@ import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import java.time.LocalDateTime; +import lombok.Builder; import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.ColumnDefault; @@ -61,4 +61,26 @@ public class TListItemFileEntity { public Integer getListHderId() { return id.getListHderId(); } -} \ No newline at end of file + + public static TListItemFileEntity create( + Long prjctIdx, + Integer sid, + Integer listHderId, + String fileNm, + Integer fileSize, + String filePath, + String regUser, + LocalDateTime regDt + ) { + TListItemFileEntity entity = new TListItemFileEntity(); + entity.setId(TListItemFileEntityId.create(prjctIdx, sid, listHderId)); + entity.setFileNm(fileNm); + entity.setFileSize(fileSize); + entity.setFilePath(filePath); + entity.setRegUser(regUser); + entity.setRegDt(regDt); + entity.setModUser(regUser); + entity.setModDt(regDt); + return entity; + } +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListUploadLogEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListUploadLogEntity.java index 5583a1a..b445335 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListUploadLogEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListUploadLogEntity.java @@ -61,6 +61,9 @@ public class TListUploadLogEntity { @Column(name = "is_success", nullable = false) private Boolean success = false; + @Column(name = "is_scheduling_del") + private LocalDateTime schedulingDelDt; + @Size(max = 32) @NotNull @Column(name = "reg_user", nullable = false, length = 32) diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignCmpnEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignCmpnEntity.java new file mode 100644 index 0000000..b972041 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignCmpnEntity.java @@ -0,0 +1,56 @@ +package com.kri.contact.server.persistence.entity; + +import com.kri.contact.server.persistence.entity.id.TPrjctAssignCmpnEntityId; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.annotations.ColumnDefault; + +@Getter +@Setter +@Entity +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "t_prjct_assign_cmpn") +public class TPrjctAssignCmpnEntity { + + @EmbeddedId + private TPrjctAssignCmpnEntityId id; + + @Size(max = 32) + @NotNull + @Column(name = "reg_user", nullable = false, length = 32) + private String regUser; + + @NotNull + @ColumnDefault("CURRENT_TIMESTAMP") + @Column(name = "reg_dt", nullable = false) + private LocalDateTime regDt; + + public static TPrjctAssignCmpnEntity create(Long prjctIdx, String cmpnId, String regUser, + LocalDateTime regDt) { + return TPrjctAssignCmpnEntity.builder() + .id(TPrjctAssignCmpnEntityId.create(prjctIdx, cmpnId)) + .regUser(regUser) + .regDt(regDt) + .build(); + } + + public Long getPrjctIdx() { + return id.getPrjctIdx(); + } + + public String getCmpnId() { + return id.getCmpnId(); + } +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignUserEntity.java similarity index 77% rename from src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntity.java rename to src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignUserEntity.java index ca3b7f6..16f9a10 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignUserEntity.java @@ -1,7 +1,6 @@ package com.kri.contact.server.persistence.entity; -import com.kri.contact.server.persistence.entity.id.TPrjctAssignEntityId; - +import com.kri.contact.server.persistence.entity.id.TPrjctAssignUserEntityId; import jakarta.persistence.Column; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; @@ -22,11 +21,11 @@ import org.hibernate.annotations.ColumnDefault; @Builder @NoArgsConstructor @AllArgsConstructor -@Table(name = "t_prjct_assign") -public class TPrjctAssignEntity { +@Table(name = "t_prjct_assign_user") +public class TPrjctAssignUserEntity { @EmbeddedId - private TPrjctAssignEntityId id; + private TPrjctAssignUserEntityId id; @Size(max = 32) @NotNull @@ -38,10 +37,10 @@ public class TPrjctAssignEntity { @Column(name = "reg_dt", nullable = false) private LocalDateTime regDt; - public static TPrjctAssignEntity create(Long prjctIdx, String userId, String regUser, + public static TPrjctAssignUserEntity create(Long prjctIdx, String userId, String regUser, LocalDateTime regDt) { - return TPrjctAssignEntity.builder() - .id(TPrjctAssignEntityId.create(prjctIdx, userId)) + return TPrjctAssignUserEntity.builder() + .id(TPrjctAssignUserEntityId.create(prjctIdx, userId)) .regUser(regUser) .regDt(regDt) .build(); @@ -54,4 +53,4 @@ public class TPrjctAssignEntity { public String getUserId() { return id.getUserId(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java index f3680db..94fc66b 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java @@ -79,6 +79,10 @@ public class TPrjctEntity { @Column(name = "survey_url", length = 128) private String surveyUrl; + @Size(max = 128) + @Column(name = "survey_dashboard_url", length = 128) + private String surveyDashboardUrl; + @NotNull @ColumnDefault("0") @Column(name = "is_ff", nullable = false) @@ -133,6 +137,7 @@ public class TPrjctEntity { .surveyTy(dto.getSurveyTy().getCode()) .surveyPrjctCd(dto.getSurveyPrjctCd()) .surveyUrl(dto.getSurveyUrl()) + .surveyDashboardUrl(resolveSurveyDashboardUrl(dto.getSurveyTy(), dto.getSurveyDashboardUrl())) .ff(dto.getFf()) .useContactSenario(dto.getUseContactSenario()) .contactSenario(dto.getContactSenario()) @@ -167,6 +172,7 @@ public class TPrjctEntity { this.surveyTy = dto.getSurveyTy().getCode(); this.surveyPrjctCd = dto.getSurveyPrjctCd(); this.surveyUrl = dto.getSurveyUrl(); + this.surveyDashboardUrl = resolveSurveyDashboardUrl(dto.getSurveyTy(), dto.getSurveyDashboardUrl()); this.ff = dto.getFf(); this.useContactSenario = dto.getUseContactSenario(); this.contactSenario = dto.getContactSenario(); @@ -174,4 +180,8 @@ public class TPrjctEntity { this.modUser = modUser; this.modDt = modDt; } + + private static String resolveSurveyDashboardUrl(SurveyType surveyTy, String surveyDashboardUrl) { + return surveyTy == SurveyType.EXTERNAL ? surveyDashboardUrl : null; + } } diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java index ff0d6e0..269c2dc 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java @@ -35,6 +35,12 @@ public class TResultCodeEntity { @Column(name = "result_cd_lbl", nullable = false, length = 32) private String resultCdLbl; + @NotNull + @Builder.Default + @ColumnDefault("0") + @Column(name = "is_default_code", nullable = false) + private Boolean defaultCode = false; + @Size(max = 32) @NotNull @Column(name = "reg_user", nullable = false, length = 32) @@ -54,6 +60,7 @@ public class TResultCodeEntity { return TResultCodeEntity.builder() .id(TResultCodeEntityId.create(prjctIdx, src.getResultCdTy(), src.getResultCd())) .resultCdLbl(src.getResultCdLbl()) + .defaultCode(Boolean.TRUE.equals(src.getDefaultCode())) .regUser(regUser) .regDt(regDt) .build(); @@ -64,6 +71,7 @@ public class TResultCodeEntity { return TResultCodeEntity.builder() .id(TResultCodeEntityId.create(prjctIdx, resultCdTy, req.getResultCd())) .resultCdLbl(req.getResultCdLbl()) + .defaultCode(false) .regUser(regUser) .regDt(regDt) .build(); @@ -81,4 +89,4 @@ public class TResultCodeEntity { public Short getResultCd() { return id.getResultCd(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/id/TListEventLatestEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/id/TListEventLatestEntityId.java new file mode 100644 index 0000000..25a1cf9 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/entity/id/TListEventLatestEntityId.java @@ -0,0 +1,30 @@ +package com.kri.contact.server.persistence.entity.id; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.validation.constraints.NotNull; +import java.io.Serializable; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@EqualsAndHashCode +@Embeddable +public class TListEventLatestEntityId implements Serializable { + + private static final long serialVersionUID = 2852702807999472163L; + + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") + private Long prjctIdx; + + @NotNull + @Column(name = "sid", nullable = false) + private Integer sid; + + @NotNull + @Column(name = "event_ty", nullable = false) + private Short eventTy; +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/id/TListItemFileEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/id/TListItemFileEntityId.java index ad826fa..17722a6 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/id/TListItemFileEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/id/TListItemFileEntityId.java @@ -28,4 +28,11 @@ public class TListItemFileEntityId implements Serializable { @Column(name = "list_hder_id", nullable = false) private Integer listHderId; -} \ No newline at end of file + public static TListItemFileEntityId create(Long prjctIdx, Integer sid, Integer listHderId) { + TListItemFileEntityId id = new TListItemFileEntityId(); + id.setPrjctIdx(prjctIdx); + id.setSid(sid); + id.setListHderId(listHderId); + return id; + } +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/id/TPrjctAssignCmpnEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/id/TPrjctAssignCmpnEntityId.java new file mode 100644 index 0000000..a23f362 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/entity/id/TPrjctAssignCmpnEntityId.java @@ -0,0 +1,41 @@ +package com.kri.contact.server.persistence.entity.id; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@EqualsAndHashCode +@Embeddable +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class TPrjctAssignCmpnEntityId implements Serializable { + + private static final long serialVersionUID = 1601351249067307447L; + + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") + private Long prjctIdx; + + @Size(max = 32) + @NotNull + @Column(name = "cmpn_id", nullable = false, length = 32) + private String cmpnId; + + public static TPrjctAssignCmpnEntityId create(Long prjctIdx, String cmpnId) { + return TPrjctAssignCmpnEntityId.builder() + .prjctIdx(prjctIdx) + .cmpnId(cmpnId) + .build(); + } +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/id/TPrjctAssignEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/id/TPrjctAssignUserEntityId.java similarity index 82% rename from src/main/java/com/kri/contact/server/persistence/entity/id/TPrjctAssignEntityId.java rename to src/main/java/com/kri/contact/server/persistence/entity/id/TPrjctAssignUserEntityId.java index 9dda7f1..4b56366 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/id/TPrjctAssignEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/id/TPrjctAssignUserEntityId.java @@ -19,7 +19,7 @@ import lombok.Setter; @Builder @NoArgsConstructor @AllArgsConstructor -public class TPrjctAssignEntityId implements Serializable { +public class TPrjctAssignUserEntityId implements Serializable { private static final long serialVersionUID = -263674621497298216L; @@ -32,11 +32,10 @@ public class TPrjctAssignEntityId implements Serializable { @Column(name = "user_id", nullable = false, length = 32) private String userId; - public static TPrjctAssignEntityId create(Long prjctIdx, String userId) { - return TPrjctAssignEntityId.builder() + public static TPrjctAssignUserEntityId create(Long prjctIdx, String userId) { + return TPrjctAssignUserEntityId.builder() .prjctIdx(prjctIdx) .userId(userId) .build(); } - -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/id/TRoleFuncMapEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/id/TRoleFuncMapEntityId.java deleted file mode 100644 index 64bab3a..0000000 --- a/src/main/java/com/kri/contact/server/persistence/entity/id/TRoleFuncMapEntityId.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.kri.contact.server.persistence.entity.id; - -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import jakarta.validation.constraints.NotNull; -import java.io.Serializable; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@EqualsAndHashCode -@Embeddable -public class TRoleFuncMapEntityId implements Serializable { - - private static final long serialVersionUID = 5430666726716009453L; - - @NotNull - @Column(name = "role_cd", nullable = false) - private Integer roleCd; - - @NotNull - @Column(name = "func_cd", nullable = false) - private Long funcCd; - -} \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/jdbc/ListAssignJdbcSupport.java b/src/main/java/com/kri/contact/server/persistence/jdbc/ListAssignJdbcSupport.java new file mode 100644 index 0000000..7ec3bc1 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/jdbc/ListAssignJdbcSupport.java @@ -0,0 +1,171 @@ +package com.kri.contact.server.persistence.jdbc; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.StringJoiner; +import lombok.RequiredArgsConstructor; +import org.jspecify.annotations.NonNull; +import org.springframework.jdbc.core.BatchPreparedStatementSetter; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class ListAssignJdbcSupport { + + private final JdbcTemplate jdbcTemplate; + + public int deleteCmpnAssign(Long prjctIdx, Collection sids, int chunkSize) { + int total = 0; + for (List sub : chunkSids(sids, chunkSize)) { + total += updateWithSidIn( + "delete from t_list_assign_cmpn where prjct_idx = ? and sid in (", + prjctIdx, + sub + ); + } + return total; + } + + public int deleteUserAssign(Long prjctIdx, Short assignRole, Collection sids, int chunkSize) { + int total = 0; + for (List sub : chunkSids(sids, chunkSize)) { + String sql = "delete from t_list_assign_user where prjct_idx = ? and assign_role = ? and sid in (" + + createInSql(sub) + ")"; + List args = new ArrayList<>(); + args.add(prjctIdx); + args.add(assignRole); + args.addAll(sub); + total += jdbcTemplate.update(sql, args.toArray()); + } + return total; + } + + public void batchInsertCmpnAssign( + Long prjctIdx, + Collection sids, + String cmpnId, + String regUser, + LocalDateTime regDt, + int chunkSize + ) { + String sql = """ + insert into t_list_assign_cmpn ( + prjct_idx, + sid, + cmpn_id, + reg_user, + reg_dt + ) values (?, ?, ?, ?, ?) + """; + + for (List sub : chunkSids(sids, chunkSize)) { + jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() { + @Override + public void setValues(@NonNull PreparedStatement ps, int index) throws SQLException { + ps.setLong(1, prjctIdx); + ps.setInt(2, sub.get(index)); + ps.setString(3, cmpnId); + ps.setString(4, regUser); + ps.setTimestamp(5, Timestamp.valueOf(regDt)); + } + + @Override + public int getBatchSize() { + return sub.size(); + } + }); + } + } + + public void batchInsertUserAssign( + Long prjctIdx, + Collection sids, + String userId, + Short assignRole, + String regUser, + LocalDateTime regDt, + int chunkSize + ) { + String sql = """ + insert into t_list_assign_user ( + prjct_idx, + sid, + user_id, + assign_role, + reg_user, + reg_dt + ) values (?, ?, ?, ?, ?, ?) + """; + + for (List sub : chunkSids(sids, chunkSize)) { + jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() { + @Override + public void setValues(@NonNull PreparedStatement ps, int index) throws SQLException { + ps.setLong(1, prjctIdx); + ps.setInt(2, sub.get(index)); + ps.setString(3, userId); + ps.setShort(4, assignRole); + ps.setString(5, regUser); + ps.setTimestamp(6, Timestamp.valueOf(regDt)); + } + + @Override + public int getBatchSize() { + return sub.size(); + } + }); + } + } + + public int transferReservationUser(Long prjctIdx, Collection sids, String resveUser, int chunkSize) { + int total = 0; + for (List sub : chunkSids(sids, chunkSize)) { + String sql = "update t_list_resve set resve_user = ? where prjct_idx = ? and sid in (" + + createInSql(sub) + ")"; + List args = new ArrayList<>(); + args.add(resveUser); + args.add(prjctIdx); + args.addAll(sub); + total += jdbcTemplate.update(sql, args.toArray()); + } + return total; + } + + private int updateWithSidIn(String sqlPrefix, Long prjctIdx, List sids) { + String sql = sqlPrefix + createInSql(sids) + ")"; + List args = new ArrayList<>(); + args.add(prjctIdx); + args.addAll(sids); + return jdbcTemplate.update(sql, args.toArray()); + } + + private List> chunkSids(Collection sids, int chunkSize) { + if (sids == null || sids.isEmpty()) { + return List.of(); + } + if (chunkSize <= 0) { + throw new IllegalArgumentException("chunkSize must be greater than 0"); + } + + List sidList = sids instanceof List list ? list : new ArrayList<>(sids); + List> chunks = new ArrayList<>(); + for (int i = 0; i < sidList.size(); i += chunkSize) { + chunks.add(sidList.subList(i, Math.min(sidList.size(), i + chunkSize))); + } + return chunks; + } + + private String createInSql(List sids) { + StringJoiner joiner = new StringJoiner(","); + for (int i = 0; i < sids.size(); i++) { + joiner.add("?"); + } + return joiner.toString(); + } +} diff --git a/src/main/java/com/kri/contact/server/persistence/jdbc/ListResetJdbcSupport.java b/src/main/java/com/kri/contact/server/persistence/jdbc/ListResetJdbcSupport.java index 320be42..bf35ee4 100644 --- a/src/main/java/com/kri/contact/server/persistence/jdbc/ListResetJdbcSupport.java +++ b/src/main/java/com/kri/contact/server/persistence/jdbc/ListResetJdbcSupport.java @@ -1,287 +1,171 @@ package com.kri.contact.server.persistence.jdbc; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.StringJoiner; import lombok.RequiredArgsConstructor; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class ListResetJdbcSupport { - private final JdbcTemplate jdbcTemplate; + private final EntityManager entityManager; - public void backupHistories(String listResetLogId, Long prjctIdx, Collection sids, int chunkSize) { - forEachSidChunk(sids, chunkSize, sub -> { - backupListEventHist(listResetLogId, prjctIdx, sub); - backupListUpdateHist(listResetLogId, prjctIdx, sub); - backupListCallHist(listResetLogId, prjctIdx, sub); - }); + public DeleteCounts deleteHistories(Long prjctIdx, Collection sids, int chunkSize) { + DeleteCounts total = DeleteCounts.empty(); + for (List sub : chunkSids(sids, chunkSize)) { + int eventHistCount = deleteBySids("t_list_event_hist", prjctIdx, sub); + int eventLatestCount = deleteBySids("t_list_event_latest", prjctIdx, sub); + int updateHistCount = deleteBySids("t_list_update_hist", prjctIdx, sub); + int callHistCount = deleteBySids("t_list_call_hist", prjctIdx, sub); + total = total.plus(DeleteCounts.histories( + eventHistCount, + eventLatestCount, + updateHistCount, + callHistCount + )); + } + return total; } - public void deleteHistories(Long prjctIdx, Collection sids, int chunkSize) { - forEachSidChunk(sids, chunkSize, sub -> { - deleteBySids("t_list_event_hist", prjctIdx, sub); - deleteBySids("t_list_update_hist", prjctIdx, sub); - deleteBySids("t_list_call_hist", prjctIdx, sub); - }); - } - - public void backupListData( - String listResetLogId, - Long prjctIdx, - Collection sids, - boolean includeFile, - int chunkSize - ) { - forEachSidChunk(sids, chunkSize, sub -> { - backupList(listResetLogId, prjctIdx, sub); - backupListItem(listResetLogId, prjctIdx, sub); - if (includeFile) { - backupListItemFile(listResetLogId, prjctIdx, sub); - } - }); - } - - public long deleteListData( + public DeleteCounts deleteListData( Long prjctIdx, Collection sids, boolean includeFile, boolean includeResve, int chunkSize ) { - long deletedCount = 0; - List sidList = new ArrayList<>(sids); - for (int i = 0; i < sidList.size(); i += chunkSize) { - List sub = sidList.subList(i, Math.min(sidList.size(), i + chunkSize)); + DeleteCounts total = DeleteCounts.empty(); + for (List sub : chunkSids(sids, chunkSize)) { + int fileCount = includeFile ? deleteBySids("t_list_item_file", prjctIdx, sub) : 0; + int itemCount = deleteBySids("t_list_item", prjctIdx, sub); + int assignUserCount = deleteBySids("t_list_assign_user", prjctIdx, sub); + int assignCmpnCount = deleteBySids("t_list_assign_cmpn", prjctIdx, sub); + int resveCount = includeResve ? deleteBySids("t_list_resve", prjctIdx, sub) : 0; + int listCount = deleteBySids("t_list", prjctIdx, sub); - if (includeFile) { - deleteBySids("t_list_item_file", prjctIdx, sub); - } - deleteBySids("t_list_item", prjctIdx, sub); - deleteBySids("t_list_assign", prjctIdx, sub); - if (includeResve) { - deleteBySids("t_list_resve", prjctIdx, sub); - } - deletedCount += deleteBySids("t_list", prjctIdx, sub); + total = total.plus(new DeleteCounts( + fileCount, + 0, + 0, + 0, + 0, + itemCount, + listCount, + assignUserCount, + assignCmpnCount, + resveCount + )); } - return deletedCount; - } - - private void backupListEventHist(String listResetLogId, Long prjctIdx, List sids) { - String inSql = createInSql(sids); - List args = createArgs(listResetLogId, prjctIdx, sids); - jdbcTemplate.update( - """ - insert into del_list_event_hist ( - list_reset_log_id, - list_event_hist_idx, - event_ty, - prjct_idx, - sid, - result_cd, - meta_data, - list_call_hist_idx, - memo, - reg_user, - reg_dt - ) - select ?, list_event_hist_idx, event_ty, prjct_idx, sid, result_cd, meta_data, - list_call_hist_idx, memo, reg_user, reg_dt - from t_list_event_hist - where prjct_idx = ? - and sid in (%s) - """.formatted(inSql), - args.toArray() - ); - } - - private void backupListUpdateHist(String listResetLogId, Long prjctIdx, List sids) { - String inSql = createInSql(sids); - List args = createArgs(listResetLogId, prjctIdx, sids); - jdbcTemplate.update( - """ - insert into del_list_update_hist ( - list_reset_log_id, - list_update_hist_idx, - prjct_idx, - sid, - list_hder_id, - before_val, - after_val, - reg_user, - reg_dt - ) - select ?, list_update_hist_idx, prjct_idx, sid, list_hder_id, before_val, - after_val, reg_user, reg_dt - from t_list_update_hist - where prjct_idx = ? - and sid in (%s) - """.formatted(inSql), - args.toArray() - ); - } - - private void backupListCallHist(String listResetLogId, Long prjctIdx, List sids) { - String inSql = createInSql(sids); - List args = createArgs(listResetLogId, prjctIdx, sids); - jdbcTemplate.update( - """ - insert into del_list_call_hist ( - list_reset_log_id, - list_call_hist_idx, - prjct_idx, - sid, - list_hder_id, - dest_num, - agent_num, - ani_num, - agent_session_id, - dest_session_id, - call_ty, - start_dt, - total_time, - talk_time, - media_server_id, - media_server_name, - record_file_name, - reg_user, - reg_dt - ) - select ?, list_call_hist_idx, prjct_idx, sid, list_hder_id, dest_num, - agent_num, ani_num, agent_session_id, dest_session_id, call_ty, - start_dt, total_time, talk_time, media_server_id, media_server_name, - record_file_name, reg_user, reg_dt - from t_list_call_hist - where prjct_idx = ? - and sid in (%s) - """.formatted(inSql), - args.toArray() - ); - } - - private void backupList(String listResetLogId, Long prjctIdx, List sids) { - String inSql = createInSql(sids); - List args = createArgs(listResetLogId, prjctIdx, sids); - jdbcTemplate.update( - """ - insert into del_list ( - list_reset_log_id, - prjct_idx, - sid, - list_upload_log_id, - is_use, - memo, - reg_user, - reg_dt, - mod_user, - mod_dt - ) - select ?, prjct_idx, sid, list_upload_log_id, is_use, memo, reg_user, - reg_dt, mod_user, mod_dt - from t_list - where prjct_idx = ? - and sid in (%s) - """.formatted(inSql), - args.toArray() - ); - } - - private void backupListItem(String listResetLogId, Long prjctIdx, List sids) { - String inSql = createInSql(sids); - List args = createArgs(listResetLogId, prjctIdx, sids); - jdbcTemplate.update( - """ - insert into del_list_item ( - list_reset_log_id, - prjct_idx, - sid, - list_hder_id, - list_item_val, - reg_user, - reg_dt, - mod_user, - mod_dt - ) - select ?, prjct_idx, sid, list_hder_id, list_item_val, reg_user, - reg_dt, mod_user, mod_dt - from t_list_item - where prjct_idx = ? - and sid in (%s) - """.formatted(inSql), - args.toArray() - ); - } - - private void backupListItemFile(String listResetLogId, Long prjctIdx, List sids) { - String inSql = createInSql(sids); - List args = createArgs(listResetLogId, prjctIdx, sids); - jdbcTemplate.update( - """ - insert into del_list_item_file ( - list_reset_log_id, - prjct_idx, - sid, - list_hder_id, - file_nm, - file_size, - file_path, - reg_user, - reg_dt, - mod_user, - mod_dt - ) - select ?, prjct_idx, sid, list_hder_id, file_nm, file_size, file_path, - reg_user, reg_dt, mod_user, mod_dt - from t_list_item_file - where prjct_idx = ? - and sid in (%s) - """.formatted(inSql), - args.toArray() - ); + return total; } private int deleteBySids(String tableName, Long prjctIdx, List sids) { - String inSql = createInSql(sids); - List args = new ArrayList<>(); - args.add(prjctIdx); - args.addAll(sids); + if (sids.isEmpty()) { + return 0; + } - return jdbcTemplate.update( - "delete from " + tableName + " where prjct_idx = ? and sid in (" + inSql + ")", - args.toArray() + Query query = entityManager.createNativeQuery( + "delete from " + tableName + " where prjct_idx = :prjctIdx and sid in (" + createInSql(sids) + ")" ); + query.setParameter("prjctIdx", prjctIdx); + for (int i = 0; i < sids.size(); i++) { + query.setParameter("sid" + i, sids.get(i)); + } + return query.executeUpdate(); } - private void forEachSidChunk(Collection sids, int chunkSize, ChunkConsumer consumer) { + private List> chunkSids(Collection sids, int chunkSize) { if (sids == null || sids.isEmpty()) { - return; + return List.of(); } if (chunkSize <= 0) { throw new IllegalArgumentException("chunkSize must be greater than 0"); } List sidList = new ArrayList<>(sids); + List> chunks = new ArrayList<>(); for (int i = 0; i < sidList.size(); i += chunkSize) { - consumer.accept(sidList.subList(i, Math.min(sidList.size(), i + chunkSize))); + chunks.add(sidList.subList(i, Math.min(sidList.size(), i + chunkSize))); } - } - - private List createArgs(String listResetLogId, Long prjctIdx, List sids) { - List args = new ArrayList<>(); - args.add(listResetLogId); - args.add(prjctIdx); - args.addAll(sids); - return args; + return chunks; } private String createInSql(List sids) { - return String.join(",", java.util.Collections.nCopies(sids.size(), "?")); + StringJoiner joiner = new StringJoiner(","); + for (int i = 0; i < sids.size(); i++) { + joiner.add(":sid" + i); + } + return joiner.toString(); } - private interface ChunkConsumer { - void accept(List sids); + public record DeleteCounts( + int fileCount, + int callHistCount, + int eventHistCount, + int eventLatestCount, + int updateHistCount, + int itemCount, + int listCount, + int assignUserCount, + int assignCmpnCount, + int resveCount + ) { + + public static DeleteCounts empty() { + return new DeleteCounts(0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + } + + public static DeleteCounts histories( + int eventHistCount, + int eventLatestCount, + int updateHistCount, + int callHistCount + ) { + return new DeleteCounts( + 0, + callHistCount, + eventHistCount, + eventLatestCount, + updateHistCount, + 0, + 0, + 0, + 0, + 0 + ); + } + + public DeleteCounts plus(DeleteCounts other) { + return new DeleteCounts( + fileCount + other.fileCount, + callHistCount + other.callHistCount, + eventHistCount + other.eventHistCount, + eventLatestCount + other.eventLatestCount, + updateHistCount + other.updateHistCount, + itemCount + other.itemCount, + listCount + other.listCount, + assignUserCount + other.assignUserCount, + assignCmpnCount + other.assignCmpnCount, + resveCount + other.resveCount + ); + } + + public int totalDeletedRows() { + return fileCount + + callHistCount + + eventHistCount + + eventLatestCount + + updateHistCount + + itemCount + + listCount + + assignUserCount + + assignCmpnCount + + resveCount; + } } } diff --git a/src/main/java/com/kri/contact/server/persistence/jdbc/ListUpdateJdbcSupport.java b/src/main/java/com/kri/contact/server/persistence/jdbc/ListUpdateJdbcSupport.java index 4185e84..a194fd8 100644 --- a/src/main/java/com/kri/contact/server/persistence/jdbc/ListUpdateJdbcSupport.java +++ b/src/main/java/com/kri/contact/server/persistence/jdbc/ListUpdateJdbcSupport.java @@ -3,6 +3,7 @@ package com.kri.contact.server.persistence.jdbc; import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Timestamp; +import java.sql.Types; import java.time.LocalDateTime; import java.util.List; import lombok.RequiredArgsConstructor; @@ -133,6 +134,59 @@ public class ListUpdateJdbcSupport { }); } + public void batchDeleteListItem(List rows, int batchSize) { + if (rows == null || rows.isEmpty()) { + return; + } + + String sql = """ + delete from t_list_item + where prjct_idx = ? + and sid = ? + and list_hder_id = ? + """; + + batchUpdate(rows, batchSize, sql, (ps, row) -> { + ps.setLong(1, row.prjctIdx()); + ps.setInt(2, row.sid()); + ps.setInt(3, row.listHderId()); + }); + } + + public void batchInsertListEventHist(List rows, int batchSize) { + if (rows == null || rows.isEmpty()) { + return; + } + + String sql = """ + insert into t_list_event_hist ( + event_ty, + prjct_idx, + sid, + result_cd, + meta_data, + memo, + reg_user, + reg_dt + ) values (?, ?, ?, ?, ?, ?, ?, ?) + """; + + batchUpdate(rows, batchSize, sql, (ps, row) -> { + ps.setShort(1, row.eventTy()); + ps.setLong(2, row.prjctIdx()); + ps.setInt(3, row.sid()); + ps.setInt(4, row.resultCd()); + if (row.metaData() == null) { + ps.setNull(5, Types.VARCHAR); + } else { + ps.setString(5, row.metaData()); + } + ps.setString(6, row.memo()); + ps.setString(7, row.regUser()); + ps.setTimestamp(8, Timestamp.valueOf(row.regDt())); + }); + } + private void batchUpdate( List rows, int batchSize, @@ -192,6 +246,23 @@ public class ListUpdateJdbcSupport { LocalDateTime regDt ) {} + public record ListItemDeleteRow( + Long prjctIdx, + Integer sid, + Integer listHderId + ) {} + + public record ListEventHistInsertRow( + Short eventTy, + Long prjctIdx, + Integer sid, + Integer resultCd, + String metaData, + String memo, + String regUser, + LocalDateTime regDt + ) {} + private interface PreparedStatementWriter { void write(PreparedStatement ps, T row) throws SQLException; } diff --git a/src/main/java/com/kri/contact/server/persistence/jdbc/ListUploadJdbcSupport.java b/src/main/java/com/kri/contact/server/persistence/jdbc/ListUploadJdbcSupport.java index 5e97d1c..8de2c8d 100644 --- a/src/main/java/com/kri/contact/server/persistence/jdbc/ListUploadJdbcSupport.java +++ b/src/main/java/com/kri/contact/server/persistence/jdbc/ListUploadJdbcSupport.java @@ -102,7 +102,7 @@ public class ListUploadJdbcSupport { public List findDbDuplicateRows( String listUploadLogId, Long prjctIdx, - boolean changeMode + boolean excludeSameSid ) { String sql = """ select distinct t.row_no, t.list_hder_id, t.raw_val @@ -130,7 +130,7 @@ public class ListUploadJdbcSupport { prjctIdx, ListHeaderTypeSpecific.EMAIL.getCode(), ListHeaderTypeSpecific.TEL_NUM.getCode(), - changeMode + excludeSameSid ); } @@ -219,13 +219,14 @@ public class ListUploadJdbcSupport { } String sql = """ - insert into t_list_assign ( + insert into t_list_assign_user ( prjct_idx, sid, user_id, + assign_role, reg_user, reg_dt - ) values (?, ?, ?, ?, ?) + ) values (?, ?, ?, ?, ?, ?) """; for (int i = 0; i < rows.size(); i += batchSize) { @@ -237,6 +238,43 @@ public class ListUploadJdbcSupport { ps.setLong(1, r.prjctIdx()); ps.setInt(2, r.sid()); ps.setString(3, r.userId()); + ps.setShort(4, r.assignRole()); + ps.setString(5, r.regUser()); + ps.setTimestamp(6, Timestamp.valueOf(r.regDt())); + } + + @Override + public int getBatchSize() { + return sub.size(); + } + }); + } + } + + public void batchInsertListAssignCmpn(List rows, int batchSize) { + if (rows == null || rows.isEmpty()) { + return; + } + + String sql = """ + insert into t_list_assign_cmpn ( + prjct_idx, + sid, + cmpn_id, + reg_user, + reg_dt + ) values (?, ?, ?, ?, ?) + """; + + for (int i = 0; i < rows.size(); i += batchSize) { + List sub = rows.subList(i, Math.min(rows.size(), i + batchSize)); + jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() { + @Override + public void setValues(@NonNull PreparedStatement ps, int index) throws SQLException { + ListAssignCmpnRowInsert r = sub.get(index); + ps.setLong(1, r.prjctIdx()); + ps.setInt(2, r.sid()); + ps.setString(3, r.cmpnId()); ps.setString(4, r.regUser()); ps.setTimestamp(5, Timestamp.valueOf(r.regDt())); } @@ -297,6 +335,15 @@ public class ListUploadJdbcSupport { Long prjctIdx, int sid, String userId, + short assignRole, + String regUser, + LocalDateTime regDt + ) {} + + public record ListAssignCmpnRowInsert( + Long prjctIdx, + int sid, + String cmpnId, String regUser, LocalDateTime regDt ) {} diff --git a/src/main/java/com/kri/contact/server/persistence/query/ProgressQuerySupport.java b/src/main/java/com/kri/contact/server/persistence/query/ProgressQuerySupport.java new file mode 100644 index 0000000..0e1d924 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/query/ProgressQuerySupport.java @@ -0,0 +1,234 @@ +package com.kri.contact.server.persistence.query; + +import com.kri.contact.server.persistence.entity.QTListEventHistEntity; +import com.kri.contact.server.persistence.entity.QTListEventLatestEntity; +import com.kri.contact.server.persistence.entity.QTUserEntity; +import com.querydsl.core.BooleanBuilder; +import com.querydsl.core.Tuple; +import com.querydsl.core.types.dsl.Expressions; +import com.querydsl.core.types.dsl.NumberExpression; +import com.querydsl.core.types.dsl.StringTemplate; +import com.querydsl.jpa.JPAExpressions; +import com.querydsl.jpa.impl.JPAQueryFactory; +import java.time.LocalDateTime; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class ProgressQuerySupport { + + private final JPAQueryFactory jpaQueryFactory; + + public List findUserProgress( + Long prjctIdx, + Short eventTy, + String userId, + String cmpnId, + LocalDateTime startDt, + LocalDateTime endDt + ) { + QTListEventHistEntity history = QTListEventHistEntity.tListEventHistEntity; + NumberExpression count = history.listEventHistIdx.count(); + + return jpaQueryFactory + .select(history.regUser, history.resultCd, count) + .from(history) + .where(basePredicate(history, prjctIdx, eventTy, userId, cmpnId, startDt, endDt)) + .groupBy(history.regUser, history.resultCd) + .orderBy(history.regUser.asc(), history.resultCd.asc()) + .fetch() + .stream() + .map(row -> new UserProgressRow( + row.get(history.regUser), + row.get(history.resultCd), + safeLong(row.get(count)) + )) + .toList(); + } + + public List findDateProgress( + Long prjctIdx, + Short eventTy, + String userId, + String cmpnId, + LocalDateTime startDt, + LocalDateTime endDt + ) { + QTListEventHistEntity history = QTListEventHistEntity.tListEventHistEntity; + DateExpressions expressions = DateExpressions.from(history); + + return fetchDateRows(history, expressions, basePredicate(history, prjctIdx, eventTy, userId, cmpnId, startDt, endDt)); + } + + public List findLastDateProgress( + Long prjctIdx, + Short eventTy, + String userId, + String cmpnId, + LocalDateTime startDt, + LocalDateTime endDt + ) { + if (userId == null && cmpnId == null && startDt == null && endDt == null) { + return findLastDateProgressFromLatest(prjctIdx, eventTy); + } + + QTListEventHistEntity history = QTListEventHistEntity.tListEventHistEntity; + QTListEventHistEntity latestHistory = new QTListEventHistEntity("latestHistory"); + DateExpressions expressions = DateExpressions.from(history); + + BooleanBuilder predicate = new BooleanBuilder() + .and(history.listEventHistIdx.in( + JPAExpressions + .select(latestHistory.listEventHistIdx.max()) + .from(latestHistory) + .where(basePredicate(latestHistory, prjctIdx, eventTy, userId, cmpnId, startDt, endDt)) + .groupBy(latestHistory.sid) + )); + + return fetchDateRows(history, expressions, predicate); + } + + private List findLastDateProgressFromLatest(Long prjctIdx, Short eventTy) { + QTListEventLatestEntity latest = QTListEventLatestEntity.tListEventLatestEntity; + NumberExpression count = latest.listEventHistIdx.count(); + DateExpressions expressions = DateExpressions.from(latest); + + List rows = jpaQueryFactory + .select( + expressions.contactDate(), + expressions.startTime(), + expressions.endTime(), + latest.resultCd, + count + ) + .from(latest) + .where( + latest.id.prjctIdx.eq(prjctIdx), + latest.id.eventTy.eq(eventTy) + ) + .groupBy(expressions.contactDate(), latest.resultCd) + .orderBy(expressions.contactDate().asc(), latest.resultCd.asc()) + .fetch(); + + return rows.stream() + .map(row -> new DateProgressRow( + row.get(expressions.contactDate()), + row.get(expressions.startTime()), + row.get(expressions.endTime()), + row.get(latest.resultCd), + safeLong(row.get(count)) + )) + .toList(); + } + + private List fetchDateRows( + QTListEventHistEntity history, + DateExpressions expressions, + BooleanBuilder predicate + ) { + NumberExpression count = history.listEventHistIdx.count(); + + List rows = jpaQueryFactory + .select( + expressions.contactDate(), + expressions.startTime(), + expressions.endTime(), + history.resultCd, + count + ) + .from(history) + .where(predicate) + .groupBy(expressions.contactDate(), history.resultCd) + .orderBy(expressions.contactDate().asc(), history.resultCd.asc()) + .fetch(); + + return rows.stream() + .map(row -> new DateProgressRow( + row.get(expressions.contactDate()), + row.get(expressions.startTime()), + row.get(expressions.endTime()), + row.get(history.resultCd), + safeLong(row.get(count)) + )) + .toList(); + } + + private BooleanBuilder basePredicate( + QTListEventHistEntity history, + Long prjctIdx, + Short eventTy, + String userId, + String cmpnId, + LocalDateTime startDt, + LocalDateTime endDt + ) { + BooleanBuilder predicate = new BooleanBuilder() + .and(history.prjctIdx.eq(prjctIdx)) + .and(history.eventTy.eq(eventTy)); + + if (userId != null && !userId.isBlank()) { + predicate.and(history.regUser.eq(userId.trim())); + } + if (cmpnId != null && !cmpnId.isBlank()) { + QTUserEntity user = new QTUserEntity("progressUser"); + predicate.and(JPAExpressions.selectOne() + .from(user) + .where( + user.userId.eq(history.regUser), + user.userCmpn.eq(cmpnId.trim()), + user.del.isFalse() + ) + .exists()); + } + if (startDt != null) { + predicate.and(history.regDt.goe(startDt)); + } + if (endDt != null) { + predicate.and(history.regDt.loe(endDt)); + } + + return predicate; + } + + private static long safeLong(Long value) { + return value == null ? 0L : value; + } + + private record DateExpressions( + StringTemplate contactDate, + StringTemplate startTime, + StringTemplate endTime + ) { + private static DateExpressions from(QTListEventHistEntity history) { + return new DateExpressions( + Expressions.stringTemplate("date_format({0}, '%Y-%m-%d')", history.regDt), + Expressions.stringTemplate("date_format(min({0}), '%H:%i:%s')", history.regDt), + Expressions.stringTemplate("date_format(max({0}), '%H:%i:%s')", history.regDt) + ); + } + + private static DateExpressions from(QTListEventLatestEntity latest) { + return new DateExpressions( + Expressions.stringTemplate("date_format({0}, '%Y-%m-%d')", latest.regDt), + Expressions.stringTemplate("date_format(min({0}), '%H:%i:%s')", latest.regDt), + Expressions.stringTemplate("date_format(max({0}), '%H:%i:%s')", latest.regDt) + ); + } + } + + public record UserProgressRow( + String userId, + int resultCode, + long resultCount + ) {} + + public record DateProgressRow( + String contactDate, + String startTime, + String endTime, + int resultCode, + long resultCount + ) {} +} diff --git a/src/main/java/com/kri/contact/server/persistence/query/ProjectSpecs.java b/src/main/java/com/kri/contact/server/persistence/query/ProjectSpecs.java index 8bf56ae..49c3d90 100644 --- a/src/main/java/com/kri/contact/server/persistence/query/ProjectSpecs.java +++ b/src/main/java/com/kri/contact/server/persistence/query/ProjectSpecs.java @@ -1,6 +1,7 @@ package com.kri.contact.server.persistence.query; -import com.kri.contact.server.persistence.entity.TPrjctAssignEntity; +import com.kri.contact.server.persistence.entity.TPrjctAssignCmpnEntity; +import com.kri.contact.server.persistence.entity.TPrjctAssignUserEntity; import com.kri.contact.server.persistence.entity.TPrjctEntity; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; @@ -62,9 +63,9 @@ public class ProjectSpecs { } var sub = query.subquery(Integer.class); - Root a = sub.from(TPrjctAssignEntity.class); + Root a = sub.from(TPrjctAssignUserEntity.class); - // exists (select 1 from t_prjct_assign a where a.prjct_idx = root.prjctIdx and a.userId = ? and a.excDt is null) + // exists (select 1 from t_prjct_assign_user a where a.prjct_idx = root.prjctIdx and a.userId = ?) Predicate p1 = cb.equal(a.get("id").get("prjctIdx"), root.get("prjctIdx")); Predicate p2 = cb.equal(a.get("id").get("userId"), userId); @@ -73,4 +74,22 @@ public class ProjectSpecs { return cb.exists(sub); }; } + + public static Specification assignedToCmpn(String cmpnId) { + return (root, query, cb) -> { + if (cmpnId == null || cmpnId.isBlank()) { + return cb.disjunction(); + } + + var sub = query.subquery(Integer.class); + Root a = sub.from(TPrjctAssignCmpnEntity.class); + + Predicate p1 = cb.equal(a.get("id").get("prjctIdx"), root.get("prjctIdx")); + Predicate p2 = cb.equal(a.get("id").get("cmpnId"), cmpnId); + + sub.select(cb.literal(1)).where(p1, p2); + + return cb.exists(sub); + }; + } } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/CmpnRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/CmpnRepository.java new file mode 100644 index 0000000..5a129ed --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/CmpnRepository.java @@ -0,0 +1,18 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TCmpnEntity; +import java.util.Collection; +import java.util.List; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface CmpnRepository extends JpaRepository { + + Optional findByCmpnId(String cmpnId); + + boolean existsByCmpnId(String cmpnId); + + List findAllByOrderByCmpnIdAsc(); + + List findByCmpnIdInOrCmpnAliasIn(Collection cmpnIds, Collection cmpnAliases); +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListAssignCmpnRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListAssignCmpnRepository.java new file mode 100644 index 0000000..1182492 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListAssignCmpnRepository.java @@ -0,0 +1,45 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TListAssignCmpnEntity; +import java.util.Collection; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; + +public interface ListAssignCmpnRepository extends JpaRepository { + + long deleteByCmpnId(String cmpnId); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TListAssignCmpnEntity a + where a.prjctIdx = :prjctIdx + """) + int deleteByPrjctIdx(Long prjctIdx); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TListAssignCmpnEntity a + where a.prjctIdx = :prjctIdx + and a.sid in :sids + """) + int deleteWithPrjctIdxAndSids(Long prjctIdx, Collection sids); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TListAssignCmpnEntity a + where a.prjctIdx = :prjctIdx + and a.cmpnId in :cmpnIds + """) + int deleteByPrjctIdxAndCmpnIdIn(Long prjctIdx, Collection cmpnIds); + + @Query(""" + select a + from TListAssignCmpnEntity a + where a.prjctIdx = :prjctIdx + and a.sid in :sids + order by a.sid asc, a.listAssignIdx asc + """) + List findByPrjctIdxAndSidIn(Long prjctIdx, Collection sids); +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListAssignRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListAssignRepository.java deleted file mode 100644 index f32330b..0000000 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListAssignRepository.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.kri.contact.server.persistence.repository; - -import com.kri.contact.server.persistence.entity.TListAssignEntity; -import java.util.Collection; -import java.util.List; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; - -public interface ListAssignRepository extends JpaRepository { - - long deleteByUserId(String userId); - - @Modifying(clearAutomatically = true, flushAutomatically = true) - @Query(""" - delete from TListAssignEntity a - where a.prjctIdx = :prjctIdx - """) - int deleteByPrjctIdx(Long prjctIdx); - - @Modifying(clearAutomatically = true, flushAutomatically = true) - @Query(""" - delete from TListAssignEntity a - where a.prjctIdx = :prjctIdx - and a.sid in :sids - """) - int deleteWithPrjctIdxAndSids( - Long prjctIdx, - Collection sids - ); - - @Query(""" - select a - from TListAssignEntity a - where a.prjctIdx = :prjctIdx - and a.sid in :sids - order by a.sid asc, a.listAssignIdx asc - """) - List findByPrjctIdxAndSidIn( - Long prjctIdx, - Collection sids - ); -} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListAssignUserRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListAssignUserRepository.java new file mode 100644 index 0000000..6b985b6 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListAssignUserRepository.java @@ -0,0 +1,62 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TListAssignUserEntity; +import java.util.Collection; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; + +public interface ListAssignUserRepository extends JpaRepository { + + long deleteByUserId(String userId); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TListAssignUserEntity a + where a.prjctIdx = :prjctIdx + """) + int deleteByPrjctIdx(Long prjctIdx); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TListAssignUserEntity a + where a.prjctIdx = :prjctIdx + and a.sid in :sids + """) + int deleteWithPrjctIdxAndSids(Long prjctIdx, Collection sids); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TListAssignUserEntity a + where a.prjctIdx = :prjctIdx + and a.assignRole = :assignRole + and a.sid in :sids + """) + int deleteByPrjctIdxAndAssignRoleAndSidIn( + Long prjctIdx, + Short assignRole, + Collection sids + ); + + @Query(""" + select a + from TListAssignUserEntity a + where a.prjctIdx = :prjctIdx + and a.sid in :sids + order by a.sid asc, a.listAssignIdx asc + """) + List findByPrjctIdxAndSidIn(Long prjctIdx, Collection sids); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TListAssignUserEntity a + where a.prjctIdx = :prjctIdx + and a.userId in ( + select u.userId + from TUserEntity u + where u.userCmpn in :cmpnIds + ) + """) + int deleteByPrjctIdxAndUserCmpnIn(Long prjctIdx, Collection cmpnIds); +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListAssignUserRoleMapRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListAssignUserRoleMapRepository.java new file mode 100644 index 0000000..2b821cf --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListAssignUserRoleMapRepository.java @@ -0,0 +1,12 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TListAssignUserRoleMapEntity; +import java.util.Collection; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ListAssignUserRoleMapRepository + extends JpaRepository { + + List findByListHderTyIn(Collection listHderTypes); +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListCallHistRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListCallHistRepository.java new file mode 100644 index 0000000..1783822 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListCallHistRepository.java @@ -0,0 +1,7 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TListCallHistEntity; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ListCallHistRepository extends JpaRepository { +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListContentRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListContentRepository.java new file mode 100644 index 0000000..7dc0df6 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListContentRepository.java @@ -0,0 +1,13 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TListContentEntity; +import java.util.Collection; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ListContentRepository extends JpaRepository { + + List findByPrjctIdx(Long prjctIdx); + + long deleteByPrjctIdxAndListHderIdIn(Long prjctIdx, Collection listHderIds); +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java index d850331..22634e8 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java @@ -4,29 +4,13 @@ import com.kri.contact.server.persistence.entity.TListEventHistEntity; import java.time.LocalDateTime; import java.util.Collection; import java.util.List; -import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; public interface ListEventHistRepository extends JpaRepository { - @Query(""" - select h - from TListEventHistEntity h - where h.prjctIdx = :prjctIdx - and h.eventTy = :eventTy - and h.sid = :sid - and h.listEventHistIdx = ( - select max(h2.listEventHistIdx) - from TListEventHistEntity h2 - where h2.prjctIdx = h.prjctIdx - and h2.eventTy = h.eventTy - and h2.sid = h.sid - ) - """) - Optional findLatest( + List findByPrjctIdxAndSidOrderByRegDtDescListEventHistIdxDesc( Long prjctIdx, - Short eventTy, Integer sid ); @@ -34,36 +18,15 @@ public interface ListEventHistRepository extends JpaRepository findLatestList( - Long prjctIdx, - Short eventTy, - List sids - ); - - @Query(""" - select h - from TListEventHistEntity h - where h.prjctIdx = :prjctIdx - and h.sid in :sids - and h.listEventHistIdx = ( - select max(h2.listEventHistIdx) - from TListEventHistEntity h2 - where h2.prjctIdx = h.prjctIdx - and h2.eventTy = h.eventTy - and h2.sid = h.sid - ) - """) - List findLatestListByEventTy( + List findLatestListByEventTyFromLatest( Long prjctIdx, List sids ); @@ -86,6 +49,57 @@ public interface ListEventHistRepository extends JpaRepository= :startDate) + and (:endDate is null or h2.regDt <= :endDate) + group by h2.sid + ) + order by h.sid asc, h.regDt asc, h.listEventHistIdx asc + """) + List findLatestDownloadHistories( + Long prjctIdx, + Collection sids, + Collection eventTypes, + LocalDateTime startDate, + LocalDateTime endDate + ); + + @Query(""" + select h + from TListEventHistEntity h + where h.prjctIdx = :prjctIdx + and h.listEventHistIdx in ( + select l.listEventHistIdx + from TListEventLatestEntity l + where l.id.prjctIdx = :prjctIdx + and l.id.sid in :sids + and l.id.eventTy in :eventTypes + and not exists ( + select 1 + from TListEventLatestEntity l2 + where l2.id.prjctIdx = l.id.prjctIdx + and l2.id.sid = l.id.sid + and l2.id.eventTy in :eventTypes + and l2.listEventHistIdx > l.listEventHistIdx + ) + ) + order by h.sid asc, h.regDt asc, h.listEventHistIdx asc + """) + List findLatestDownloadHistoriesFromLatest( + Long prjctIdx, + Collection sids, + Collection eventTypes + ); + @Query(""" select h.sid as sid, count(h) as historyCount from TListEventHistEntity h @@ -104,8 +118,28 @@ public interface ListEventHistRepository extends JpaRepository findHistoryCountsByEventType( + Long prjctIdx, + Collection sids, + Collection eventTypes + ); + interface EventHistoryCountProjection { Integer getSid(); Long getHistoryCount(); } + + interface EventTypeHistoryCountProjection { + Integer getSid(); + Short getEventTy(); + Long getHistoryCount(); + } } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListHeaderRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListHeaderRepository.java index ef5cc1f..facbd81 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListHeaderRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListHeaderRepository.java @@ -5,6 +5,7 @@ import com.kri.contact.server.persistence.entity.TListHeaderEntity; import com.kri.contact.server.persistence.entity.id.TListHeaderEntityId; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; public interface ListHeaderRepository extends JpaRepository { @@ -12,8 +13,23 @@ public interface ListHeaderRepository extends JpaRepository findByIdPrjctIdxAndListHderGradNot(Long prjctIdx, Short listHderGrad); + boolean existsByIdPrjctIdxAndIdListHderId(Long prjctIdx, Integer listHderId); + + @Query(""" + select h.id.listHderId + from TListHeaderEntity h + where h.id.prjctIdx = :prjctIdx + and h.listHderTy in :listHderTy + """) List findIdListHderIdByIdPrjctIdxAndListHderTyIn(Long prjctIdx, List listHderTy); + @Query(""" + select max(h.id.listHderId) + from TListHeaderEntity h + where h.id.prjctIdx = :prjctIdx + """) + Integer findMaxListHderIdByIdPrjctIdx(Long prjctIdx); + default List findDefaultHeader(){ return findByIdPrjctIdxAndListHderGradNot(0L, ListHeaderGrade.COMMON.getCode()); } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListItemFileRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListItemFileRepository.java index 36a6e4b..d15f8af 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListItemFileRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListItemFileRepository.java @@ -3,12 +3,19 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.persistence.entity.TListItemFileEntity; import com.kri.contact.server.persistence.entity.id.TListItemFileEntityId; import java.util.Collection; +import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; public interface ListItemFileRepository extends JpaRepository { + List findByIdPrjctIdxAndIdSidInAndIdListHderIdInOrderByIdSidAscIdListHderIdAsc( + Long prjctIdx, + Collection sids, + Collection listHderIds + ); + @Modifying(clearAutomatically = true, flushAutomatically = true) @Query(""" delete from TListItemFileEntity f diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java index 51a2b5a..31de91e 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java @@ -11,6 +11,11 @@ import org.springframework.data.jpa.repository.Query; public interface ListItemRepository extends JpaRepository { + interface ListContentItemRow { + Integer getListHderId(); + String getListItemVal(); + } + long deleteByIdPrjctIdxAndIdListHderIdNotIn(Long prjctIdx, List listHderIds); @Modifying(clearAutomatically = true, flushAutomatically = true) @@ -61,4 +66,20 @@ public interface ListItemRepository extends JpaRepository sids, Collection listHderIds ); + + @Query(""" + select distinct + t.id.listHderId as listHderId, + t.listItemVal as listItemVal + from TListItemEntity t + where t.id.prjctIdx = :prjctIdx + and t.id.listHderId in :listHderIds + and t.listItemVal is not null + and trim(t.listItemVal) <> '' + order by t.id.listHderId asc, listItemVal asc + """) + List findDistinctContentItemsByPrjctIdxAndListHderIds( + Long prjctIdx, + Collection listHderIds + ); } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepositoryImpl.java b/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepositoryImpl.java index 8ae20cf..26131ab 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepositoryImpl.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListQueryRepositoryImpl.java @@ -2,19 +2,34 @@ package com.kri.contact.server.persistence.repository; import static com.kri.common.feature.util.StringUtil.normalizeBlank; +import com.kri.common.feature.web.BusinessException; import com.kri.common.feature.web.page.PageRequestDto; +import com.kri.contact.server.common.enums.ListHeaderTypeAssign; import com.kri.contact.server.common.enums.ListIsUse; +import com.kri.contact.server.common.enums.ResultCodeType; +import com.kri.contact.server.dto.list.ListAssignFilterConditionDto; +import com.kri.contact.server.dto.list.ListFilterConditionDto; import com.kri.contact.server.dto.list.ListFilterDto; +import com.kri.contact.server.common.enums.ListFilterMatchType; +import com.kri.contact.server.common.enums.ListFilterOperator; +import com.kri.contact.server.dto.list.ListOtherItemFilterConditionDto; +import com.kri.contact.server.persistence.entity.QTCmpnEntity; +import com.kri.contact.server.persistence.entity.QTListAssignCmpnEntity; +import com.kri.contact.server.persistence.entity.QTListAssignUserEntity; import com.kri.contact.server.persistence.entity.QTListEntity; +import com.kri.contact.server.persistence.entity.QTListEventLatestEntity; import com.kri.contact.server.persistence.entity.QTListItemEntity; +import com.kri.contact.server.persistence.entity.QTUserEntity; import com.kri.contact.server.persistence.entity.TListEntity; import com.querydsl.core.BooleanBuilder; import com.querydsl.core.types.Order; import com.querydsl.core.types.OrderSpecifier; +import com.querydsl.core.types.dsl.StringPath; import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.impl.JPAQueryFactory; +import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -25,17 +40,19 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor public class ListQueryRepositoryImpl implements ListQueryRepository { + private static final int NO_RESULT_HISTORY_CODE = 0; + private final JPAQueryFactory jpaQueryFactory; @Override public List findPagedListEntities( Long prjctIdx, - List emailTelnumHeaderIds, + List exactMatchHeaderIds, ListFilterDto listFilter, PageRequestDto pageRequest ) { QTListEntity list = QTListEntity.tListEntity; - BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, emailTelnumHeaderIds, listFilter, list); + BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, exactMatchHeaderIds, listFilter, list); int pageIndex = pageRequest == null ? 0 : Math.max(pageRequest.getPageIndex(), 0); int pageSize = pageRequest == null ? 10 : Math.max(pageRequest.getPageSize(), 1); @@ -51,11 +68,11 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { @Override public List findAllListEntities( Long prjctIdx, - List emailTelnumHeaderIds, + List exactMatchHeaderIds, ListFilterDto listFilter ) { QTListEntity list = QTListEntity.tListEntity; - BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, emailTelnumHeaderIds, listFilter, list); + BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, exactMatchHeaderIds, listFilter, list); return jpaQueryFactory.selectFrom(list) .where(predicate) @@ -66,11 +83,11 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { @Override public List findAllSids( Long prjctIdx, - List emailTelnumHeaderIds, + List exactMatchHeaderIds, ListFilterDto listFilter ) { QTListEntity list = QTListEntity.tListEntity; - BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, emailTelnumHeaderIds, listFilter, list); + BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, exactMatchHeaderIds, listFilter, list); return jpaQueryFactory.select(list.id.sid) .from(list) @@ -82,13 +99,13 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { @Override public List findChunkedListEntities( Long prjctIdx, - List emailTelnumHeaderIds, + List exactMatchHeaderIds, ListFilterDto listFilter, Integer lastSid, int limit ) { QTListEntity list = QTListEntity.tListEntity; - BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, emailTelnumHeaderIds, listFilter, list); + BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, exactMatchHeaderIds, listFilter, list); if (lastSid != null) { predicate.and(list.id.sid.gt(lastSid)); } @@ -103,13 +120,13 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { @Override public List findChunkedSids( Long prjctIdx, - List emailTelnumHeaderIds, + List exactMatchHeaderIds, ListFilterDto listFilter, Integer lastSid, int limit ) { QTListEntity list = QTListEntity.tListEntity; - BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, emailTelnumHeaderIds, listFilter, list); + BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, exactMatchHeaderIds, listFilter, list); if (lastSid != null) { predicate.and(list.id.sid.gt(lastSid)); } @@ -124,7 +141,7 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { private BooleanBuilder buildListFilterPredicate( Long prjctIdx, - List emailTelnumHeaderIds, + List exactMatchHeaderIds, ListFilterDto listFilter, QTListEntity list ) { @@ -136,7 +153,7 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { } if (listFilter.getSidSet() != null && !listFilter.getSidSet().isEmpty()) { - predicate.and(list.id.sid.in(listFilter.getSidSet())); + appendSidPredicates(predicate, list, listFilter.getSidSet()); } Set useCodes = toUseCodes(listFilter.getListUseSet()); @@ -144,54 +161,582 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { predicate.and(list.use.in(useCodes)); } - String memo = normalizeBlank(listFilter.getMemo()); - if (memo != null) { - predicate.and(list.memo.contains(memo)); + appendListUseConditionPredicates(predicate, list, listFilter.getListUseConditions()); + appendMemoPredicates(predicate, list, listFilter.getMemoConditions()); + appendAssignPredicates(predicate, prjctIdx, list, listFilter.getAssignUserMap()); + appendAssignConditionPredicates(predicate, prjctIdx, list, listFilter.getAssignConditions()); + appendResultCodePredicates(predicate, prjctIdx, list, listFilter.getResultCodeMap()); + appendOtherItemPredicates(predicate, prjctIdx, exactMatchHeaderIds, list, listFilter.getOtherItemConditions()); + return predicate; + } + + private void appendSidPredicates(BooleanBuilder predicate, QTListEntity list, Set sidSet) { + BooleanBuilder sidPredicate = new BooleanBuilder(); + Set sidNumbers = new LinkedHashSet<>(); + + for (String sidCondition : sidSet) { + String normalized = normalizeBlank(sidCondition); + if (normalized == null) { + continue; + } + + if (normalized.contains("~")) { + sidPredicate.or(toSidRangePredicate(list, normalized)); + } else { + sidNumbers.add(parseSidNumber(normalized, sidCondition)); + } } - appendOtherItemPredicates(predicate, prjctIdx, emailTelnumHeaderIds, list, listFilter.getOtherItems()); + if (!sidNumbers.isEmpty()) { + sidPredicate.or(list.id.sid.in(sidNumbers)); + } + + if (sidPredicate.hasValue()) { + predicate.and(sidPredicate); + } + } + + private BooleanBuilder toSidRangePredicate(QTListEntity list, String normalized) { + String[] tokens = normalized.split("~", -1); + if (tokens.length != 2) { + return null; + } + + Integer start = parseSidNumber(tokens[0].trim(), normalized); + Integer end = parseSidNumber(tokens[1].trim(), normalized); + + if(start == null || end == null) { + return null; + } + + if (start > end) { + Integer temp = start; + start = end; + end = temp; + } + + return new BooleanBuilder() + .and(list.id.sid.goe(start)) + .and(list.id.sid.loe(end)); + } + + private Integer parseSidNumber(String value, String originalCondition) { + if (value == null || !value.matches("\\d+")) { + return null; + } + + try { + return Integer.valueOf(value); + } catch (NumberFormatException e) { + throw invalidSidCondition(originalCondition); + } + } + + private BusinessException invalidSidCondition(String sidCondition) { + return BusinessException.badRequest("INVALID_SID_FILTER", "SID 필터는 숫자 또는 숫자~숫자 형식이어야 합니다.") + .with("sidCondition", sidCondition); + } + + private void appendListUseConditionPredicates( + BooleanBuilder predicate, + QTListEntity list, + List listUseConditions + ) { + if (listUseConditions == null || listUseConditions.isEmpty()) { + return; + } + + for (ListFilterConditionDto condition : listUseConditions) { + if (condition == null + || condition.getOperator() == null + || condition.getMatchType() != ListFilterMatchType.EXACT) { + continue; + } + + Set useCodes = toUseCodes(condition.getValues()); + if (useCodes.isEmpty()) { + continue; + } + + if (condition.getOperator() == ListFilterOperator.POSITIVE) { + predicate.and(list.use.in(useCodes)); + } else { + predicate.and(list.use.notIn(useCodes)); + } + } + } + + private void appendMemoPredicates( + BooleanBuilder predicate, + QTListEntity list, + List memoConditions + ) { + if (memoConditions == null || memoConditions.isEmpty()) { + return; + } + + for (ListFilterConditionDto condition : memoConditions) { + if (condition == null || condition.getOperator() == null || condition.getMatchType() == null) { + continue; + } + + if (condition.getMatchType() == ListFilterMatchType.EMPTY) { + appendEmptyTextCondition(predicate, list.memo, condition.getOperator()); + continue; + } + + List values = normalizeFilterValues(condition.getValues()); + if (values.isEmpty()) { + continue; + } + + appendTextCondition(predicate, list.memo, condition.getOperator(), condition.getMatchType(), values); + } + } + + private void appendAssignPredicates( + BooleanBuilder predicate, + Long prjctIdx, + QTListEntity list, + Map> assignUserMap + ) { + if (assignUserMap == null || assignUserMap.isEmpty()) { + return; + } + + for (Map.Entry> entry : assignUserMap.entrySet()) { + ListHeaderTypeAssign assignType = entry.getKey(); + List userIds = normalizeFilterValues(entry.getValue()); + if (assignType == null || userIds.isEmpty()) { + continue; + } + + if (assignType == ListHeaderTypeAssign.OUTSOURCE) { + appendAssignCmpnPredicate(predicate, prjctIdx, list, assignType, userIds); + continue; + } + + QTListAssignUserEntity assign = new QTListAssignUserEntity("assign_" + assignType.getCode()); + QTUserEntity user = new QTUserEntity("assign_user_" + assignType.getCode()); + + predicate.and(JPAExpressions.selectOne() + .from(assign, user) + .where( + assign.prjctIdx.eq(prjctIdx), + assign.sid.eq(list.id.sid), + assign.assignRole.eq(assignType.getCode()), + assign.userId.in(userIds), + user.userId.eq(assign.userId), + user.del.isFalse() + ) + .exists()); + } + } + + private void appendAssignCmpnPredicate( + BooleanBuilder predicate, + Long prjctIdx, + QTListEntity list, + ListHeaderTypeAssign assignType, + List cmpnValues + ) { + QTListAssignCmpnEntity assign = new QTListAssignCmpnEntity("assign_cmpn_" + assignType.getCode()); + QTCmpnEntity cmpn = new QTCmpnEntity("assign_cmpn_info_" + assignType.getCode()); + + predicate.and(JPAExpressions.selectOne() + .from(assign, cmpn) + .where( + assign.prjctIdx.eq(prjctIdx), + assign.sid.eq(list.id.sid), + cmpn.cmpnId.eq(assign.cmpnId), + new BooleanBuilder() + .or(cmpn.cmpnId.in(cmpnValues)) + .or(cmpn.cmpnAlias.in(cmpnValues)) + ) + .exists()); + } + + private void appendAssignConditionPredicates( + BooleanBuilder predicate, + Long prjctIdx, + QTListEntity list, + List assignConditions + ) { + if (assignConditions == null || assignConditions.isEmpty()) { + return; + } + + for (int index = 0; index < assignConditions.size(); index++) { + ListAssignFilterConditionDto condition = assignConditions.get(index); + if (condition == null + || condition.getAssignType() == null + || condition.getOperator() == null + || condition.getMatchType() == null) { + continue; + } + + if (condition.getMatchType() == ListFilterMatchType.EMPTY) { + appendEmptyAssignPredicate(predicate, prjctIdx, list, condition, index); + continue; + } + + List values = normalizeFilterValues(condition.getValues()); + if (values.isEmpty()) { + continue; + } + + appendAssignValuePredicate(predicate, prjctIdx, list, condition, values, index); + } + } + + private void appendEmptyAssignPredicate( + BooleanBuilder predicate, + Long prjctIdx, + QTListEntity list, + ListAssignFilterConditionDto condition, + int index + ) { + boolean empty = condition.getOperator() == ListFilterOperator.POSITIVE; + if (condition.getAssignType() == ListHeaderTypeAssign.OUTSOURCE) { + QTListAssignCmpnEntity assign = new QTListAssignCmpnEntity("empty_assign_cmpn_" + index); + var exists = JPAExpressions.selectOne() + .from(assign) + .where( + assign.prjctIdx.eq(prjctIdx), + assign.sid.eq(list.id.sid) + ) + .exists(); + predicate.and(empty ? exists.not() : exists); + return; + } + + QTListAssignUserEntity assign = new QTListAssignUserEntity("empty_assign_user_" + index); + QTUserEntity user = new QTUserEntity("empty_assign_active_user_" + index); + var exists = JPAExpressions.selectOne() + .from(assign, user) + .where( + assign.prjctIdx.eq(prjctIdx), + assign.sid.eq(list.id.sid), + assign.assignRole.eq(condition.getAssignType().getCode()), + user.userId.eq(assign.userId), + user.del.isFalse() + ) + .exists(); + predicate.and(empty ? exists.not() : exists); + } + + private void appendAssignValuePredicate( + BooleanBuilder predicate, + Long prjctIdx, + QTListEntity list, + ListAssignFilterConditionDto condition, + List values, + int index + ) { + boolean positive = condition.getOperator() == ListFilterOperator.POSITIVE; + if (condition.getAssignType() == ListHeaderTypeAssign.OUTSOURCE) { + QTListAssignCmpnEntity assign = new QTListAssignCmpnEntity("condition_assign_cmpn_" + index); + QTCmpnEntity cmpn = new QTCmpnEntity("condition_assign_cmpn_info_" + index); + BooleanBuilder valuePredicate = buildAssignCmpnTextPredicate(cmpn, condition.getMatchType(), values); + if (!valuePredicate.hasValue()) { + return; + } + var exists = JPAExpressions.selectOne() + .from(assign, cmpn) + .where( + assign.prjctIdx.eq(prjctIdx), + assign.sid.eq(list.id.sid), + cmpn.cmpnId.eq(assign.cmpnId), + valuePredicate + ) + .exists(); + predicate.and(positive ? exists : exists.not()); + return; + } + + QTListAssignUserEntity assign = new QTListAssignUserEntity("condition_assign_user_" + index); + QTUserEntity user = new QTUserEntity("condition_assign_active_user_" + index); + BooleanBuilder valuePredicate = buildAssignUserTextPredicate(assign, condition.getMatchType(), values); + if (!valuePredicate.hasValue()) { + return; + } + var exists = JPAExpressions.selectOne() + .from(assign, user) + .where( + assign.prjctIdx.eq(prjctIdx), + assign.sid.eq(list.id.sid), + assign.assignRole.eq(condition.getAssignType().getCode()), + user.userId.eq(assign.userId), + user.del.isFalse(), + valuePredicate + ) + .exists(); + predicate.and(positive ? exists : exists.not()); + } + + private BooleanBuilder buildAssignCmpnTextPredicate( + QTCmpnEntity cmpn, + ListFilterMatchType matchType, + List values + ) { + BooleanBuilder predicate = new BooleanBuilder(); + if (matchType == ListFilterMatchType.EXACT) { + return predicate + .or(cmpn.cmpnId.in(values)) + .or(cmpn.cmpnAlias.in(values)); + } + + for (String value : values) { + predicate.or(cmpn.cmpnId.contains(value)); + predicate.or(cmpn.cmpnAlias.contains(value)); + } return predicate; } + private BooleanBuilder buildAssignUserTextPredicate( + QTListAssignUserEntity assign, + ListFilterMatchType matchType, + List values + ) { + BooleanBuilder predicate = new BooleanBuilder(); + if (matchType == ListFilterMatchType.EXACT) { + return predicate.and(assign.userId.in(values)); + } + + for (String value : values) { + predicate.or(assign.userId.contains(value)); + } + return predicate; + } + + private void appendResultCodePredicates( + BooleanBuilder predicate, + Long prjctIdx, + QTListEntity list, + Map> resultCodeMap + ) { + if (resultCodeMap == null || resultCodeMap.isEmpty()) { + return; + } + + for (Map.Entry> entry : resultCodeMap.entrySet()) { + ResultCodeType resultCodeType = entry.getKey(); + Set resultCodes = entry.getValue(); + if (resultCodeType == null || resultCodes == null || resultCodes.isEmpty()) { + continue; + } + + boolean includeNoHistory = resultCodes.stream() + .filter(Objects::nonNull) + .anyMatch(resultCode -> resultCode == NO_RESULT_HISTORY_CODE); + List existingHistoryResultCodes = resultCodes.stream() + .filter(Objects::nonNull) + .filter(resultCode -> resultCode != NO_RESULT_HISTORY_CODE) + .distinct() + .toList(); + if (!includeNoHistory && existingHistoryResultCodes.isEmpty()) { + continue; + } + + BooleanBuilder eventResultPredicate = new BooleanBuilder(); + QTListEventLatestEntity latest = new QTListEventLatestEntity( + "latest_result_" + resultCodeType.getCode() + ); + + if (!existingHistoryResultCodes.isEmpty()) { + eventResultPredicate.or(JPAExpressions.selectOne() + .from(latest) + .where( + latest.id.prjctIdx.eq(prjctIdx), + latest.id.sid.eq(list.id.sid), + latest.id.eventTy.eq(resultCodeType.getCode()), + latest.resultCd.in(existingHistoryResultCodes) + ) + .exists()); + } + + if (includeNoHistory) { + QTListEventLatestEntity noHistoryLatest = new QTListEventLatestEntity( + "no_history_result_" + resultCodeType.getCode() + ); + eventResultPredicate.or(JPAExpressions.selectOne() + .from(noHistoryLatest) + .where( + noHistoryLatest.id.prjctIdx.eq(prjctIdx), + noHistoryLatest.id.sid.eq(list.id.sid), + noHistoryLatest.id.eventTy.eq(resultCodeType.getCode()) + ) + .notExists()); + } + + predicate.and(eventResultPredicate); + } + } + private void appendOtherItemPredicates( BooleanBuilder predicate, Long prjctIdx, - List emailTelnumHeaderIds, + List exactMatchHeaderIds, QTListEntity list, - Map> otherItems + List otherItemConditions ) { - if (otherItems == null || otherItems.isEmpty()) { + if (otherItemConditions == null || otherItemConditions.isEmpty()) { return; } - for (Map.Entry> entry : otherItems.entrySet()) { - Integer listHderId = entry.getKey(); - Set values = normalizeFilterValues(entry.getValue()); - if (listHderId == null || values.isEmpty()) { + for (ListOtherItemFilterConditionDto condition : otherItemConditions) { + if (condition == null + || condition.getListHderId() == null + || condition.getOperator() == null + || condition.getMatchType() == null) { continue; } - //전화번호나 이메일은 Like 조회 - boolean isLike = emailTelnumHeaderIds != null - && emailTelnumHeaderIds.contains(listHderId) - && values.size() == 1; - String likeValue = values.iterator().next(); + if (condition.getMatchType() == ListFilterMatchType.EMPTY) { + appendEmptyItemPredicate(predicate, prjctIdx, list, condition); + continue; + } + + List values = normalizeFilterValues(condition.getValues()); + if (values.isEmpty()) { + continue; + } + + QTListItemEntity item = new QTListItemEntity("item_" + condition.getListHderId()); + BooleanBuilder itemValuePredicate = buildItemValuePredicate(item, condition.getMatchType(), values); + if (!itemValuePredicate.hasValue()) { + continue; + } + + if (condition.getOperator() == ListFilterOperator.POSITIVE) { + predicate.and(JPAExpressions.selectOne() + .from(item) + .where( + item.id.prjctIdx.eq(prjctIdx), + item.id.sid.eq(list.id.sid), + item.id.listHderId.eq(condition.getListHderId()), + itemValuePredicate + ) + .exists()); + continue; + } - QTListItemEntity item = new QTListItemEntity("item_" + listHderId); predicate.and(JPAExpressions.selectOne() .from(item) .where( item.id.prjctIdx.eq(prjctIdx), item.id.sid.eq(list.id.sid), - item.id.listHderId.eq(listHderId), - isLike - ? item.listItemVal.contains(likeValue) - : item.listItemVal.in(values) + item.id.listHderId.eq(condition.getListHderId()), + itemValuePredicate ) - .exists()); + .notExists()); } } + private void appendEmptyTextCondition( + BooleanBuilder predicate, + StringPath path, + ListFilterOperator operator + ) { + if (operator == ListFilterOperator.POSITIVE) { + predicate.and(path.eq("")); + return; + } + predicate.and(path.ne("")); + } + + private void appendEmptyItemPredicate( + BooleanBuilder predicate, + Long prjctIdx, + QTListEntity list, + ListOtherItemFilterConditionDto condition + ) { + QTListItemEntity item = new QTListItemEntity("empty_item_" + condition.getListHderId()); + BooleanBuilder existingBlankPredicate = new BooleanBuilder() + .and(item.id.prjctIdx.eq(prjctIdx)) + .and(item.id.sid.eq(list.id.sid)) + .and(item.id.listHderId.eq(condition.getListHderId())) + .and(item.listItemVal.trim().eq("")); + + if (condition.getOperator() == ListFilterOperator.POSITIVE) { + QTListItemEntity existsItem = new QTListItemEntity("exists_item_" + condition.getListHderId()); + predicate.and(new BooleanBuilder() + .or(JPAExpressions.selectOne() + .from(existsItem) + .where( + existsItem.id.prjctIdx.eq(prjctIdx), + existsItem.id.sid.eq(list.id.sid), + existsItem.id.listHderId.eq(condition.getListHderId()) + ) + .notExists()) + .or(JPAExpressions.selectOne() + .from(item) + .where(existingBlankPredicate) + .exists())); + return; + } + + predicate.and(JPAExpressions.selectOne() + .from(item) + .where( + item.id.prjctIdx.eq(prjctIdx), + item.id.sid.eq(list.id.sid), + item.id.listHderId.eq(condition.getListHderId()), + item.listItemVal.trim().ne("") + ) + .exists()); + } + + private void appendTextCondition( + BooleanBuilder predicate, + StringPath path, + ListFilterOperator operator, + ListFilterMatchType matchType, + List values + ) { + if (matchType == ListFilterMatchType.EXACT) { + if (operator == ListFilterOperator.POSITIVE) { + predicate.and(path.in(values)); + } else { + predicate.and(path.notIn(values)); + } + return; + } + + if (operator == ListFilterOperator.POSITIVE) { + BooleanBuilder containsPredicate = new BooleanBuilder(); + for (String value : values) { + containsPredicate.or(path.contains(value)); + } + if (containsPredicate.hasValue()) { + predicate.and(containsPredicate); + } + return; + } + + for (String value : values) { + predicate.and(path.contains(value).not()); + } + } + + private BooleanBuilder buildItemValuePredicate( + QTListItemEntity item, + ListFilterMatchType matchType, + List values + ) { + BooleanBuilder predicate = new BooleanBuilder(); + + if (matchType == ListFilterMatchType.EXACT) { + predicate.and(item.listItemVal.in(values)); + return predicate; + } + + for (String value : values) { + predicate.or(item.listItemVal.contains(value)); + } + return predicate; + } + private OrderSpecifier resolveOrderSpecifier(QTListEntity list, PageRequestDto pageRequest) { String sortBy = pageRequest == null ? null : pageRequest.getSortBy(); Order order = pageRequest != null && "desc".equalsIgnoreCase(pageRequest.getSortDir()) @@ -218,12 +763,28 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { .collect(java.util.stream.Collectors.toCollection(LinkedHashSet::new)); } - private Set normalizeFilterValues(Set values) { - if (values == null || values.isEmpty()) { + private Set toUseCodes(Collection values) { + List normalizedValues = normalizeFilterValues(values); + if (normalizedValues.isEmpty()) { return Collections.emptySet(); } - Set normalized = new HashSet<>(); + Set useCodes = new LinkedHashSet<>(); + for (String value : normalizedValues) { + try { + useCodes.add(ListIsUse.fromCode(Short.valueOf(value)).getCode()); + } catch (IllegalArgumentException ignored) { + } + } + return useCodes; + } + + private List normalizeFilterValues(Collection values) { + if (values == null || values.isEmpty()) { + return Collections.emptyList(); + } + + List normalized = new ArrayList<>(); for (String value : values) { String normalizedValue = normalizeBlank(value); if (normalizedValue != null) { diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java index 4160aff..973b8d4 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java @@ -4,6 +4,7 @@ import com.kri.contact.server.persistence.entity.TListEntity; import com.kri.contact.server.persistence.entity.id.TListEntityId; import java.util.Collection; import java.util.List; +import java.util.Optional; import java.util.Set; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; @@ -15,6 +16,8 @@ public interface ListRepository extends JpaRepository findByIdPrjctIdxAndIdSidIn(Long prjctIdx, Collection sids); + boolean existsByIdPrjctIdxAndIdSid(Long prjctIdx, Integer sid); + @Query(""" select l.id.sid from TListEntity l diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListReserveRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListReserveRepository.java new file mode 100644 index 0000000..609fa52 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListReserveRepository.java @@ -0,0 +1,18 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TListResveEntity; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ListReserveRepository extends JpaRepository { + + List findByPrjctIdxAndResveUserOrderByResveDtAscListResveIdxAsc( + Long prjctIdx, + String resveUser + ); + + List findByPrjctIdxAndSidOrderByResveDtAscListResveIdxAsc( + Long prjctIdx, + Integer sid + ); +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListUpdateHistRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListUpdateHistRepository.java index aed48d5..820b8c8 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListUpdateHistRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListUpdateHistRepository.java @@ -9,6 +9,11 @@ import org.springframework.data.jpa.repository.Query; public interface ListUpdateHistRepository extends JpaRepository { + List findByPrjctIdxAndSidOrderByRegDtDescListUpdateHistIdxDesc( + Long prjctIdx, + Integer sid + ); + @Query(""" select h from TListUpdateHistEntity h diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListUploadLogRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListUploadLogRepository.java index f4f6567..2f2455e 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListUploadLogRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListUploadLogRepository.java @@ -1,6 +1,9 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.persistence.entity.TListUploadLogEntity; +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.Query; @@ -12,4 +15,13 @@ public interface ListUploadLogRepository extends JpaRepository findByPrjctIdxAndSuccessTrueOrderByWaveDesc(Long prjctIdx); + + Optional findByListUploadLogIdAndPrjctIdxAndSuccessTrue( + String listUploadLogId, + Long prjctIdx + ); + + List findBySchedulingDelDtIsNullAndRegDtBefore(LocalDateTime threshold); } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignCmpnRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignCmpnRepository.java new file mode 100644 index 0000000..07a181c --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignCmpnRepository.java @@ -0,0 +1,38 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TPrjctAssignCmpnEntity; +import com.kri.contact.server.persistence.entity.id.TPrjctAssignCmpnEntityId; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; + +public interface ProjectAssignCmpnRepository + extends JpaRepository { + + @Query(""" + select a.id.cmpnId + from TPrjctAssignCmpnEntity a + join TCmpnEntity c on c.cmpnId = a.id.cmpnId + where a.id.prjctIdx = :prjctIdx + order by a.id.cmpnId + """) + List findAssignCmpnIdByPrjctIdx(Long prjctIdx); + + @Query(""" + select a.id.cmpnId + from TPrjctAssignCmpnEntity a + join TCmpnEntity c on c.cmpnId = a.id.cmpnId + where a.id.prjctIdx = :prjctIdx + and c.ownCmpn = false + order by a.id.cmpnId + """) + List findExternalAssignCmpnIdByPrjctIdx(Long prjctIdx); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TPrjctAssignCmpnEntity a + where a.id.prjctIdx = :prjctIdx + """) + int deleteAssignByPrjctIdx(Long prjctIdx); +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignUserRepository.java similarity index 55% rename from src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignRepository.java rename to src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignUserRepository.java index c89b04a..a8cbbab 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignUserRepository.java @@ -1,17 +1,19 @@ package com.kri.contact.server.persistence.repository; -import com.kri.contact.server.persistence.entity.TPrjctAssignEntity; -import com.kri.contact.server.persistence.entity.id.TPrjctAssignEntityId; +import com.kri.contact.server.persistence.entity.TPrjctAssignUserEntity; +import com.kri.contact.server.persistence.entity.id.TPrjctAssignUserEntityId; +import java.util.Collection; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; -public interface ProjectAssignRepository extends JpaRepository { +public interface ProjectAssignUserRepository + extends JpaRepository { @Query(""" select a.id.userId - from TPrjctAssignEntity a + from TPrjctAssignUserEntity a join TUserEntity u on u.userId = a.id.userId where a.id.prjctIdx = :prjctIdx and u.del = false @@ -22,15 +24,26 @@ public interface ProjectAssignRepository extends JpaRepository= :startRole - and u.userRole < :endRole + where u.userRole >= :startRole + and u.userRole < :endRole ) """) int deleteAssignByPrjctIdxAndRoleRange(Long prjctIdx, int startRole, int endRole); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TPrjctAssignUserEntity a + where a.id.prjctIdx = :prjctIdx + and a.id.userId in ( + select u.userId + from TUserEntity u + where u.userCmpn in :cmpnIds + ) + """) + int deleteByPrjctIdxAndUserCmpnIn(Long prjctIdx, Collection cmpnIds); } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ResultCodeRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ResultCodeRepository.java index ddfec7a..2f0fa81 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ResultCodeRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ResultCodeRepository.java @@ -5,6 +5,7 @@ import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.persistence.entity.TResultCodeEntity; import com.kri.contact.server.persistence.entity.id.TResultCodeEntityId; import java.util.List; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -19,9 +20,25 @@ public interface ResultCodeRepository extends JpaRepository findByIdPrjctIdx(Long prjctIdx); - List findByIdPrjctIdxAndIdResultCdTy(Long prjctIdx, Short resultCdTy); + List findByIdPrjctIdxAndIdResultCdTy(Long prjctIdx, ResultCodeType resultCdTy); - long deleteByIdPrjctIdx(Long prjctIdx); + List findByIdPrjctIdxAndIdResultCdTyAndDefaultCodeTrue( + Long prjctIdx, + ResultCodeType resultCdTy + ); - long deleteByIdPrjctIdxAndIdResultCdTy(Long prjctIdx, ResultCodeType resultCdTy); + boolean existsByIdPrjctIdxAndIdResultCdTyAndIdResultCd( + Long prjctIdx, + ResultCodeType resultCdTy, + Short resultCd + ); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(""" + delete from TResultCodeEntity r + where r.id.prjctIdx = :prjctIdx + and r.id.resultCdTy = :resultCdTy + and r.defaultCode = false + """) + void deleteEditableByPrjctIdxAndResultCdTy(Long prjctIdx, ResultCodeType resultCdTy); } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java index e6e1461..a2ada96 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java @@ -23,6 +23,20 @@ public interface UserRepository extends JpaRepository { List findByUserIdInAndDelFalse(Collection userIds); + @Query(""" + select u + from TUserEntity u + where u.del = false + and u.userCmpn in :userCmpns + and u.userRole >= :startRole + and u.userRole < :endRole + """) + List findByUserCmpnInAndRoleRangeAndDelFalse( + Collection userCmpns, + int startRole, + int endRole + ); + @Query(""" select u from TUserEntity u diff --git a/src/main/java/com/kri/contact/server/scheduler/ListUploadFileCleanupScheduler.java b/src/main/java/com/kri/contact/server/scheduler/ListUploadFileCleanupScheduler.java new file mode 100644 index 0000000..8cca132 --- /dev/null +++ b/src/main/java/com/kri/contact/server/scheduler/ListUploadFileCleanupScheduler.java @@ -0,0 +1,74 @@ +package com.kri.contact.server.scheduler; + +import com.kri.contact.server.persistence.entity.TListUploadLogEntity; +import com.kri.contact.server.persistence.repository.ListUploadLogRepository; +import com.kri.contact.server.service.file.ListFileService; +import java.time.LocalDateTime; +import java.util.List; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@Component +public class ListUploadFileCleanupScheduler { + + private final ListUploadLogRepository listUploadLogRepository; + private final ListFileService listFileService; + private final long expireDays; + + public ListUploadFileCleanupScheduler( + ListUploadLogRepository listUploadLogRepository, + ListFileService listFileService, + @Value("${kri.list-upload-file.cleanup-expire-days:7}") long expireDays + ) { + this.listUploadLogRepository = listUploadLogRepository; + this.listFileService = listFileService; + this.expireDays = expireDays; + } + + @Transactional + @Scheduled(cron = "${kri.list-upload-file.cleanup-cron:0 30 0 * * SUN}") + public void cleanupOldListUploadFiles() { + LocalDateTime threshold = LocalDateTime.now().minusDays(expireDays); + LocalDateTime deletedAt = LocalDateTime.now(); + + List uploadLogs = + listUploadLogRepository.findBySchedulingDelDtIsNullAndRegDtBefore(threshold); + + if (uploadLogs.isEmpty()) { + log.info("[ListUploadFileCleanup] 대상 없음 - threshold={}", threshold); + return; + } + + log.info("[ListUploadFileCleanup] 시작 - threshold={}, count={}", threshold, uploadLogs.size()); + + for (TListUploadLogEntity uploadLog : uploadLogs) { + try { + boolean deleted = listFileService.deleteListFileIfExists( + uploadLog.getPrjctIdx(), + uploadLog.getFileNm() + ); + uploadLog.setSchedulingDelDt(deletedAt); + + log.debug( + "[ListUploadFileCleanup] 삭제 처리 - listUploadLogId={}, fileNm={}, deleted={}", + uploadLog.getListUploadLogId(), + uploadLog.getFileNm(), + deleted + ); + } catch (Exception e) { + log.warn( + "[ListUploadFileCleanup] 삭제 실패 - listUploadLogId={}, fileNm={}", + uploadLog.getListUploadLogId(), + uploadLog.getFileNm(), + e + ); + } + } + + log.info("[ListUploadFileCleanup] 종료"); + } +} diff --git a/src/main/java/com/kri/contact/server/service/AssignService.java b/src/main/java/com/kri/contact/server/service/AssignService.java index b972ffd..73ae2bd 100644 --- a/src/main/java/com/kri/contact/server/service/AssignService.java +++ b/src/main/java/com/kri/contact/server/service/AssignService.java @@ -1,11 +1,34 @@ package com.kri.contact.server.service; +import com.kri.common.feature.web.BusinessException; import com.kri.contact.server.common.consts.ContactConstant; -import com.kri.contact.server.persistence.entity.TPrjctAssignEntity; -import com.kri.contact.server.persistence.repository.ListAssignRepository; -import com.kri.contact.server.persistence.repository.ProjectAssignRepository; +import com.kri.contact.server.common.enums.ListAssignType; +import com.kri.contact.server.dto.list.ListAssignRequestDto; +import com.kri.contact.server.dto.list.ListAssignResetRequestDto; +import com.kri.contact.server.dto.list.ListFilterDto; +import com.kri.contact.server.persistence.entity.TListAssignUserEntity; +import com.kri.contact.server.persistence.entity.TListAssignUserRoleMapEntity; +import com.kri.contact.server.persistence.entity.TPrjctAssignCmpnEntity; +import com.kri.contact.server.persistence.entity.TPrjctAssignUserEntity; +import com.kri.contact.server.persistence.entity.TUserEntity; +import com.kri.contact.server.persistence.jdbc.ListAssignJdbcSupport; +import com.kri.contact.server.persistence.repository.ListAssignCmpnRepository; +import com.kri.contact.server.persistence.repository.ListAssignUserRepository; +import com.kri.contact.server.persistence.repository.ListAssignUserRoleMapRepository; +import com.kri.contact.server.persistence.repository.ListRepository; +import com.kri.contact.server.persistence.repository.ProjectAssignCmpnRepository; +import com.kri.contact.server.persistence.repository.ProjectAssignUserRepository; +import com.kri.contact.server.persistence.repository.UserRepository; import java.time.LocalDateTime; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -14,49 +37,90 @@ import org.springframework.transaction.annotation.Transactional; @RequiredArgsConstructor public class AssignService { - private final ProjectAssignRepository projectAssignRepository; - private final ListAssignRepository listAssignRepository; - - public List getPrjctOutsourceAndFieldworkAssign(Long prjctIdx) { - List outsourceAssign = getPrjctOutsourceAssign(prjctIdx); - List fieldworkAssign = getPrjctFieldworkAssign(prjctIdx); - outsourceAssign.addAll(fieldworkAssign); - - return outsourceAssign; - } - - public List getPrjctOutsourceAssign(Long prjctIdx) { - return projectAssignRepository.findAssignUserIdByPrjctIdxAndRoleRange( - prjctIdx, - ContactConstant.OUTSOURCE_USER_ROLE, - ContactConstant.OUTSOURCE_USER_ROLE + 1000 - ); - } + private final ProjectAssignUserRepository projectAssignUserRepository; + private final ProjectAssignCmpnRepository projectAssignCmpnRepository; + private final ListAssignCmpnRepository listAssignCmpnRepository; + private final ListAssignUserRepository listAssignUserRepository; + private final ListAssignUserRoleMapRepository listAssignUserRoleMapRepository; + private final ListAssignJdbcSupport listAssignJdbcSupport; + private final ListRepository listRepository; + private final ListHeaderService listHeaderService; + private final UserRepository userRepository; public List getPrjctFieldworkAssign(Long prjctIdx) { - return projectAssignRepository.findAssignUserIdByPrjctIdxAndRoleRange( + return projectAssignUserRepository.findAssignUserIdByPrjctIdxAndRoleRange( prjctIdx, ContactConstant.FIELDWORK_USER_ROLE, ContactConstant.FIELDWORK_USER_ROLE + 1000 ); } - @Transactional - public void upsertPrjctOutsourceAssign(Long prjctIdx, List assignUserIdList, - String regUser, LocalDateTime regDt) { - projectAssignRepository.deleteAssignByPrjctIdxAndRoleRange( - prjctIdx, - ContactConstant.OUTSOURCE_USER_ROLE, - ContactConstant.OUTSOURCE_USER_ROLE + 1000 - ); + public List getPrjctCmpnAssign(Long prjctIdx) { + return projectAssignCmpnRepository.findAssignCmpnIdByPrjctIdx(prjctIdx); + } - insertPrjctAssign(prjctIdx, assignUserIdList, regUser, regDt); + public List getPrjctAssignableUserIds(Long prjctIdx) { + List fieldworkAssign = getPrjctFieldworkAssign(prjctIdx); + List cmpnAssign = getPrjctCmpnAssign(prjctIdx); + if (cmpnAssign.isEmpty()) { + return fieldworkAssign; + } + + Set assignableUserIds = new LinkedHashSet<>(fieldworkAssign); + userRepository.findByUserCmpnInAndRoleRangeAndDelFalse( + cmpnAssign, + ContactConstant.OUTSOURCE_USER_ROLE, + ContactConstant.OUTSOURCE_USER_ROLE + 1000 + ) + .stream() + .map(TUserEntity::getUserId) + .forEach(assignableUserIds::add); + + return List.copyOf(assignableUserIds); + } + + @Transactional(readOnly = true) + public Map findActiveUserRoleMap(Collection userIds) { + if (userIds == null || userIds.isEmpty()) { + return Collections.emptyMap(); + } + + return userRepository.findByUserIdInAndDelFalse(userIds).stream() + .collect(Collectors.toMap( + TUserEntity::getUserId, + TUserEntity::getUserRole, + (left, right) -> right, + LinkedHashMap::new + )); + } + + @Transactional(readOnly = true) + public Map> findAllowedUserRolesByAssignRole(Collection assignRoles) { + if (assignRoles == null || assignRoles.isEmpty()) { + return Collections.emptyMap(); + } + + List listHderTypes = assignRoles.stream() + .filter(Objects::nonNull) + .map(Short::intValue) + .distinct() + .toList(); + if (listHderTypes.isEmpty()) { + return Collections.emptyMap(); + } + + Map> result = new LinkedHashMap<>(); + for (TListAssignUserRoleMapEntity entity : listAssignUserRoleMapRepository.findByListHderTyIn(listHderTypes)) { + result.computeIfAbsent(entity.getAssignRole(), ignored -> new LinkedHashSet<>()) + .add(entity.getUserRole()); + } + return result; } @Transactional public void upsertPrjctFieldworkAssign(Long prjctIdx, List assignUserIdList, String regUser, LocalDateTime regDt) { - projectAssignRepository.deleteAssignByPrjctIdxAndRoleRange( + projectAssignUserRepository.deleteAssignByPrjctIdxAndRoleRange( prjctIdx, ContactConstant.FIELDWORK_USER_ROLE, ContactConstant.FIELDWORK_USER_ROLE + 1000 @@ -65,9 +129,143 @@ public class AssignService { insertPrjctAssign(prjctIdx, assignUserIdList, regUser, regDt); } + @Transactional + public void upsertPrjctCmpnAssign(Long prjctIdx, List assignCmpnIdList, + String regUser, LocalDateTime regDt) { + List normalized = normalizeAssignIds(assignCmpnIdList); + cleanupRemovedExternalCmpnAssign(prjctIdx, normalized); + projectAssignCmpnRepository.deleteAssignByPrjctIdx(prjctIdx); + insertPrjctCmpnAssign(prjctIdx, normalized, regUser, regDt); + } + @Transactional public void deleteListAssignWithUser(String userId) { - listAssignRepository.deleteByUserId(userId); + listAssignUserRepository.deleteByUserId(userId); + } + + @Transactional + public Integer upsertListAssign( + Long prjctIdx, + String assignId, + ListAssignRequestDto req, + String regUser, + LocalDateTime regDt + ) { + if (assignId == null || assignId.isBlank()) { + throw BusinessException.badRequest( + "INVALID_LIST_ASSIGN_ID", + "리스트 배정 ID가 필수입니다." + ); + } + ListAssignType assignType = requireAssignType(req.getAssignType()); + Set targetSids = resolveTargetSids(prjctIdx, req.getListFilter()); + if (targetSids.isEmpty()) { + return 0; + } + + if (assignType == ListAssignType.OUTSOURCE) { + listAssignJdbcSupport.deleteCmpnAssign(prjctIdx, targetSids, ContactConstant.INSERT_CHUNK_SIZE); + listAssignJdbcSupport.batchInsertCmpnAssign( + prjctIdx, + targetSids, + assignId.trim(), + regUser, + regDt, + ContactConstant.INSERT_CHUNK_SIZE + ); + } else { + Short assignRole = assignType.getCode(); + listAssignJdbcSupport.deleteUserAssign(prjctIdx, assignRole, targetSids, ContactConstant.INSERT_CHUNK_SIZE); + listAssignJdbcSupport.batchInsertUserAssign( + prjctIdx, + targetSids, + assignId.trim(), + assignRole, + regUser, + regDt, + ContactConstant.INSERT_CHUNK_SIZE + ); + if (Boolean.TRUE.equals(req.getTransferResve())) { + listAssignJdbcSupport.transferReservationUser( + prjctIdx, + targetSids, + assignId.trim(), + ContactConstant.INSERT_CHUNK_SIZE + ); + } + } + + return targetSids.size(); + } + + @Transactional + public Integer resetListAssign(Long prjctIdx, ListAssignResetRequestDto req) { + ListAssignType assignType = requireAssignType(req == null ? null : req.getAssignType()); + Set targetSids = resolveTargetSids(prjctIdx, req); + if (targetSids.isEmpty()) { + return 0; + } + + if (assignType == ListAssignType.OUTSOURCE) { + return listAssignJdbcSupport.deleteCmpnAssign(prjctIdx, targetSids, ContactConstant.INSERT_CHUNK_SIZE); + } + return listAssignJdbcSupport.deleteUserAssign( + prjctIdx, + assignType.getCode(), + targetSids, + ContactConstant.INSERT_CHUNK_SIZE + ); + } + + @Transactional(readOnly = true) + public List findListAssignUserRoles(Long prjctIdx, Collection sids) { + if (sids == null || sids.isEmpty()) { + return Collections.emptyList(); + } + + List assignEntities = listAssignUserRepository.findByPrjctIdxAndSidIn(prjctIdx, sids); + if (assignEntities.isEmpty()) { + return Collections.emptyList(); + } + + Set assignedUserIds = assignEntities.stream() + .map(TListAssignUserEntity::getUserId) + .filter(Objects::nonNull) + .filter(userId -> !userId.isBlank()) + .collect(Collectors.toCollection(LinkedHashSet::new)); + if (assignedUserIds.isEmpty()) { + return Collections.emptyList(); + } + + Set activeUserIds = userRepository.findByUserIdInAndDelFalse(assignedUserIds).stream() + .map(TUserEntity::getUserId) + .collect(Collectors.toCollection(LinkedHashSet::new)); + + return assignEntities.stream() + .map(assignEntity -> { + if (!activeUserIds.contains(assignEntity.getUserId())) { + return null; + } + return new ListAssignUserRole( + assignEntity.getSid(), + assignEntity.getUserId(), + assignEntity.getAssignRole() + ); + }) + .filter(Objects::nonNull) + .toList(); + } + + @Transactional(readOnly = true) + public List findListAssignCmpns(Long prjctIdx, Collection sids) { + if (sids == null || sids.isEmpty()) { + return Collections.emptyList(); + } + + return listAssignCmpnRepository.findByPrjctIdxAndSidIn(prjctIdx, sids).stream() + .map(entity -> new ListAssignCmpn(entity.getSid(), entity.getCmpnId())) + .filter(assign -> assign.cmpnId() != null && !assign.cmpnId().isBlank()) + .toList(); } private void insertPrjctAssign(Long prjctIdx, List assignUserIdList, String regUser, @@ -76,20 +274,117 @@ public class AssignService { return; } - List normalized = assignUserIdList.stream() - .filter(s -> s != null && !s.isBlank()) - .map(String::trim) - .distinct() - .toList(); + List normalized = normalizeAssignIds(assignUserIdList); if (normalized.isEmpty()) { return; } - List entities = normalized.stream() - .map(uid -> TPrjctAssignEntity.create(prjctIdx, uid, regUser, regDt)) + validateFieldworkUsers(normalized); + + List entities = normalized.stream() + .map(uid -> TPrjctAssignUserEntity.create(prjctIdx, uid, regUser, regDt)) .toList(); - projectAssignRepository.saveAll(entities); + projectAssignUserRepository.saveAll(entities); } + + private void validateFieldworkUsers(List userIds) { + Map roleByUserId = userRepository.findByUserIdInAndDelFalse(userIds).stream() + .collect(Collectors.toMap( + TUserEntity::getUserId, + TUserEntity::getUserRole, + (left, right) -> right, + LinkedHashMap::new + )); + + List invalidUserIds = userIds.stream() + .filter(userId -> { + Integer role = roleByUserId.get(userId); + return role == null + || role < ContactConstant.FIELDWORK_USER_ROLE + || role >= ContactConstant.FIELDWORK_USER_ROLE + 1000; + }) + .toList(); + + if (!invalidUserIds.isEmpty()) { + throw BusinessException.badRequest( + "INVALID_PROJECT_FIELDWORK_ASSIGN", + "프로젝트 user 배정에는 fieldwork 사용자만 지정할 수 있습니다." + ) + .with("userIds", invalidUserIds); + } + } + + private void insertPrjctCmpnAssign(Long prjctIdx, List assignCmpnIdList, String regUser, + LocalDateTime regDt) { + if (assignCmpnIdList == null || assignCmpnIdList.isEmpty()) { + return; + } + + List entities = assignCmpnIdList.stream() + .map(cmpnId -> TPrjctAssignCmpnEntity.create(prjctIdx, cmpnId, regUser, regDt)) + .toList(); + + projectAssignCmpnRepository.saveAll(entities); + } + + private void cleanupRemovedExternalCmpnAssign(Long prjctIdx, List retainedCmpnIds) { + Set retainedSet = new LinkedHashSet<>(retainedCmpnIds); + List removedExternalCmpnIds = projectAssignCmpnRepository + .findExternalAssignCmpnIdByPrjctIdx(prjctIdx) + .stream() + .filter(cmpnId -> !retainedSet.contains(cmpnId)) + .toList(); + + if (removedExternalCmpnIds.isEmpty()) { + return; + } + + projectAssignUserRepository.deleteByPrjctIdxAndUserCmpnIn(prjctIdx, removedExternalCmpnIds); + listAssignCmpnRepository.deleteByPrjctIdxAndCmpnIdIn(prjctIdx, removedExternalCmpnIds); + listAssignUserRepository.deleteByPrjctIdxAndUserCmpnIn(prjctIdx, removedExternalCmpnIds); + } + + private List normalizeAssignIds(List assignIds) { + if (assignIds == null || assignIds.isEmpty()) { + return Collections.emptyList(); + } + + return assignIds.stream() + .filter(s -> s != null && !s.isBlank()) + .map(String::trim) + .distinct() + .toList(); + } + + private ListAssignType requireAssignType(ListAssignType assignType) { + if (assignType == null) { + throw BusinessException.badRequest( + "INVALID_LIST_ASSIGN_TYPE", + "리스트 배정 타입은 필수입니다." + ); + } + return assignType; + } + + private Set resolveTargetSids(Long prjctIdx, ListAssignResetRequestDto req) { + return resolveTargetSids(prjctIdx, req == null ? null : req.getListFilter()); + } + + private Set resolveTargetSids(Long prjctIdx, ListFilterDto listFilter) { + List exactMatchHeaderIds = listHeaderService.getExactMatchHeaderId(prjctIdx); + return new LinkedHashSet<>(listRepository.findAllSids(prjctIdx, exactMatchHeaderIds, listFilter)); + } + + public record ListAssignUserRole( + Integer sid, + String userId, + Short assignRole + ) {} + + public record ListAssignCmpn( + Integer sid, + String cmpnId + ) {} } diff --git a/src/main/java/com/kri/contact/server/service/CmpnService.java b/src/main/java/com/kri/contact/server/service/CmpnService.java new file mode 100644 index 0000000..b324210 --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/CmpnService.java @@ -0,0 +1,81 @@ +package com.kri.contact.server.service; + +import com.kri.common.feature.web.BusinessException; +import com.kri.contact.server.dto.cmpn.CmpnInfoDto; +import com.kri.contact.server.dto.common.DataVerificationDto; +import com.kri.contact.server.persistence.entity.TCmpnEntity; +import com.kri.contact.server.persistence.repository.CmpnRepository; +import java.time.LocalDateTime; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class CmpnService { + + private final CmpnRepository cmpnRepository; + + public DataVerificationDto checkCmpnId(String cmpnId) { + return verifyCmpnId(cmpnId); + } + + public CmpnInfoDto getCmpn(String cmpnId) { + return CmpnInfoDto.from(findCmpn(cmpnId)); + } + + public List getCmpnList() { + return cmpnRepository.findAllByOrderByCmpnIdAsc().stream() + .map(CmpnInfoDto::from) + .toList(); + } + + @Transactional + public void createCmpn(CmpnInfoDto dto, String regUser, LocalDateTime regDt) { + DataVerificationDto verification = verifyCmpnId(dto.getCmpnId()); + if (!verification.isSuccess()) { + throw BusinessException.badRequest("WRONG_CMPN_DATA", verification.getErrMessage()); + } + validateCmpnDto(dto); + + cmpnRepository.save(TCmpnEntity.fromDto(dto, regUser, regDt)); + } + + @Transactional + public void updateCmpn(CmpnInfoDto dto, String modUser, LocalDateTime modDt) { + validateCmpnDto(dto); + TCmpnEntity entity = findCmpn(dto.getCmpnId()); + entity.updateFromDto(dto, modUser, modDt); + } + + private TCmpnEntity findCmpn(String cmpnId) { + return cmpnRepository.findByCmpnId(cmpnId) + .orElseThrow(() -> + BusinessException.notFound("CMPN_NOT_FOUND", "회사를 찾을 수 없습니다.") + .with("cmpnId", cmpnId) + ); + } + + private DataVerificationDto verifyCmpnId(String cmpnId) { + if (cmpnId == null || cmpnId.isBlank()) { + return new DataVerificationDto(false, "회사 id", "회사 id가 비어 있습니다."); + } + if (cmpnId.length() > 32) { + return new DataVerificationDto(false, "회사 id", "회사 id는 32자 이하로 입력해야 합니다."); + } + if (!cmpnId.matches("^[가-힣A-Za-z0-9() _.-]+$")) { + return new DataVerificationDto(false, "회사 id", "회사 id는 한글, 영문, 숫자, 공백, (), _, ., -만 입력할 수 있습니다."); + } + if (cmpnRepository.existsByCmpnId(cmpnId)) { + return new DataVerificationDto(false, "회사 id", "이미 사용 중인 회사 id입니다."); + } + return new DataVerificationDto(); + } + + private void validateCmpnDto(CmpnInfoDto dto) { + if (dto.getCmpnAlias() == null || dto.getCmpnAlias().isBlank()) { + throw BusinessException.badRequest("WRONG_CMPN_DATA", "회사 별칭이 비어 있습니다."); + } + } +} diff --git a/src/main/java/com/kri/contact/server/service/ListCallHistService.java b/src/main/java/com/kri/contact/server/service/ListCallHistService.java new file mode 100644 index 0000000..59a3b22 --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/ListCallHistService.java @@ -0,0 +1,62 @@ +package com.kri.contact.server.service; + +import com.kri.common.feature.web.BusinessException; +import com.kri.contact.server.dto.list.ListCallHistDto; +import com.kri.contact.server.dto.list.ListCallHistRequestDto; +import com.kri.contact.server.persistence.entity.TListCallHistEntity; +import com.kri.contact.server.persistence.repository.ListCallHistRepository; +import com.kri.contact.server.persistence.repository.ListHeaderRepository; +import com.kri.contact.server.persistence.repository.ListRepository; +import java.time.LocalDateTime; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ListCallHistService { + + private final ListRepository listRepository; + private final ListHeaderRepository listHeaderRepository; + private final ListCallHistRepository listCallHistRepository; + + @Transactional + public ListCallHistDto saveCallHistory( + Long prjctIdx, + Integer sid, + ListCallHistRequestDto request, + String regUser, + LocalDateTime regDt + ) { + if (!listRepository.existsByIdPrjctIdxAndIdSid(prjctIdx, sid)) { + throw BusinessException.notFound("LIST_NOT_FOUND", "통화 이력 대상 리스트를 찾을 수 없습니다.") + .with("prjctIdx", prjctIdx) + .with("sid", sid); + } + if (!listHeaderRepository.existsByIdPrjctIdxAndIdListHderId(prjctIdx, request.getListHderId())) { + throw BusinessException.badRequest("HEADER_NOT_FOUND", "통화 이력 대상 헤더를 찾을 수 없습니다.") + .with("prjctIdx", prjctIdx) + .with("listHderId", request.getListHderId()); + } + + TListCallHistEntity entity = new TListCallHistEntity(); + entity.setPrjctIdx(prjctIdx); + entity.setSid(sid); + entity.setListHderId(request.getListHderId()); + entity.setDestNum(request.getDestNum()); + entity.setAgentNum(request.getAgentNum()); + entity.setAniNum(request.getAniNum()); + entity.setAgentSessionId(request.getAgentSessionId()); + entity.setDestSessionId(request.getDestSessionId()); + entity.setCallTy(request.getCallTy()); + entity.setStartDt(request.getStartDt()); + entity.setTotalTime(request.getTotalTime()); + entity.setTalkTime(request.getTalkTime()); + entity.setMediaServerId(request.getMediaServerId()); + entity.setMediaServerName(request.getMediaServerName()); + entity.setRecordFileName(request.getRecordFileName()); + entity.setRegUser(regUser); + entity.setRegDt(regDt); + return ListCallHistDto.from(listCallHistRepository.save(entity)); + } +} diff --git a/src/main/java/com/kri/contact/server/service/ListContentItemService.java b/src/main/java/com/kri/contact/server/service/ListContentItemService.java new file mode 100644 index 0000000..5575e0f --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/ListContentItemService.java @@ -0,0 +1,75 @@ +package com.kri.contact.server.service; + +import com.kri.contact.server.common.enums.ListHeaderType; +import com.kri.contact.server.dto.list.ListHeaderDto; +import com.kri.contact.server.persistence.entity.TListContentEntity; +import com.kri.contact.server.persistence.repository.ListContentRepository; +import com.kri.contact.server.persistence.repository.ListItemRepository; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ListContentItemService { + private final ListContentRepository listFilterContentRepository; + private final ListItemRepository listItemRepository; + + public Map> getListContentItemMap(Long prjctIdx) { + return listFilterContentRepository.findByPrjctIdx(prjctIdx).stream() + .collect(Collectors.groupingBy( + TListContentEntity::getListHderId, + Collectors.mapping(TListContentEntity::getListContentItem, Collectors.toList()) + )); + } + + @Transactional + public void refreshListContentItem(Long prjctIdx, List listHeaders) { + if (listHeaders == null || listHeaders.isEmpty()) { + return; + } + + List headerIds = listHeaders.stream() + .filter(h -> h.getListHderTy() == ListHeaderType.CONTENT_ITEM) + .map(ListHeaderDto::getListHderId) + .toList(); + + if (headerIds.isEmpty()) { + return; + } + + listFilterContentRepository.deleteByPrjctIdxAndListHderIdIn(prjctIdx, headerIds); + + Map> contentItemMap = listItemRepository + .findDistinctContentItemsByPrjctIdxAndListHderIds(prjctIdx, headerIds) + .stream() + .collect(Collectors.groupingBy( + ListItemRepository.ListContentItemRow::getListHderId, + Collectors.mapping(ListItemRepository.ListContentItemRow::getListItemVal, Collectors.toList()) + )); + + List contentEntities = contentItemMap.entrySet().stream() + .flatMap(entry -> toContentEntities(prjctIdx, entry.getKey(), entry.getValue()).stream()) + .toList(); + + if (contentEntities.isEmpty()) { + return; + } + + listFilterContentRepository.saveAll(contentEntities); + } + + private List toContentEntities( + Long prjctIdx, + Integer headerId, + Collection contentItems + ) { + return contentItems.stream() + .map(contentItem -> TListContentEntity.create(prjctIdx, headerId, contentItem)) + .toList(); + } +} diff --git a/src/main/java/com/kri/contact/server/service/ListDownloadService.java b/src/main/java/com/kri/contact/server/service/ListDownloadService.java index ee309d9..30636f5 100644 --- a/src/main/java/com/kri/contact/server/service/ListDownloadService.java +++ b/src/main/java/com/kri/contact/server/service/ListDownloadService.java @@ -3,12 +3,16 @@ package com.kri.contact.server.service; import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.excel.ExcelMapper; import com.kri.common.feature.web.BusinessException; +import com.kri.contact.server.common.enums.ListEventHistoryBase; import com.kri.contact.server.common.enums.ListHeaderType; import com.kri.contact.server.common.enums.ListIsUse; import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.dto.common.DateRangeDto; import com.kri.contact.server.dto.list.ListFilterDto; import com.kri.contact.server.dto.list.ListHeaderDto; +import com.kri.contact.server.persistence.entity.TListItemFileEntity; +import com.kri.contact.server.persistence.repository.ListItemFileRepository; +import com.kri.contact.server.service.file.ListItemFileService; import java.io.ByteArrayOutputStream; import java.time.LocalDateTime; import java.util.ArrayList; @@ -18,6 +22,10 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -49,6 +57,8 @@ public class ListDownloadService { private final ListHeaderService listHeaderService; private final ListSearchService listSearchService; + private final ListItemFileRepository listItemFileRepository; + private final ListItemFileService listItemFileService; public byte[] downloadList(Long prjctIdx, ListFilterDto listFilter) { List headers = getSortedHeaders(prjctIdx); @@ -83,11 +93,16 @@ public class ListDownloadService { Long prjctIdx, ListFilterDto listFilter, Collection resultCodeTypes, + ListEventHistoryBase searchBase, DateRangeDto dateRange ) { + if (searchBase == null) { + throw BusinessException.internalError("이력 기준은 필수입니다."); + } + validateDateRange(dateRange); List headers = getSortedHeaders(prjctIdx); - int maxHistoryCount = findMaxEventHistoryCount(prjctIdx, listFilter, resultCodeTypes, dateRange); + int maxHistoryCount = findMaxEventHistoryCount(prjctIdx, listFilter, resultCodeTypes, searchBase, dateRange); List excelHeaders = new ArrayList<>(toBaseHeaderNames(headers)); appendRepeatedHeaders(excelHeaders, EVENT_HISTORY_HEADERS, maxHistoryCount); @@ -107,6 +122,7 @@ public class ListDownloadService { prjctIdx, sids, resultCodeTypes, + searchBase, dateRange ); @@ -169,10 +185,71 @@ public class ListDownloadService { } } + public byte[] downloadItemFile(Long prjctIdx, ListFilterDto listFilter) { + List fileHeaders = getSortedHeaders(prjctIdx).stream() + .filter(header -> Objects.equals(header.getListHderTy(), ListHeaderType.FILE)) + .toList(); + if (fileHeaders.isEmpty()) { + throw BusinessException.badRequest("LIST_FILE_HEADER_NOT_FOUND", "파일 업로드 헤더가 없습니다."); + } + + Set fileHeaderIds = fileHeaders.stream() + .map(ListHeaderDto::getListHderId) + .collect(Collectors.toSet()); + + try ( + ByteArrayOutputStream out = new ByteArrayOutputStream(); + ZipOutputStream zip = new ZipOutputStream(out) + ) { + Integer lastSid = null; + int fileCount = 0; + + while (true) { + List sids = listSearchService.findDownloadSids(prjctIdx, listFilter, lastSid); + if (sids.isEmpty()) { + break; + } + + List fileEntities = + listItemFileRepository.findByIdPrjctIdxAndIdSidInAndIdListHderIdInOrderByIdSidAscIdListHderIdAsc( + prjctIdx, + sids, + fileHeaderIds + ); + + for (TListItemFileEntity fileEntity : fileEntities) { + if (fileEntity.getFileNm() == null || fileEntity.getFileNm().isBlank()) { + continue; + } + + ZipEntry entry = new ZipEntry(sanitizeZipEntryName(fileEntity.getFileNm())); + zip.putNextEntry(entry); + zip.write(listItemFileService.readItemFile(fileEntity.getFilePath(), fileEntity.getFileNm())); + zip.closeEntry(); + fileCount++; + } + + lastSid = sids.get(sids.size() - 1); + } + + if (fileCount == 0) { + throw BusinessException.notFound("LIST_ITEM_FILE_NOT_FOUND", "다운로드할 리스트 파일이 없습니다."); + } + + zip.finish(); + return out.toByteArray(); + } catch (BusinessException e) { + throw e; + } catch (Exception e) { + throw BusinessException.internalError("FAIL_DOWNLOAD_LIST_ITEM_FILE", e.getMessage()); + } + } + private int findMaxEventHistoryCount( Long prjctIdx, ListFilterDto listFilter, Collection resultCodeTypes, + ListEventHistoryBase searchBase, DateRangeDto dateRange ) { int maxCount = 0; @@ -190,7 +267,7 @@ public class ListDownloadService { dateRange ); for (Integer count : countMap.values()) { - maxCount = Math.max(maxCount, count); + maxCount = Math.max(maxCount, searchBase == ListEventHistoryBase.LATEST ? 1 : count); } lastSid = sids.get(sids.size() - 1); } @@ -215,6 +292,7 @@ public class ListDownloadService { private List getSortedHeaders(Long prjctIdx) { List headers = listHeaderService.getHeader(prjctIdx).stream() + .map(header -> (ListHeaderDto) header) .sorted(Comparator.comparing(ListHeaderDto::getListHderOrder)) .toList(); if (headers.isEmpty()) { @@ -285,8 +363,11 @@ public class ListDownloadService { if (Objects.equals(header.getListHderTy(), ListHeaderType.OUTSOURCE)) { return String.join(", ", row.assignValues().outsourceUserIds()); } - if (Objects.equals(header.getListHderTy(), ListHeaderType.FIELDWORK)) { - return String.join(", ", row.assignValues().fieldworkUserIds()); + if (Objects.equals(header.getListHderTy(), ListHeaderType.CONTACT_INTERVIEWER)) { + return String.join(", ", row.assignValues().contactInterviewerIds()); + } + if (Objects.equals(header.getListHderTy(), ListHeaderType.FIELD_INTERVIEWER)) { + return String.join(", ", row.assignValues().fieldInterviewerIds()); } return defaultString(row.itemMap().get(header.getListHderId())); } @@ -335,4 +416,8 @@ public class ListDownloadService { private String defaultString(Object value) { return value == null ? "" : String.valueOf(value); } + + private String sanitizeZipEntryName(String fileName) { + return fileName.replace("\\", "_").replace("/", "_"); + } } diff --git a/src/main/java/com/kri/contact/server/service/ListHeaderService.java b/src/main/java/com/kri/contact/server/service/ListHeaderService.java index f4be90a..4d677eb 100644 --- a/src/main/java/com/kri/contact/server/service/ListHeaderService.java +++ b/src/main/java/com/kri/contact/server/service/ListHeaderService.java @@ -1,14 +1,17 @@ package com.kri.contact.server.service; -import static com.kri.contact.server.common.consts.ContactConstant.EMAIL_TELNUM_TYPE; -import static com.kri.contact.server.common.consts.ContactConstant.LIST_TEXT_REGEX; +import static com.kri.contact.server.common.consts.ContactConstant.EXACT_MATCH_HEADER_TYPE; +import static com.kri.contact.server.common.consts.ContactConstant.LIST_HEADER_ACCEPT_REGEX; +import static com.kri.contact.server.common.consts.ContactConstant.SYSTEM_USER_NAME; +import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.web.BusinessException; import com.kri.contact.server.common.enums.ListHeaderGrade; import com.kri.contact.server.common.enums.ListHeaderType; import com.kri.contact.server.common.enums.ListHeaderTypeSpecific; import com.kri.contact.server.dto.excel.ListUploadErrorDto; import com.kri.contact.server.dto.list.ListHeaderDto; +import com.kri.contact.server.dto.list.ListHeaderWithFilterContentDto; import com.kri.contact.server.dto.list.ListUploadRequestDto; import com.kri.contact.server.persistence.entity.TListHeaderEntity; import com.kri.contact.server.persistence.repository.ListHeaderRepository; @@ -22,6 +25,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; import java.util.function.Predicate; import lombok.RequiredArgsConstructor; @@ -34,9 +38,10 @@ public class ListHeaderService { private final ListHeaderRepository listHeaderRepository; private final ListItemRepository listItemRepository; + private final ListContentItemService listContentItemService; @Transactional - public void copyDefaultHeader(Long prjctIdx, String regUser, LocalDateTime regDt) { + public List copyDefaultHeader(Long prjctIdx, String regUser, LocalDateTime regDt) { listHeaderRepository.deleteByIdPrjctIdx(prjctIdx); List defaultHeaderList = listHeaderRepository.findDefaultHeader() @@ -44,27 +49,33 @@ public class ListHeaderService { .map(src -> TListHeaderEntity.copyFromDefault(src, prjctIdx, regUser, regDt)) .toList(); - listHeaderRepository.saveAll(defaultHeaderList); + return listHeaderRepository.saveAll(defaultHeaderList); } - public List getHeader(Long prjctIdx) { + @Transactional + public List getHeader(Long prjctIdx) { List headerEntityList = listHeaderRepository.findByIdPrjctIdx(prjctIdx); if (headerEntityList.isEmpty()) { - + final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + headerEntityList = copyDefaultHeader(prjctIdx, SYSTEM_USER_NAME, now); } + Map> contentItemMap = listContentItemService.getListContentItemMap(prjctIdx); return headerEntityList.stream() - .map(ListHeaderDto::fromEntity) + .map(entity -> ListHeaderWithFilterContentDto.fromEntity( + entity, + contentItemMap.getOrDefault(entity.getListHderId(), List.of()) + )) .toList(); } - public List getEmailTelnumHeaderId(Long prjctIdx) { - List emailTelnumCodeList = EMAIL_TELNUM_TYPE.stream() + public List getExactMatchHeaderId(Long prjctIdx) { + List exactMatchCodeList = EXACT_MATCH_HEADER_TYPE.stream() .map(ListHeaderType::getCode) .toList(); - return listHeaderRepository.findIdListHderIdByIdPrjctIdxAndListHderTyIn(prjctIdx, emailTelnumCodeList); + return listHeaderRepository.findIdListHderIdByIdPrjctIdxAndListHderTyIn(prjctIdx, exactMatchCodeList); } public List resolveUploadHeaders( @@ -100,7 +111,7 @@ public class ListHeaderService { errors.add(ListUploadErrorDto.of(1, "헤더", "빈 헤더명이 있습니다.")); } else if (!dupCheck.add(h)) { errors.add(ListUploadErrorDto.of(1, h, "헤더명이 중복됩니다.")); - } else if (!h.matches(LIST_TEXT_REGEX)) { + } else if (!h.matches(LIST_HEADER_ACCEPT_REGEX)) { errors.add(ListUploadErrorDto.of(1, h, "허용되지 않는 헤더명 입니다.")); } } @@ -131,6 +142,13 @@ public class ListHeaderService { .toList(); } + @Transactional + public void updateListHeader(Long prjctIdx, List headerList, String regUser, LocalDateTime regDt){ + //upload에서의 header upsert와 분리하기 위한 래핑 메서드 + upsertHeader(prjctIdx, headerList, regUser, regDt); + listContentItemService.refreshListContentItem(prjctIdx, headerList); + } + @Transactional public void upsertHeader(Long prjctIdx, List headerList, String regUser, LocalDateTime regDt) { List defaultHeaderList = listHeaderRepository.findDefaultHeader() @@ -148,7 +166,7 @@ public class ListHeaderService { List invalidHeaderList = headerList.stream() .map(ListHeaderDto::getListHderNm) - .filter(name -> name == null || !name.matches(LIST_TEXT_REGEX)) + .filter(name -> name == null || !name.matches(LIST_HEADER_ACCEPT_REGEX)) .toList(); if (!invalidHeaderList.isEmpty()) { @@ -157,11 +175,18 @@ public class ListHeaderService { } // headerList에 없는 헤더는 삭제 - List headerIdList = headerList.stream().map(ListHeaderDto::getListHderId).toList(); - listHeaderRepository.deleteByIdPrjctIdxAndIdListHderIdNotIn(prjctIdx, headerIdList); + List headerIdList = headerList.stream() + .map(ListHeaderDto::getListHderId) + .filter(id -> id != null && id > 0) + .toList(); - // 없는 정보에 대해서 리스트 아이템 삭제 - listItemRepository.deleteByIdPrjctIdxAndIdListHderIdNotIn(prjctIdx, headerIdList); + deleteHderIdNotIn(prjctIdx, headerIdList); + + AtomicInteger maxListHderId = new AtomicInteger(getMaxListHderId(prjctIdx)); + + headerList.stream() + .filter(h -> h.getListHderId() < 0) + .forEach(h -> h.setListHderId(maxListHderId.incrementAndGet())); // ListHeaderGrade.IMMUTABLE 헤더를 제외한 헤더 저장 List headerEntityList = headerList.stream() @@ -225,10 +250,21 @@ public class ListHeaderService { case EMAIL -> ListHeaderType.EMAIL; case TEL_NUM -> ListHeaderType.TEL_NUM; case FILE -> ListHeaderType.FILE; + case CONTENT_ITEM -> ListHeaderType.CONTENT_ITEM; }; } - private long deleteHderIdNotIn(Long prjctIdx, List listHderId){ - return listItemRepository.deleteByIdPrjctIdxAndIdListHderIdNotIn(prjctIdx, listHderId); + private void deleteHderIdNotIn(Long prjctIdx, List headerIdList){ + listHeaderRepository.deleteByIdPrjctIdxAndIdListHderIdNotIn(prjctIdx, headerIdList); + // 없는 정보에 대해서 리스트 아이템 삭제 + listItemRepository.deleteByIdPrjctIdxAndIdListHderIdNotIn(prjctIdx, headerIdList); + } + + private int getMaxListHderId(Long prjctIdx) { + Integer maxListHderId = listHeaderRepository.findMaxListHderIdByIdPrjctIdx(prjctIdx); + if (maxListHderId == null) { + maxListHderId = 0; + } + return maxListHderId; } } diff --git a/src/main/java/com/kri/contact/server/service/ListHistoryQueryService.java b/src/main/java/com/kri/contact/server/service/ListHistoryQueryService.java new file mode 100644 index 0000000..a307177 --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/ListHistoryQueryService.java @@ -0,0 +1,34 @@ +package com.kri.contact.server.service; + +import com.kri.contact.server.dto.list.ListEventHistoryDto; +import com.kri.contact.server.dto.list.ListUpdateHistoryDto; +import com.kri.contact.server.persistence.repository.ListEventHistRepository; +import com.kri.contact.server.persistence.repository.ListUpdateHistRepository; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ListHistoryQueryService { + + private final ListEventHistRepository listEventHistRepository; + private final ListUpdateHistRepository listUpdateHistRepository; + + @Transactional(readOnly = true) + public List findEventHistories(Long prjctIdx, Integer sid) { + return listEventHistRepository.findByPrjctIdxAndSidOrderByRegDtDescListEventHistIdxDesc(prjctIdx, sid) + .stream() + .map(ListEventHistoryDto::from) + .toList(); + } + + @Transactional(readOnly = true) + public List findUpdateHistories(Long prjctIdx, Integer sid) { + return listUpdateHistRepository.findByPrjctIdxAndSidOrderByRegDtDescListUpdateHistIdxDesc(prjctIdx, sid) + .stream() + .map(ListUpdateHistoryDto::from) + .toList(); + } +} diff --git a/src/main/java/com/kri/contact/server/service/ListResetService.java b/src/main/java/com/kri/contact/server/service/ListResetService.java index 084ef6e..82be480 100644 --- a/src/main/java/com/kri/contact/server/service/ListResetService.java +++ b/src/main/java/com/kri/contact/server/service/ListResetService.java @@ -1,14 +1,17 @@ package com.kri.contact.server.service; -import com.kri.common.feature.util.CommonUtil; +import com.kri.common.feature.web.BusinessException; import com.kri.contact.server.common.consts.ContactConstant; import com.kri.contact.server.common.enums.ListResetMode; import com.kri.contact.server.dto.list.ListFilterDto; import com.kri.contact.server.persistence.entity.TListResetLogEntity; +import com.kri.contact.server.persistence.jdbc.ListResetJdbcSupport.DeleteCounts; import com.kri.contact.server.persistence.jdbc.ListResetJdbcSupport; import com.kri.contact.server.persistence.repository.ListResetLogRepository; +import jakarta.persistence.EntityManager; import java.time.LocalDateTime; import java.util.Set; +import java.util.UUID; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -20,6 +23,7 @@ public class ListResetService { private final ListResetLogRepository listResetLogRepository; private final ListSearchService listSearchService; private final ListResetJdbcSupport listResetJdbcSupport; + private final EntityManager entityManager; @Transactional public int resetByFilter( @@ -45,30 +49,39 @@ public class ListResetService { return 0; } if (mode == null) { - throw new IllegalArgumentException("mode must not be null"); + throw BusinessException.badRequest("EMPTY_MODE","mode는 필수 입니다."); } - String listResetLogId = createResetLog(prjctIdx, mode, sids.size(), regUser, regDt); + String listResetLogId = createResetLog(prjctIdx, mode, 0, regUser, regDt); int chunkSize = ContactConstant.INSERT_CHUNK_SIZE; + int resetCount = mode == ListResetMode.HIST ? sids.size() : 0; - switch (mode) { - case HIST -> { - listResetJdbcSupport.backupHistories(listResetLogId, prjctIdx, sids, chunkSize); - listResetJdbcSupport.deleteHistories(prjctIdx, sids, chunkSize); - } - case ALL -> { - listResetJdbcSupport.backupHistories(listResetLogId, prjctIdx, sids, chunkSize); - listResetJdbcSupport.backupListData(listResetLogId, prjctIdx, sids, true, chunkSize); - listResetJdbcSupport.deleteHistories(prjctIdx, sids, chunkSize); - listResetJdbcSupport.deleteListData(prjctIdx, sids, true, true, chunkSize); - } - case LIST_UPLOAD -> { - listResetJdbcSupport.backupListData(listResetLogId, prjctIdx, sids, false, chunkSize); - listResetJdbcSupport.deleteListData(prjctIdx, sids, false, false, chunkSize); + try { + setDeleteContext(listResetLogId, regUser); + entityManager.flush(); + entityManager.clear(); + + switch (mode) { + case HIST -> listResetJdbcSupport.deleteHistories(prjctIdx, sids, chunkSize); + case ALL -> { + listResetJdbcSupport.deleteHistories(prjctIdx, sids, chunkSize); + DeleteCounts counts = listResetJdbcSupport.deleteListData(prjctIdx, sids, true, true, chunkSize); + resetCount = counts.listCount(); + } + case LIST_UPLOAD -> { + DeleteCounts counts = listResetJdbcSupport.deleteListData(prjctIdx, sids, false, false, chunkSize); + resetCount = counts.listCount(); + } } + + entityManager.flush(); + entityManager.clear(); + updateResetCount(listResetLogId, resetCount); + } finally { + clearDeleteContext(); } - return sids.size(); + return resetCount; } private String createResetLog( @@ -78,7 +91,7 @@ public class ListResetService { String regUser, LocalDateTime regDt ) { - String listResetLogId = CommonUtil.uuid32(); + String listResetLogId = UUID.randomUUID().toString().replace("-", ""); TListResetLogEntity log = new TListResetLogEntity(); log.setListResetLogId(listResetLogId); @@ -91,4 +104,25 @@ public class ListResetService { return listResetLogId; } + + private void updateResetCount(String listResetLogId, int resetCount) { + TListResetLogEntity log = listResetLogRepository.findById(listResetLogId) + .orElseThrow(() -> BusinessException.internalError("List reset log not found.")); + log.setListCnt(resetCount); + listResetLogRepository.saveAndFlush(log); + } + + private void setDeleteContext(String listResetLogId, String delUser) { + entityManager.createNativeQuery("SET @list_reset_log_id = :listResetLogId") + .setParameter("listResetLogId", listResetLogId) + .executeUpdate(); + entityManager.createNativeQuery("SET @del_user = :delUser") + .setParameter("delUser", delUser) + .executeUpdate(); + } + + private void clearDeleteContext() { + entityManager.createNativeQuery("SET @list_reset_log_id = NULL").executeUpdate(); + entityManager.createNativeQuery("SET @del_user = NULL").executeUpdate(); + } } 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 9d91d01..95403d2 100644 --- a/src/main/java/com/kri/contact/server/service/ListSearchService.java +++ b/src/main/java/com/kri/contact/server/service/ListSearchService.java @@ -4,6 +4,8 @@ import com.kri.common.feature.web.BusinessException; import com.kri.common.feature.web.page.PageRequestDto; import com.kri.common.feature.web.page.PageResponseDto; import com.kri.contact.server.common.consts.ContactConstant; +import com.kri.contact.server.common.enums.ListEventHistoryBase; +import com.kri.contact.server.common.enums.ListHeaderTypeAssign; import com.kri.contact.server.common.enums.ListSearchResponseType; import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.dto.common.DateRangeDto; @@ -15,18 +17,17 @@ import com.kri.contact.server.dto.list.ListSearchBaseDto; import com.kri.contact.server.dto.list.ListSearchRequestDto; import com.kri.contact.server.dto.list.ListSearchWithFullResultDto; import com.kri.contact.server.dto.list.ListSearchWithResultDto; -import com.kri.contact.server.persistence.entity.TListAssignEntity; +import com.kri.contact.server.dto.list.ListSendResultDto; import com.kri.contact.server.persistence.entity.TListEntity; import com.kri.contact.server.persistence.entity.TListEventHistEntity; import com.kri.contact.server.persistence.entity.TListItemEntity; import com.kri.contact.server.persistence.entity.TListUpdateHistEntity; -import com.kri.contact.server.persistence.entity.TUserEntity; -import com.kri.contact.server.persistence.repository.ListAssignRepository; import com.kri.contact.server.persistence.repository.ListEventHistRepository; import com.kri.contact.server.persistence.repository.ListItemRepository; import com.kri.contact.server.persistence.repository.ListRepository; import com.kri.contact.server.persistence.repository.ListUpdateHistRepository; -import com.kri.contact.server.persistence.repository.UserRepository; +import com.kri.contact.server.service.AssignService.ListAssignCmpn; +import com.kri.contact.server.service.AssignService.ListAssignUserRole; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collection; @@ -49,13 +50,12 @@ import org.springframework.transaction.annotation.Transactional; @RequiredArgsConstructor public class ListSearchService { - private final ListAssignRepository listAssignRepository; + private final AssignService assignService; private final ListEventHistRepository listEventHistRepository; private final ListItemRepository listItemRepository; private final ListRepository listRepository; private final ListUpdateHistRepository listUpdateHistRepository; private final ListHeaderService listHeaderService; - private final UserRepository userRepository; @Transactional(readOnly = true) public ListSearchWithFullResultDto searchListWithSid(Long prjctIdx, Integer sid) { @@ -115,10 +115,10 @@ public class ListSearchService { ListFilterDto listFilter, Integer lastSid ) { - List emailTelnumHeaderIds = listHeaderService.getEmailTelnumHeaderId(prjctIdx); + List exactMatchHeaderIds = listHeaderService.getExactMatchHeaderId(prjctIdx); List listEntities = listRepository.findChunkedListEntities( prjctIdx, - emailTelnumHeaderIds, + exactMatchHeaderIds, listFilter, lastSid, ContactConstant.LIST_SELECT_CHUNK_SIZE @@ -150,10 +150,10 @@ public class ListSearchService { ListFilterDto listFilter, Integer lastSid ) { - List emailTelnumHeaderIds = listHeaderService.getEmailTelnumHeaderId(prjctIdx); + List exactMatchHeaderIds = listHeaderService.getExactMatchHeaderId(prjctIdx); return listRepository.findChunkedSids( prjctIdx, - emailTelnumHeaderIds, + exactMatchHeaderIds, listFilter, lastSid, ContactConstant.LIST_SELECT_CHUNK_SIZE @@ -192,19 +192,21 @@ public class ListSearchService { Long prjctIdx, Collection sids, Collection resultCodeTypes, + ListEventHistoryBase searchBase, DateRangeDto dateRange ) { if (sids == null || sids.isEmpty()) { return Collections.emptyMap(); } - return listEventHistRepository.findDownloadHistories( - prjctIdx, - sids, - toEventTypeCodes(resultCodeTypes), - getStartDate(dateRange), - getEndDate(dateRange) - ) + List eventTypes = toEventTypeCodes(resultCodeTypes); + LocalDateTime startDate = getStartDate(dateRange); + LocalDateTime endDate = getEndDate(dateRange); + List histories = searchBase == ListEventHistoryBase.LATEST + ? findLatestEventHistoriesForDownload(prjctIdx, sids, eventTypes, startDate, endDate) + : listEventHistRepository.findDownloadHistories(prjctIdx, sids, eventTypes, startDate, endDate); + + return histories .stream() .collect(Collectors.groupingBy( TListEventHistEntity::getSid, @@ -222,6 +224,19 @@ public class ListSearchService { )); } + private List findLatestEventHistoriesForDownload( + Long prjctIdx, + Collection sids, + Collection eventTypes, + LocalDateTime startDate, + LocalDateTime endDate + ) { + if (startDate == null && endDate == null) { + return listEventHistRepository.findLatestDownloadHistoriesFromLatest(prjctIdx, sids, eventTypes); + } + return listEventHistRepository.findLatestDownloadHistories(prjctIdx, sids, eventTypes, startDate, endDate); + } + @Transactional(readOnly = true) public Map findUpdateHistoryGroupCountsForDownload( Long prjctIdx, @@ -324,30 +339,30 @@ public class ListSearchService { } private List findPagedListEntities(Long prjctIdx, ListSearchRequestDto request) { - List emailTelnumHeaderIds = listHeaderService.getEmailTelnumHeaderId(prjctIdx); + List exactMatchHeaderIds = listHeaderService.getExactMatchHeaderId(prjctIdx); ListFilterDto listFilter = request == null ? null : request.getListFilter(); return listRepository.findPagedListEntities( prjctIdx, - emailTelnumHeaderIds, + exactMatchHeaderIds, listFilter, request == null ? null : request.getPageRequest() ); } private List findAllListEntities(Long prjctIdx, ListFilterDto listFilter) { - List emailTelnumHeaderIds = listHeaderService.getEmailTelnumHeaderId(prjctIdx); - return listRepository.findAllListEntities(prjctIdx, emailTelnumHeaderIds, listFilter); + List exactMatchHeaderIds = listHeaderService.getExactMatchHeaderId(prjctIdx); + return listRepository.findAllListEntities(prjctIdx, exactMatchHeaderIds, listFilter); } private List findAllSids(Long prjctIdx, ListFilterDto listFilter) { - List emailTelnumHeaderIds = listHeaderService.getEmailTelnumHeaderId(prjctIdx); - return listRepository.findAllSids(prjctIdx, emailTelnumHeaderIds, listFilter); + List exactMatchHeaderIds = listHeaderService.getExactMatchHeaderId(prjctIdx); + return listRepository.findAllSids(prjctIdx, exactMatchHeaderIds, listFilter); } private List createListSearchBase(Long prjctIdx, List listEntities) { return createListSearchRows(prjctIdx, listEntities).stream() - .map(row -> ListSearchBaseDto.from(row.listEntity(), row.itemList())) + .map(row -> ListSearchBaseDto.from(row.listEntity(), row.itemList(), row.assignValues())) .toList(); } @@ -362,13 +377,14 @@ public class ListSearchService { .toList(); Map resultMap = listEventHistRepository - .findLatestListByEventTy(prjctIdx, sids) + .findLatestListByEventTyFromLatest(prjctIdx, sids) .stream() .collect(Collectors.toMap( entity -> new ListResultKey(entity.getSid(), entity.getEventTy()), entity -> entity, (left, right) -> left )); + Map attemptCountMap = findAttemptCountMap(prjctIdx, sids); return rows.stream() .map(row -> { @@ -376,9 +392,19 @@ public class ListSearchService { return ListSearchWithResultDto.from( row.listEntity(), row.itemList(), - ListContactResultDto.from(resultMap.get(new ListResultKey(sid, ResultCodeType.CONTACT.getCode()))), - ListContactResultDto.from(resultMap.get(new ListResultKey(sid, ResultCodeType.INTERVIEW.getCode()))), - ListResultBaseDto.from(resultMap.get(new ListResultKey(sid, ResultCodeType.SURVEY.getCode()))) + row.assignValues(), + ListContactResultDto.from( + resultMap.get(new ListResultKey(sid, ResultCodeType.CONTACT.getCode())), + attemptCountMap.get(new ListResultKey(sid, ResultCodeType.CONTACT.getCode())) + ), + ListContactResultDto.from( + resultMap.get(new ListResultKey(sid, ResultCodeType.INTERVIEW.getCode())), + attemptCountMap.get(new ListResultKey(sid, ResultCodeType.INTERVIEW.getCode())) + ), + ListResultBaseDto.from( + resultMap.get(new ListResultKey(sid, ResultCodeType.SURVEY.getCode())), + attemptCountMap.get(new ListResultKey(sid, ResultCodeType.SURVEY.getCode())) + ) ); }) .toList(); @@ -395,16 +421,17 @@ public class ListSearchService { .toList(); Map resultMap = listEventHistRepository - .findLatestListByEventTy(prjctIdx, sids) + .findLatestListByEventTyFromLatest(prjctIdx, sids) .stream() .collect(Collectors.toMap( entity -> new ListResultKey(entity.getSid(), entity.getEventTy()), entity -> entity, (left, right) -> left )); + Map attemptCountMap = findAttemptCountMap(prjctIdx, sids); - ListResultBaseDto mailSendResult = null; - ListResultBaseDto smsSendResult = null; + ListSendResultDto mailSendResult = null; + ListSendResultDto smsSendResult = null; return rows.stream() .map(row -> { @@ -412,9 +439,19 @@ public class ListSearchService { return ListSearchWithFullResultDto.from( row.listEntity(), row.itemList(), - ListContactResultDto.from(resultMap.get(new ListResultKey(sid, ResultCodeType.CONTACT.getCode()))), - ListContactResultDto.from(resultMap.get(new ListResultKey(sid, ResultCodeType.INTERVIEW.getCode()))), - ListResultBaseDto.from(resultMap.get(new ListResultKey(sid, ResultCodeType.SURVEY.getCode()))), + row.assignValues(), + ListContactResultDto.from( + resultMap.get(new ListResultKey(sid, ResultCodeType.CONTACT.getCode())), + attemptCountMap.get(new ListResultKey(sid, ResultCodeType.CONTACT.getCode())) + ), + ListContactResultDto.from( + resultMap.get(new ListResultKey(sid, ResultCodeType.INTERVIEW.getCode())), + attemptCountMap.get(new ListResultKey(sid, ResultCodeType.INTERVIEW.getCode())) + ), + ListResultBaseDto.from( + resultMap.get(new ListResultKey(sid, ResultCodeType.SURVEY.getCode())), + attemptCountMap.get(new ListResultKey(sid, ResultCodeType.SURVEY.getCode())) + ), mailSendResult, smsSendResult ); @@ -422,6 +459,26 @@ public class ListSearchService { .toList(); } + private Map findAttemptCountMap(Long prjctIdx, Collection sids) { + if (sids == null || sids.isEmpty()) { + return Collections.emptyMap(); + } + + List eventTypes = List.of( + ResultCodeType.CONTACT.getCode(), + ResultCodeType.INTERVIEW.getCode(), + ResultCodeType.SURVEY.getCode() + ); + return listEventHistRepository.findHistoryCountsByEventType(prjctIdx, sids, eventTypes) + .stream() + .collect(Collectors.toMap( + projection -> new ListResultKey(projection.getSid(), projection.getEventTy()), + projection -> projection.getHistoryCount().intValue(), + (left, right) -> right, + LinkedHashMap::new + )); + } + @SuppressWarnings("unchecked") private List createListSearch( Long prjctIdx, @@ -448,11 +505,13 @@ public class ListSearchService { .map(TListEntity::getSid) .collect(Collectors.toCollection(LinkedHashSet::new)); Map> itemMapBySid = createItemMapBySid(prjctIdx, sidSet, null); + Map assignMapBySid = createAssignMapBySid(prjctIdx, sidSet); return listEntities.stream() .map(entity -> new ListSearchRow( entity, - itemMapBySid.getOrDefault(entity.getSid(), Collections.emptyMap()) + itemMapBySid.getOrDefault(entity.getSid(), Collections.emptyMap()), + assignMapBySid.getOrDefault(entity.getSid(), AssignValues.empty()) )) .toList(); } @@ -480,36 +539,25 @@ public class ListSearchService { } private Map createAssignMapBySid(Long prjctIdx, Set sidSet) { - List assignEntities = listAssignRepository.findByPrjctIdxAndSidIn(prjctIdx, sidSet); - if (assignEntities.isEmpty()) { + List assignRows = assignService.findListAssignUserRoles(prjctIdx, sidSet); + List assignCmpnRows = assignService.findListAssignCmpns(prjctIdx, sidSet); + if (assignRows.isEmpty() && assignCmpnRows.isEmpty()) { return Collections.emptyMap(); } - Set assignedUserIds = assignEntities.stream() - .map(TListAssignEntity::getUserId) - .filter(Objects::nonNull) - .filter(userId -> !userId.isBlank()) - .collect(Collectors.toCollection(LinkedHashSet::new)); - Map roleByUserId = userRepository.findByUserIdInAndDelFalse(assignedUserIds).stream() - .collect(Collectors.toMap( - TUserEntity::getUserId, - TUserEntity::getUserRole, - (left, right) -> right, - LinkedHashMap::new - )); - Map result = new LinkedHashMap<>(); - for (TListAssignEntity assignEntity : assignEntities) { - Integer role = roleByUserId.get(assignEntity.getUserId()); - if (role == null) { - continue; - } - - AssignValues assignValues = result.computeIfAbsent(assignEntity.getSid(), ignored -> AssignValues.empty()); - if (role >= ContactConstant.FIELDWORK_USER_ROLE) { - assignValues.fieldworkUserIds().add(assignEntity.getUserId()); - } else if (role >= ContactConstant.OUTSOURCE_USER_ROLE) { - assignValues.outsourceUserIds().add(assignEntity.getUserId()); + for (ListAssignCmpn assignCmpnRow : assignCmpnRows) { + AssignValues assignValues = result.computeIfAbsent(assignCmpnRow.sid(), ignored -> AssignValues.empty()); + assignValues.outsourceUserIds().add(assignCmpnRow.cmpnId()); + } + for (ListAssignUserRole assignRow : assignRows) { + Short role = assignRow.assignRole(); + AssignValues assignValues = result.computeIfAbsent(assignRow.sid(), ignored -> AssignValues.empty()); + // TODO: 현재 고정된 역할 매핑을 추후 테이블 기반 배정 정책 조회로 교체해야 한다. + if (Objects.equals(role, ListHeaderTypeAssign.CONTACT_INTERVIEWER.getCode())) { + assignValues.contactInterviewerIds().add(assignRow.userId()); + } else if (Objects.equals(role, ListHeaderTypeAssign.FIELD_INTERVIEWER.getCode())) { + assignValues.fieldInterviewerIds().add(assignRow.userId()); } } return result; @@ -546,7 +594,8 @@ public class ListSearchService { private record ListSearchRow( TListEntity listEntity, - Map itemList + Map itemList, + AssignValues assignValues ) {} private record ListResultKey( @@ -562,10 +611,11 @@ public class ListSearchService { public record AssignValues( List outsourceUserIds, - List fieldworkUserIds + List contactInterviewerIds, + List fieldInterviewerIds ) { public static AssignValues empty() { - return new AssignValues(new ArrayList<>(), new ArrayList<>()); + return new AssignValues(new ArrayList<>(), new ArrayList<>(), new ArrayList<>()); } } diff --git a/src/main/java/com/kri/contact/server/service/ListUpdateService.java b/src/main/java/com/kri/contact/server/service/ListUpdateService.java index 48b3fd4..353041b 100644 --- a/src/main/java/com/kri/contact/server/service/ListUpdateService.java +++ b/src/main/java/com/kri/contact/server/service/ListUpdateService.java @@ -2,20 +2,32 @@ package com.kri.contact.server.service; import static com.kri.common.feature.util.StringUtil.normalizeBlank; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import com.kri.common.feature.web.BusinessException; import com.kri.contact.server.common.consts.ContactConstant; import com.kri.contact.server.common.enums.ListHeaderGrade; import com.kri.contact.server.common.enums.ListHeaderType; import com.kri.contact.server.common.enums.ListIsUse; +import com.kri.contact.server.common.enums.ResultCodeType; +import com.kri.contact.server.dto.list.ListEventHistFromSurveyDto; +import com.kri.contact.server.dto.list.ListEventHistInternalMetaDto; +import com.kri.contact.server.dto.list.ListEventHistInsertRequestDto; import com.kri.contact.server.dto.list.ListFilterDto; +import com.kri.contact.server.dto.list.ListHeaderDto; import com.kri.contact.server.dto.list.ListUpdateRequestDto; +import com.kri.contact.server.persistence.entity.TListEventHistEntity; import com.kri.contact.server.persistence.entity.TListHeaderEntity; import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport; +import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.ListItemDeleteRow; import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.ListItemInsertRow; import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.ListItemUpdateRow; +import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.ListEventHistInsertRow; import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.ListUpdateRow; import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.UpdateHistRow; +import com.kri.contact.server.persistence.repository.ListEventHistRepository; import com.kri.contact.server.persistence.repository.ListHeaderRepository; +import com.kri.contact.server.persistence.repository.ListRepository; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collection; @@ -35,7 +47,12 @@ public class ListUpdateService { private final ListHeaderRepository listHeaderRepository; private final ListSearchService listSearchService; + private final ListContentItemService listContentItemService; private final ListUpdateJdbcSupport listUpdateJdbcSupport; + private final ListRepository listRepository; + private final ListEventHistRepository listEventHistRepository; + private final ResultCodeService resultCodeService; + private final ObjectMapper objectMapper; @Transactional public int updateList( @@ -46,48 +63,170 @@ public class ListUpdateService { LocalDateTime regDt ) { Map updateContents = request.getUpdateContents(); - if (updateContents == null || updateContents.isEmpty()) { + Map updateResultCodes = request.getUpdateResultCodes(); + if (isEmpty(updateContents) && isEmpty(updateResultCodes)) { return 0; } + validateResultCodes(prjctIdx, updateResultCodes); Set sids = resolveTargetSids(prjctIdx, request.getListFilter()); if (sids.isEmpty()) { return 0; } - Map headerMap = validateHeaders(prjctIdx, updateContents.keySet(), userRole); - List itemHeaderIds = updateContents.keySet().stream() - .filter(headerId -> !isListColumnHeader(headerId)) - .toList(); - int chunkSize = ContactConstant.INSERT_CHUNK_SIZE; int totalUpdatedCount = 0; - List sidList = new ArrayList<>(sids); - for (int i = 0; i < sidList.size(); i += chunkSize) { - List sidChunk = sidList.subList(i, Math.min(sidList.size(), i + chunkSize)); - List targetRows = listSearchService.findUpdateTargetRows( - prjctIdx, - sidChunk, - itemHeaderIds - ); + if (!isEmpty(updateContents)) { + Map headerMap = validateHeaders(prjctIdx, updateContents.keySet(), userRole); + List itemHeaderIds = updateContents.keySet().stream().toList(); - if (targetRows.size() != sidChunk.size()) { - throw BusinessException.badRequest("LIST_NOT_FOUND", "?섏젙 ?€??由ъ뒪?몃? 李얠쓣 ???놁뒿?덈떎."); + List sidList = new ArrayList<>(sids); + for (int i = 0; i < sidList.size(); i += chunkSize) { + List sidChunk = sidList.subList(i, Math.min(sidList.size(), i + chunkSize)); + List targetRows = listSearchService.findUpdateTargetRows( + prjctIdx, + sidChunk, + itemHeaderIds + ); + + if (targetRows.size() != sidChunk.size()) { + throw BusinessException.badRequest("LIST_NOT_FOUND", "수정 대상 리스트를 찾을 수 없습니다."); + } + + totalUpdatedCount += updateChunk( + prjctIdx, + targetRows, + updateContents, + headerMap, + regUser, + regDt + ); } - totalUpdatedCount += updateChunk( - prjctIdx, - targetRows, - updateContents, - headerMap, - regUser, - regDt - ); + List updatedHeaders = headerMap.values().stream() + .map(ListHeaderDto::fromEntity) + .toList(); + + listContentItemService.refreshListContentItem(prjctIdx, updatedHeaders); + } + + if (!isEmpty(updateResultCodes)) { + insertResultCodeHistories(prjctIdx, sids, updateResultCodes, regUser, regDt); } return totalUpdatedCount; } + @Transactional + public void putSurveyHistory( + ListEventHistFromSurveyDto request, + String regUser, + LocalDateTime regDt + ) { + validateEventHistoryTarget(request.getPrjctIdx(), request.getSid()); + + listEventHistRepository.save(TListEventHistEntity.fromSurveyHistory( + request, + writeMetaData(request), + regUser, + regDt + )); + } + + private void validateResultCodes(Long prjctIdx, Map resultCodes) { + if (isEmpty(resultCodes)) { + return; + } + for (Map.Entry entry : resultCodes.entrySet()) { + ResultCodeType resultCodeType = entry.getKey(); + Integer resultCd = entry.getValue(); + if (resultCd == null || resultCd < Short.MIN_VALUE || resultCd > Short.MAX_VALUE) { + throw BusinessException.badRequest("RESULT_CODE_NOT_FOUND", "존재하지 않는 결과 코드입니다."); + } + resultCodeService.validateResultCodeExists( + prjctIdx, + resultCodeType, + resultCd.shortValue() + ); + } + } + + private void insertResultCodeHistories( + Long prjctIdx, + Collection sids, + Map resultCodes, + String regUser, + LocalDateTime regDt + ) { + List rows = new ArrayList<>(); + for (Integer sid : sids) { + for (Map.Entry entry : resultCodes.entrySet()) { + rows.add(new ListEventHistInsertRow( + entry.getKey().getCode(), + prjctIdx, + sid, + entry.getValue(), + null, + "", + regUser, + regDt + )); + } + } + listUpdateJdbcSupport.batchInsertListEventHist(rows, ContactConstant.INSERT_CHUNK_SIZE); + } + + private void validateEventHistoryTarget(Long prjctIdx, Integer sid) { + if (!listRepository.existsByIdPrjctIdxAndIdSid(prjctIdx, sid)) { + throw BusinessException.badRequest("LIST_NOT_FOUND", "이력을 추가할 리스트를 찾을 수 없습니다."); + } + } + + @Transactional + public void putInternalEventHistory( + ListEventHistInsertRequestDto request, + String remoteAddr, + String regUser, + LocalDateTime regDt + ) { + validateEventHistoryTarget(request.getPrjctIdx(), request.getSid()); + validateResultCode(request); + ListEventHistInternalMetaDto meta = ListEventHistInternalMetaDto.withRemoteAddr( + request.getMeta(), + remoteAddr + ); + + listEventHistRepository.save(TListEventHistEntity.fromInternalHistory( + request, + writeMetaData(meta), + regUser, + regDt + )); + } + + private void validateResultCode(ListEventHistInsertRequestDto request) { + if (request.getResultCd() < Short.MIN_VALUE || request.getResultCd() > Short.MAX_VALUE) { + throw BusinessException.badRequest("RESULT_CODE_NOT_FOUND", "존재하지 않는 결과 코드입니다."); + } + resultCodeService.validateResultCodeExists( + request.getPrjctIdx(), + request.getResultCodeType(), + request.getResultCd().shortValue() + ); + } + + private String writeMetaData(ListEventHistFromSurveyDto request) { + return writeMetaData(request.getMeta()); + } + + private String writeMetaData(Object meta) { + try { + return objectMapper.writeValueAsString(meta); + } catch (JsonProcessingException e) { + throw BusinessException.internalError("이력 메타 데이터를 저장할 수 없습니다."); + } + } + private int updateChunk( Long prjctIdx, List targetRows, @@ -100,6 +239,7 @@ public class ListUpdateService { Map listUpdates = new LinkedHashMap<>(); Map itemUpdates = new LinkedHashMap<>(); Map itemInserts = new LinkedHashMap<>(); + Map itemDeletes = new LinkedHashMap<>(); for (ListSearchService.ListUpdateTargetRow targetRow : targetRows) { Short currentIsUse = targetRow.isUse(); @@ -109,9 +249,10 @@ public class ListUpdateService { for (Map.Entry entry : updateContents.entrySet()) { Integer headerId = entry.getKey(); Integer sid = targetRow.sid(); - String newValue = normalizeUpdateValue(headerMap.get(headerId), entry.getValue()); + TListHeaderEntity header = headerMap.get(headerId); + String newValue = normalizeUpdateValue(header, entry.getValue()); - if (ListHeaderType.IS_USE.getCode().intValue() == headerId.intValue()) { + if (Objects.equals(header.getListHderTy(), ListHeaderType.IS_USE.getCode())) { String beforeVal = String.valueOf(currentIsUse); if (!Objects.equals(beforeVal, newValue)) { currentIsUse = Short.valueOf(newValue); @@ -128,7 +269,7 @@ public class ListUpdateService { continue; } - if (ListHeaderType.MEMO.getCode().intValue() == headerId.intValue()) { + if (Objects.equals(header.getListHderTy(), ListHeaderType.MEMO.getCode())) { String beforeVal = defaultString(currentMemo); if (!Objects.equals(beforeVal, newValue)) { currentMemo = newValue; @@ -152,7 +293,13 @@ public class ListUpdateService { } ListItemKey itemKey = new ListItemKey(sid, headerId); - if (currentValue == null) { + if (newValue.isEmpty()) { + if (currentValue != null) { + itemDeletes.put(itemKey, new ListItemDeleteRow(prjctIdx, sid, headerId)); + itemUpdates.remove(itemKey); + itemInserts.remove(itemKey); + } + } else if (currentValue == null) { itemInserts.put(itemKey, new ListItemInsertRow( prjctIdx, sid, @@ -162,6 +309,7 @@ public class ListUpdateService { regDt )); itemUpdates.remove(itemKey); + itemDeletes.remove(itemKey); } else { itemUpdates.put(itemKey, new ListItemUpdateRow( prjctIdx, @@ -171,8 +319,13 @@ public class ListUpdateService { regUser, regDt )); + itemDeletes.remove(itemKey); + } + if (newValue.isEmpty()) { + itemMap.remove(headerId); + } else { + itemMap.put(headerId, newValue); } - itemMap.put(headerId, newValue); updateHistRows.add(new UpdateHistRow(prjctIdx, sid, headerId, beforeVal, newValue, regUser, regDt)); } } @@ -185,6 +338,7 @@ public class ListUpdateService { listUpdateJdbcSupport.batchUpdateList(new ArrayList<>(listUpdates.values()), ContactConstant.INSERT_CHUNK_SIZE); listUpdateJdbcSupport.batchUpdateListItem(new ArrayList<>(itemUpdates.values()), ContactConstant.INSERT_CHUNK_SIZE); listUpdateJdbcSupport.batchInsertListItem(new ArrayList<>(itemInserts.values()), ContactConstant.INSERT_CHUNK_SIZE); + listUpdateJdbcSupport.batchDeleteListItem(new ArrayList<>(itemDeletes.values()), ContactConstant.INSERT_CHUNK_SIZE); return updateHistRows.size(); } @@ -200,24 +354,28 @@ public class ListUpdateService { ) { Map headerMap = listHeaderRepository.findByIdPrjctIdx(prjctIdx).stream() .filter(header -> headerIds.contains(header.getListHderId())) - .collect(LinkedHashMap::new, (map, entity) -> map.put(entity.getListHderId(), entity), Map::putAll); + .collect( + LinkedHashMap::new, + (map, entity) -> + map.put(entity.getListHderId(), entity) + , Map::putAll); if (headerMap.size() != headerIds.size()) { - throw BusinessException.badRequest("HEADER_NOT_FOUND", "?섏젙 ?€???ㅻ뜑瑜?李얠쓣 ???놁뒿?덈떎."); + throw BusinessException.badRequest("HEADER_NOT_FOUND", "수정 대상 헤더를 찾을 수 없습니다."); } for (Integer headerId : headerIds) { TListHeaderEntity header = headerMap.get(headerId); - if (ListHeaderType.SID.getCode().intValue() == headerId.intValue()) { - throw BusinessException.badRequest("SID_UPDATE_NOT_ALLOWED", "SID???섏젙?????놁뒿?덈떎."); + if (Objects.equals(header.getListHderTy(), ListHeaderType.SID.getCode())) { + throw BusinessException.badRequest("SID_UPDATE_NOT_ALLOWED", "SID는 수정할 수 없습니다."); } if (header.getListHderGrad() < ListHeaderGrade.RESERVED.getCode()) { - throw BusinessException.badRequest("HEADER_UPDATE_NOT_ALLOWED", "?섏젙?????녿뒗 ?ㅻ뜑媛€ ?ы븿?섏뼱 ?덉뒿?덈떎."); + throw BusinessException.badRequest("HEADER_UPDATE_NOT_ALLOWED", "수정할 수 없는 헤더가 포함되어 있습니다."); } if (userRole != null && userRole >= ContactConstant.FIELDWORK_USER_ROLE && !Boolean.TRUE.equals(header.getUseIntrvwerEdit())) { - throw BusinessException.badRequest("INTERVIEWER_EDIT_NOT_ALLOWED", "硫댁젒???섏젙 沅뚰븳???녿뒗 ?ㅻ뜑媛€ ?ы븿?섏뼱 ?덉뒿?덈떎."); + throw BusinessException.badRequest("INTERVIEWER_EDIT_NOT_ALLOWED", "면접원 수정 권한이 없는 헤더가 포함되어 있습니다."); } } @@ -237,21 +395,20 @@ public class ListUpdateService { case "0", "X" -> ListIsUse.UNUSABLE.getCode(); case "1", "O" -> ListIsUse.USABLE.getCode(); case "9", "TEST" -> ListIsUse.TEST.getCode(); - default -> throw BusinessException.badRequest("INVALID_IS_USE", "?ъ슜 ?щ???0, 1, 9 ?먮뒗 O, X, TEST留??덉슜?⑸땲??"); + default -> throw BusinessException.badRequest("INVALID_IS_USE", "사용 여부는 0, 1, 9 또는 O, X, TEST만 입력 가능합니다."); }; } - - private boolean isListColumnHeader(Integer headerId) { - return ListHeaderType.IS_USE.getCode().intValue() == headerId.intValue() - || ListHeaderType.MEMO.getCode().intValue() == headerId.intValue(); - } - private String defaultString(String value) { return value == null ? "" : value; } + private boolean isEmpty(Map map) { + return map == null || map.isEmpty(); + } + private record ListItemKey( Integer sid, Integer listHderId ) {} } + diff --git a/src/main/java/com/kri/contact/server/service/ListUploadService.java b/src/main/java/com/kri/contact/server/service/ListUploadService.java index 743c881..80db0eb 100644 --- a/src/main/java/com/kri/contact/server/service/ListUploadService.java +++ b/src/main/java/com/kri/contact/server/service/ListUploadService.java @@ -1,15 +1,13 @@ package com.kri.contact.server.service; import static com.kri.common.feature.util.NumericUtil.parseOnlyInteger; -import static com.kri.common.feature.util.StringUtil.isBasicText; +import static com.kri.common.feature.util.StringUtil.escapeUnsafeText; import static com.kri.common.feature.util.StringUtil.isNullOrBlank; import static com.kri.common.feature.util.StringUtil.normalizeBlank; import static com.kri.common.feature.util.StringUtil.normalizeEmail; import static com.kri.common.feature.util.StringUtil.normalizeOnlyNumber; -import static com.kri.contact.server.common.consts.ContactConstant.ASSIGN_TYPE; import static com.kri.contact.server.common.consts.ContactConstant.DEFAULT_AND_FILE_TYPE; -import static com.kri.contact.server.common.consts.ContactConstant.LIST_TEXT_REGEX; -import static com.kri.contact.server.common.consts.ContactConstant.LOWER_CASE_HEADER_OPTIONS; +import static com.kri.contact.server.common.consts.ContactConstant.UPPER_CASE_HEADER_OPTIONS; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -25,21 +23,35 @@ import com.kri.contact.server.common.enums.ListUploadMode; import com.kri.contact.server.common.util.ExcelUploadResultUtil; import com.kri.contact.server.dto.excel.ExcelUploadResultDto; import com.kri.contact.server.dto.excel.ListUploadErrorDto; +import com.kri.contact.server.dto.list.ListFilterDto; import com.kri.contact.server.dto.list.ListHeaderDto; +import com.kri.contact.server.dto.list.ListUploadFileInfoDto; +import com.kri.contact.server.dto.list.ListUploadHistoryDto; import com.kri.contact.server.dto.list.ListUploadRequestDto; +import com.kri.contact.server.dto.list.ListUpdateRequestDto; +import com.kri.contact.server.persistence.entity.TCmpnEntity; +import com.kri.contact.server.persistence.entity.TListHeaderEntity; +import com.kri.contact.server.persistence.entity.TListItemFileEntity; import com.kri.contact.server.persistence.entity.TListUploadLogEntity; import com.kri.contact.server.persistence.jdbc.ListUploadJdbcSupport; +import com.kri.contact.server.persistence.jdbc.ListUploadJdbcSupport.ListAssignCmpnRowInsert; import com.kri.contact.server.persistence.jdbc.ListUploadJdbcSupport.ListAssignRowInsert; import com.kri.contact.server.persistence.jdbc.ListUploadJdbcSupport.ListItemRowInsert; import com.kri.contact.server.persistence.jdbc.ListUploadJdbcSupport.ListRowInsert; import com.kri.contact.server.persistence.jdbc.ListUploadJdbcSupport.TmpSpecialRow; +import com.kri.contact.server.persistence.repository.CmpnRepository; import com.kri.contact.server.persistence.repository.ListRepository; +import com.kri.contact.server.persistence.repository.ListHeaderRepository; +import com.kri.contact.server.persistence.repository.ListItemFileRepository; import com.kri.contact.server.persistence.repository.ListUploadLogRepository; import com.kri.contact.server.service.file.ListFileService; +import com.kri.contact.server.service.file.ListItemFileService; import java.io.ByteArrayOutputStream; import java.nio.file.Path; +import java.nio.file.Paths; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Collections; import java.util.Comparator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -60,16 +72,102 @@ import org.springframework.web.multipart.MultipartFile; public class ListUploadService { private final ListRepository listRepository; + private final ListHeaderRepository listHeaderRepository; + private final ListItemFileRepository listItemFileRepository; + private final CmpnRepository cmpnRepository; private final ListUploadJdbcSupport listUploadJdbcSupport; private final ListUploadLogRepository listUploadLogRepository; private final ListHeaderService listHeaderService; + private final ListContentItemService listContentItemService; private final ListResetService listResetService; private final ListFileService listFileService; private final AssignService assignService; private final ObjectMapper objectMapper; + private final ListItemFileService listItemFileService; + private final ListUpdateService listUpdateService; + + @Transactional(readOnly = true) + public List findUploadHistories(Long prjctIdx) { + return listUploadLogRepository.findByPrjctIdxAndSuccessTrueOrderByWaveDesc(prjctIdx).stream() + .map(ListUploadHistoryDto::fromEntity) + .toList(); + } + + @Transactional(readOnly = true) + public ListUploadFileInfoDto downloadUploadFile(Long prjctIdx, String listUploadLogId) { + TListUploadLogEntity uploadLog = listUploadLogRepository + .findByListUploadLogIdAndPrjctIdxAndSuccessTrue(listUploadLogId, prjctIdx) + .orElseThrow(() -> BusinessException.notFound( + "LIST_UPLOAD_LOG_NOT_FOUND", + "리스트 업로드 이력을 찾을 수 없습니다." + )); + + return ListUploadFileInfoDto.builder() + .fileName(uploadLog.getFileNm()) + .bytes(listFileService.readListFile(prjctIdx, uploadLog.getFileNm())) + .build(); + } + + @Transactional + public void uploadItemFile( + Long prjctIdx, + Integer sid, + Map files, + Integer userRole, + String regUser, + LocalDateTime regDt + ) { + if (files == null || files.isEmpty()) { + throw BusinessException.badRequest("EMPTY_FILE", "업로드할 파일이 없습니다."); + } + + Map fileHeaderMap = findFileHeaderMap(prjctIdx); + Map updateContents = new LinkedHashMap<>(); + List fileEntities = new ArrayList<>(); + + for (Map.Entry entry : files.entrySet()) { + Integer listHderId = parseListHderId(entry.getKey()); + TListHeaderEntity header = fileHeaderMap.get(listHderId); + if (header == null) { + throw BusinessException.badRequest("INVALID_FILE_HEADER", "파일 업로드 헤더가 아닙니다.") + .with("listHderId", listHderId); + } + + MultipartFile file = entry.getValue(); + if (file == null || file.isEmpty()) { + throw BusinessException.badRequest("EMPTY_FILE", "업로드할 파일이 없습니다.") + .with("listHderId", listHderId); + } + + String originalFileName = Paths.get(defaultFileName(file.getOriginalFilename())).getFileName().toString(); + String storedFileName = buildItemStoredFileName(sid, header.getListHderNm(), originalFileName); + String relativePath = prjctIdx + "/" + sid; + + listItemFileService.saveItemFile(file, relativePath, storedFileName); + fileEntities.add(TListItemFileEntity.create( + prjctIdx, + sid, + listHderId, + storedFileName, + toFileSize(file.getSize()), + relativePath, + regUser, + regDt + )); + updateContents.put(listHderId, storedFileName); + } + + ListUpdateRequestDto updateRequest = new ListUpdateRequestDto(); + updateRequest.setListFilter(ListFilterDto.onlyOneSid(sid)); + updateRequest.setUpdateContents(updateContents); + + listUpdateService.updateList(prjctIdx, updateRequest, userRole, regUser, regDt); + listItemFileRepository.saveAll(fileEntities); + } public byte[] downloadExcelTemplate(Long prjctIdx) { List listHeaderList = listHeaderService.getHeader(prjctIdx).stream() + .map(header -> (ListHeaderDto) header) .sorted(Comparator.comparing(ListHeaderDto::getListHderOrder)) .toList(); @@ -105,7 +203,8 @@ public class ListUploadService { ) { Path listFilePath = listFileService.saveListFile(file, prjctIdx); - List excelHeaders = ExcelMapper.readHeaderStreaming(listFilePath, LOWER_CASE_HEADER_OPTIONS); + List excelHeaders = ExcelMapper.readHeaderStreaming(listFilePath, + UPPER_CASE_HEADER_OPTIONS); List headerErrorList = new ArrayList<>(); List resolvedHeaders = listHeaderService.resolveUploadHeaders( @@ -115,21 +214,31 @@ public class ListUploadService { headerErrorList ); if (!headerErrorList.isEmpty()) { + listFilePath = markUploadFailed(prjctIdx, listFilePath, null); return buildErrorResponse(0, headerErrorList, listFilePath); } - List existingHeaders = listHeaderService.getHeader(prjctIdx); + List existingHeaders = listHeaderService.getHeader(prjctIdx).stream() + .map(ListHeaderDto.class::cast) + .toList(); List existingCommon = existingHeaders.stream() .filter(h -> Objects.equals(h.getListHderGrad(), ListHeaderGrade.COMMON)) .sorted(Comparator.comparing(ListHeaderDto::getListHderOrder)) .toList(); - if (!existingCommon.isEmpty() && !listHeaderService.isEqualHeader(existingHeaders, resolvedHeaders, false)) { + if (!existingCommon.isEmpty() && !listHeaderService.isEqualHeader(existingHeaders, resolvedHeaders, true)) { + listFilePath = markUploadFailed(prjctIdx, listFilePath, null); headerErrorList.add(ListUploadErrorDto.of(1, "헤더", "기존 헤더와 업로드 헤더가 일치하지 않습니다.")); return buildErrorResponse(0, headerErrorList, listFilePath); } - List prjctAssignList = assignService.getPrjctOutsourceAndFieldworkAssign(prjctIdx); + List prjctAssignList = assignService.getPrjctFieldworkAssign(prjctIdx); + List prjctAssignCmpnList = assignService.getPrjctCmpnAssign(prjctIdx); + Map userRoleByUserId = assignService.findActiveUserRoleMap(prjctAssignList); + Map assignRoleByHeaderName = createAssignRoleByHeaderName(resolvedHeaders); + Map> allowedUserRolesByAssignRole = + assignService.findAllowedUserRolesByAssignRole(new LinkedHashSet<>(assignRoleByHeaderName.values())); + Map cmpnByUploadText = createCmpnByUploadText(resolvedHeaders, listFilePath); TListUploadLogEntity uploadLog = createPendingLog( prjctIdx, @@ -145,6 +254,11 @@ public class ListUploadService { request, resolvedHeaders, prjctAssignList, + prjctAssignCmpnList, + userRoleByUserId, + assignRoleByHeaderName, + allowedUserRolesByAssignRole, + cmpnByUploadText, uploadLog.getListUploadLogId() ); @@ -152,6 +266,7 @@ public class ListUploadService { if (!validation.errors().isEmpty()) { listUploadJdbcSupport.deleteTemp(uploadLog.getListUploadLogId()); + listFilePath = markUploadFailed(prjctIdx, listFilePath, uploadLog); return buildErrorResponse(validation.totalCount(), validation.errors(), listFilePath); } @@ -160,6 +275,7 @@ public class ListUploadService { listFilePath, request, resolvedHeaders, + cmpnByUploadText, uploadLog.getListUploadLogId(), validation.uploadedSids(), uploadUser, @@ -169,9 +285,57 @@ public class ListUploadService { markSuccess(uploadLog, validation.totalCount()); listUploadJdbcSupport.deleteTemp(uploadLog.getListUploadLogId()); + //목록형 헤더의 값들 최신화 + listContentItemService.refreshListContentItem(prjctIdx, resolvedHeaders); + return ExcelUploadResultDto.success(validation.totalCount(), validation.totalCount()); } + private Path markUploadFailed(Long prjctIdx, Path listFilePath, TListUploadLogEntity uploadLog) { + Path failedFilePath = listFileService.renameFailedListFile(prjctIdx, listFilePath); + if (uploadLog != null) { + uploadLog.setFileNm(failedFilePath.getFileName().toString()); + listUploadLogRepository.save(uploadLog); + } + return failedFilePath; + } + + private Map createCmpnByUploadText( + List resolvedHeaders, + Path listFilePath + ) { + String outsourceHeaderName = findOptionalHeaderNameByType(resolvedHeaders, ListHeaderType.OUTSOURCE); + if (outsourceHeaderName == null) { + return Collections.emptyMap(); + } + + Set uploadTexts = new LinkedHashSet<>(); + ExcelMapper.readStreaming(listFilePath, UPPER_CASE_HEADER_OPTIONS, (row, rowNo) -> { + String raw = normalizeBlank(row.get(outsourceHeaderName)); + if (raw != null) { + uploadTexts.add(raw); + } + }); + + if (uploadTexts.isEmpty()) { + return Collections.emptyMap(); + } + + Map result = new LinkedHashMap<>(); + List cmpnList = cmpnRepository.findByCmpnIdInOrCmpnAliasIn(uploadTexts, uploadTexts); + for (TCmpnEntity cmpn : cmpnList) { + if (uploadTexts.contains(cmpn.getCmpnId())) { + result.put(cmpn.getCmpnId(), cmpn); + } + } + for (TCmpnEntity cmpn : cmpnList) { + if (cmpn.getCmpnAlias() != null && uploadTexts.contains(cmpn.getCmpnAlias())) { + result.putIfAbsent(cmpn.getCmpnAlias(), cmpn); + } + } + return result; + } + private TListUploadLogEntity createPendingLog( Long prjctIdx, Path listFilePath, @@ -192,6 +356,45 @@ public class ListUploadService { return listUploadLogRepository.save(uploadLog); } + private Map findFileHeaderMap(Long prjctIdx) { + return listHeaderRepository.findByIdPrjctIdx(prjctIdx).stream() + .filter(header -> Objects.equals(header.getListHderTy(), ListHeaderType.FILE.getCode())) + .collect(java.util.stream.Collectors.toMap( + TListHeaderEntity::getListHderId, + header -> header, + (left, right) -> left, + LinkedHashMap::new + )); + } + + private Integer parseListHderId(String value) { + try { + return Integer.valueOf(value); + } catch (NumberFormatException e) { + throw BusinessException.badRequest("INVALID_FILE_HEADER", "파일 업로드 헤더 ID가 올바르지 않습니다.") + .with("listHderId", value); + } + } + + private String buildItemStoredFileName(Integer sid, String headerName, String originalFileName) { + return sanitizeFileName(sid + "_" + headerName + "_" + originalFileName); + } + + private String sanitizeFileName(String fileName) { + return fileName.replace("\\", "_").replace("/", "_"); + } + + private String defaultFileName(String fileName) { + return fileName == null || fileName.isBlank() ? "file" : fileName; + } + + private Integer toFileSize(long fileSize) { + if (fileSize > Integer.MAX_VALUE) { + throw BusinessException.badRequest("FILE_TOO_LARGE", "파일 크기가 너무 큽니다."); + } + return (int) fileSize; + } + private void markValidated(TListUploadLogEntity uploadLog, int totalCount) { uploadLog.setListCnt(totalCount); uploadLog.setSuccess(false); @@ -209,6 +412,7 @@ public class ListUploadService { Path listFilePath, ListUploadRequestDto request, List resolvedHeaders, + Map cmpnByUploadText, String listUploadLogId, Set uploadedSids, String uploadUser, @@ -216,7 +420,7 @@ public class ListUploadService { ) { listHeaderService.upsertHeader(prjctIdx, resolvedHeaders, uploadUser, uploadDt); - if (request.getUploadMode() == ListUploadMode.CHANGE) { + if (request.getUploadMode() == ListUploadMode.RESET_AND_INSERT) { listResetService.resetByFilter( prjctIdx, null, @@ -225,7 +429,7 @@ public class ListUploadService { uploadDt ); } - else if (request.getUploadMode() == ListUploadMode.ADD && !uploadedSids.isEmpty()) { + else if (request.getUploadMode() == ListUploadMode.ADD_AND_CHANGE && !uploadedSids.isEmpty()) { listResetService.resetBySids( prjctIdx, uploadedSids, @@ -238,13 +442,15 @@ public class ListUploadService { String sidHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.SID); String isUseHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.IS_USE); String memoHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.MEMO); - List assginHeaderNames = listHeaderService.findHeaderNamesByTypes(resolvedHeaders, ASSIGN_TYPE); + String outsourceHeaderName = findOptionalHeaderNameByType(resolvedHeaders, ListHeaderType.OUTSOURCE); + Map assignRoleByHeaderName = createAssignRoleByHeaderName(resolvedHeaders); List listRows = new ArrayList<>(); List itemRows = new ArrayList<>(); List assignRows = new ArrayList<>(); + List assignCmpnRows = new ArrayList<>(); - ExcelMapper.readStreaming(listFilePath, LOWER_CASE_HEADER_OPTIONS, (row, rowNo) -> { + ExcelMapper.readStreaming(listFilePath, UPPER_CASE_HEADER_OPTIONS, (row, rowNo) -> { Integer sid = parseOnlyInteger(row.get(sidHeaderName)); short isUse = parseIsUseSafe(row.get(isUseHeaderName)); String memo = normalizeBlank(row.get(memoHeaderName)); @@ -259,13 +465,32 @@ public class ListUploadService { uploadDt )); - for (String assignHeaderName : assginHeaderNames) { + if (outsourceHeaderName != null) { + String rawCmpn = normalizeBlank(row.get(outsourceHeaderName)); + TCmpnEntity cmpn = rawCmpn == null ? null : cmpnByUploadText.get(rawCmpn); + if (cmpn != null && !Boolean.TRUE.equals(cmpn.getOwnCmpn())) { + assignCmpnRows.add(new ListAssignCmpnRowInsert( + prjctIdx, + sid, + cmpn.getCmpnId(), + uploadUser, + uploadDt + )); + } + } + + for (Map.Entry assignEntry : assignRoleByHeaderName.entrySet()) { + String assignHeaderName = assignEntry.getKey(); String userId = normalizeBlank(row.get(assignHeaderName)); + if (userId == null) { + continue; + } assignRows.add(new ListAssignRowInsert( prjctIdx, sid, userId, + assignEntry.getValue(), uploadUser, uploadDt )); @@ -277,12 +502,22 @@ public class ListUploadService { } String raw = normalizeBlank(row.get(header.getListHderNm())); + if (raw == null) { + continue; + } + + if (header.getListHderTy() == ListHeaderType.TEXT) { + raw = escapeUnsafeText(raw); + } if (header.getListHderTy() == ListHeaderType.EMAIL) { raw = normalizeEmail(raw); } else if (header.getListHderTy() == ListHeaderType.TEL_NUM) { raw = normalizeOnlyNumber(raw); } + if (raw == null) { + continue; + } itemRows.add(new ListItemRowInsert( prjctIdx, @@ -306,6 +541,10 @@ public class ListUploadService { listUploadJdbcSupport.batchInsertListAssign(assignRows, ContactConstant.INSERT_CHUNK_SIZE); assignRows.clear(); } + if (assignCmpnRows.size() >= ContactConstant.INSERT_CHUNK_SIZE) { + listUploadJdbcSupport.batchInsertListAssignCmpn(assignCmpnRows, ContactConstant.INSERT_CHUNK_SIZE); + assignCmpnRows.clear(); + } }); if (!listRows.isEmpty()) { @@ -317,6 +556,9 @@ public class ListUploadService { if (!assignRows.isEmpty()) { listUploadJdbcSupport.batchInsertListAssign(assignRows, ContactConstant.INSERT_CHUNK_SIZE); } + if (!assignCmpnRows.isEmpty()) { + listUploadJdbcSupport.batchInsertListAssignCmpn(assignCmpnRows, ContactConstant.INSERT_CHUNK_SIZE); + } } private ValidationSummary validateFile( @@ -325,15 +567,20 @@ public class ListUploadService { ListUploadRequestDto request, List resolvedHeaders, List prjctAssignList, + List prjctAssignCmpnList, + Map userRoleByUserId, + Map assignRoleByHeaderName, + Map> allowedUserRolesByAssignRole, + Map cmpnByUploadText, String listUploadLogId ) { Map headerById = toHeaderById(resolvedHeaders); String sidHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.SID); String isUseHeaderName = listHeaderService.findHeaderNameByType(resolvedHeaders, ListHeaderType.IS_USE); - List assginHeaderNames = listHeaderService.findHeaderNamesByTypes(resolvedHeaders, ASSIGN_TYPE); + String outsourceHeaderName = findOptionalHeaderNameByType(resolvedHeaders, ListHeaderType.OUTSOURCE); + Set prjctAssignUserSet = new LinkedHashSet<>(prjctAssignList); - Set existingSids = listRepository.findSidsByPrjctIdx(prjctIdx); Set uploadedSids = new LinkedHashSet<>(); List errors = new ArrayList<>(); List tempBuffer = new ArrayList<>(); @@ -341,7 +588,7 @@ public class ListUploadService { listUploadJdbcSupport.deleteTemp(listUploadLogId); - ExcelMapper.readStreaming(listFilePath, LOWER_CASE_HEADER_OPTIONS, (row, rowNo) -> { + ExcelMapper.readStreaming(listFilePath, UPPER_CASE_HEADER_OPTIONS, (row, rowNo) -> { totalCount.incrementAndGet(); Integer sid = parseOnlyInteger(row.get(sidHeaderName)); @@ -350,27 +597,52 @@ public class ListUploadService { return; } - Short isUse = parseIsUse(row.get(isUseHeaderName)); + Short isUse = parseIsUseDefaultUsable(row.get(isUseHeaderName)); if (isUse == null) { errors.add(ListUploadErrorDto.of(rowNo, isUseHeaderName, "사용 여부는 O, X, TEST만 허용됩니다.")); } - if (request.getUploadMode() == ListUploadMode.ADD && existingSids.contains(sid)) { - errors.add(ListUploadErrorDto.of(rowNo, sidHeaderName, "이미 존재하는 SID입니다.")); - } - if (!uploadedSids.add(sid)) { errors.add(ListUploadErrorDto.of(rowNo, sidHeaderName, "업로드 파일 내 SID가 중복됩니다.")); } - for (String assignHeaderName : assginHeaderNames) { + if (outsourceHeaderName != null) { + String raw = normalizeBlank(row.get(outsourceHeaderName)); + if (raw != null) { + TCmpnEntity cmpn = cmpnByUploadText.get(raw); + if (cmpn == null) { + errors.add(ListUploadErrorDto.of(rowNo, outsourceHeaderName, "존재하지 않는 회사입니다.")); + } else if (!Boolean.TRUE.equals(cmpn.getOwnCmpn()) + && !prjctAssignCmpnList.contains(cmpn.getCmpnId())) { + errors.add(ListUploadErrorDto.of(rowNo, outsourceHeaderName, "프로젝트에 배정되지 않은 회사입니다.")); + } + } + } + + for (Map.Entry assignEntry : assignRoleByHeaderName.entrySet()) { + String assignHeaderName = assignEntry.getKey(); + Short assignRole = assignEntry.getValue(); String raw = normalizeBlank(row.get(assignHeaderName)); - if (!prjctAssignList.contains(raw)) { + if (raw == null) { + continue; + } + if (!prjctAssignUserSet.contains(raw)) { errors.add(ListUploadErrorDto.of( rowNo, assignHeaderName, "프로젝트에 배정되지 않은 사용자입니다." )); + continue; + } + + Integer userRole = userRoleByUserId.get(raw); + Set allowedUserRoles = allowedUserRolesByAssignRole.getOrDefault(assignRole, Set.of()); + if (userRole == null || !allowedUserRoles.contains(String.valueOf(userRole))) { + errors.add(ListUploadErrorDto.of( + rowNo, + assignHeaderName, + "배정 구분과 사용자 권한이 일치하지 않습니다." + )); } } @@ -384,14 +656,8 @@ public class ListUploadService { continue; } - if (header.getListHderTy() == ListHeaderType.TEXT && !isBasicText(raw, LIST_TEXT_REGEX)) { - errors.add(ListUploadErrorDto.of( - rowNo, - header.getListHderNm(), - "데이터에 들어갈 수 없는 문자열이 있습니다. 한글, 영문, 숫자, 공백, 괄호(), 밑줄(_), 하이픈(-), 대괄호[]만 입력할 수 있습니다." - )); - - continue; + if (header.getListHderTy() == ListHeaderType.TEXT) { + raw = escapeUnsafeText(raw); } if (header.getListHderTy() == ListHeaderType.EMAIL) { @@ -444,9 +710,10 @@ public class ListUploadService { } if (request.isCheckDuplicateEmail() || request.isCheckDuplicatePhone()) { - boolean changeMode = request.getUploadMode() == ListUploadMode.CHANGE; + boolean excludeSameSid = request.getUploadMode() == ListUploadMode.RESET_AND_INSERT + || request.getUploadMode() == ListUploadMode.ADD_AND_CHANGE; for (ListUploadJdbcSupport.DuplicateHit hit : listUploadJdbcSupport.findDbDuplicateRows( - listUploadLogId, prjctIdx, changeMode + listUploadLogId, prjctIdx, excludeSameSid )) { String fieldName = headerById.get(hit.listHderId()).getListHderNm(); errors.add(ListUploadErrorDto.of(hit.rowNo(), fieldName, "DB 내 중복값입니다.")); @@ -456,6 +723,17 @@ public class ListUploadService { return new ValidationSummary(totalCount.get(), uploadedSids, errors); } + private Map createAssignRoleByHeaderName(List headers) { + Map result = new LinkedHashMap<>(); + for (ListHeaderDto header : headers) { + if (header.getListHderTy() == ListHeaderType.CONTACT_INTERVIEWER + || header.getListHderTy() == ListHeaderType.FIELD_INTERVIEWER) { + result.put(header.getListHderNm(), header.getListHderTy().getCode()); + } + } + return result; + } + private ExcelUploadResultDto buildErrorResponse( int totalCount, List errorList, @@ -489,6 +767,14 @@ public class ListUploadService { return map; } + private String findOptionalHeaderNameByType(List headers, ListHeaderType type) { + return headers.stream() + .filter(h -> h.getListHderTy() == type) + .map(ListHeaderDto::getListHderNm) + .findFirst() + .orElse(null); + } + private Short parseIsUse(String raw) { String s = normalizeBlank(raw); s = s == null ? "" : s.toUpperCase(); @@ -502,13 +788,22 @@ public class ListUploadService { } private short parseIsUseSafe(String raw) { - Short code = parseIsUse(raw); + Short code = parseIsUseDefaultUsable(raw); return code == null ? ListIsUse.USABLE.getCode() : code; } + private Short parseIsUseDefaultUsable(String raw) { + String s = normalizeBlank(raw); + if (s == null) { + return ListIsUse.USABLE.getCode(); + } + return parseIsUse(s); + } + private record ValidationSummary( int totalCount, Set uploadedSids, List errors ) {} + } diff --git a/src/main/java/com/kri/contact/server/service/MessageService.java b/src/main/java/com/kri/contact/server/service/MessageService.java new file mode 100644 index 0000000..8e9f4db --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/MessageService.java @@ -0,0 +1,426 @@ +package com.kri.contact.server.service; + +import com.kri.common.feature.web.BusinessException; +import com.kri.common.feature.web.RequestUserContext; +import com.kri.contact.server.common.consts.ContactConstant; +import com.kri.contact.server.common.enums.ChannelType; +import com.kri.contact.server.common.enums.ListHeaderType; +import com.kri.contact.server.common.enums.ListIsUse; +import com.kri.contact.server.common.external.notihub.NotiHubApiClient; +import com.kri.contact.server.common.external.notihub.NotiHubBulkSendCreateRequestDto; +import com.kri.contact.server.common.external.notihub.NotiHubBulkSendResponseDto; +import com.kri.contact.server.common.external.notihub.NotiHubDestInfoDto; +import com.kri.contact.server.common.external.notihub.NotiHubSendRequestBulkDto; +import com.kri.contact.server.common.external.notihub.NotiHubSendRequestSingleDto; +import com.kri.contact.server.common.external.notihub.NotiHubTemplateDto; +import com.kri.contact.server.dto.list.ListHeaderDto; +import com.kri.contact.server.dto.message.MessageBulkSendResponseDto; +import com.kri.contact.server.dto.message.MessageFailedChunkDto; +import com.kri.contact.server.dto.message.MessageSendBulkRequestDto; +import com.kri.contact.server.dto.message.MessageSendSingleRequestDto; +import com.kri.contact.server.dto.project.ProjectInfoDto; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class MessageService { + + private static final String REQUEST_SERVICE = "kri-contact"; + private static final int BULK_SEND_CHUNK_SIZE = 1_000; + private static final Pattern TEMPLATE_PARAM_PATTERN = Pattern.compile("(?:\\[\\$|#\\{)([^\\]}]+)(?:]|})"); + + private final ProjectService projectService; + private final ListHeaderService listHeaderService; + private final ListSearchService listSearchService; + private final NotiHubApiClient notiHubApiClient; + + @Transactional(readOnly = true) + public void sendEmailSingle(Long prjctIdx, MessageSendSingleRequestDto request, RequestUserContext ctx) { + sendSingle(prjctIdx, request, ctx, ChannelType.EMAIL); + } + + @Transactional(readOnly = true) + public void sendSmsSingle(Long prjctIdx, MessageSendSingleRequestDto request, RequestUserContext ctx) { + sendSingle(prjctIdx, request, ctx, ChannelType.SMS); + } + + @Transactional(readOnly = true) + public MessageBulkSendResponseDto sendEmailBulk(Long prjctIdx, MessageSendBulkRequestDto request, RequestUserContext ctx) { + return sendBulk(prjctIdx, request, ctx, ChannelType.EMAIL); + } + + @Transactional(readOnly = true) + public MessageBulkSendResponseDto sendSmsBulk(Long prjctIdx, MessageSendBulkRequestDto request, RequestUserContext ctx) { + return sendBulk(prjctIdx, request, ctx, ChannelType.SMS); + } + + private void sendSingle( + Long prjctIdx, + MessageSendSingleRequestDto request, + RequestUserContext ctx, + ChannelType channelType + ) { + validateDestinationHeaders(request.getDestHeaderIds()); + + MessageContext messageContext = createMessageContext(prjctIdx, request.getTmplatIdx(), request.getDestHeaderIds()); + ListSearchService.DownloadListRow row = listSearchService + .findDownloadListRows(prjctIdx, ListFilterDtoFactory.onlySid(request.getSid()), null) + .stream() + .findFirst() + .orElseThrow(() -> BusinessException.notFound("LIST_NOT_FOUND", "발송 대상 리스트를 찾을 수 없습니다.") + .with("sid", request.getSid())); + + List destInfos = createDestInfos( + List.of(row), + request.getDestHeaderIds(), + request.getDestNameHeaderId(), + messageContext, + channelType, + new LinkedHashSet<>() + ); + if (destInfos.isEmpty()) { + throw BusinessException.badRequest("NO_DESTINATION", "발송 대상 이메일 또는 전화번호가 없습니다."); + } + + for (NotiHubDestInfoDto destInfo : destInfos) { + NotiHubSendRequestSingleDto notiRequest = NotiHubSendRequestSingleDto.builder() + .destInfo(destInfo) + .tmplatIdx(request.getTmplatIdx()) + .reqstSvc(REQUEST_SERVICE) + .prjctCd(messageContext.project().getPrjctCd()) + .resve(request.getResve()) + .sendDt(request.getSendDt()) + .build(); + + if (channelType == ChannelType.EMAIL) { + notiHubApiClient.sendEmailSingle(notiRequest, ctx); + } else { + notiHubApiClient.sendSmsSingle(notiRequest, ctx); + } + } + } + + private MessageBulkSendResponseDto sendBulk( + Long prjctIdx, + MessageSendBulkRequestDto request, + RequestUserContext ctx, + ChannelType channelType + ) { + validateDestinationHeaders(request.getDestHeaderIds()); + + MessageContext messageContext = createMessageContext(prjctIdx, request.getTmplatIdx(), request.getDestHeaderIds()); + List destInfos = createAllDestInfos( + prjctIdx, + request, + messageContext, + channelType + ); + if (destInfos.isEmpty()) { + throw BusinessException.badRequest("NO_DESTINATION", "발송 대상 이메일 또는 전화번호가 없습니다."); + } + + String bulkSendKey = createBulkSendKey(request, ctx, messageContext, destInfos.size(), channelType); + int requestCount = 0; + int acceptCount = 0; + int failCount = 0; + List failedChunks = new ArrayList<>(); + + for (int start = 0, chunkIndex = 1; start < destInfos.size(); start += BULK_SEND_CHUNK_SIZE, chunkIndex++) { + int end = Math.min(start + BULK_SEND_CHUNK_SIZE, destInfos.size()); + List chunk = destInfos.subList(start, end); + try { + NotiHubBulkSendResponseDto response = sendBulkChunk(bulkSendKey, chunk, channelType); + requestCount += defaultInt(response.getRequestCount()); + acceptCount += defaultInt(response.getAcceptCount()); + failCount += defaultInt(response.getFailCount()); + } catch (RuntimeException e) { + requestCount += chunk.size(); + failCount += chunk.size(); + failedChunks.add(MessageFailedChunkDto.builder() + .chunkIndex(chunkIndex) + .from(start + 1) + .to(end) + .targetCount(chunk.size()) + .errorMessage(e.getMessage()) + .build()); + } + } + + return MessageBulkSendResponseDto.builder() + .bulkSendKey(bulkSendKey) + .targetCount(destInfos.size()) + .requestCount(requestCount) + .acceptCount(acceptCount) + .failCount(failCount) + .failedChunks(failedChunks) + .build(); + } + + private List createAllDestInfos( + Long prjctIdx, + MessageSendBulkRequestDto request, + MessageContext messageContext, + ChannelType channelType + ) { + List destInfos = new ArrayList<>(); + Set dedupeKeys = new LinkedHashSet<>(); + Integer lastSid = null; + + while (true) { + List rows = listSearchService.findDownloadListRows( + prjctIdx, + request.getListFilter(), + lastSid + ); + if (rows.isEmpty()) { + break; + } + + destInfos.addAll(createDestInfos( + rows, + request.getDestHeaderIds(), + request.getDestNameHeaderId(), + messageContext, + channelType, + dedupeKeys + )); + lastSid = rows.get(rows.size() - 1).sid(); + } + return destInfos; + } + + private List createDestInfos( + Collection rows, + List destHeaderIds, + Integer destNameHeaderId, + MessageContext messageContext, + ChannelType channelType, + Set dedupeKeys + ) { + List result = new ArrayList<>(); + for (ListSearchService.DownloadListRow row : rows) { + Map msgParam = createMessageParams(row, messageContext.paramHeaderByName()); + String destNm = resolveHeaderValue(row, messageContext.headerById().get(destNameHeaderId)); + + for (Integer destHeaderId : destHeaderIds) { + String rawDestination = row.itemMap().get(destHeaderId); + String destination = normalizeDestination(rawDestination, channelType); + if (destination == null || !dedupeKeys.add(destination)) { + continue; + } + + NotiHubDestInfoDto.NotiHubDestInfoDtoBuilder builder = NotiHubDestInfoDto.builder() + .sid(String.valueOf(row.sid())) + .destNm(destNm) + .msgParam(msgParam); + if (channelType == ChannelType.EMAIL) { + builder.destEml(destination); + } else { + builder.destTel(destination); + } + result.add(builder.build()); + } + } + return result; + } + + private MessageContext createMessageContext(Long prjctIdx, Long tmplatIdx, List destHeaderIds) { + ProjectInfoDto project = projectService.getProject(prjctIdx); + if (project == null) { + throw BusinessException.notFound("PROJECT_NOT_FOUND", "프로젝트를 찾을 수 없습니다.") + .with("prjctIdx", prjctIdx); + } + + NotiHubTemplateDto template = notiHubApiClient.getTemplate(tmplatIdx); + Set templateParams = extractTemplateParams(template.getTmplatBody()); + Map headerById = listHeaderService.getHeader(prjctIdx).stream() + .collect(Collectors.toMap( + ListHeaderDto::getListHderId, + header -> header, + (left, right) -> left, + LinkedHashMap::new + )); + + List missingDestHeaderIds = destHeaderIds.stream() + .filter(headerId -> !headerById.containsKey(headerId)) + .toList(); + if (!missingDestHeaderIds.isEmpty()) { + throw BusinessException.badRequest("DEST_HEADER_NOT_FOUND", "수신처 헤더를 찾을 수 없습니다.") + .with("destHeaderIds", missingDestHeaderIds); + } + + Map paramHeaderByName = headerById.values().stream() + .filter(header -> templateParams.contains(header.getListHderNm())) + .collect(Collectors.toMap( + ListHeaderDto::getListHderNm, + header -> header, + (left, right) -> left, + LinkedHashMap::new + )); + + return new MessageContext(project, template, headerById, paramHeaderByName); + } + + private String createBulkSendKey( + MessageSendBulkRequestDto request, + RequestUserContext ctx, + MessageContext messageContext, + int targetCount, + ChannelType channelType + ) { + NotiHubBulkSendCreateRequestDto notiRequest = NotiHubBulkSendCreateRequestDto.builder() + .reqstCmpn(ctx == null ? null : ctx.getUserCmpn()) + .reqstUser(ctx == null ? null : ctx.getUserId()) + .reqstSvc(REQUEST_SERVICE) + .prjctCd(messageContext.project().getPrjctCd()) + .tmplatIdx(request.getTmplatIdx()) + .resve(request.getResve()) + .sendDt(request.getSendDt()) + .trgtCnt(targetCount) + .build(); + + return channelType == ChannelType.EMAIL + ? notiHubApiClient.createEmailBulk(notiRequest) + : notiHubApiClient.createSmsBulk(notiRequest); + } + + private NotiHubBulkSendResponseDto sendBulkChunk( + String bulkSendKey, + List destInfos, + ChannelType channelType + ) { + NotiHubSendRequestBulkDto request = NotiHubSendRequestBulkDto.builder() + .bulkSendKey(bulkSendKey) + .destInfoList(destInfos) + .build(); + + return channelType == ChannelType.EMAIL + ? notiHubApiClient.sendEmailBulk(request) + : notiHubApiClient.sendSmsBulk(request); + } + + private Map createMessageParams( + ListSearchService.DownloadListRow row, + Map paramHeaderByName + ) { + Map msgParam = new LinkedHashMap<>(); + for (Map.Entry entry : paramHeaderByName.entrySet()) { + String value = resolveHeaderValue(row, entry.getValue()); + if (value != null) { + msgParam.put(entry.getKey(), value); + } + } + return msgParam; + } + + private String resolveHeaderValue(ListSearchService.DownloadListRow row, ListHeaderDto header) { + if (header == null) { + return null; + } + if (Objects.equals(header.getListHderTy(), ListHeaderType.SID)) { + return String.valueOf(row.sid()); + } + if (Objects.equals(header.getListHderTy(), ListHeaderType.IS_USE)) { + return toUseValue(row.isUse()); + } + if (Objects.equals(header.getListHderTy(), ListHeaderType.MEMO)) { + return normalizeBlank(row.memo()); + } + if (Objects.equals(header.getListHderTy(), ListHeaderType.OUTSOURCE)) { + return normalizeBlank(String.join(", ", row.assignValues().outsourceUserIds())); + } + if (Objects.equals(header.getListHderTy(), ListHeaderType.CONTACT_INTERVIEWER)) { + return normalizeBlank(String.join(", ", row.assignValues().contactInterviewerIds())); + } + if (Objects.equals(header.getListHderTy(), ListHeaderType.FIELD_INTERVIEWER)) { + return normalizeBlank(String.join(", ", row.assignValues().fieldInterviewerIds())); + } + return normalizeBlank(row.itemMap().get(header.getListHderId())); + } + + private String toUseValue(Short isUse) { + if (Objects.equals(isUse, ListIsUse.USABLE.getCode())) { + return "O"; + } + if (Objects.equals(isUse, ListIsUse.UNUSABLE.getCode())) { + return "X"; + } + if (Objects.equals(isUse, ListIsUse.TEST.getCode())) { + return "TEST"; + } + return isUse == null ? null : String.valueOf(isUse); + } + + private Set extractTemplateParams(String templateBody) { + if (templateBody == null || templateBody.isBlank()) { + return Set.of(); + } + + Set params = new HashSet<>(); + Matcher matcher = TEMPLATE_PARAM_PATTERN.matcher(templateBody); + while (matcher.find()) { + String param = normalizeBlank(matcher.group(1)); + if (param != null) { + params.add(param); + } + } + return params; + } + + private void validateDestinationHeaders(List destHeaderIds) { + if (destHeaderIds == null || destHeaderIds.isEmpty()) { + throw BusinessException.badRequest("DEST_HEADER_REQUIRED", "수신처 헤더가 필요합니다."); + } + } + + private String normalizeDestination(String value, ChannelType channelType) { + String normalized = normalizeBlank(value); + if (normalized == null) { + return null; + } + if (channelType == ChannelType.SMS) { + String digits = normalized.replaceAll("\\D", ""); + return digits.isBlank() ? null : digits; + } + return normalized; + } + + private String normalizeBlank(String value) { + if (value == null) { + return null; + } + String trimmed = value.trim(); + return trimmed.isEmpty() ? null : trimmed; + } + + private int defaultInt(Integer value) { + return value == null ? 0 : value; + } + + private record MessageContext( + ProjectInfoDto project, + NotiHubTemplateDto template, + Map headerById, + Map paramHeaderByName + ) {} + + private static class ListFilterDtoFactory { + static com.kri.contact.server.dto.list.ListFilterDto onlySid(Integer sid) { + return com.kri.contact.server.dto.list.ListFilterDto.onlyOneSid(sid); + } + } +} diff --git a/src/main/java/com/kri/contact/server/service/ProgressService.java b/src/main/java/com/kri/contact/server/service/ProgressService.java new file mode 100644 index 0000000..6cc7169 --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/ProgressService.java @@ -0,0 +1,224 @@ +package com.kri.contact.server.service; + +import com.kri.common.feature.web.BusinessException; +import com.kri.contact.server.common.enums.ResultCodeType; +import com.kri.contact.server.dto.progress.ProgressDateResponseDto; +import com.kri.contact.server.dto.progress.ProgressSearchRequestDto; +import com.kri.contact.server.dto.progress.ProgressUserResponseDto; +import com.kri.contact.server.persistence.query.ProgressQuerySupport; +import com.kri.contact.server.persistence.query.ProgressQuerySupport.DateProgressRow; +import com.kri.contact.server.persistence.query.ProgressQuerySupport.UserProgressRow; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeParseException; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ProgressService { + + private final ProgressQuerySupport progressQuerySupport; + + public List getUserProgress( + Long prjctIdx, + Short eventTy, + ProgressSearchRequestDto request + ) { + validateEventTy(eventTy); + SearchCondition condition = SearchCondition.from(request); + Map result = new LinkedHashMap<>(); + + for (UserProgressRow row : progressQuerySupport.findUserProgress( + prjctIdx, + eventTy, + condition.userId(), + condition.cmpnId(), + condition.startDt(), + condition.endDt() + )) { + result.computeIfAbsent(row.userId(), ProgressUserAccumulator::new) + .add(row.resultCode(), row.resultCount()); + } + + return result.values().stream() + .map(ProgressUserAccumulator::toDto) + .toList(); + } + + public List getDateProgress( + Long prjctIdx, + Short eventTy, + ProgressSearchRequestDto request + ) { + validateEventTy(eventTy); + SearchCondition condition = SearchCondition.from(request); + return toDateDtos(progressQuerySupport.findDateProgress( + prjctIdx, + eventTy, + condition.userId(), + condition.cmpnId(), + condition.startDt(), + condition.endDt() + )); + } + + public List getLastDateProgress( + Long prjctIdx, + Short eventTy, + ProgressSearchRequestDto request + ) { + validateEventTy(eventTy); + SearchCondition condition = SearchCondition.from(request); + return toDateDtos(progressQuerySupport.findLastDateProgress( + prjctIdx, + eventTy, + condition.userId(), + condition.cmpnId(), + condition.startDt(), + condition.endDt() + )); + } + + private List toDateDtos(List rows) { + Map result = new LinkedHashMap<>(); + for (DateProgressRow row : rows) { + result.computeIfAbsent( + row.contactDate(), + ignored -> new ProgressDateAccumulator(row.contactDate()) + ) + .add(row.startTime(), row.endTime(), row.resultCode(), row.resultCount()); + } + return result.values().stream() + .map(ProgressDateAccumulator::toDto) + .toList(); + } + + private void validateEventTy(Short eventTy) { + if (eventTy == null || + ( + !eventTy.equals(ResultCodeType.CONTACT.getCode()) && + !eventTy.equals(ResultCodeType.INTERVIEW.getCode()) + ) + ) { + throw BusinessException.badRequest( + "INVALID_PROGRESS_EVENT_TYPE", + "eventTy는 "+ResultCodeType.CONTACT.getCode()+" 또는 "+ResultCodeType.INTERVIEW.getCode()+"만 허용됩니다." + ) + .with("eventTy", eventTy); + } + } + + private record SearchCondition( + String userId, + String cmpnId, + LocalDateTime startDt, + LocalDateTime endDt + ) { + static SearchCondition from(ProgressSearchRequestDto request) { + if (request == null) { + return new SearchCondition(null, null, null, null); + } + return new SearchCondition( + normalizeBlank(request.getUserId()), + normalizeBlank(request.getCmpnId()), + parseStartDateTime(request.getStartDt()), + parseEndDateTime(request.getEndDt()) + ); + } + } + + private static String normalizeBlank(String value) { + return value == null || value.isBlank() ? null : value.trim(); + } + + private static LocalDateTime parseStartDateTime(String value) { + String normalized = normalizeBlank(value); + if (normalized == null) { + return null; + } + return parseDateTime(normalized, false); + } + + private static LocalDateTime parseEndDateTime(String value) { + String normalized = normalizeBlank(value); + if (normalized == null) { + return null; + } + return parseDateTime(normalized, true); + } + + private static LocalDateTime parseDateTime(String value, boolean endOfDay) { + try { + return LocalDateTime.parse(value); + } catch (DateTimeParseException ignored) { + try { + LocalDate date = LocalDate.parse(value); + return endOfDay ? date.atTime(LocalTime.MAX) : date.atStartOfDay(); + } catch (DateTimeParseException e) { + throw BusinessException.badRequest("INVALID_PROGRESS_DATE", "날짜 형식이 올바르지 않습니다.") + .with("value", value); + } + } + } + + private static class ProgressUserAccumulator { + private final String userId; + private long totalCount; + private final Map resultCodeCountMap = new LinkedHashMap<>(); + + private ProgressUserAccumulator(String userId) { + this.userId = userId; + } + + private void add(int resultCode, long count) { + totalCount += count; + resultCodeCountMap.merge(resultCode, count, Long::sum); + } + + private ProgressUserResponseDto toDto() { + return ProgressUserResponseDto.builder() + .userId(userId) + .totalCount(totalCount) + .resultCodeCountMap(resultCodeCountMap) + .build(); + } + } + + private static class ProgressDateAccumulator { + private final String contactDate; + private String startTime; + private String endTime; + private long totalCount; + private final Map resultCodeCountMap = new LinkedHashMap<>(); + + private ProgressDateAccumulator(String contactDate) { + this.contactDate = contactDate; + } + + private void add(String rowStartTime, String rowEndTime, int resultCode, long count) { + if (startTime == null || rowStartTime.compareTo(startTime) < 0) { + startTime = rowStartTime; + } + if (endTime == null || rowEndTime.compareTo(endTime) > 0) { + endTime = rowEndTime; + } + totalCount += count; + resultCodeCountMap.merge(resultCode, count, Long::sum); + } + + private ProgressDateResponseDto toDto() { + return ProgressDateResponseDto.builder() + .contactDate(contactDate) + .startTime(startTime) + .endTime(endTime) + .totalCount(totalCount) + .resultCodeCountMap(resultCodeCountMap) + .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 173b56a..7a6ec94 100644 --- a/src/main/java/com/kri/contact/server/service/ProjectService.java +++ b/src/main/java/com/kri/contact/server/service/ProjectService.java @@ -74,7 +74,7 @@ public class ProjectService { } public List getTopProject(int topCount, String keyword, String userId, - Integer userRole) { + String userCmpn, Integer userRole) { Specification spec = ProjectSpecs.keywordLike(keyword) .and(ProjectSpecs.isDelFalse()); @@ -85,7 +85,9 @@ public class ProjectService { } else { spec = spec.and(ProjectSpecs.statusIn(STATUS_0_1)); } - spec = spec.and(ProjectSpecs.assignedToUserAndNotExcluded(userId)); + spec = spec.and(userRole >= ContactConstant.FIELDWORK_USER_ROLE + ? ProjectSpecs.assignedToUserAndNotExcluded(userId) + : ProjectSpecs.assignedToCmpn(userCmpn)); } Pageable pageable = PageRequest.of(0, topCount, Sort.by(Sort.Direction.DESC, "regDt")); @@ -98,7 +100,7 @@ public class ProjectService { } public PageResponseDto searchProject(ProjectSearchRequestDto req, String userId, - Integer userRole) { + String userCmpn, Integer userRole) { Specification spec = ProjectSpecs.keywordLike(req.getPrjctText()) .and(ProjectSpecs.isDelFalse()) @@ -112,7 +114,9 @@ public class ProjectService { } else { spec = spec.and(ProjectSpecs.statusIn(STATUS_0_1)); } - spec = spec.and(ProjectSpecs.assignedToUserAndNotExcluded(userId)); + spec = spec.and(userRole >= ContactConstant.FIELDWORK_USER_ROLE + ? ProjectSpecs.assignedToUserAndNotExcluded(userId) + : ProjectSpecs.assignedToCmpn(userCmpn)); } PageRequestDto pageReq = req.getPageRequest(); @@ -169,7 +173,7 @@ public class ProjectService { entity.updateFrom(req.getProjectInfo(), modUser, modDt); - assignService.upsertPrjctOutsourceAssign(prjctIdx, req.getAssignUserIdList(), modUser, modDt); + assignService.upsertPrjctCmpnAssign(prjctIdx, req.getAssignCmpnIdList(), modUser, modDt); resultCodeService.updateResultCode(prjctIdx, req.getResultCodeList(), modUser, modDt); } diff --git a/src/main/java/com/kri/contact/server/service/ReserveService.java b/src/main/java/com/kri/contact/server/service/ReserveService.java new file mode 100644 index 0000000..3cfa212 --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/ReserveService.java @@ -0,0 +1,58 @@ +package com.kri.contact.server.service; + +import com.kri.common.feature.web.BusinessException; +import com.kri.contact.server.common.consts.ContactConstant; +import com.kri.contact.server.dto.reserve.ListReserveDto; +import com.kri.contact.server.dto.reserve.ListReserveRequestDto; +import com.kri.contact.server.persistence.entity.TListResveEntity; +import com.kri.contact.server.persistence.repository.ListRepository; +import com.kri.contact.server.persistence.repository.ListReserveRepository; +import java.time.LocalDateTime; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ReserveService { + + private final ListRepository listRepository; + private final ListReserveRepository listReserveRepository; + + @Transactional + public ListReserveDto reserve(ListReserveRequestDto request, String regUser, LocalDateTime regDt) { + if (!listRepository.existsByIdPrjctIdxAndIdSid(request.getPrjctIdx(), request.getSid())) { + throw BusinessException.notFound("LIST_NOT_FOUND", "예약 대상 리스트를 찾을 수 없습니다.") + .with("prjctIdx", request.getPrjctIdx()) + .with("sid", request.getSid()); + } + + TListResveEntity entity = new TListResveEntity(); + entity.setPrjctIdx(request.getPrjctIdx()); + entity.setSid(request.getSid()); + entity.setMemo(""); + entity.setCnfirm(false); + entity.setResveDt(request.getResveDt()); + entity.setResveUser(request.getUserId().trim()); + entity.setRegUser(regUser == null || regUser.isBlank() ? ContactConstant.SYSTEM_USER_NAME : regUser); + entity.setRegDt(regDt); + return ListReserveDto.from(listReserveRepository.save(entity)); + } + + @Transactional(readOnly = true) + public List findByUser(Long prjctIdx, String userId) { + return listReserveRepository.findByPrjctIdxAndResveUserOrderByResveDtAscListResveIdxAsc(prjctIdx, userId) + .stream() + .map(ListReserveDto::from) + .toList(); + } + + @Transactional(readOnly = true) + public List findBySid(Long prjctIdx, Integer sid) { + return listReserveRepository.findByPrjctIdxAndSidOrderByResveDtAscListResveIdxAsc(prjctIdx, sid) + .stream() + .map(ListReserveDto::from) + .toList(); + } +} diff --git a/src/main/java/com/kri/contact/server/service/ResultCodeService.java b/src/main/java/com/kri/contact/server/service/ResultCodeService.java index 3b02832..afcbd11 100644 --- a/src/main/java/com/kri/contact/server/service/ResultCodeService.java +++ b/src/main/java/com/kri/contact/server/service/ResultCodeService.java @@ -1,5 +1,6 @@ package com.kri.contact.server.service; +import com.kri.common.feature.web.BusinessException; import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.dto.project.ResultCodeDto; import com.kri.contact.server.persistence.entity.TResultCodeEntity; @@ -7,6 +8,7 @@ import com.kri.contact.server.persistence.repository.ResultCodeRepository; import java.time.LocalDateTime; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,13 +36,30 @@ public class ResultCodeService { .map(ResultCodeDto::from) .toList(); } else { - return resultCodeRepository.findByIdPrjctIdxAndIdResultCdTy(prjctIdx, resultCdTy.getCode()) + return resultCodeRepository.findByIdPrjctIdxAndIdResultCdTy(prjctIdx, resultCdTy) .stream() .map(ResultCodeDto::from) .toList(); } } + public boolean existsResultCode(long prjctIdx, ResultCodeType resultCdTy, Short resultCode) { + if (resultCdTy == null || resultCode == null) { + return false; + } + return resultCodeRepository.existsByIdPrjctIdxAndIdResultCdTyAndIdResultCd( + prjctIdx, + resultCdTy, + resultCode + ); + } + + public void validateResultCodeExists(long prjctIdx, ResultCodeType resultCdTy, Short resultCode) { + if (!existsResultCode(prjctIdx, resultCdTy, resultCode)) { + throw BusinessException.badRequest("RESULT_CODE_NOT_FOUND", "존재하지 않는 결과 코드입니다."); + } + } + @Transactional public void updateResultCode(long prjctIdx, List resultCodeDtoList, String modUser, LocalDateTime modDt) { @@ -58,9 +77,17 @@ public class ResultCodeService { /*************************private************************************/ private void replaceResultCodes(long prjctIdx, ResultCodeType resultCdTy, List dtos, String userId, LocalDateTime modDt) { - resultCodeRepository.deleteByIdPrjctIdxAndIdResultCdTy(prjctIdx, resultCdTy); + Set defaultCodes = resultCodeRepository + .findByIdPrjctIdxAndIdResultCdTyAndDefaultCodeTrue(prjctIdx, resultCdTy) + .stream() + .map(TResultCodeEntity::getResultCd) + .collect(Collectors.toSet()); + + resultCodeRepository.deleteEditableByPrjctIdxAndResultCdTy(prjctIdx, resultCdTy); List entities = dtos.stream() + .filter(dto -> dto.getResultCd() != null) + .filter(dto -> !defaultCodes.contains(dto.getResultCd())) .map(dto -> TResultCodeEntity.fromDto(prjctIdx, resultCdTy, dto, userId, modDt)) .toList(); diff --git a/src/main/java/com/kri/contact/server/service/UserService.java b/src/main/java/com/kri/contact/server/service/UserService.java index 65105cc..bd36df1 100644 --- a/src/main/java/com/kri/contact/server/service/UserService.java +++ b/src/main/java/com/kri/contact/server/service/UserService.java @@ -1,5 +1,7 @@ package com.kri.contact.server.service; +import static com.kri.contact.server.common.consts.ContactConstant.SYSTEM_USER_NAME; + import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.excel.ExcelMapper; import com.kri.common.feature.web.BusinessException; @@ -113,7 +115,7 @@ public class UserService { errorList.add( UserUploadErrorDto.of( rowNumber, - "SYSTEM", + SYSTEM_USER_NAME, ex.getMessage() ) ); @@ -174,7 +176,7 @@ public class UserService { } public List getUserList() { - return userRepository.findByDelFalse().stream() + return userRepository.findByUserRoleGreaterThanEqualAndDelFalse(ContactConstant.OUTSOURCE_USER_ROLE).stream() .map(UserInfoDto::from) .toList(); } diff --git a/src/main/java/com/kri/contact/server/service/SystemEventLogService.java b/src/main/java/com/kri/contact/server/service/common/SystemEventLogService.java similarity index 79% rename from src/main/java/com/kri/contact/server/service/SystemEventLogService.java rename to src/main/java/com/kri/contact/server/service/common/SystemEventLogService.java index 26c9224..3f35557 100644 --- a/src/main/java/com/kri/contact/server/service/SystemEventLogService.java +++ b/src/main/java/com/kri/contact/server/service/common/SystemEventLogService.java @@ -1,9 +1,12 @@ -package com.kri.contact.server.service; +package com.kri.contact.server.service.common; import static com.kri.common.feature.json.JsonUtil.toMap; import com.fasterxml.jackson.databind.ObjectMapper; import com.kri.contact.server.common.enums.SystemEventType; +import com.kri.contact.server.dto.list.ListAssignRequestDto; +import com.kri.contact.server.dto.list.ListAssignResetRequestDto; +import com.kri.contact.server.dto.list.ListFilterDto; import com.kri.contact.server.dto.list.ListHeaderDto; import com.kri.contact.server.dto.list.ListResetRequestDto; import com.kri.contact.server.dto.list.ListUpdateRequestDto; @@ -11,7 +14,7 @@ import com.kri.contact.server.dto.project.ProjectCreateRequestDto; import com.kri.contact.server.dto.project.ProjectMainTemplateUpdateRequestDto; import com.kri.contact.server.dto.project.ProjectUpdateRequestDto; import com.kri.contact.server.dto.user.UserInfoDto; -import com.kri.contact.server.dto.systemlog.UploadUserContentDto; +import com.kri.contact.server.dto.systemlog.UploadContentDto; import com.kri.contact.server.persistence.entity.TSysEventLogEntity; import com.kri.contact.server.persistence.repository.SystemEventLogRepository; import java.time.LocalDateTime; @@ -60,7 +63,7 @@ public class SystemEventLogService { } public void writeUploadUserLog(String regId, LocalDateTime regDt, String clientIp, - UploadUserContentDto content) { + UploadContentDto content) { writeSystemLog(SystemEventType.UPLOAD_USER, "Upload User", null, regId, regDt, clientIp, content); } @@ -120,7 +123,7 @@ public class SystemEventLogService { public void writeAssignUserProject(String regId, LocalDateTime regDt, String clientIp, Long prjctIdx, List assignUserIdList) { writeSystemLog( - SystemEventType.ASSIGN_PROJECT_USER, + SystemEventType.ASSIGN_PROJECT, "Assign Project FW User", prjctIdx, regId, @@ -131,6 +134,20 @@ public class SystemEventLogService { ); } + public void writeAssignCmpnProject(String regId, LocalDateTime regDt, String clientIp, + Long prjctIdx, List assignCmpnIdList) { + writeSystemLog( + SystemEventType.ASSIGN_PROJECT, + "Assign Project Cmpn", + prjctIdx, + regId, + regDt, + clientIp, + "assignCmpnIdList", + assignCmpnIdList + ); + } + public void writeUpsertListHeader(String regId, LocalDateTime regDt, String clientIp, Long prjctIdx, List headerList) { writeSystemLog( @@ -146,7 +163,7 @@ public class SystemEventLogService { } public void writeUploadList(String regId, LocalDateTime regDt, String clientIp, - Long prjctIdx, String uploadFileName){ + Long prjctIdx, UploadContentDto content){ writeSystemLog( SystemEventType.UPLOAD_LIST, "Upload List", @@ -154,8 +171,7 @@ public class SystemEventLogService { regId, regDt, clientIp, - "uploadFileName", - uploadFileName + content ); } @@ -165,12 +181,30 @@ public class SystemEventLogService { "Update List Info", prjctIdx, regId, regDt, clientIp, req); } + public void writeUploadListItemFiles(String regId, LocalDateTime regDt, String clientIp, + Long prjctIdx, Map contents){ + writeSystemLog(SystemEventType.UPLOAD_LIST_ITEM_FILE, + "Upload List Item File", prjctIdx, regId, regDt, clientIp, contents); + } + public void writeResetList(String regId, LocalDateTime regDt, String clientIp, Long prjctIdx, ListResetRequestDto req){ writeSystemLog(SystemEventType.RESET_LIST, "Reset List", prjctIdx, regId, regDt, clientIp, req); } + public void writeAssignList(String regId, LocalDateTime regDt, String clientIp, + Long prjctIdx, ListAssignRequestDto req){ + writeSystemLog(SystemEventType.LIST_ASSIGN, + "Assign List", prjctIdx, regId, regDt, clientIp, req); + } + + public void writeAssignListReset(String regId, LocalDateTime regDt, String clientIp, + Long prjctIdx, ListAssignResetRequestDto req){ + writeSystemLog(SystemEventType.LIST_ASSIGN_RESET, + "Assign List Reset", prjctIdx, regId, regDt, clientIp, req); + } + protected void writeSystemLog( SystemEventType eventType, String title, diff --git a/src/main/java/com/kri/contact/server/service/file/AbstractFileService.java b/src/main/java/com/kri/contact/server/service/file/AbstractFileService.java index 259a4ba..58e695e 100644 --- a/src/main/java/com/kri/contact/server/service/file/AbstractFileService.java +++ b/src/main/java/com/kri/contact/server/service/file/AbstractFileService.java @@ -2,6 +2,7 @@ package com.kri.contact.server.service.file; import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.util.CommonUtil; +import com.kri.common.feature.web.BusinessException; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -63,7 +64,7 @@ public abstract class AbstractFileService { protected String saveFile(Path dir, MultipartFile file) throws IOException { if (file == null || file.isEmpty()) { - throw new IllegalArgumentException("업로드할 파일이 없습니다."); + throw BusinessException.forbidden("EMPTY_FILE","업로드할 파일이 없습니다."); } Path normalizedDir = createDirectories(dir); @@ -80,14 +81,14 @@ public abstract class AbstractFileService { protected void saveFile(Path dir, MultipartFile file, String fileName) throws IOException { if (file == null || file.isEmpty()) { - throw new IllegalArgumentException("업로드할 파일이 없습니다."); + throw BusinessException.forbidden("EMPTY_FILE","업로드할 파일이 없습니다."); } Path normalizedDir = createDirectories(dir); Path target = normalizedDir.resolve(fileName).normalize(); if (!target.startsWith(normalizedDir)) { - throw new IllegalStateException("잘못된 파일 경로입니다."); + throw BusinessException.internalError("WRONG_DIRECTORY","잘못된 파일 경로입니다."); } file.transferTo(target.toFile()); diff --git a/src/main/java/com/kri/contact/server/service/file/ListFileService.java b/src/main/java/com/kri/contact/server/service/file/ListFileService.java index 6355bb2..df61449 100644 --- a/src/main/java/com/kri/contact/server/service/file/ListFileService.java +++ b/src/main/java/com/kri/contact/server/service/file/ListFileService.java @@ -3,8 +3,10 @@ package com.kri.contact.server.service.file; import com.kri.common.feature.web.BusinessException; import com.kri.contact.server.config.FileStorageProperties; import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -32,4 +34,64 @@ public class ListFileService extends AbstractFileService { throw BusinessException.internalError("FAIL_LIST_UPLOAD", e.getMessage()); } } + + public Path renameFailedListFile(Long prjctIdx, Path sourceFilePath) { + String failPrefix = "uploadfail_"; + Path dir = getBaseDir().resolve(prjctIdx.toString()).toAbsolutePath().normalize(); + Path source = sourceFilePath.toAbsolutePath().normalize(); + + if (!source.startsWith(dir)) { + throw BusinessException.badRequest("WRONG_FILE_PATH", "Wrong file path."); + } + + String sourceFileName = source.getFileName().toString(); + if (sourceFileName.startsWith(failPrefix)) { + return source; + } + + Path target = dir.resolve(failPrefix + sourceFileName).toAbsolutePath().normalize(); + if (!target.startsWith(dir)) { + throw BusinessException.badRequest("WRONG_FILE_PATH", "Wrong file path."); + } + + try { + Files.move(source, target, StandardCopyOption.REPLACE_EXISTING); + return target; + } catch (IOException e) { + throw BusinessException.internalError("FAIL_RENAME_LIST_UPLOAD_FILE", e.getMessage()); + } + } + + public byte[] readListFile(Long prjctIdx, String fileName) { + Path dir = getBaseDir().resolve(prjctIdx.toString()).toAbsolutePath().normalize(); + Path filePath = dir.resolve(fileName).toAbsolutePath().normalize(); + + if (!filePath.startsWith(dir)) { + throw BusinessException.badRequest("WRONG_FILE_PATH", "Wrong file path."); + } + if (!Files.exists(filePath)) { + throw BusinessException.notFound("LIST_UPLOAD_FILE_NOT_FOUND", "List upload file not found."); + } + + try { + return Files.readAllBytes(filePath); + } catch (IOException e) { + throw BusinessException.internalError("FAIL_READ_LIST_UPLOAD_FILE", e.getMessage()); + } + } + + public boolean deleteListFileIfExists(Long prjctIdx, String fileName) { + Path dir = getBaseDir().resolve(prjctIdx.toString()).toAbsolutePath().normalize(); + Path filePath = dir.resolve(fileName).toAbsolutePath().normalize(); + + if (!filePath.startsWith(dir)) { + throw BusinessException.badRequest("WRONG_FILE_PATH", "Wrong file path."); + } + + try { + return Files.deleteIfExists(filePath); + } catch (IOException e) { + throw BusinessException.internalError("FAIL_DELETE_LIST_UPLOAD_FILE", e.getMessage()); + } + } } diff --git a/src/main/java/com/kri/contact/server/service/file/ListItemFileService.java b/src/main/java/com/kri/contact/server/service/file/ListItemFileService.java index 4551d49..43a0df0 100644 --- a/src/main/java/com/kri/contact/server/service/file/ListItemFileService.java +++ b/src/main/java/com/kri/contact/server/service/file/ListItemFileService.java @@ -1,10 +1,14 @@ package com.kri.contact.server.service.file; +import com.kri.common.feature.web.BusinessException; import com.kri.contact.server.config.FileStorageProperties; +import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; @Service @RequiredArgsConstructor @@ -14,6 +18,45 @@ public class ListItemFileService extends AbstractFileService { @Override protected Path getBaseDir() { - return Paths.get(properties.getListBaseDir()); + return Paths.get(properties.getListItemBaseDir()).toAbsolutePath().normalize(); } -} \ No newline at end of file + + public byte[] readItemFile(String filePath, String fileName) { + Path baseDir = getBaseDir(); + Path target = resolveItemFilePath(baseDir, filePath, fileName); + + if (!target.startsWith(baseDir)) { + throw BusinessException.badRequest("WRONG_FILE_PATH", "잘못된 파일 경로입니다."); + } + if (!Files.exists(target) || !Files.isRegularFile(target)) { + throw BusinessException.notFound("LIST_ITEM_FILE_NOT_FOUND", "리스트 파일을 찾을 수 없습니다."); + } + + try { + return Files.readAllBytes(target); + } catch (IOException e) { + throw BusinessException.internalError("FAIL_READ_LIST_ITEM_FILE", e.getMessage()); + } + } + + public String saveItemFile(MultipartFile file, String filePath, String fileName) { + Path baseDir = getBaseDir(); + Path dir = baseDir.resolve(filePath).toAbsolutePath().normalize(); + + if (!dir.startsWith(baseDir)) { + throw BusinessException.badRequest("WRONG_FILE_PATH", "잘못된 파일 경로입니다."); + } + + try { + saveFile(dir, file, fileName); + return filePath; + } catch (IOException e) { + throw BusinessException.internalError("FAIL_LIST_ITEM_FILE_UPLOAD", e.getMessage()); + } + } + + private Path resolveItemFilePath(Path baseDir, String filePath, String fileName) { + String relativePath = filePath == null || filePath.isBlank() ? "" : filePath; + return baseDir.resolve(relativePath).resolve(fileName).toAbsolutePath().normalize(); + } +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index bd243c7..237ad02 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,6 +1,7 @@ kri: api-url: intranet-extension: https://intranet-ext.kric.com/api/v1 + noti-hub: https://noti-hub.kric.com/api/v1 spring: datasource: diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 6b187ba..8f0106b 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -2,6 +2,8 @@ kri: api-url: #intranet-extension: "http://localhost:3031/api/v1" intranet-extension: https://intranet-ext.kric.com/api/v1 + #noti-hub: http://localhost:4011/api/v1 + noti-hub: https://noti-hub.kric.com/api/v1 spring: datasource: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index bd243c7..237ad02 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,6 +1,7 @@ kri: api-url: intranet-extension: https://intranet-ext.kric.com/api/v1 + noti-hub: https://noti-hub.kric.com/api/v1 spring: datasource: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 0205274..9a8da93 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -27,6 +27,7 @@ logging: path: ./logs kri: + auth: apikey: key: "4B726963-436F6E74616374-53657276696365-402531213230" @@ -40,6 +41,7 @@ kri: - /swagger-ui/** - /ping - /api/v1/auth/login + - /api/v1/list-hist/survey/** - /contact-senario/** swagger: @@ -48,6 +50,8 @@ kri: description: "KRI 컨택 API" version: "v1.0.0" base-package: "com.kri.contact.server" + allowed-ips: + - 211.254.145.130 file: list-base-dir: ./upload-file/list @@ -59,11 +63,13 @@ kri: temp-expire-hours: 24 temp-cleanup-cron: "0 0 0 * * *" # 매일 00:00(초 분 시 일 월 요일) + list-upload-file: + cleanup-expire-days: 7 + cleanup-cron: "0 30 0 * * SUN" + web: enabled: true # 공통 Web 구성 사용 여부 (기본 true) - webmvc: - enabled: true # 공통 Webmvc 구성 사용 여부 (기본 true) redis: enabled: false # RedisQueueHelper 사용 시 true scheduling: - enabled: true # @Scheduled 사용 시 true \ No newline at end of file + enabled: true # @Scheduled 사용 시 true -- 2.49.0.windows.1 From 5e96dded62df61e2fc227db820b39dba5444ef75 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Thu, 16 Jul 2026 09:12:19 +0900 Subject: [PATCH 9/9] =?UTF-8?q?260716=5F01=5FENH:=20=EB=B3=B8=20=EC=84=9C?= =?UTF-8?q?=EB=B2=84=EC=97=90=EC=84=9C=20=EA=B8=B0=EB=8F=99=20=ED=9B=84=20?= =?UTF-8?q?=EC=A4=91=EA=B0=84=20=ED=85=8C=EC=8A=A4=ED=8A=B8=EB=A5=BC=20?= =?UTF-8?q?=EC=9C=84=ED=95=9C=20=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NotiHubBulkSendCreateRequestDto.java | 11 +++ .../notihub/NotiHubBulkSendResponseDto.java | 7 ++ .../external/notihub/NotiHubDestInfoDto.java | 8 ++ .../notihub/NotiHubSendRequestBulkDto.java | 8 ++ .../notihub/NotiHubSendRequestSingleDto.java | 12 +++ .../external/notihub/NotiHubTemplateDto.java | 8 ++ .../controller/ListHistoryController.java | 1 - .../server/dto/excel/ExcelErrorDto.java | 6 ++ .../dto/excel/ExcelUploadResultDto.java | 1 + .../server/dto/excel/ListUploadErrorDto.java | 3 + .../server/dto/excel/UserUploadDto.java | 1 + .../server/dto/excel/UserUploadErrorDto.java | 3 + .../server/dto/list/ListCallHistDto.java | 25 +++++- .../dto/list/ListCallHistRequestDto.java | 17 +++- .../list/ListEventHistInsertRequestDto.java | 3 + .../list/ListEventHistInternalMetaDto.java | 1 + .../dto/list/ListEventHistSurveyMetaDto.java | 1 + .../server/dto/list/ListEventHistoryDto.java | 13 +++ .../list/ListHeaderWithFilterContentDto.java | 1 + .../server/dto/list/ListUpdateHistoryDto.java | 11 +++ .../message/MessageBulkSendResponseDto.java | 9 ++ .../dto/message/MessageFailedChunkDto.java | 8 ++ .../message/MessageSendBulkRequestDto.java | 9 ++ .../message/MessageSendSingleRequestDto.java | 6 ++ .../dto/progress/ProgressDateResponseDto.java | 5 ++ .../dto/progress/ProgressUserResponseDto.java | 3 + .../server/dto/project/ResultCodeDto.java | 1 + .../server/dto/reserve/ListReserveDto.java | 12 +++ .../dto/reserve/ListReserveRequestDto.java | 7 ++ .../dto/systemlog/UploadContentDto.java | 3 + .../entity/TListCallHistEntity.java | 63 +++++++++++-- .../entity/TListEventHistEntity.java | 1 + .../jdbc/ListResetJdbcSupport.java | 89 +++++++++++++------ .../repository/ListCallHistRepository.java | 3 + .../server/service/ListCallHistService.java | 25 ++---- .../server/service/ListDownloadService.java | 59 ++++++++++-- .../server/service/ListResetService.java | 4 +- .../server/service/ListSearchService.java | 28 +++++- .../server/service/ListUpdateService.java | 87 +++++++++++++++++- .../server/service/MessageService.java | 37 ++++++-- .../contact/server/service/UserService.java | 30 ++++++- .../service/file/ListItemFileService.java | 17 ++++ 42 files changed, 572 insertions(+), 75 deletions(-) diff --git a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubBulkSendCreateRequestDto.java b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubBulkSendCreateRequestDto.java index ab2dfd0..36eef73 100644 --- a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubBulkSendCreateRequestDto.java +++ b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubBulkSendCreateRequestDto.java @@ -1,19 +1,30 @@ package com.kri.contact.server.common.external.notihub; +import io.swagger.v3.oas.annotations.media.Schema; + import java.time.LocalDateTime; import lombok.Builder; import lombok.Getter; @Getter @Builder +@Schema(description = "NotiHubBulkSendCreateRequestDto") public class NotiHubBulkSendCreateRequestDto { + @Schema(description = "reqstCmpn") private String reqstCmpn; + @Schema(description = "reqstUser") private String reqstUser; + @Schema(description = "reqstSvc") private String reqstSvc; + @Schema(description = "prjctCd") private String prjctCd; + @Schema(description = "tmplatIdx") private Long tmplatIdx; + @Schema(description = "resve") private Boolean resve; + @Schema(description = "sendDt") private LocalDateTime sendDt; + @Schema(description = "trgtCnt") private Integer trgtCnt; } diff --git a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubBulkSendResponseDto.java b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubBulkSendResponseDto.java index a2343fc..73960e4 100644 --- a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubBulkSendResponseDto.java +++ b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubBulkSendResponseDto.java @@ -1,5 +1,7 @@ package com.kri.contact.server.common.external.notihub; +import io.swagger.v3.oas.annotations.media.Schema; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Getter; import lombok.NoArgsConstructor; @@ -9,10 +11,15 @@ import lombok.Setter; @Setter @NoArgsConstructor @JsonIgnoreProperties(ignoreUnknown = true) +@Schema(description = "NotiHubBulkSendResponseDto") public class NotiHubBulkSendResponseDto { + @Schema(description = "bulkSendKey") private String bulkSendKey; + @Schema(description = "requestCount") private Integer requestCount; + @Schema(description = "acceptCount") private Integer acceptCount; + @Schema(description = "failCount") private Integer failCount; } diff --git a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubDestInfoDto.java b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubDestInfoDto.java index 3dd9436..4a99033 100644 --- a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubDestInfoDto.java +++ b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubDestInfoDto.java @@ -1,16 +1,24 @@ package com.kri.contact.server.common.external.notihub; +import io.swagger.v3.oas.annotations.media.Schema; + import java.util.Map; import lombok.Builder; import lombok.Getter; @Getter @Builder +@Schema(description = "NotiHubDestInfoDto") public class NotiHubDestInfoDto { + @Schema(description = "sid") private String sid; + @Schema(description = "destEml") private String destEml; + @Schema(description = "destTel") private String destTel; + @Schema(description = "destNm") private String destNm; + @Schema(description = "msgParam") private Map msgParam; } diff --git a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubSendRequestBulkDto.java b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubSendRequestBulkDto.java index 2ab90d4..058aa3b 100644 --- a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubSendRequestBulkDto.java +++ b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubSendRequestBulkDto.java @@ -1,16 +1,24 @@ package com.kri.contact.server.common.external.notihub; +import io.swagger.v3.oas.annotations.media.Schema; + import java.util.List; import lombok.Builder; import lombok.Getter; @Getter @Builder +@Schema(description = "NotiHubSendRequestBulkDto") public class NotiHubSendRequestBulkDto { + @Schema(description = "sendEml") private String sendEml; + @Schema(description = "sendTel") private String sendTel; + @Schema(description = "sendNm") private String sendNm; + @Schema(description = "bulkSendKey") private String bulkSendKey; + @Schema(description = "destInfoList") private List destInfoList; } diff --git a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubSendRequestSingleDto.java b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubSendRequestSingleDto.java index bf5e1d4..ae5db2f 100644 --- a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubSendRequestSingleDto.java +++ b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubSendRequestSingleDto.java @@ -1,20 +1,32 @@ package com.kri.contact.server.common.external.notihub; +import io.swagger.v3.oas.annotations.media.Schema; + import java.time.LocalDateTime; import lombok.Builder; import lombok.Getter; @Getter @Builder +@Schema(description = "NotiHubSendRequestSingleDto") public class NotiHubSendRequestSingleDto { + @Schema(description = "sendEml") private String sendEml; + @Schema(description = "sendTel") private String sendTel; + @Schema(description = "sendNm") private String sendNm; + @Schema(description = "destInfo") private NotiHubDestInfoDto destInfo; + @Schema(description = "tmplatIdx") private Long tmplatIdx; + @Schema(description = "reqstSvc") private String reqstSvc; + @Schema(description = "prjctCd") private String prjctCd; + @Schema(description = "resve") private Boolean resve; + @Schema(description = "sendDt") private LocalDateTime sendDt; } diff --git a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubTemplateDto.java b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubTemplateDto.java index 09f2e06..c42a32a 100644 --- a/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubTemplateDto.java +++ b/src/main/java/com/kri/contact/server/common/external/notihub/NotiHubTemplateDto.java @@ -1,5 +1,7 @@ package com.kri.contact.server.common.external.notihub; +import io.swagger.v3.oas.annotations.media.Schema; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Getter; import lombok.NoArgsConstructor; @@ -9,11 +11,17 @@ import lombok.Setter; @Setter @NoArgsConstructor @JsonIgnoreProperties(ignoreUnknown = true) +@Schema(description = "NotiHubTemplateDto") public class NotiHubTemplateDto { + @Schema(description = "tmplatIdx") private Long tmplatIdx; + @Schema(description = "tmplatBody") private String tmplatBody; + @Schema(description = "sendTel") private String sendTel; + @Schema(description = "sendEml") private String sendEml; + @Schema(description = "sendNm") private String sendNm; } diff --git a/src/main/java/com/kri/contact/server/controller/ListHistoryController.java b/src/main/java/com/kri/contact/server/controller/ListHistoryController.java index bd9e4dd..f43d288 100644 --- a/src/main/java/com/kri/contact/server/controller/ListHistoryController.java +++ b/src/main/java/com/kri/contact/server/controller/ListHistoryController.java @@ -5,7 +5,6 @@ import static com.kri.contact.server.common.util.ExcelResponseBuilder.buildExcel import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.web.BusinessException; import com.kri.common.feature.web.RequestUserContext; -import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.dto.list.ListEventHistDownloadRequestDto; import com.kri.contact.server.dto.list.ListEventHistFromSurveyDto; import com.kri.contact.server.dto.list.ListEventHistInsertRequestDto; diff --git a/src/main/java/com/kri/contact/server/dto/excel/ExcelErrorDto.java b/src/main/java/com/kri/contact/server/dto/excel/ExcelErrorDto.java index 2b56ce9..eeb0cc1 100644 --- a/src/main/java/com/kri/contact/server/dto/excel/ExcelErrorDto.java +++ b/src/main/java/com/kri/contact/server/dto/excel/ExcelErrorDto.java @@ -1,5 +1,7 @@ package com.kri.contact.server.dto.excel; +import io.swagger.v3.oas.annotations.media.Schema; + import com.kri.common.feature.excel.ExcelColumn; import lombok.Getter; import lombok.Setter; @@ -8,15 +10,19 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @Getter @Setter +@Schema(description = "ExcelErrorDto") public class ExcelErrorDto { @ExcelColumn(header = "행 번호", order = 0) + @Schema(description = "rowNumber") private int rowNumber; @ExcelColumn(header = "필드명", order = 1) + @Schema(description = "fieldName") private String fieldName; @ExcelColumn(header = "에러 메시지", order = 2) + @Schema(description = "errorMessage") private String errorMessage; public static ExcelErrorDto of(int rowNumber, String fieldName, String errorMessage) { diff --git a/src/main/java/com/kri/contact/server/dto/excel/ExcelUploadResultDto.java b/src/main/java/com/kri/contact/server/dto/excel/ExcelUploadResultDto.java index afbbd18..e93fa10 100644 --- a/src/main/java/com/kri/contact/server/dto/excel/ExcelUploadResultDto.java +++ b/src/main/java/com/kri/contact/server/dto/excel/ExcelUploadResultDto.java @@ -8,6 +8,7 @@ import lombok.Setter; @Getter @Setter @Builder +@Schema(description = "ExcelUploadResultDto") public class ExcelUploadResultDto { @Schema(description = "전체 읽은 행 수 (헤더 제외)") diff --git a/src/main/java/com/kri/contact/server/dto/excel/ListUploadErrorDto.java b/src/main/java/com/kri/contact/server/dto/excel/ListUploadErrorDto.java index 1c3c048..a7e3da2 100644 --- a/src/main/java/com/kri/contact/server/dto/excel/ListUploadErrorDto.java +++ b/src/main/java/com/kri/contact/server/dto/excel/ListUploadErrorDto.java @@ -1,5 +1,7 @@ package com.kri.contact.server.dto.excel; +import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Getter; import lombok.Setter; import lombok.experimental.SuperBuilder; @@ -7,6 +9,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @Getter @Setter +@Schema(description = "ListUploadErrorDto") public class ListUploadErrorDto extends ExcelErrorDto { public static ListUploadErrorDto of(int rowNumber, String fieldName, String errorMessage) { return ListUploadErrorDto.builder() diff --git a/src/main/java/com/kri/contact/server/dto/excel/UserUploadDto.java b/src/main/java/com/kri/contact/server/dto/excel/UserUploadDto.java index 1a0754e..12a4f26 100644 --- a/src/main/java/com/kri/contact/server/dto/excel/UserUploadDto.java +++ b/src/main/java/com/kri/contact/server/dto/excel/UserUploadDto.java @@ -13,6 +13,7 @@ import lombok.Setter; @Builder @NoArgsConstructor @AllArgsConstructor +@Schema(description = "UserUploadDto") public class UserUploadDto { @ExcelColumn(header = "사용자 ID", order = 0, width = 11) diff --git a/src/main/java/com/kri/contact/server/dto/excel/UserUploadErrorDto.java b/src/main/java/com/kri/contact/server/dto/excel/UserUploadErrorDto.java index 5fad05e..0758c1e 100644 --- a/src/main/java/com/kri/contact/server/dto/excel/UserUploadErrorDto.java +++ b/src/main/java/com/kri/contact/server/dto/excel/UserUploadErrorDto.java @@ -1,5 +1,7 @@ package com.kri.contact.server.dto.excel; +import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Getter; import lombok.Setter; import lombok.experimental.SuperBuilder; @@ -7,6 +9,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @Getter @Setter +@Schema(description = "UserUploadErrorDto") public class UserUploadErrorDto extends ExcelErrorDto { public static UserUploadErrorDto of(int rowNumber, String fieldName, String errorMessage) { diff --git a/src/main/java/com/kri/contact/server/dto/list/ListCallHistDto.java b/src/main/java/com/kri/contact/server/dto/list/ListCallHistDto.java index cc50e62..ec1c11a 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListCallHistDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListCallHistDto.java @@ -1,32 +1,54 @@ package com.kri.contact.server.dto.list; +import io.swagger.v3.oas.annotations.media.Schema; + import com.kri.contact.server.persistence.entity.TListCallHistEntity; -import java.time.Instant; import java.time.LocalDateTime; import lombok.Builder; import lombok.Getter; @Getter @Builder +@Schema(description = "ListCallHistDto") public class ListCallHistDto { + @Schema(description = "listCallHistIdx") private Long listCallHistIdx; + @Schema(description = "prjctIdx") private Long prjctIdx; + @Schema(description = "sid") private Integer sid; + @Schema(description = "listHderId") private Integer listHderId; + @Schema(description = "destNum") private String destNum; + @Schema(description = "agentNum") private String agentNum; + @Schema(description = "aniNum") private String aniNum; + @Schema(description = "agentSessionId") private String agentSessionId; + @Schema(description = "destSessionId") private String destSessionId; + @Schema(description = "callTy") private String callTy; + @Schema(description = "startDt") private LocalDateTime startDt; + @Schema(description = "endDt") + private LocalDateTime endDt; + @Schema(description = "totalTime") private Integer totalTime; + @Schema(description = "talkTime") private Integer talkTime; + @Schema(description = "mediaServerId") private Integer mediaServerId; + @Schema(description = "mediaServerName") private String mediaServerName; + @Schema(description = "recordFileName") private String recordFileName; + @Schema(description = "regUser") private String regUser; + @Schema(description = "regDt") private LocalDateTime regDt; public static ListCallHistDto from(TListCallHistEntity entity) { @@ -42,6 +64,7 @@ public class ListCallHistDto { .destSessionId(entity.getDestSessionId()) .callTy(entity.getCallTy()) .startDt(entity.getStartDt()) + .endDt(entity.getEndDt()) .totalTime(entity.getTotalTime()) .talkTime(entity.getTalkTime()) .mediaServerId(entity.getMediaServerId()) diff --git a/src/main/java/com/kri/contact/server/dto/list/ListCallHistRequestDto.java b/src/main/java/com/kri/contact/server/dto/list/ListCallHistRequestDto.java index 6a31565..9dd541f 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListCallHistRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListCallHistRequestDto.java @@ -1,5 +1,7 @@ package com.kri.contact.server.dto.list; +import io.swagger.v3.oas.annotations.media.Schema; + import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; @@ -12,52 +14,65 @@ import lombok.Setter; @Getter @Setter @NoArgsConstructor +@Schema(description = "ListCallHistRequestDto") public class ListCallHistRequestDto { @NotNull + @Schema(description = "listHderId") private Integer listHderId; @NotBlank @Size(max = 64) + @Schema(description = "destNum") private String destNum; @NotBlank @Size(max = 64) + @Schema(description = "agentNum") private String agentNum; @NotBlank @Size(max = 64) + @Schema(description = "aniNum") private String aniNum; @NotBlank @Size(max = 64) + @Schema(description = "agentSessionId") private String agentSessionId; @NotBlank @Size(max = 64) + @Schema(description = "destSessionId") private String destSessionId; @NotBlank @Size(max = 64) + @Schema(description = "callTy") private String callTy; @NotNull + @Schema(description = "startDt") private LocalDateTime startDt; @NotNull + @Schema(description = "totalTime") private Integer totalTime; @NotNull + @Schema(description = "talkTime") private Integer talkTime; @NotNull + @Schema(description = "mediaServerId") private Integer mediaServerId; @NotBlank @Size(max = 64) + @Schema(description = "mediaServerName") private String mediaServerName; - @NotBlank @Size(max = 256) + @Schema(description = "recordFileName") private String recordFileName; } diff --git a/src/main/java/com/kri/contact/server/dto/list/ListEventHistInsertRequestDto.java b/src/main/java/com/kri/contact/server/dto/list/ListEventHistInsertRequestDto.java index 3c7cf77..8f7d97f 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListEventHistInsertRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListEventHistInsertRequestDto.java @@ -31,6 +31,9 @@ public class ListEventHistInsertRequestDto { @Schema(description = "결과 코드") private Integer resultCd; + @Schema(description = "전화 이력 id") + private Long listCallHistIdx; + @Valid @Schema(description = "메타 데이터") private ListEventHistInternalMetaDto meta; diff --git a/src/main/java/com/kri/contact/server/dto/list/ListEventHistInternalMetaDto.java b/src/main/java/com/kri/contact/server/dto/list/ListEventHistInternalMetaDto.java index c488c16..6d88897 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListEventHistInternalMetaDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListEventHistInternalMetaDto.java @@ -10,6 +10,7 @@ import lombok.Setter; @Getter @Setter @NoArgsConstructor +@Schema(description = "ListEventHistInternalMetaDto") public class ListEventHistInternalMetaDto { @Schema(description = "GPS 위도") diff --git a/src/main/java/com/kri/contact/server/dto/list/ListEventHistSurveyMetaDto.java b/src/main/java/com/kri/contact/server/dto/list/ListEventHistSurveyMetaDto.java index b1f89b3..fe773af 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListEventHistSurveyMetaDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListEventHistSurveyMetaDto.java @@ -11,6 +11,7 @@ import lombok.Setter; @Getter @Setter @NoArgsConstructor +@Schema(description = "ListEventHistSurveyMetaDto") public class ListEventHistSurveyMetaDto { @NotNull @Schema(description = "진입 유형") diff --git a/src/main/java/com/kri/contact/server/dto/list/ListEventHistoryDto.java b/src/main/java/com/kri/contact/server/dto/list/ListEventHistoryDto.java index f2735f3..79758b1 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListEventHistoryDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListEventHistoryDto.java @@ -1,5 +1,7 @@ package com.kri.contact.server.dto.list; +import io.swagger.v3.oas.annotations.media.Schema; + import com.kri.contact.server.persistence.entity.TListEventHistEntity; import java.time.LocalDateTime; import lombok.Builder; @@ -7,17 +9,28 @@ import lombok.Getter; @Getter @Builder +@Schema(description = "ListEventHistoryDto") public class ListEventHistoryDto { + @Schema(description = "listEventHistIdx") private Long listEventHistIdx; + @Schema(description = "eventTy") private Short eventTy; + @Schema(description = "prjctIdx") private Long prjctIdx; + @Schema(description = "sid") private Integer sid; + @Schema(description = "resultCd") private Integer resultCd; + @Schema(description = "metaData") private String metaData; + @Schema(description = "listCallHistIdx") private Long listCallHistIdx; + @Schema(description = "memo") private String memo; + @Schema(description = "regUser") private String regUser; + @Schema(description = "regDt") private LocalDateTime regDt; public static ListEventHistoryDto from(TListEventHistEntity entity) { diff --git a/src/main/java/com/kri/contact/server/dto/list/ListHeaderWithFilterContentDto.java b/src/main/java/com/kri/contact/server/dto/list/ListHeaderWithFilterContentDto.java index 4136089..f869b62 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListHeaderWithFilterContentDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListHeaderWithFilterContentDto.java @@ -18,6 +18,7 @@ import lombok.experimental.SuperBuilder; @AllArgsConstructor @Schema(description = "리스트 헤더 (필터 목록 포함)") public class ListHeaderWithFilterContentDto extends ListHeaderDto { + @Schema(description = "filterContents") private List filterContents; public static ListHeaderWithFilterContentDto fromEntity( diff --git a/src/main/java/com/kri/contact/server/dto/list/ListUpdateHistoryDto.java b/src/main/java/com/kri/contact/server/dto/list/ListUpdateHistoryDto.java index 44659c7..25f8668 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListUpdateHistoryDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListUpdateHistoryDto.java @@ -1,5 +1,7 @@ package com.kri.contact.server.dto.list; +import io.swagger.v3.oas.annotations.media.Schema; + import com.kri.contact.server.persistence.entity.TListUpdateHistEntity; import java.time.LocalDateTime; import lombok.Builder; @@ -7,15 +9,24 @@ import lombok.Getter; @Getter @Builder +@Schema(description = "ListUpdateHistoryDto") public class ListUpdateHistoryDto { + @Schema(description = "listUpdateHistIdx") private Long listUpdateHistIdx; + @Schema(description = "prjctIdx") private Long prjctIdx; + @Schema(description = "sid") private Integer sid; + @Schema(description = "listHderId") private Integer listHderId; + @Schema(description = "beforeVal") private String beforeVal; + @Schema(description = "afterVal") private String afterVal; + @Schema(description = "regUser") private String regUser; + @Schema(description = "regDt") private LocalDateTime regDt; public static ListUpdateHistoryDto from(TListUpdateHistEntity entity) { diff --git a/src/main/java/com/kri/contact/server/dto/message/MessageBulkSendResponseDto.java b/src/main/java/com/kri/contact/server/dto/message/MessageBulkSendResponseDto.java index e41cc12..1e459bf 100644 --- a/src/main/java/com/kri/contact/server/dto/message/MessageBulkSendResponseDto.java +++ b/src/main/java/com/kri/contact/server/dto/message/MessageBulkSendResponseDto.java @@ -1,5 +1,7 @@ package com.kri.contact.server.dto.message; +import io.swagger.v3.oas.annotations.media.Schema; + import java.util.ArrayList; import java.util.List; import lombok.Builder; @@ -7,13 +9,20 @@ import lombok.Getter; @Getter @Builder +@Schema(description = "MessageBulkSendResponseDto") public class MessageBulkSendResponseDto { + @Schema(description = "bulkSendKey") private String bulkSendKey; + @Schema(description = "targetCount") private int targetCount; + @Schema(description = "requestCount") private int requestCount; + @Schema(description = "acceptCount") private int acceptCount; + @Schema(description = "failCount") private int failCount; @Builder.Default + @Schema(description = "failedChunks") private List failedChunks = new ArrayList<>(); } diff --git a/src/main/java/com/kri/contact/server/dto/message/MessageFailedChunkDto.java b/src/main/java/com/kri/contact/server/dto/message/MessageFailedChunkDto.java index 34b951a..e553f06 100644 --- a/src/main/java/com/kri/contact/server/dto/message/MessageFailedChunkDto.java +++ b/src/main/java/com/kri/contact/server/dto/message/MessageFailedChunkDto.java @@ -1,15 +1,23 @@ package com.kri.contact.server.dto.message; +import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Builder; import lombok.Getter; @Getter @Builder +@Schema(description = "MessageFailedChunkDto") public class MessageFailedChunkDto { + @Schema(description = "chunkIndex") private int chunkIndex; + @Schema(description = "from") private int from; + @Schema(description = "to") private int to; + @Schema(description = "targetCount") private int targetCount; + @Schema(description = "errorMessage") private String errorMessage; } diff --git a/src/main/java/com/kri/contact/server/dto/message/MessageSendBulkRequestDto.java b/src/main/java/com/kri/contact/server/dto/message/MessageSendBulkRequestDto.java index ac39d17..33a17d4 100644 --- a/src/main/java/com/kri/contact/server/dto/message/MessageSendBulkRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/message/MessageSendBulkRequestDto.java @@ -18,18 +18,27 @@ import lombok.Setter; public class MessageSendBulkRequestDto { @NotNull + @Schema(description = "템플릿 고유 번호", requiredMode = Schema.RequiredMode.REQUIRED) private Long tmplatIdx; @NotNull + @Schema(description = "예약 발송 여부", requiredMode = Schema.RequiredMode.REQUIRED) private Boolean resve; + @Schema(description = "예약 발송 일시") private LocalDateTime sendDt; @Valid + @Schema(description = "리스트 필터") private ListFilterDto listFilter; @NotEmpty + @Schema(description = "수신처로 사용할 리스트 헤더 ID 목록", requiredMode = Schema.RequiredMode.REQUIRED) private List destHeaderIds; + @Schema(description = "수신자 이름으로 사용할 리스트 헤더 ID") private Integer destNameHeaderId; + + @Schema(description = "수신처 중복 제거 여부", defaultValue = "false") + private Boolean dedupe = false; } diff --git a/src/main/java/com/kri/contact/server/dto/message/MessageSendSingleRequestDto.java b/src/main/java/com/kri/contact/server/dto/message/MessageSendSingleRequestDto.java index 71970ab..df9b629 100644 --- a/src/main/java/com/kri/contact/server/dto/message/MessageSendSingleRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/message/MessageSendSingleRequestDto.java @@ -16,18 +16,24 @@ import lombok.Setter; public class MessageSendSingleRequestDto { @NotNull + @Schema(description = "tmplatIdx") private Long tmplatIdx; @NotNull + @Schema(description = "resve") private Boolean resve; + @Schema(description = "sendDt") private LocalDateTime sendDt; @NotNull + @Schema(description = "sid") private Integer sid; @NotEmpty + @Schema(description = "destHeaderIds") private List destHeaderIds; + @Schema(description = "destNameHeaderId") private Integer destNameHeaderId; } diff --git a/src/main/java/com/kri/contact/server/dto/progress/ProgressDateResponseDto.java b/src/main/java/com/kri/contact/server/dto/progress/ProgressDateResponseDto.java index 61b2e2f..e5983a2 100644 --- a/src/main/java/com/kri/contact/server/dto/progress/ProgressDateResponseDto.java +++ b/src/main/java/com/kri/contact/server/dto/progress/ProgressDateResponseDto.java @@ -11,14 +11,19 @@ import lombok.Getter; @Schema(description = "날짜별 진행 현황") public class ProgressDateResponseDto { + @Schema(description = "contactDate") private String contactDate; + @Schema(description = "startTime") private String startTime; + @Schema(description = "endTime") private String endTime; + @Schema(description = "totalCount") private long totalCount; @Builder.Default + @Schema(description = "resultCodeCountMap") private Map resultCodeCountMap = new LinkedHashMap<>(); } diff --git a/src/main/java/com/kri/contact/server/dto/progress/ProgressUserResponseDto.java b/src/main/java/com/kri/contact/server/dto/progress/ProgressUserResponseDto.java index 259aeaa..fc85a6b 100644 --- a/src/main/java/com/kri/contact/server/dto/progress/ProgressUserResponseDto.java +++ b/src/main/java/com/kri/contact/server/dto/progress/ProgressUserResponseDto.java @@ -11,10 +11,13 @@ import lombok.Getter; @Schema(description = "사용자별 진행 현황") public class ProgressUserResponseDto { + @Schema(description = "userId") private String userId; + @Schema(description = "totalCount") private long totalCount; @Builder.Default + @Schema(description = "resultCodeCountMap") private Map resultCodeCountMap = new LinkedHashMap<>(); } diff --git a/src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java b/src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java index f3d7fce..8f17c5f 100644 --- a/src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java @@ -29,6 +29,7 @@ public class ResultCodeDto { @Schema(description = "결과 코드 라벨") private String resultCdLbl; + @Schema(description = "isDefault") private Boolean isDefault; public static ResultCodeDto from(TResultCodeEntity entity) { diff --git a/src/main/java/com/kri/contact/server/dto/reserve/ListReserveDto.java b/src/main/java/com/kri/contact/server/dto/reserve/ListReserveDto.java index 824d6b8..0d9b316 100644 --- a/src/main/java/com/kri/contact/server/dto/reserve/ListReserveDto.java +++ b/src/main/java/com/kri/contact/server/dto/reserve/ListReserveDto.java @@ -1,5 +1,7 @@ package com.kri.contact.server.dto.reserve; +import io.swagger.v3.oas.annotations.media.Schema; + import com.kri.contact.server.persistence.entity.TListResveEntity; import java.time.LocalDateTime; import lombok.Builder; @@ -7,16 +9,26 @@ import lombok.Getter; @Getter @Builder +@Schema(description = "ListReserveDto") public class ListReserveDto { + @Schema(description = "listResveIdx") private Long listResveIdx; + @Schema(description = "prjctIdx") private Long prjctIdx; + @Schema(description = "sid") private Integer sid; + @Schema(description = "memo") private String memo; + @Schema(description = "cnfirm") private Boolean cnfirm; + @Schema(description = "resveDt") private LocalDateTime resveDt; + @Schema(description = "resveUser") private String resveUser; + @Schema(description = "regUser") private String regUser; + @Schema(description = "regDt") private LocalDateTime regDt; public static ListReserveDto from(TListResveEntity entity) { diff --git a/src/main/java/com/kri/contact/server/dto/reserve/ListReserveRequestDto.java b/src/main/java/com/kri/contact/server/dto/reserve/ListReserveRequestDto.java index 3a11557..20c8da4 100644 --- a/src/main/java/com/kri/contact/server/dto/reserve/ListReserveRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/reserve/ListReserveRequestDto.java @@ -1,5 +1,7 @@ package com.kri.contact.server.dto.reserve; +import io.swagger.v3.oas.annotations.media.Schema; + import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import java.time.LocalDateTime; @@ -10,17 +12,22 @@ import lombok.Setter; @Getter @Setter @NoArgsConstructor +@Schema(description = "ListReserveRequestDto") public class ListReserveRequestDto { @NotNull + @Schema(description = "prjctIdx") private Long prjctIdx; @NotNull + @Schema(description = "sid") private Integer sid; @NotBlank + @Schema(description = "userId") private String userId; @NotNull + @Schema(description = "resveDt") private LocalDateTime resveDt; } diff --git a/src/main/java/com/kri/contact/server/dto/systemlog/UploadContentDto.java b/src/main/java/com/kri/contact/server/dto/systemlog/UploadContentDto.java index bdb6aba..b45bbd0 100644 --- a/src/main/java/com/kri/contact/server/dto/systemlog/UploadContentDto.java +++ b/src/main/java/com/kri/contact/server/dto/systemlog/UploadContentDto.java @@ -1,5 +1,7 @@ package com.kri.contact.server.dto.systemlog; +import io.swagger.v3.oas.annotations.media.Schema; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -12,6 +14,7 @@ import org.springframework.web.multipart.MultipartFile; @Builder @NoArgsConstructor @AllArgsConstructor +@Schema(description = "UploadContentDto") public class UploadContentDto { String fileName; String fileType; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java index 0f662ab..fca2159 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java @@ -1,5 +1,6 @@ package com.kri.contact.server.persistence.entity; +import com.kri.contact.server.dto.list.ListCallHistRequestDto; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -8,21 +9,26 @@ import jakarta.persistence.Id; import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import java.time.Instant; import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.ColumnDefault; +@Builder @Getter @Setter @Entity +@AllArgsConstructor +@NoArgsConstructor @Table(name = "t_list_call_hist") public class TListCallHistEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "list_call_hist_idx", nullable = false, insertable = false) + @Column(name = "list_call_hist_idx", nullable = false, insertable = false, updatable = false) private Long id; @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") @@ -53,12 +59,12 @@ public class TListCallHistEntity { @Size(max = 64) @NotNull - @Column(name = "agent_session_id", nullable = false, length = 64) + @Column(name = "agent_session_id", nullable = false, length = 64, updatable = false) private String agentSessionId; @Size(max = 64) @NotNull - @Column(name = "dest_session_id", nullable = false, length = 64) + @Column(name = "dest_session_id", nullable = false, length = 64, updatable = false) private String destSessionId; @Size(max = 64) @@ -70,6 +76,9 @@ public class TListCallHistEntity { @Column(name = "start_dt", nullable = false) private LocalDateTime startDt; + @Column(name = "end_dt") + private LocalDateTime endDt; + @NotNull @Column(name = "total_time", nullable = false) private Integer totalTime; @@ -88,19 +97,55 @@ public class TListCallHistEntity { private String mediaServerName; @Size(max = 256) - @NotNull - @Column(name = "record_file_name", nullable = false, length = 256) + @Column(name = "record_file_name", length = 256) private String recordFileName; @Size(max = 32) @NotNull - @Column(name = "reg_user", nullable = false, length = 32) + @Column(name = "reg_user", nullable = false, length = 32, updatable = false) private String regUser; @NotNull @ColumnDefault("CURRENT_TIMESTAMP") - @Column(name = "reg_dt", nullable = false) + @Column(name = "reg_dt", nullable = false, updatable = false) private LocalDateTime regDt; + public static TListCallHistEntity from( + Long prjctIdx, + Integer sid, + ListCallHistRequestDto request, + String regUser, + LocalDateTime regDt + ) { + return TListCallHistEntity.builder() + .prjctIdx(prjctIdx) + .sid(sid) + .listHderId(request.getListHderId()) + .destNum(request.getDestNum()) + .agentNum(request.getAgentNum()) + .aniNum(request.getAniNum()) + .agentSessionId(request.getAgentSessionId()) + .destSessionId(request.getDestSessionId()) + .callTy(request.getCallTy()) + .startDt(request.getStartDt()) + .endDt(regDt) + .totalTime(request.getTotalTime()) + .talkTime(request.getTalkTime()) + .mediaServerId(request.getMediaServerId()) + .mediaServerName(request.getMediaServerName()) + .recordFileName(request.getRecordFileName()) + .regUser(regUser) + .regDt(regDt) + .build(); + } -} \ No newline at end of file + public void updateCallResult(ListCallHistRequestDto request, LocalDateTime endDt) { + this.endDt = endDt; + this.totalTime = request.getTotalTime(); + this.talkTime = request.getTalkTime(); + this.mediaServerId = request.getMediaServerId(); + this.mediaServerName = request.getMediaServerName(); + this.recordFileName = request.getRecordFileName(); + } + +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListEventHistEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListEventHistEntity.java index aea9099..c26eeb1 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListEventHistEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListEventHistEntity.java @@ -101,6 +101,7 @@ public class TListEventHistEntity { .prjctIdx(request.getPrjctIdx()) .sid(request.getSid()) .resultCd(request.getResultCd()) + .listCallHistIdx(request.getListCallHistIdx()) .metaData(metaData) .memo(request.getMemo()) .regUser(regUser) diff --git a/src/main/java/com/kri/contact/server/persistence/jdbc/ListResetJdbcSupport.java b/src/main/java/com/kri/contact/server/persistence/jdbc/ListResetJdbcSupport.java index bf35ee4..7395487 100644 --- a/src/main/java/com/kri/contact/server/persistence/jdbc/ListResetJdbcSupport.java +++ b/src/main/java/com/kri/contact/server/persistence/jdbc/ListResetJdbcSupport.java @@ -13,23 +13,30 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ListResetJdbcSupport { + private static final String TEMP_SID_TABLE = "tmp_list_reset_sid"; + private final EntityManager entityManager; public DeleteCounts deleteHistories(Long prjctIdx, Collection sids, int chunkSize) { - DeleteCounts total = DeleteCounts.empty(); - for (List sub : chunkSids(sids, chunkSize)) { - int eventHistCount = deleteBySids("t_list_event_hist", prjctIdx, sub); - int eventLatestCount = deleteBySids("t_list_event_latest", prjctIdx, sub); - int updateHistCount = deleteBySids("t_list_update_hist", prjctIdx, sub); - int callHistCount = deleteBySids("t_list_call_hist", prjctIdx, sub); - total = total.plus(DeleteCounts.histories( + if (sids == null || sids.isEmpty()) { + return DeleteCounts.empty(); + } + + prepareTempSids(sids, chunkSize); + try { + int eventHistCount = deleteByTempSids("t_list_event_hist", prjctIdx); + int eventLatestCount = deleteByTempSids("t_list_event_latest", prjctIdx); + int updateHistCount = deleteByTempSids("t_list_update_hist", prjctIdx); + int callHistCount = deleteByTempSids("t_list_call_hist", prjctIdx); + return DeleteCounts.histories( eventHistCount, eventLatestCount, updateHistCount, callHistCount - )); + ); + } finally { + dropTempSids(); } - return total; } public DeleteCounts deleteListData( @@ -39,16 +46,20 @@ public class ListResetJdbcSupport { boolean includeResve, int chunkSize ) { - DeleteCounts total = DeleteCounts.empty(); - for (List sub : chunkSids(sids, chunkSize)) { - int fileCount = includeFile ? deleteBySids("t_list_item_file", prjctIdx, sub) : 0; - int itemCount = deleteBySids("t_list_item", prjctIdx, sub); - int assignUserCount = deleteBySids("t_list_assign_user", prjctIdx, sub); - int assignCmpnCount = deleteBySids("t_list_assign_cmpn", prjctIdx, sub); - int resveCount = includeResve ? deleteBySids("t_list_resve", prjctIdx, sub) : 0; - int listCount = deleteBySids("t_list", prjctIdx, sub); + if (sids == null || sids.isEmpty()) { + return DeleteCounts.empty(); + } - total = total.plus(new DeleteCounts( + prepareTempSids(sids, chunkSize); + try { + int fileCount = includeFile ? deleteByTempSids("t_list_item_file", prjctIdx) : 0; + int itemCount = deleteByTempSids("t_list_item", prjctIdx); + int assignUserCount = deleteByTempSids("t_list_assign_user", prjctIdx); + int assignCmpnCount = deleteByTempSids("t_list_assign_cmpn", prjctIdx); + int resveCount = includeResve ? deleteByTempSids("t_list_resve", prjctIdx) : 0; + int listCount = deleteByTempSids("t_list", prjctIdx); + + return new DeleteCounts( fileCount, 0, 0, @@ -59,26 +70,52 @@ public class ListResetJdbcSupport { assignUserCount, assignCmpnCount, resveCount - )); + ); + } finally { + dropTempSids(); } - return total; } - private int deleteBySids(String tableName, Long prjctIdx, List sids) { + private void prepareTempSids(Collection sids, int chunkSize) { + dropTempSids(); + entityManager.createNativeQuery( + "create temporary table " + TEMP_SID_TABLE + " (sid int not null primary key) engine=memory" + ).executeUpdate(); + + List sidList = new ArrayList<>(sids); + for (List sub : chunkSids(sidList, chunkSize)) { + insertTempSids(sub); + } + } + + private void insertTempSids(List sids) { if (sids.isEmpty()) { - return 0; + return; } Query query = entityManager.createNativeQuery( - "delete from " + tableName + " where prjct_idx = :prjctIdx and sid in (" + createInSql(sids) + ")" + "insert into " + TEMP_SID_TABLE + " (sid) values " + createValuesSql(sids) ); - query.setParameter("prjctIdx", prjctIdx); for (int i = 0; i < sids.size(); i++) { query.setParameter("sid" + i, sids.get(i)); } + query.executeUpdate(); + } + + private int deleteByTempSids(String tableName, Long prjctIdx) { + Query query = entityManager.createNativeQuery( + "delete target from " + tableName + " target " + + "join " + TEMP_SID_TABLE + " reset_sid on reset_sid.sid = target.sid " + + "where target.prjct_idx = :prjctIdx" + ); + query.setParameter("prjctIdx", prjctIdx); return query.executeUpdate(); } + private void dropTempSids() { + entityManager.createNativeQuery("drop temporary table if exists " + TEMP_SID_TABLE).executeUpdate(); + } + private List> chunkSids(Collection sids, int chunkSize) { if (sids == null || sids.isEmpty()) { return List.of(); @@ -95,10 +132,10 @@ public class ListResetJdbcSupport { return chunks; } - private String createInSql(List sids) { + private String createValuesSql(List sids) { StringJoiner joiner = new StringJoiner(","); for (int i = 0; i < sids.size(); i++) { - joiner.add(":sid" + i); + joiner.add("(:sid" + i + ")"); } return joiner.toString(); } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListCallHistRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListCallHistRepository.java index 1783822..68e7d17 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListCallHistRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListCallHistRepository.java @@ -1,7 +1,10 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.persistence.entity.TListCallHistEntity; +import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; public interface ListCallHistRepository extends JpaRepository { + + Optional findFirstByAgentSessionId(String agentSessionId); } diff --git a/src/main/java/com/kri/contact/server/service/ListCallHistService.java b/src/main/java/com/kri/contact/server/service/ListCallHistService.java index 59a3b22..23ae112 100644 --- a/src/main/java/com/kri/contact/server/service/ListCallHistService.java +++ b/src/main/java/com/kri/contact/server/service/ListCallHistService.java @@ -39,24 +39,13 @@ public class ListCallHistService { .with("listHderId", request.getListHderId()); } - TListCallHistEntity entity = new TListCallHistEntity(); - entity.setPrjctIdx(prjctIdx); - entity.setSid(sid); - entity.setListHderId(request.getListHderId()); - entity.setDestNum(request.getDestNum()); - entity.setAgentNum(request.getAgentNum()); - entity.setAniNum(request.getAniNum()); - entity.setAgentSessionId(request.getAgentSessionId()); - entity.setDestSessionId(request.getDestSessionId()); - entity.setCallTy(request.getCallTy()); - entity.setStartDt(request.getStartDt()); - entity.setTotalTime(request.getTotalTime()); - entity.setTalkTime(request.getTalkTime()); - entity.setMediaServerId(request.getMediaServerId()); - entity.setMediaServerName(request.getMediaServerName()); - entity.setRecordFileName(request.getRecordFileName()); - entity.setRegUser(regUser); - entity.setRegDt(regDt); + TListCallHistEntity entity = listCallHistRepository.findFirstByAgentSessionId(request.getAgentSessionId()) + .map(existing -> { + existing.updateCallResult(request, regDt); + return existing; + }) + .orElseGet(() -> TListCallHistEntity.from(prjctIdx, sid, request, regUser, regDt)); + return ListCallHistDto.from(listCallHistRepository.save(entity)); } } diff --git a/src/main/java/com/kri/contact/server/service/ListDownloadService.java b/src/main/java/com/kri/contact/server/service/ListDownloadService.java index 30636f5..72c1920 100644 --- a/src/main/java/com/kri/contact/server/service/ListDownloadService.java +++ b/src/main/java/com/kri/contact/server/service/ListDownloadService.java @@ -11,7 +11,9 @@ import com.kri.contact.server.dto.common.DateRangeDto; import com.kri.contact.server.dto.list.ListFilterDto; import com.kri.contact.server.dto.list.ListHeaderDto; import com.kri.contact.server.persistence.entity.TListItemFileEntity; +import com.kri.contact.server.persistence.entity.TResultCodeEntity; import com.kri.contact.server.persistence.repository.ListItemFileRepository; +import com.kri.contact.server.persistence.repository.ResultCodeRepository; import com.kri.contact.server.service.file.ListItemFileService; import java.io.ByteArrayOutputStream; import java.time.LocalDateTime; @@ -40,6 +42,7 @@ public class ListDownloadService { private static final String HEADER_MEMO = "메모"; private static final String HEADER_BEFORE = "변경전"; private static final String HEADER_AFTER = "변경후"; + private static final String ZERO_WIDTH_SPACE = String.valueOf(Character.toChars(0x200B)); private static final List EVENT_HISTORY_HEADERS = List.of( HEADER_TYPE, @@ -59,6 +62,7 @@ public class ListDownloadService { private final ListSearchService listSearchService; private final ListItemFileRepository listItemFileRepository; private final ListItemFileService listItemFileService; + private final ResultCodeRepository resultCodeRepository; public byte[] downloadList(Long prjctIdx, ListFilterDto listFilter) { List headers = getSortedHeaders(prjctIdx); @@ -102,6 +106,7 @@ public class ListDownloadService { validateDateRange(dateRange); List headers = getSortedHeaders(prjctIdx); + Map resultLabelMap = createResultLabelMap(prjctIdx); int maxHistoryCount = findMaxEventHistoryCount(prjctIdx, listFilter, resultCodeTypes, searchBase, dateRange); List excelHeaders = new ArrayList<>(toBaseHeaderNames(headers)); appendRepeatedHeaders(excelHeaders, EVENT_HISTORY_HEADERS, maxHistoryCount); @@ -131,6 +136,7 @@ public class ListDownloadService { headers, row, historyMap.getOrDefault(row.sid(), List.of()), + resultLabelMap, maxHistoryCount )); lastSid = row.sid(); @@ -167,12 +173,16 @@ public class ListDownloadService { listSearchService.findUpdateHistoryGroupsForDownload(prjctIdx, sids); for (Integer sid : sids) { + lastSid = sid; + List histories = historyMap.getOrDefault(sid, List.of()); + if (histories.isEmpty()) { + continue; + } writer.append(createUpdateHistoryRow( sid, - historyMap.getOrDefault(sid, List.of()), + histories, maxHistoryGroupCount )); - lastSid = sid; } } @@ -319,15 +329,16 @@ public class ListDownloadService { List headers, ListSearchService.DownloadListRow row, List histories, + Map resultLabelMap, int maxHistoryCount ) { Map excelRow = createBaseRow(headers, row); for (int index = 0; index < maxHistoryCount; index++) { ListSearchService.EventHistoryRow history = index < histories.size() ? histories.get(index) : null; - excelRow.put(createRepeatedHeaderName(HEADER_TYPE, index), history == null ? "" : defaultString(history.eventTy())); + excelRow.put(createRepeatedHeaderName(HEADER_TYPE, index), history == null ? "" : resolveEventTypeLabel(history.eventTy())); excelRow.put(createRepeatedHeaderName(HEADER_DATE, index), history == null ? "" : formatDateTime(history.regDt())); excelRow.put(createRepeatedHeaderName(HEADER_USER, index), history == null ? "" : defaultString(history.regUser())); - excelRow.put(createRepeatedHeaderName(HEADER_RESULT, index), history == null ? "" : defaultString(history.resultCd())); + excelRow.put(createRepeatedHeaderName(HEADER_RESULT, index), history == null ? "" : resolveResultLabel(history, resultLabelMap)); excelRow.put(createRepeatedHeaderName(HEADER_MEMO, index), history == null ? "" : defaultString(history.memo())); } return excelRow; @@ -381,7 +392,7 @@ public class ListDownloadService { } private String createRepeatedHeaderName(String headerName, int index) { - return index == 0 ? headerName : headerName + "\u200B".repeat(index); + return index == 0 ? headerName : headerName + ZERO_WIDTH_SPACE.repeat(index); } private void validateDateRange(DateRangeDto dateRange) { @@ -413,6 +424,39 @@ public class ListDownloadService { return defaultString(isUse); } + private Map createResultLabelMap(Long prjctIdx) { + return resultCodeRepository.findByIdPrjctIdx(prjctIdx) + .stream() + .filter(entity -> entity.getResultCdTy() != null && entity.getResultCd() != null) + .collect(Collectors.toMap( + entity -> new EventResultKey(entity.getResultCdTy().getCode(), entity.getResultCd().intValue()), + TResultCodeEntity::getResultCdLbl, + (left, right) -> left, + LinkedHashMap::new + )); + } + + private String resolveEventTypeLabel(Short eventTy) { + if (Objects.equals(eventTy, ResultCodeType.CONTACT.getCode())) { + return "컨택"; + } + if (Objects.equals(eventTy, ResultCodeType.INTERVIEW.getCode())) { + return "면접"; + } + if (Objects.equals(eventTy, ResultCodeType.SURVEY.getCode())) { + return "설문"; + } + return defaultString(eventTy); + } + + private String resolveResultLabel( + ListSearchService.EventHistoryRow history, + Map resultLabelMap + ) { + String label = resultLabelMap.get(new EventResultKey(history.eventTy(), history.resultCd())); + return label == null ? defaultString(history.resultCd()) : label; + } + private String defaultString(Object value) { return value == null ? "" : String.valueOf(value); } @@ -420,4 +464,9 @@ public class ListDownloadService { private String sanitizeZipEntryName(String fileName) { return fileName.replace("\\", "_").replace("/", "_"); } + + private record EventResultKey( + Short eventTy, + Integer resultCd + ) {} } diff --git a/src/main/java/com/kri/contact/server/service/ListResetService.java b/src/main/java/com/kri/contact/server/service/ListResetService.java index 82be480..ec59bca 100644 --- a/src/main/java/com/kri/contact/server/service/ListResetService.java +++ b/src/main/java/com/kri/contact/server/service/ListResetService.java @@ -5,8 +5,8 @@ import com.kri.contact.server.common.consts.ContactConstant; import com.kri.contact.server.common.enums.ListResetMode; import com.kri.contact.server.dto.list.ListFilterDto; import com.kri.contact.server.persistence.entity.TListResetLogEntity; -import com.kri.contact.server.persistence.jdbc.ListResetJdbcSupport.DeleteCounts; import com.kri.contact.server.persistence.jdbc.ListResetJdbcSupport; +import com.kri.contact.server.persistence.jdbc.ListResetJdbcSupport.DeleteCounts; import com.kri.contact.server.persistence.repository.ListResetLogRepository; import jakarta.persistence.EntityManager; import java.time.LocalDateTime; @@ -49,7 +49,7 @@ public class ListResetService { return 0; } if (mode == null) { - throw BusinessException.badRequest("EMPTY_MODE","mode는 필수 입니다."); + throw BusinessException.badRequest("EMPTY_MODE", "mode는 필수 입니다."); } String listResetLogId = createResetLog(prjctIdx, mode, 0, regUser, regDt); 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 95403d2..9561189 100644 --- a/src/main/java/com/kri/contact/server/service/ListSearchService.java +++ b/src/main/java/com/kri/contact/server/service/ListSearchService.java @@ -5,7 +5,9 @@ import com.kri.common.feature.web.page.PageRequestDto; import com.kri.common.feature.web.page.PageResponseDto; import com.kri.contact.server.common.consts.ContactConstant; import com.kri.contact.server.common.enums.ListEventHistoryBase; +import com.kri.contact.server.common.enums.ListHeaderType; import com.kri.contact.server.common.enums.ListHeaderTypeAssign; +import com.kri.contact.server.common.enums.ListIsUse; import com.kri.contact.server.common.enums.ListSearchResponseType; import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.dto.common.DateRangeDto; @@ -292,9 +294,10 @@ public class ListSearchService { List beforeValues = new ArrayList<>(groupHistories.size()); List afterValues = new ArrayList<>(groupHistories.size()); for (TListUpdateHistEntity history : groupHistories) { + ListHeaderDto header = headerMap.get(history.getListHderId()); String headerName = resolveHeaderName(headerMap, history.getListHderId()); - beforeValues.add(headerName + ": " + defaultString(history.getBeforeVal())); - afterValues.add(headerName + ": " + defaultString(history.getAfterVal())); + beforeValues.add(headerName + ": " + resolveUpdateHistoryValue(header, history.getBeforeVal())); + afterValues.add(headerName + ": " + resolveUpdateHistoryValue(header, history.getAfterVal())); } UpdateHistoryGroupKey key = entry.getKey(); @@ -588,6 +591,27 @@ public class ListSearchService { return header == null ? String.valueOf(headerId) : header.getListHderNm(); } + private String resolveUpdateHistoryValue(ListHeaderDto header, String value) { + if (header != null && Objects.equals(header.getListHderTy(), ListHeaderType.IS_USE)) { + return toUseValue(value); + } + return defaultString(value); + } + + private String toUseValue(String value) { + String trimmedValue = defaultString(value).trim(); + if (Objects.equals(trimmedValue, String.valueOf(ListIsUse.USABLE.getCode()))) { + return "O"; + } + if (Objects.equals(trimmedValue, String.valueOf(ListIsUse.UNUSABLE.getCode()))) { + return "X"; + } + if (Objects.equals(trimmedValue, String.valueOf(ListIsUse.TEST.getCode()))) { + return "TEST"; + } + return defaultString(value); + } + private String defaultString(String value) { return value == null ? "" : value; } diff --git a/src/main/java/com/kri/contact/server/service/ListUpdateService.java b/src/main/java/com/kri/contact/server/service/ListUpdateService.java index 353041b..87f37d2 100644 --- a/src/main/java/com/kri/contact/server/service/ListUpdateService.java +++ b/src/main/java/com/kri/contact/server/service/ListUpdateService.java @@ -18,6 +18,7 @@ import com.kri.contact.server.dto.list.ListHeaderDto; import com.kri.contact.server.dto.list.ListUpdateRequestDto; import com.kri.contact.server.persistence.entity.TListEventHistEntity; import com.kri.contact.server.persistence.entity.TListHeaderEntity; +import com.kri.contact.server.persistence.entity.TListItemFileEntity; import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport; import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.ListItemDeleteRow; import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.ListItemInsertRow; @@ -27,7 +28,10 @@ import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.ListUpdateR import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.UpdateHistRow; import com.kri.contact.server.persistence.repository.ListEventHistRepository; import com.kri.contact.server.persistence.repository.ListHeaderRepository; +import com.kri.contact.server.persistence.repository.ListItemFileRepository; import com.kri.contact.server.persistence.repository.ListRepository; +import com.kri.contact.server.service.file.ListItemFileService; +import jakarta.persistence.EntityManager; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collection; @@ -45,14 +49,19 @@ import org.springframework.transaction.annotation.Transactional; @RequiredArgsConstructor public class ListUpdateService { + private static final String FILE_DELETE = "FILE_DELETE"; + private final ListHeaderRepository listHeaderRepository; private final ListSearchService listSearchService; private final ListContentItemService listContentItemService; private final ListUpdateJdbcSupport listUpdateJdbcSupport; private final ListRepository listRepository; private final ListEventHistRepository listEventHistRepository; + private final ListItemFileRepository listItemFileRepository; + private final ListItemFileService listItemFileService; private final ResultCodeService resultCodeService; private final ObjectMapper objectMapper; + private final EntityManager entityManager; @Transactional public int updateList( @@ -240,6 +249,7 @@ public class ListUpdateService { Map itemUpdates = new LinkedHashMap<>(); Map itemInserts = new LinkedHashMap<>(); Map itemDeletes = new LinkedHashMap<>(); + Set fileDeleteKeys = new LinkedHashSet<>(); for (ListSearchService.ListUpdateTargetRow targetRow : targetRows) { Short currentIsUse = targetRow.isUse(); @@ -250,7 +260,8 @@ public class ListUpdateService { Integer headerId = entry.getKey(); Integer sid = targetRow.sid(); TListHeaderEntity header = headerMap.get(headerId); - String newValue = normalizeUpdateValue(header, entry.getValue()); + boolean deleteFile = isFileDeleteCommand(header, entry.getValue()); + String newValue = deleteFile ? "" : normalizeUpdateValue(header, entry.getValue()); if (Objects.equals(header.getListHderTy(), ListHeaderType.IS_USE.getCode())) { String beforeVal = String.valueOf(currentIsUse); @@ -293,6 +304,9 @@ public class ListUpdateService { } ListItemKey itemKey = new ListItemKey(sid, headerId); + if (deleteFile) { + fileDeleteKeys.add(itemKey); + } if (newValue.isEmpty()) { if (currentValue != null) { itemDeletes.put(itemKey, new ListItemDeleteRow(prjctIdx, sid, headerId)); @@ -330,7 +344,7 @@ public class ListUpdateService { } } - if (updateHistRows.isEmpty()) { + if (updateHistRows.isEmpty() && fileDeleteKeys.isEmpty()) { return 0; } @@ -338,11 +352,65 @@ public class ListUpdateService { listUpdateJdbcSupport.batchUpdateList(new ArrayList<>(listUpdates.values()), ContactConstant.INSERT_CHUNK_SIZE); listUpdateJdbcSupport.batchUpdateListItem(new ArrayList<>(itemUpdates.values()), ContactConstant.INSERT_CHUNK_SIZE); listUpdateJdbcSupport.batchInsertListItem(new ArrayList<>(itemInserts.values()), ContactConstant.INSERT_CHUNK_SIZE); - listUpdateJdbcSupport.batchDeleteListItem(new ArrayList<>(itemDeletes.values()), ContactConstant.INSERT_CHUNK_SIZE); + deleteItemsWithoutBackup( + prjctIdx, + new ArrayList<>(itemDeletes.values()), + fileDeleteKeys + ); return updateHistRows.size(); } + private void deleteItemsWithoutBackup( + Long prjctIdx, + List itemDeletes, + Set fileDeleteKeys + ) { + if (itemDeletes.isEmpty() && fileDeleteKeys.isEmpty()) { + return; + } + + setSkipDeleteBackup(); + try { + listUpdateJdbcSupport.batchDeleteListItem(itemDeletes, ContactConstant.INSERT_CHUNK_SIZE); + deleteListItemFiles(prjctIdx, fileDeleteKeys); + } finally { + clearSkipDeleteBackup(); + } + } + + private void deleteListItemFiles(Long prjctIdx, Set fileDeleteKeys) { + if (fileDeleteKeys.isEmpty()) { + return; + } + + Set sids = fileDeleteKeys.stream() + .map(ListItemKey::sid) + .collect(LinkedHashSet::new, LinkedHashSet::add, LinkedHashSet::addAll); + Set headerIds = fileDeleteKeys.stream() + .map(ListItemKey::listHderId) + .collect(LinkedHashSet::new, LinkedHashSet::add, LinkedHashSet::addAll); + + List fileEntities = listItemFileRepository + .findByIdPrjctIdxAndIdSidInAndIdListHderIdInOrderByIdSidAscIdListHderIdAsc( + prjctIdx, + sids, + headerIds + ) + .stream() + .filter(entity -> fileDeleteKeys.contains(new ListItemKey(entity.getSid(), entity.getListHderId()))) + .toList(); + + if (fileEntities.isEmpty()) { + return; + } + + listItemFileRepository.deleteAllInBatch(fileEntities); + for (TListItemFileEntity fileEntity : fileEntities) { + listItemFileService.deleteItemFile(fileEntity.getFilePath(), fileEntity.getFileNm()); + } + } + private Set resolveTargetSids(Long prjctIdx, ListFilterDto listFilter) { return new LinkedHashSet<>(listSearchService.findTargetSids(prjctIdx, listFilter)); } @@ -389,6 +457,19 @@ public class ListUpdateService { return defaultString(normalizeBlank(value)); } + private boolean isFileDeleteCommand(TListHeaderEntity header, String value) { + return Objects.equals(header.getListHderTy(), ListHeaderType.FILE.getCode()) + && Objects.equals(normalizeBlank(value), FILE_DELETE); + } + + private void setSkipDeleteBackup() { + entityManager.createNativeQuery("SET @skip_delete_backup = 1").executeUpdate(); + } + + private void clearSkipDeleteBackup() { + entityManager.createNativeQuery("SET @skip_delete_backup = NULL").executeUpdate(); + } + private short parseIsUseCode(String value) { String normalized = defaultString(normalizeBlank(value)).toUpperCase(); return switch (normalized) { diff --git a/src/main/java/com/kri/contact/server/service/MessageService.java b/src/main/java/com/kri/contact/server/service/MessageService.java index 8e9f4db..9a42484 100644 --- a/src/main/java/com/kri/contact/server/service/MessageService.java +++ b/src/main/java/com/kri/contact/server/service/MessageService.java @@ -25,6 +25,7 @@ import java.util.HashSet; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.Set; @@ -90,7 +91,8 @@ public class MessageService { request.getDestNameHeaderId(), messageContext, channelType, - new LinkedHashSet<>() + new LinkedHashSet<>(), + true ); if (destInfos.isEmpty()) { throw BusinessException.badRequest("NO_DESTINATION", "발송 대상 이메일 또는 전화번호가 없습니다."); @@ -127,7 +129,8 @@ public class MessageService { prjctIdx, request, messageContext, - channelType + channelType, + Boolean.TRUE.equals(request.getDedupe()) ); if (destInfos.isEmpty()) { throw BusinessException.badRequest("NO_DESTINATION", "발송 대상 이메일 또는 전화번호가 없습니다."); @@ -174,7 +177,8 @@ public class MessageService { Long prjctIdx, MessageSendBulkRequestDto request, MessageContext messageContext, - ChannelType channelType + ChannelType channelType, + boolean dedupe ) { List destInfos = new ArrayList<>(); Set dedupeKeys = new LinkedHashSet<>(); @@ -196,7 +200,8 @@ public class MessageService { request.getDestNameHeaderId(), messageContext, channelType, - dedupeKeys + dedupeKeys, + dedupe )); lastSid = rows.get(rows.size() - 1).sid(); } @@ -209,7 +214,8 @@ public class MessageService { Integer destNameHeaderId, MessageContext messageContext, ChannelType channelType, - Set dedupeKeys + Set dedupeKeys, + boolean dedupe ) { List result = new ArrayList<>(); for (ListSearchService.DownloadListRow row : rows) { @@ -219,7 +225,7 @@ public class MessageService { for (Integer destHeaderId : destHeaderIds) { String rawDestination = row.itemMap().get(destHeaderId); String destination = normalizeDestination(rawDestination, channelType); - if (destination == null || !dedupeKeys.add(destination)) { + if (destination == null || isDuplicateDestination(destination, channelType, dedupeKeys, dedupe)) { continue; } @@ -399,6 +405,25 @@ public class MessageService { return normalized; } + private boolean isDuplicateDestination( + String destination, + ChannelType channelType, + Set dedupeKeys, + boolean dedupe + ) { + if (!dedupe) { + return false; + } + return !dedupeKeys.add(createDedupeKey(destination, channelType)); + } + + private String createDedupeKey(String destination, ChannelType channelType) { + if (channelType == ChannelType.EMAIL) { + return destination.toLowerCase(Locale.ROOT); + } + return destination; + } + private String normalizeBlank(String value) { if (value == null) { return null; diff --git a/src/main/java/com/kri/contact/server/service/UserService.java b/src/main/java/com/kri/contact/server/service/UserService.java index bd36df1..7fd2119 100644 --- a/src/main/java/com/kri/contact/server/service/UserService.java +++ b/src/main/java/com/kri/contact/server/service/UserService.java @@ -21,6 +21,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Objects; import lombok.RequiredArgsConstructor; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.WorkbookFactory; @@ -37,6 +38,8 @@ public class UserService { private final RoleService roleService; private final UserRepository userRepository; + private static final int OUTSOURCE_USER_ROLE_END = ContactConstant.OUTSOURCE_USER_ROLE + 1000; + @Transactional public void createUser(UserInfoDto userInfo, String regUser, LocalDateTime regDt) { List roleList = roleService.getRoleList(); @@ -220,7 +223,9 @@ public class UserService { .with("userId", dto.getUserId()) ); - if(entity.getUserRole() != dto.getUserRole()) { + validateUserRoleChange(entity.getUserRole(), dto.getUserRole()); + + if(!Objects.equals(entity.getUserRole(), dto.getUserRole())) { assignService.deleteListAssignWithUser(dto.getUserId()); } @@ -239,6 +244,29 @@ public class UserService { } /*******************************private*******************************/ + private void validateUserRoleChange(Integer currentRole, Integer newRole) { + if (Objects.equals(currentRole, newRole)) { + return; + } + if ((isOutsourceRole(currentRole) && isFieldworkRole(newRole)) + || (isFieldworkRole(currentRole) && isOutsourceRole(newRole))) { + throw BusinessException.badRequest( + "USER_ROLE_CHANGE_NOT_ALLOWED", + "외주사와 콜센터/컨택원/면접원 간 권한 변경은 할 수 없습니다." + ); + } + } + + private boolean isOutsourceRole(Integer role) { + return role != null + && role >= ContactConstant.OUTSOURCE_USER_ROLE + && role < OUTSOURCE_USER_ROLE_END; + } + + private boolean isFieldworkRole(Integer role) { + return role != null && role >= ContactConstant.FIELDWORK_USER_ROLE; + } + private DataVerificationDto verifyUserId(String userId, List intranetUserList) { if (userId == null || userId.isBlank()) { return new DataVerificationDto(false, "사용자 ID", "사용자 ID가 비었습니다."); diff --git a/src/main/java/com/kri/contact/server/service/file/ListItemFileService.java b/src/main/java/com/kri/contact/server/service/file/ListItemFileService.java index 43a0df0..5ae9c96 100644 --- a/src/main/java/com/kri/contact/server/service/file/ListItemFileService.java +++ b/src/main/java/com/kri/contact/server/service/file/ListItemFileService.java @@ -55,6 +55,23 @@ public class ListItemFileService extends AbstractFileService { } } + public void deleteItemFile(String filePath, String fileName) { + Path baseDir = getBaseDir(); + Path dir = baseDir.resolve(filePath == null || filePath.isBlank() ? "" : filePath) + .toAbsolutePath() + .normalize(); + + if (!dir.startsWith(baseDir)) { + throw BusinessException.badRequest("WRONG_FILE_PATH", "잘못된 파일 경로입니다."); + } + + try { + deleteFile(dir, fileName); + } catch (IOException e) { + throw BusinessException.internalError("FAIL_DELETE_LIST_ITEM_FILE", e.getMessage()); + } + } + private Path resolveItemFilePath(Path baseDir, String filePath, String fileName) { String relativePath = filePath == null || filePath.isBlank() ? "" : filePath; return baseDir.resolve(relativePath).resolve(fileName).toAbsolutePath().normalize(); -- 2.49.0.windows.1