diff --git a/src/main/java/com/kri/contact/server/controller/ListCallHistController.java b/src/main/java/com/kri/contact/server/controller/ListCallHistController.java index 5c82341..ab2e270 100644 --- a/src/main/java/com/kri/contact/server/controller/ListCallHistController.java +++ b/src/main/java/com/kri/contact/server/controller/ListCallHistController.java @@ -31,7 +31,7 @@ public class ListCallHistController { @PutMapping("/{prjctIdx}/{sid}/call-start") public ListCallHistDto callStart( @PathVariable Long prjctIdx, - @PathVariable Integer sid, + @PathVariable String sid, @Valid @RequestBody ListCallStartRequestDto request, RequestUserContext ctx ) { @@ -51,7 +51,7 @@ public class ListCallHistController { @PutMapping("/{prjctIdx}/{sid}/call-close") public ListCallHistDto callClose( @PathVariable Long prjctIdx, - @PathVariable Integer sid, + @PathVariable String sid, @Valid @RequestBody ListCallCloseRequestDto request, RequestUserContext ctx ) { 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 6db24db..8437b25 100644 --- a/src/main/java/com/kri/contact/server/controller/ListController.java +++ b/src/main/java/com/kri/contact/server/controller/ListController.java @@ -70,7 +70,7 @@ public class ListController { @GetMapping("/search-sid/{prjctIdx}/{sid}") public ListSearchWithFullResultDto searchListWithSid( @PathVariable Long prjctIdx, - @PathVariable Integer sid + @PathVariable String sid ) { return listSearchService.searchListWithSid(prjctIdx, sid); } @@ -171,7 +171,7 @@ public class ListController { @PostMapping(value = "/item-file/upload/{prjctIdx}/{sid}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public void uploadItemFile( @PathVariable Long prjctIdx, - @PathVariable Integer sid, + @PathVariable String sid, @RequestParam Map files, RequestUserContext ctx ) { @@ -203,7 +203,7 @@ public class ListController { @GetMapping("/item-file/download/{prjctIdx}/{sid}/{listHderId}") public ResponseEntity downloadOneItemFile( @PathVariable Long prjctIdx, - @PathVariable Integer sid, + @PathVariable String sid, @PathVariable Integer listHderId ) { getProjectOrThrow(prjctIdx); 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 da6bc6e..5634ea6 100644 --- a/src/main/java/com/kri/contact/server/controller/ListHistoryController.java +++ b/src/main/java/com/kri/contact/server/controller/ListHistoryController.java @@ -46,7 +46,7 @@ public class ListHistoryController { @GetMapping("/event/{prjctIdx}/{sid}") public List findListEventHistories( @PathVariable Long prjctIdx, - @PathVariable Integer sid + @PathVariable String sid ) { return listHistoryQueryService.findEventHistories(prjctIdx, sid); } @@ -55,7 +55,7 @@ public class ListHistoryController { @GetMapping("/update/{prjctIdx}/{sid}") public List findListUpdateHistories( @PathVariable Long prjctIdx, - @PathVariable Integer sid + @PathVariable String sid ) { return listHistoryQueryService.findUpdateHistories(prjctIdx, sid); } diff --git a/src/main/java/com/kri/contact/server/controller/ReserveController.java b/src/main/java/com/kri/contact/server/controller/ReserveController.java index dddf3f1..d0ebaa6 100644 --- a/src/main/java/com/kri/contact/server/controller/ReserveController.java +++ b/src/main/java/com/kri/contact/server/controller/ReserveController.java @@ -49,7 +49,7 @@ public class ReserveController { @GetMapping("/{prjctIdx}/sid/{sid}") public List findBySid( @PathVariable Long prjctIdx, - @PathVariable Integer sid + @PathVariable String sid ) { return reserveService.findBySid(prjctIdx, sid); } 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 9f5bead..5b8b696 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 @@ -17,7 +17,7 @@ public class ListCallHistDto { @Schema(description = "prjctIdx") private Long prjctIdx; @Schema(description = "sid") - private Integer sid; + private String sid; @Schema(description = "listHderId") private Integer listHderId; @Schema(description = "destNum") 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 index 2103313..122bc20 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListEventHistFromSurveyDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListEventHistFromSurveyDto.java @@ -24,7 +24,7 @@ public class ListEventHistFromSurveyDto { @NotNull @Schema(description = "리스트 고유번호") - private Integer sid; + private String sid; @NotNull @Valid 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 8f7d97f..49a8c46 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 @@ -21,7 +21,7 @@ public class ListEventHistInsertRequestDto { @NotNull @Schema(description = "리스트 고유 번호") - private Integer sid; + private String sid; @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 86ef253..d02b6ea 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 @@ -20,7 +20,7 @@ public class ListEventHistoryDto { @Schema(description = "prjctSurveyIdx") private Long prjctSurveyIdx; @Schema(description = "sid") - private Integer sid; + private String sid; @Schema(description = "resultCd") private Integer resultCd; @Schema(description = "metaData") 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 9c04c3b..17da3f6 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 @@ -58,7 +58,7 @@ public class ListFilterDto { @Schema(description = "기타 항목 필터 조건") private List<@Valid ListOtherItemFilterConditionDto> otherItemConditions; - public static ListFilterDto onlyOneSid(Integer sid) { + public static ListFilterDto onlyOneSid(String sid) { return ListFilterDto.builder() .sidSet(Set.of(String.valueOf(sid))) .listUseSet(Set.of()) 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 aeafe3d..3819450 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 @@ -26,7 +26,7 @@ public class ListSearchBaseDto { private Long prjctIdx; @Schema(description = "SID") - private Integer sid; + private String sid; @Schema(description = "사용 여부") private ListIsUse use; 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 25f8668..3715c22 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 @@ -17,7 +17,7 @@ public class ListUpdateHistoryDto { @Schema(description = "prjctIdx") private Long prjctIdx; @Schema(description = "sid") - private Integer sid; + private String sid; @Schema(description = "listHderId") private Integer listHderId; @Schema(description = "beforeVal") 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 df9b629..6bb008a 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 @@ -28,7 +28,7 @@ public class MessageSendSingleRequestDto { @NotNull @Schema(description = "sid") - private Integer sid; + private String sid; @NotEmpty @Schema(description = "destHeaderIds") 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 0d9b316..9170938 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 @@ -17,7 +17,7 @@ public class ListReserveDto { @Schema(description = "prjctIdx") private Long prjctIdx; @Schema(description = "sid") - private Integer sid; + private String sid; @Schema(description = "memo") private String memo; @Schema(description = "cnfirm") 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 20c8da4..d365a3d 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 @@ -21,7 +21,7 @@ public class ListReserveRequestDto { @NotNull @Schema(description = "sid") - private Integer sid; + private String sid; @NotBlank @Schema(description = "userId") diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListAssignCmpnEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListAssignCmpnEntity.java index 4fbe293..2da7b05 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListAssignCmpnEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListAssignCmpnEntity.java @@ -29,7 +29,7 @@ public class TListAssignCmpnEntity { @NotNull @Column(name = "sid", nullable = false) - private Integer sid; + private String sid; @Size(max = 32) @Column(name = "cmpn_id", length = 32) 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 index 39bbd30..5e646bf 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListAssignUserEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListAssignUserEntity.java @@ -29,7 +29,7 @@ public class TListAssignUserEntity { @NotNull @Column(name = "sid", nullable = false) - private Integer sid; + private String sid; @Size(max = 32) @Column(name = "user_id", length = 32) 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 4b69244..775c20d 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 @@ -44,7 +44,7 @@ public class TListCallHistEntity { @NotNull @Column(name = "sid", nullable = false) - private Integer sid; + private String sid; @NotNull @Column(name = "list_hder_id", nullable = false) @@ -126,7 +126,7 @@ public class TListCallHistEntity { public static TListCallHistEntity from( Long prjctIdx, - Integer sid, + String sid, ListCallCloseRequestDto request, String regUser, LocalDateTime regDt 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 d82e39a..c6fc93e 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 @@ -8,6 +8,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; +import java.math.BigDecimal; import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; @@ -53,11 +54,17 @@ public class TListEntity { @Column(name = "mod_dt", insertable = false) private LocalDateTime modDt; + @Column(name = "sid_sort_type", insertable = false, updatable = false) + private Integer sidSortType; + + @Column(name = "sid_sort_number", precision = 32, scale = 0, insertable = false, updatable = false) + private BigDecimal sidSortNumber; + public Long getPrjctIdx() { return id.getPrjctIdx(); } - public Integer getSid() { + public String getSid() { return id.getSid(); } } 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 d3c9005..56f6dec 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 @@ -48,7 +48,7 @@ public class TListEventHistEntity { @NotNull @Column(name = "sid", nullable = false) - private Integer sid; + private String sid; @NotNull @Column(name = "result_cd", nullable = false) diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListEventLatestEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListEventLatestEntity.java index 9bec690..e6ddb7d 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListEventLatestEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListEventLatestEntity.java @@ -29,7 +29,7 @@ public class TListEventLatestEntity { @NotNull @Column(name = "sid", nullable = false) - private Integer sid; + private String sid; @NotNull @Column(name = "event_ty", nullable = false) 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 a270444..c1e14eb 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 @@ -49,11 +49,11 @@ public class TListItemEntity { return id.getPrjctIdx(); } - public Integer getSid() { + public String getSid() { return id.getSid(); } public Integer getListHderId() { return id.getListHderId(); } -} \ No newline at end of file +} 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 5f1d6c7..9f9f1dd 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 @@ -54,7 +54,7 @@ public class TListItemFileEntity { return id.getPrjctIdx(); } - public Integer getSid() { + public String getSid() { return id.getSid(); } @@ -64,7 +64,7 @@ public class TListItemFileEntity { public static TListItemFileEntity create( Long prjctIdx, - Integer sid, + String sid, Integer listHderId, String fileNm, Integer fileSize, diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListResveEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListResveEntity.java index 8ffb364..91ea472 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListResveEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListResveEntity.java @@ -29,7 +29,7 @@ public class TListResveEntity { @NotNull @Column(name = "sid", nullable = false) - private Integer sid; + private String sid; @Size(max = 2048) @NotNull @@ -60,4 +60,4 @@ public class TListResveEntity { @Column(name = "reg_dt", nullable = false) private LocalDateTime regDt; -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListUpdateHistEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListUpdateHistEntity.java index c9a4136..0693101 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListUpdateHistEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListUpdateHistEntity.java @@ -30,7 +30,7 @@ public class TListUpdateHistEntity { @NotNull @Column(name = "sid", nullable = false) - private Integer sid; + private String sid; @NotNull @Column(name = "list_hder_id", nullable = false) @@ -56,4 +56,4 @@ public class TListUpdateHistEntity { @Column(name = "reg_dt", nullable = false) private LocalDateTime regDt; -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/contact/server/persistence/entity/id/TListEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/id/TListEntityId.java index 8c8c112..e2ea284 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/id/TListEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/id/TListEntityId.java @@ -22,6 +22,6 @@ public class TListEntityId implements Serializable { @NotNull @Column(name = "sid", nullable = false) - private Integer sid; + private String sid; -} \ 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 index 25a1cf9..a79697f 100644 --- 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 @@ -22,7 +22,7 @@ public class TListEventLatestEntityId implements Serializable { @NotNull @Column(name = "sid", nullable = false) - private Integer sid; + private String sid; @NotNull @Column(name = "event_ty", nullable = false) diff --git a/src/main/java/com/kri/contact/server/persistence/entity/id/TListItemEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/id/TListItemEntityId.java index 768ae32..a0def43 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/id/TListItemEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/id/TListItemEntityId.java @@ -22,10 +22,10 @@ public class TListItemEntityId implements Serializable { @NotNull @Column(name = "sid", nullable = false) - private Integer sid; + private String 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/id/TListItemFileEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/id/TListItemFileEntityId.java index 17722a6..2d8ee0a 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 @@ -22,13 +22,13 @@ public class TListItemFileEntityId implements Serializable { @NotNull @Column(name = "sid", nullable = false) - private Integer sid; + private String sid; @NotNull @Column(name = "list_hder_id", nullable = false) private Integer listHderId; - public static TListItemFileEntityId create(Long prjctIdx, Integer sid, Integer listHderId) { + public static TListItemFileEntityId create(Long prjctIdx, String sid, Integer listHderId) { TListItemFileEntityId id = new TListItemFileEntityId(); id.setPrjctIdx(prjctIdx); id.setSid(sid); 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 index 7ec3bc1..8a1689e 100644 --- a/src/main/java/com/kri/contact/server/persistence/jdbc/ListAssignJdbcSupport.java +++ b/src/main/java/com/kri/contact/server/persistence/jdbc/ListAssignJdbcSupport.java @@ -20,9 +20,9 @@ public class ListAssignJdbcSupport { private final JdbcTemplate jdbcTemplate; - public int deleteCmpnAssign(Long prjctIdx, Collection sids, int chunkSize) { + public int deleteCmpnAssign(Long prjctIdx, Collection sids, int chunkSize) { int total = 0; - for (List sub : chunkSids(sids, chunkSize)) { + for (List sub : chunkSids(sids, chunkSize)) { total += updateWithSidIn( "delete from t_list_assign_cmpn where prjct_idx = ? and sid in (", prjctIdx, @@ -32,9 +32,9 @@ public class ListAssignJdbcSupport { return total; } - public int deleteUserAssign(Long prjctIdx, Short assignRole, Collection sids, int chunkSize) { + public int deleteUserAssign(Long prjctIdx, Short assignRole, Collection sids, int chunkSize) { int total = 0; - for (List sub : chunkSids(sids, chunkSize)) { + 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<>(); @@ -48,7 +48,7 @@ public class ListAssignJdbcSupport { public void batchInsertCmpnAssign( Long prjctIdx, - Collection sids, + Collection sids, String cmpnId, String regUser, LocalDateTime regDt, @@ -64,12 +64,12 @@ public class ListAssignJdbcSupport { ) values (?, ?, ?, ?, ?) """; - for (List sub : chunkSids(sids, chunkSize)) { + 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(2, sub.get(index)); ps.setString(3, cmpnId); ps.setString(4, regUser); ps.setTimestamp(5, Timestamp.valueOf(regDt)); @@ -85,7 +85,7 @@ public class ListAssignJdbcSupport { public void batchInsertUserAssign( Long prjctIdx, - Collection sids, + Collection sids, String userId, Short assignRole, String regUser, @@ -103,12 +103,12 @@ public class ListAssignJdbcSupport { ) values (?, ?, ?, ?, ?, ?) """; - for (List sub : chunkSids(sids, chunkSize)) { + 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(2, sub.get(index)); ps.setString(3, userId); ps.setShort(4, assignRole); ps.setString(5, regUser); @@ -123,9 +123,9 @@ public class ListAssignJdbcSupport { } } - public int transferReservationUser(Long prjctIdx, Collection sids, String resveUser, int chunkSize) { + public int transferReservationUser(Long prjctIdx, Collection sids, String resveUser, int chunkSize) { int total = 0; - for (List sub : chunkSids(sids, chunkSize)) { + 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<>(); @@ -137,7 +137,7 @@ public class ListAssignJdbcSupport { return total; } - private int updateWithSidIn(String sqlPrefix, Long prjctIdx, List sids) { + private int updateWithSidIn(String sqlPrefix, Long prjctIdx, List sids) { String sql = sqlPrefix + createInSql(sids) + ")"; List args = new ArrayList<>(); args.add(prjctIdx); @@ -145,7 +145,7 @@ public class ListAssignJdbcSupport { return jdbcTemplate.update(sql, args.toArray()); } - private List> chunkSids(Collection sids, int chunkSize) { + private List> chunkSids(Collection sids, int chunkSize) { if (sids == null || sids.isEmpty()) { return List.of(); } @@ -153,15 +153,15 @@ public class ListAssignJdbcSupport { throw new IllegalArgumentException("chunkSize must be greater than 0"); } - List sidList = sids instanceof List list ? list : new ArrayList<>(sids); - List> chunks = new ArrayList<>(); + 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) { + private String createInSql(List sids) { StringJoiner joiner = new StringJoiner(","); for (int i = 0; i < sids.size(); i++) { joiner.add("?"); diff --git a/src/main/java/com/kri/contact/server/persistence/jdbc/ListCallHistJdbcSupport.java b/src/main/java/com/kri/contact/server/persistence/jdbc/ListCallHistJdbcSupport.java index 416d1c8..ff1e78c 100644 --- a/src/main/java/com/kri/contact/server/persistence/jdbc/ListCallHistJdbcSupport.java +++ b/src/main/java/com/kri/contact/server/persistence/jdbc/ListCallHistJdbcSupport.java @@ -16,7 +16,7 @@ public class ListCallHistJdbcSupport { public void upsertCallHistory( Long prjctIdx, - Integer sid, + String sid, ListCallStartRequestDto request, CallStatus callStatus, String regUser, @@ -95,4 +95,3 @@ public class ListCallHistJdbcSupport { return value == null ? "" : value; } } - 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 7395487..50cec44 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 @@ -17,7 +17,7 @@ public class ListResetJdbcSupport { private final EntityManager entityManager; - public DeleteCounts deleteHistories(Long prjctIdx, Collection sids, int chunkSize) { + public DeleteCounts deleteHistories(Long prjctIdx, Collection sids, int chunkSize) { if (sids == null || sids.isEmpty()) { return DeleteCounts.empty(); } @@ -41,7 +41,7 @@ public class ListResetJdbcSupport { public DeleteCounts deleteListData( Long prjctIdx, - Collection sids, + Collection sids, boolean includeFile, boolean includeResve, int chunkSize @@ -76,19 +76,19 @@ public class ListResetJdbcSupport { } } - private void prepareTempSids(Collection sids, int chunkSize) { + private void prepareTempSids(Collection sids, int chunkSize) { dropTempSids(); entityManager.createNativeQuery( - "create temporary table " + TEMP_SID_TABLE + " (sid int not null primary key) engine=memory" + "create temporary table " + TEMP_SID_TABLE + " (sid varchar(32) not null primary key) engine=memory" ).executeUpdate(); - List sidList = new ArrayList<>(sids); - for (List sub : chunkSids(sidList, chunkSize)) { + List sidList = new ArrayList<>(sids); + for (List sub : chunkSids(sidList, chunkSize)) { insertTempSids(sub); } } - private void insertTempSids(List sids) { + private void insertTempSids(List sids) { if (sids.isEmpty()) { return; } @@ -116,7 +116,7 @@ public class ListResetJdbcSupport { entityManager.createNativeQuery("drop temporary table if exists " + TEMP_SID_TABLE).executeUpdate(); } - private List> chunkSids(Collection sids, int chunkSize) { + private List> chunkSids(Collection sids, int chunkSize) { if (sids == null || sids.isEmpty()) { return List.of(); } @@ -124,15 +124,15 @@ public class ListResetJdbcSupport { throw new IllegalArgumentException("chunkSize must be greater than 0"); } - List sidList = new ArrayList<>(sids); - List> chunks = new ArrayList<>(); + List sidList = 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 createValuesSql(List sids) { + private String createValuesSql(List sids) { StringJoiner joiner = new StringJoiner(","); for (int i = 0; i < sids.size(); i++) { joiner.add("(:sid" + i + ")"); 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 a194fd8..b371adf 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 @@ -42,7 +42,7 @@ public class ListUpdateJdbcSupport { 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.setString(2, row.sid()); ps.setInt(3, row.listHderId()); ps.setString(4, row.beforeVal()); ps.setString(5, row.afterVal()); @@ -79,7 +79,7 @@ public class ListUpdateJdbcSupport { ps.setString(3, row.modUser()); ps.setTimestamp(4, Timestamp.valueOf(row.modDt())); ps.setLong(5, row.prjctIdx()); - ps.setInt(6, row.sid()); + ps.setString(6, row.sid()); }); } @@ -103,7 +103,7 @@ public class ListUpdateJdbcSupport { ps.setString(2, row.modUser()); ps.setTimestamp(3, Timestamp.valueOf(row.modDt())); ps.setLong(4, row.prjctIdx()); - ps.setInt(5, row.sid()); + ps.setString(5, row.sid()); ps.setInt(6, row.listHderId()); }); } @@ -126,7 +126,7 @@ public class ListUpdateJdbcSupport { batchUpdate(rows, batchSize, sql, (ps, row) -> { ps.setLong(1, row.prjctIdx()); - ps.setInt(2, row.sid()); + ps.setString(2, row.sid()); ps.setInt(3, row.listHderId()); ps.setString(4, row.listItemVal()); ps.setString(5, row.regUser()); @@ -148,7 +148,7 @@ public class ListUpdateJdbcSupport { batchUpdate(rows, batchSize, sql, (ps, row) -> { ps.setLong(1, row.prjctIdx()); - ps.setInt(2, row.sid()); + ps.setString(2, row.sid()); ps.setInt(3, row.listHderId()); }); } @@ -174,7 +174,7 @@ public class ListUpdateJdbcSupport { batchUpdate(rows, batchSize, sql, (ps, row) -> { ps.setShort(1, row.eventTy()); ps.setLong(2, row.prjctIdx()); - ps.setInt(3, row.sid()); + ps.setString(3, row.sid()); ps.setInt(4, row.resultCd()); if (row.metaData() == null) { ps.setNull(5, Types.VARCHAR); @@ -211,7 +211,7 @@ public class ListUpdateJdbcSupport { public record UpdateHistRow( Long prjctIdx, - Integer sid, + String sid, Integer listHderId, String beforeVal, String afterVal, @@ -221,7 +221,7 @@ public class ListUpdateJdbcSupport { public record ListUpdateRow( Long prjctIdx, - Integer sid, + String sid, Short isUse, String memo, String modUser, @@ -230,7 +230,7 @@ public class ListUpdateJdbcSupport { public record ListItemUpdateRow( Long prjctIdx, - Integer sid, + String sid, Integer listHderId, String listItemVal, String modUser, @@ -239,7 +239,7 @@ public class ListUpdateJdbcSupport { public record ListItemInsertRow( Long prjctIdx, - Integer sid, + String sid, Integer listHderId, String listItemVal, String regUser, @@ -248,14 +248,14 @@ public class ListUpdateJdbcSupport { public record ListItemDeleteRow( Long prjctIdx, - Integer sid, + String sid, Integer listHderId ) {} public record ListEventHistInsertRow( Short eventTy, Long prjctIdx, - Integer sid, + String sid, Integer resultCd, String metaData, String memo, 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 8de2c8d..e861e82 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 @@ -54,7 +54,7 @@ public class ListUploadJdbcSupport { ps.setString(1, r.listUploadLogId()); ps.setLong(2, r.prjctIdx()); ps.setInt(3, r.rowNo()); - ps.setInt(4, r.sid()); + ps.setString(4, r.sid()); ps.setInt(5, r.listHderId()); ps.setShort(6, r.specificType()); setNullableString(ps, 7, r.rawVal()); @@ -159,7 +159,7 @@ public class ListUploadJdbcSupport { 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(2, r.sid()); ps.setString(3, r.listUploadLogId()); ps.setShort(4, r.isUse()); setNullableString(ps, 5, r.memo()); @@ -198,7 +198,7 @@ public class ListUploadJdbcSupport { 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.setString(2, r.sid()); ps.setInt(3, r.listHderId()); setNullableString(ps, 4, r.listItemVal()); ps.setString(5, r.regUser()); @@ -236,7 +236,7 @@ public class ListUploadJdbcSupport { 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(2, r.sid()); ps.setString(3, r.userId()); ps.setShort(4, r.assignRole()); ps.setString(5, r.regUser()); @@ -273,7 +273,7 @@ public class ListUploadJdbcSupport { 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(2, r.sid()); ps.setString(3, r.cmpnId()); ps.setString(4, r.regUser()); ps.setTimestamp(5, Timestamp.valueOf(r.regDt())); @@ -299,7 +299,7 @@ public class ListUploadJdbcSupport { String listUploadLogId, Long prjctIdx, int rowNo, - int sid, + String sid, int listHderId, short specificType, String rawVal, @@ -314,7 +314,7 @@ public class ListUploadJdbcSupport { public record ListRowInsert( Long prjctIdx, - int sid, + String sid, String listUploadLogId, short isUse, String memo, @@ -324,7 +324,7 @@ public class ListUploadJdbcSupport { public record ListItemRowInsert( Long prjctIdx, - int sid, + String sid, int listHderId, String listItemVal, String regUser, @@ -333,7 +333,7 @@ public class ListUploadJdbcSupport { public record ListAssignRowInsert( Long prjctIdx, - int sid, + String sid, String userId, short assignRole, String regUser, @@ -342,7 +342,7 @@ public class ListUploadJdbcSupport { public record ListAssignCmpnRowInsert( Long prjctIdx, - int sid, + String sid, String cmpnId, String regUser, LocalDateTime regDt 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 index 759a766..ce01058 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListAssignCmpnRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListAssignCmpnRepository.java @@ -11,7 +11,7 @@ public interface ListAssignCmpnRepository extends JpaRepository sids); + int deleteWithPrjctIdxAndSids(Long prjctIdx, Collection sids); @Modifying(clearAutomatically = true, flushAutomatically = true) @Query(""" @@ -43,5 +43,5 @@ public interface ListAssignCmpnRepository extends JpaRepository findByPrjctIdxAndSidIn(Long prjctIdx, Collection sids); + 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 index 3c8c18c..18e3bff 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListAssignUserRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListAssignUserRepository.java @@ -11,7 +11,7 @@ public interface ListAssignUserRepository extends JpaRepository sids); + int deleteWithPrjctIdxAndSids(Long prjctIdx, Collection sids); @Modifying(clearAutomatically = true, flushAutomatically = true) @Query(""" @@ -38,7 +38,7 @@ public interface ListAssignUserRepository extends JpaRepository sids + Collection sids ); @Query(""" @@ -48,7 +48,7 @@ public interface ListAssignUserRepository extends JpaRepository findByPrjctIdxAndSidIn(Long prjctIdx, Collection sids); + List findByPrjctIdxAndSidIn(Long prjctIdx, Collection sids); @Modifying(clearAutomatically = true, flushAutomatically = true) @Query(""" 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 9b8bb78..eaedf2d 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 @@ -11,7 +11,7 @@ public interface ListEventHistRepository extends JpaRepository findByPrjctIdxAndSidOrderByRegDtDescListEventHistIdxDesc( Long prjctIdx, - Integer sid + String sid ); @Query(""" @@ -28,7 +28,7 @@ public interface ListEventHistRepository extends JpaRepository findLatestListByEventTyFromLatest( Long prjctIdx, - List sids + List sids ); @Query(""" @@ -43,7 +43,7 @@ public interface ListEventHistRepository extends JpaRepository findDownloadHistories( Long prjctIdx, - Collection sids, + Collection sids, Collection eventTypes, LocalDateTime startDate, LocalDateTime endDate @@ -67,7 +67,7 @@ public interface ListEventHistRepository extends JpaRepository findLatestDownloadHistories( Long prjctIdx, - Collection sids, + Collection sids, Collection eventTypes, LocalDateTime startDate, LocalDateTime endDate @@ -88,7 +88,7 @@ public interface ListEventHistRepository extends JpaRepository findLatestDownloadHistoriesFromLatest( Long prjctIdx, - Collection sids, + Collection sids, Collection eventTypes ); @@ -104,7 +104,7 @@ public interface ListEventHistRepository extends JpaRepository findDownloadHistoryCounts( Long prjctIdx, - Collection sids, + Collection sids, Collection eventTypes, LocalDateTime startDate, LocalDateTime endDate @@ -123,17 +123,17 @@ public interface ListEventHistRepository extends JpaRepository findHistoryCountsByEventType( Long prjctIdx, - Collection sids, + Collection sids, Collection eventTypes ); interface EventHistoryCountProjection { - Integer getSid(); + String getSid(); Long getHistoryCount(); } interface EventTypeHistoryCountProjection { - Integer getSid(); + String getSid(); Short getEventTy(); Long getPrjctSurveyIdx(); Long getHistoryCount(); 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 d15f8af..e129e65 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 @@ -12,7 +12,7 @@ public interface ListItemFileRepository extends JpaRepository findByIdPrjctIdxAndIdSidInAndIdListHderIdInOrderByIdSidAscIdListHderIdAsc( Long prjctIdx, - Collection sids, + Collection sids, Collection listHderIds ); @@ -31,6 +31,6 @@ public interface ListItemFileRepository extends JpaRepository sids + 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 31de91e..7f6de36 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 @@ -33,7 +33,7 @@ public interface ListItemRepository extends JpaRepository sids + Collection sids ); @Modifying(clearAutomatically = true, flushAutomatically = true) @@ -45,7 +45,7 @@ public interface ListItemRepository extends JpaRepository sids, + Collection sids, Collection rejectHeaderIds ); @@ -58,12 +58,12 @@ public interface ListItemRepository extends JpaRepository findByIdPrjctIdxAndIdSidIn( Long prjctIdx, - Set sids + Set sids ); List findByIdPrjctIdxAndIdSidInAndIdListHderIdIn( Long prjctIdx, - Set sids, + Set sids, Collection listHderIds ); 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 98db4a1..8e9793f 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 @@ -11,21 +11,21 @@ public interface ListQueryRepository { List findAllListEntities(Long prjctIdx, List emailTelnumHeaderIds, ListFilterDto listFilter); - List findAllSids(Long prjctIdx, List emailTelnumHeaderIds, ListFilterDto listFilter); + List findAllSids(Long prjctIdx, List emailTelnumHeaderIds, ListFilterDto listFilter); List findChunkedListEntities( Long prjctIdx, List emailTelnumHeaderIds, ListFilterDto listFilter, - Integer lastSid, + String lastSid, int limit ); - List findChunkedSids( + List findChunkedSids( Long prjctIdx, List emailTelnumHeaderIds, ListFilterDto listFilter, - Integer lastSid, + String 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 b834421..da7abba 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 @@ -32,6 +32,7 @@ import com.querydsl.core.types.dsl.StringPath; import com.querydsl.jpa.impl.JPAQuery; import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.impl.JPAQueryFactory; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -81,14 +82,14 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { QTListEntity list = QTListEntity.tListEntity; BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, exactMatchHeaderIds, listFilter, list); - return jpaQueryFactory.selectFrom(list) - .where(predicate) - .orderBy(list.id.sid.asc()) - .fetch(); + JPAQuery query = jpaQueryFactory.selectFrom(list) + .where(predicate); + orderByNaturalSid(query, list, Order.ASC); + return query.fetch(); } @Override - public List findAllSids( + public List findAllSids( Long prjctIdx, List exactMatchHeaderIds, ListFilterDto listFilter @@ -96,11 +97,11 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { QTListEntity list = QTListEntity.tListEntity; BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, exactMatchHeaderIds, listFilter, list); - return jpaQueryFactory.select(list.id.sid) + JPAQuery query = jpaQueryFactory.select(list.id.sid) .from(list) - .where(predicate) - .orderBy(list.id.sid.asc()) - .fetch(); + .where(predicate); + orderByNaturalSid(query, list, Order.ASC); + return query.fetch(); } @Override @@ -108,44 +109,73 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { Long prjctIdx, List exactMatchHeaderIds, ListFilterDto listFilter, - Integer lastSid, + String lastSid, int limit ) { QTListEntity list = QTListEntity.tListEntity; BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, exactMatchHeaderIds, listFilter, list); if (lastSid != null) { - predicate.and(list.id.sid.gt(lastSid)); + predicate.and(toAfterSidSortCursorPredicate(prjctIdx, list, lastSid)); } - return jpaQueryFactory.selectFrom(list) - .where(predicate) - .orderBy(list.id.sid.asc()) + JPAQuery query = jpaQueryFactory.selectFrom(list) + .where(predicate); + orderByNaturalSid(query, list, Order.ASC); + return query .limit(limit) .fetch(); } @Override - public List findChunkedSids( + public List findChunkedSids( Long prjctIdx, List exactMatchHeaderIds, ListFilterDto listFilter, - Integer lastSid, + String lastSid, int limit ) { QTListEntity list = QTListEntity.tListEntity; BooleanBuilder predicate = buildListFilterPredicate(prjctIdx, exactMatchHeaderIds, listFilter, list); if (lastSid != null) { - predicate.and(list.id.sid.gt(lastSid)); + predicate.and(toAfterSidSortCursorPredicate(prjctIdx, list, lastSid)); } - return jpaQueryFactory.select(list.id.sid) + JPAQuery query = jpaQueryFactory.select(list.id.sid) .from(list) - .where(predicate) - .orderBy(list.id.sid.asc()) + .where(predicate); + orderByNaturalSid(query, list, Order.ASC); + return query .limit(limit) .fetch(); } + private BooleanBuilder toAfterSidSortCursorPredicate(Long prjctIdx, QTListEntity list, String lastSid) { + QTListEntity cursor = new QTListEntity("sid_sort_cursor"); + TListEntity cursorRow = jpaQueryFactory.selectFrom(cursor) + .where( + cursor.id.prjctIdx.eq(prjctIdx), + cursor.id.sid.eq(lastSid) + ) + .fetchOne(); + + if (cursorRow == null || cursorRow.getSidSortType() == null) { + return new BooleanBuilder(list.id.sid.gt(lastSid)); + } + + Integer sortType = cursorRow.getSidSortType(); + BigDecimal sortNumber = cursorRow.getSidSortNumber(); + BooleanBuilder after = new BooleanBuilder() + .or(list.sidSortType.gt(sortType)); + + if (sortNumber == null) { + return after.or(list.sidSortType.eq(sortType).and(list.id.sid.gt(lastSid))); + } + + return after + .or(list.sidSortType.eq(sortType).and(list.sidSortNumber.gt(sortNumber))) + .or(list.sidSortType.eq(sortType).and(list.sidSortNumber.eq(sortNumber)).and(list.id.sid.gt(lastSid))); + } + private BooleanBuilder buildListFilterPredicate( Long prjctIdx, List exactMatchHeaderIds, @@ -180,7 +210,7 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { private void appendSidPredicates(BooleanBuilder predicate, QTListEntity list, Set sidSet) { BooleanBuilder sidPredicate = new BooleanBuilder(); - Set sidNumbers = new LinkedHashSet<>(); + Set sidNumbers = new LinkedHashSet<>(); for (String sidCondition : sidSet) { String normalized = normalizeBlank(sidCondition); @@ -191,7 +221,10 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { if (normalized.contains("~")) { sidPredicate.or(toSidRangePredicate(list, normalized)); } else { - sidNumbers.add(parseSidNumber(normalized, sidCondition)); + BigDecimal sidNumber = parseSidNumber(normalized, sidCondition); + if (sidNumber != null) { + sidNumbers.add(normalized); + } } } @@ -210,31 +243,36 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { return null; } - Integer start = parseSidNumber(tokens[0].trim(), normalized); - Integer end = parseSidNumber(tokens[1].trim(), normalized); + BigDecimal start = parseSidNumber(tokens[0].trim(), normalized); + BigDecimal end = parseSidNumber(tokens[1].trim(), normalized); if(start == null || end == null) { return null; } - if (start > end) { - Integer temp = start; + if (start.compareTo(end) > 0) { + BigDecimal temp = start; start = end; end = temp; } return new BooleanBuilder() - .and(list.id.sid.goe(start)) - .and(list.id.sid.loe(end)); + .and(list.sidSortNumber.isNotNull()) + .and(list.sidSortNumber.goe(start)) + .and(list.sidSortNumber.loe(end)); } - private Integer parseSidNumber(String value, String originalCondition) { + private BigDecimal parseSidNumber(String value, String originalCondition) { if (value == null || !value.matches("\\d+")) { return null; } try { - return Integer.valueOf(value); + BigDecimal parsed = new BigDecimal(value); + if (parsed.precision() > 32) { + throw invalidSidCondition(originalCondition); + } + return parsed; } catch (NumberFormatException e) { throw invalidSidCondition(originalCondition); } @@ -822,6 +860,10 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { PageRequestDto pageRequest ) { SortTarget sortTarget = resolveSortTarget(pageRequest); + if (sortTarget.naturalSid()) { + orderByNaturalSid(query, list, sortTarget.order()); + return; + } if (sortTarget.assignType() != null) { applyAssignSort(query, list, prjctIdx, sortTarget); } else if (sortTarget.listHderId() != null) { @@ -831,7 +873,15 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { } else { query.orderBy(toOrderSpecifier(sortTarget.order(), sortTarget.basePath())); } - query.orderBy(list.id.sid.asc()); + orderByNaturalSid(query, list, sortTarget.order()); + } + + private void orderByNaturalSid(JPAQuery query, QTListEntity list, Order order) { + query.orderBy( + toOrderSpecifier(order, list.sidSortType), + toOrderSpecifier(order, list.sidSortNumber), + toOrderSpecifier(order, list.id.sid) + ); } private SortTarget resolveSortTarget(PageRequestDto pageRequest) { @@ -863,7 +913,7 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { if (listHderId != null) { return SortTarget.item(order, listHderId); } - return SortTarget.base(order, QTListEntity.tListEntity.id.sid); + return SortTarget.sidNatural(order); } private void applyAssignSort( @@ -970,22 +1020,27 @@ public class ListQueryRepositoryImpl implements ListQueryRepository { Short assignType, Integer listHderId, Short resultType, - Long prjctSurveyIdx + Long prjctSurveyIdx, + boolean naturalSid ) { + private static SortTarget sidNatural(Order order) { + return new SortTarget(order, null, null, null, null, null, true); + } + private static SortTarget base(Order order, ComparableExpressionBase path) { - return new SortTarget(order, path, null, null, null, null); + return new SortTarget(order, path, null, null, null, null, false); } private static SortTarget assign(Order order, Short assignType) { - return new SortTarget(order, null, assignType, null, null, null); + return new SortTarget(order, null, assignType, null, null, null, false); } private static SortTarget item(Order order, Integer listHderId) { - return new SortTarget(order, null, null, listHderId, null, null); + return new SortTarget(order, null, null, listHderId, null, null, false); } private static SortTarget result(Order order, Short resultType, Long prjctSurveyIdx) { - return new SortTarget(order, null, null, null, resultType, prjctSurveyIdx); + return new SortTarget(order, null, null, null, resultType, prjctSurveyIdx, false); } } 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 973b8d4..3d0e567 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 @@ -14,16 +14,16 @@ import org.springframework.data.jpa.repository.Query; public interface ListRepository extends JpaRepository, JpaSpecificationExecutor, ListQueryRepository { - List findByIdPrjctIdxAndIdSidIn(Long prjctIdx, Collection sids); + List findByIdPrjctIdxAndIdSidIn(Long prjctIdx, Collection sids); - boolean existsByIdPrjctIdxAndIdSid(Long prjctIdx, Integer sid); + boolean existsByIdPrjctIdxAndIdSid(Long prjctIdx, String sid); @Query(""" select l.id.sid from TListEntity l where l.id.prjctIdx = :prjctIdx """) - Set findSidsByPrjctIdx(Long prjctIdx); + Set findSidsByPrjctIdx(Long prjctIdx); @Modifying(clearAutomatically = true, flushAutomatically = true) @Query(""" @@ -40,6 +40,6 @@ public interface ListRepository extends JpaRepository sids + Collection sids ); } 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 index 609fa52..7e8283e 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListReserveRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListReserveRepository.java @@ -13,6 +13,6 @@ public interface ListReserveRepository extends JpaRepository findByPrjctIdxAndSidOrderByResveDtAscListResveIdxAsc( Long prjctIdx, - Integer sid + String 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 820b8c8..6dc41df 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 @@ -11,7 +11,7 @@ public interface ListUpdateHistRepository extends JpaRepository findByPrjctIdxAndSidOrderByRegDtDescListUpdateHistIdxDesc( Long prjctIdx, - Integer sid + String sid ); @Query(""" @@ -23,7 +23,7 @@ public interface ListUpdateHistRepository extends JpaRepository findDownloadHistories( Long prjctIdx, - Collection sids + Collection sids ); @Query(""" @@ -36,11 +36,11 @@ public interface ListUpdateHistRepository extends JpaRepository findDownloadHistoryGroups( Long prjctIdx, - Collection sids + Collection sids ); interface UpdateHistoryGroupProjection { - Integer getSid(); + String getSid(); LocalDateTime getRegDt(); String getRegUser(); } diff --git a/src/main/java/com/kri/contact/server/scheduler/ListUploadFileCleanupScheduler.java b/src/main/java/com/kri/contact/server/scheduler/ListUploadFileCleanupScheduler.java index 8cca132..f104716 100644 --- a/src/main/java/com/kri/contact/server/scheduler/ListUploadFileCleanupScheduler.java +++ b/src/main/java/com/kri/contact/server/scheduler/ListUploadFileCleanupScheduler.java @@ -17,22 +17,22 @@ public class ListUploadFileCleanupScheduler { private final ListUploadLogRepository listUploadLogRepository; private final ListFileService listFileService; - private final long expireDays; + private final long expireMonths; public ListUploadFileCleanupScheduler( ListUploadLogRepository listUploadLogRepository, ListFileService listFileService, - @Value("${kri.list-upload-file.cleanup-expire-days:7}") long expireDays + @Value("${kri.list-upload-file.cleanup-expire-months:3}") long expireMonths ) { this.listUploadLogRepository = listUploadLogRepository; this.listFileService = listFileService; - this.expireDays = expireDays; + this.expireMonths = expireMonths; } @Transactional @Scheduled(cron = "${kri.list-upload-file.cleanup-cron:0 30 0 * * SUN}") public void cleanupOldListUploadFiles() { - LocalDateTime threshold = LocalDateTime.now().minusDays(expireDays); + LocalDateTime threshold = LocalDateTime.now().minusMonths(expireMonths); LocalDateTime deletedAt = LocalDateTime.now(); List uploadLogs = 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 73ae2bd..f1a91f7 100644 --- a/src/main/java/com/kri/contact/server/service/AssignService.java +++ b/src/main/java/com/kri/contact/server/service/AssignService.java @@ -158,7 +158,7 @@ public class AssignService { ); } ListAssignType assignType = requireAssignType(req.getAssignType()); - Set targetSids = resolveTargetSids(prjctIdx, req.getListFilter()); + Set targetSids = resolveTargetSids(prjctIdx, req.getListFilter()); if (targetSids.isEmpty()) { return 0; } @@ -201,7 +201,7 @@ public class AssignService { @Transactional public Integer resetListAssign(Long prjctIdx, ListAssignResetRequestDto req) { ListAssignType assignType = requireAssignType(req == null ? null : req.getAssignType()); - Set targetSids = resolveTargetSids(prjctIdx, req); + Set targetSids = resolveTargetSids(prjctIdx, req); if (targetSids.isEmpty()) { return 0; } @@ -218,7 +218,7 @@ public class AssignService { } @Transactional(readOnly = true) - public List findListAssignUserRoles(Long prjctIdx, Collection sids) { + public List findListAssignUserRoles(Long prjctIdx, Collection sids) { if (sids == null || sids.isEmpty()) { return Collections.emptyList(); } @@ -257,7 +257,7 @@ public class AssignService { } @Transactional(readOnly = true) - public List findListAssignCmpns(Long prjctIdx, Collection sids) { + public List findListAssignCmpns(Long prjctIdx, Collection sids) { if (sids == null || sids.isEmpty()) { return Collections.emptyList(); } @@ -368,23 +368,23 @@ public class AssignService { return assignType; } - private Set resolveTargetSids(Long prjctIdx, ListAssignResetRequestDto req) { + private Set resolveTargetSids(Long prjctIdx, ListAssignResetRequestDto req) { return resolveTargetSids(prjctIdx, req == null ? null : req.getListFilter()); } - private Set resolveTargetSids(Long prjctIdx, ListFilterDto listFilter) { + 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 sid, String userId, Short assignRole ) {} public record ListAssignCmpn( - Integer sid, + String sid, String cmpnId ) {} } 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 218a196..dbb1445 100644 --- a/src/main/java/com/kri/contact/server/service/ListCallHistService.java +++ b/src/main/java/com/kri/contact/server/service/ListCallHistService.java @@ -37,7 +37,7 @@ public class ListCallHistService { @Transactional public ListCallHistDto callStart( Long prjctIdx, - Integer sid, + String sid, ListCallStartRequestDto request, String regUser, String userCmpn, @@ -50,7 +50,7 @@ public class ListCallHistService { @Transactional public ListCallHistDto callClose( Long prjctIdx, - Integer sid, + String sid, ListCallCloseRequestDto request, String regUser, String userCmpn, @@ -62,7 +62,7 @@ public class ListCallHistService { private ListCallHistDto saveCallHistory( Long prjctIdx, - Integer sid, + String sid, ListCallStartRequestDto request, CallStatus callStatus, String regUser, @@ -124,7 +124,7 @@ public class ListCallHistService { public void validateListCallHistoryForEvent( Long listCallHistIdx, Long prjctIdx, - Integer sid, + String sid, String userId, String userCmpn, Integer userRole @@ -176,7 +176,7 @@ public class ListCallHistService { private void validateCallIdentity( TListCallHistEntity existing, Long prjctIdx, - Integer sid, + String sid, ListCallStartRequestDto request ) { rejectDifferent("prjctIdx", existing.getPrjctIdx(), prjctIdx); @@ -223,7 +223,7 @@ public class ListCallHistService { return true; } Long prjctIdx = entity.getPrjctIdx(); - Integer sid = entity.getSid(); + String sid = entity.getSid(); if (userRole >= ContactConstant.FIELDWORK_USER_ROLE) { return hasText(userId) && (projectAssignUserRepository.existsByIdPrjctIdxAndIdUserId(prjctIdx, userId) 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 77e5dae..ca84a7a 100644 --- a/src/main/java/com/kri/contact/server/service/ListDownloadService.java +++ b/src/main/java/com/kri/contact/server/service/ListDownloadService.java @@ -81,7 +81,7 @@ public class ListDownloadService { ExcelMapper.StreamingMapWriter writer = ExcelMapper.openStreamingMapWriter(toBaseHeaderNames(headers), 100); ByteArrayOutputStream out = new ByteArrayOutputStream() ) { - Integer lastSid = null; + String lastSid = null; while (true) { List rows = listSearchService.findDownloadListRows(prjctIdx, listFilter, lastSid); if (rows.isEmpty()) { @@ -126,15 +126,15 @@ public class ListDownloadService { ExcelMapper.StreamingMapWriter writer = ExcelMapper.openStreamingMapWriter(excelHeaders, 100); ByteArrayOutputStream out = new ByteArrayOutputStream() ) { - Integer lastSid = null; + String 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( + List sids = rows.stream().map(ListSearchService.DownloadListRow::sid).toList(); + Map> historyMap = listSearchService.findEventHistoriesForDownload( prjctIdx, sids, resultCodeTypes, @@ -174,17 +174,17 @@ public class ListDownloadService { ExcelMapper.StreamingMapWriter writer = ExcelMapper.openStreamingMapWriter(excelHeaders, 100); ByteArrayOutputStream out = new ByteArrayOutputStream() ) { - Integer lastSid = null; + String lastSid = null; while (true) { - List sids = listSearchService.findDownloadSids(prjctIdx, listFilter, lastSid); + List sids = listSearchService.findDownloadSids(prjctIdx, listFilter, lastSid); if (sids.isEmpty()) { break; } - Map> historyMap = + Map> historyMap = listSearchService.findUpdateHistoryGroupsForDownload(prjctIdx, sids); - for (Integer sid : sids) { + for (String sid : sids) { lastSid = sid; List histories = historyMap.getOrDefault(sid, List.of()); if (histories.isEmpty()) { @@ -223,11 +223,11 @@ public class ListDownloadService { ByteArrayOutputStream out = new ByteArrayOutputStream(); ZipOutputStream zip = new ZipOutputStream(out) ) { - Integer lastSid = null; + String lastSid = null; int fileCount = 0; while (true) { - List sids = listSearchService.findDownloadSids(prjctIdx, listFilter, lastSid); + List sids = listSearchService.findDownloadSids(prjctIdx, listFilter, lastSid); if (sids.isEmpty()) { break; } @@ -267,7 +267,7 @@ public class ListDownloadService { } } - public ListUploadFileInfoDto downloadItemFile(Long prjctIdx, Integer sid, Integer listHderId) { + public ListUploadFileInfoDto downloadItemFile(Long prjctIdx, String sid, Integer listHderId) { TListItemFileEntity fileEntity = listItemFileRepository .findById(TListItemFileEntityId.create(prjctIdx, sid, listHderId)) .orElseThrow(() -> BusinessException.notFound( @@ -296,14 +296,14 @@ public class ListDownloadService { DateRangeDto dateRange ) { int maxCount = 0; - Integer lastSid = null; + String lastSid = null; while (true) { - List sids = listSearchService.findDownloadSids(prjctIdx, listFilter, lastSid); + List sids = listSearchService.findDownloadSids(prjctIdx, listFilter, lastSid); if (sids.isEmpty()) { return maxCount; } - Map countMap = searchBase == ListEventHistoryBase.LATEST + Map countMap = searchBase == ListEventHistoryBase.LATEST ? listSearchService.findEventHistoriesForDownload( prjctIdx, sids, @@ -334,14 +334,14 @@ public class ListDownloadService { private int findMaxUpdateHistoryGroupCount(Long prjctIdx, ListFilterDto listFilter) { int maxCount = 0; - Integer lastSid = null; + String lastSid = null; while (true) { - List sids = listSearchService.findDownloadSids(prjctIdx, listFilter, lastSid); + List sids = listSearchService.findDownloadSids(prjctIdx, listFilter, lastSid); if (sids.isEmpty()) { return maxCount; } - Map countMap = listSearchService.findUpdateHistoryGroupCountsForDownload(prjctIdx, sids); + Map countMap = listSearchService.findUpdateHistoryGroupCountsForDownload(prjctIdx, sids); for (Integer count : countMap.values()) { maxCount = Math.max(maxCount, count); } @@ -396,7 +396,7 @@ public class ListDownloadService { } private Map createUpdateHistoryRow( - Integer sid, + String sid, List histories, int maxHistoryCount ) { @@ -560,4 +560,3 @@ public class ListDownloadService { Integer resultCd ) {} } - diff --git a/src/main/java/com/kri/contact/server/service/ListHistoryQueryService.java b/src/main/java/com/kri/contact/server/service/ListHistoryQueryService.java index a307177..d2bc94c 100644 --- a/src/main/java/com/kri/contact/server/service/ListHistoryQueryService.java +++ b/src/main/java/com/kri/contact/server/service/ListHistoryQueryService.java @@ -17,7 +17,7 @@ public class ListHistoryQueryService { private final ListUpdateHistRepository listUpdateHistRepository; @Transactional(readOnly = true) - public List findEventHistories(Long prjctIdx, Integer sid) { + public List findEventHistories(Long prjctIdx, String sid) { return listEventHistRepository.findByPrjctIdxAndSidOrderByRegDtDescListEventHistIdxDesc(prjctIdx, sid) .stream() .map(ListEventHistoryDto::from) @@ -25,7 +25,7 @@ public class ListHistoryQueryService { } @Transactional(readOnly = true) - public List findUpdateHistories(Long prjctIdx, Integer sid) { + public List findUpdateHistories(Long prjctIdx, String sid) { return listUpdateHistRepository.findByPrjctIdxAndSidOrderByRegDtDescListUpdateHistIdxDesc(prjctIdx, sid) .stream() .map(ListUpdateHistoryDto::from) 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 ec59bca..3edcf4a 100644 --- a/src/main/java/com/kri/contact/server/service/ListResetService.java +++ b/src/main/java/com/kri/contact/server/service/ListResetService.java @@ -33,14 +33,14 @@ public class ListResetService { String regUser, LocalDateTime regDt ) { - Set sids = listSearchService.findTargetSids(prjctIdx, filter); + Set sids = listSearchService.findTargetSids(prjctIdx, filter); return resetBySids(prjctIdx, sids, mode, regUser, regDt); } @Transactional public int resetBySids( Long prjctIdx, - Set sids, + Set sids, ListResetMode mode, String regUser, LocalDateTime 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 0700e8b..89ecfec 100644 --- a/src/main/java/com/kri/contact/server/service/ListSearchService.java +++ b/src/main/java/com/kri/contact/server/service/ListSearchService.java @@ -71,7 +71,7 @@ public class ListSearchService { private final ProjectSurveyRepository projectSurveyRepository; @Transactional(readOnly = true) - public ListSearchWithFullResultDto searchListWithSid(Long prjctIdx, Integer sid) { + public ListSearchWithFullResultDto searchListWithSid(Long prjctIdx, String sid) { ListFilterDto filterDto = ListFilterDto.onlyOneSid(sid); List result = createListSearchWithFullResult( prjctIdx, @@ -118,7 +118,7 @@ public class ListSearchService { } @Transactional(readOnly = true) - public Set findTargetSids(Long prjctIdx, ListFilterDto listFilter) { + public Set findTargetSids(Long prjctIdx, ListFilterDto listFilter) { return new LinkedHashSet<>(findAllSids(prjctIdx, listFilter)); } @@ -126,7 +126,7 @@ public class ListSearchService { public List findDownloadListRows( Long prjctIdx, ListFilterDto listFilter, - Integer lastSid + String lastSid ) { List exactMatchHeaderIds = listHeaderService.getExactMatchHeaderId(prjctIdx); List listEntities = listRepository.findChunkedListEntities( @@ -140,11 +140,11 @@ public class ListSearchService { return Collections.emptyList(); } - Set sidSet = listEntities.stream() + Set sidSet = listEntities.stream() .map(TListEntity::getSid) .collect(Collectors.toCollection(LinkedHashSet::new)); - Map> itemMapBySid = createItemMapBySid(prjctIdx, sidSet, null); - Map assignMapBySid = createAssignMapBySid(prjctIdx, sidSet); + Map> itemMapBySid = createItemMapBySid(prjctIdx, sidSet, null); + Map assignMapBySid = createAssignMapBySid(prjctIdx, sidSet); return listEntities.stream() .map(entity -> new DownloadListRow( @@ -158,10 +158,10 @@ public class ListSearchService { } @Transactional(readOnly = true) - public List findDownloadSids( + public List findDownloadSids( Long prjctIdx, ListFilterDto listFilter, - Integer lastSid + String lastSid ) { List exactMatchHeaderIds = listHeaderService.getExactMatchHeaderId(prjctIdx); return listRepository.findChunkedSids( @@ -174,9 +174,9 @@ public class ListSearchService { } @Transactional(readOnly = true) - public Map findEventHistoryCountsForDownload( + public Map findEventHistoryCountsForDownload( Long prjctIdx, - Collection sids, + Collection sids, Collection resultCodeTypes, DateRangeDto dateRange ) { @@ -201,9 +201,9 @@ public class ListSearchService { } @Transactional(readOnly = true) - public Map> findEventHistoriesForDownload( + public Map> findEventHistoriesForDownload( Long prjctIdx, - Collection sids, + Collection sids, Collection resultCodeTypes, ListEventHistoryBase searchBase, DateRangeDto dateRange @@ -241,7 +241,7 @@ public class ListSearchService { private List findLatestEventHistoriesForDownload( Long prjctIdx, - Collection sids, + Collection sids, Collection eventTypes, LocalDateTime startDate, LocalDateTime endDate @@ -253,15 +253,15 @@ public class ListSearchService { } @Transactional(readOnly = true) - public Map findUpdateHistoryGroupCountsForDownload( + public Map findUpdateHistoryGroupCountsForDownload( Long prjctIdx, - Collection sids + Collection sids ) { if (sids == null || sids.isEmpty()) { return Collections.emptyMap(); } - Map counts = new LinkedHashMap<>(); + Map counts = new LinkedHashMap<>(); for (ListUpdateHistRepository.UpdateHistoryGroupProjection projection : listUpdateHistRepository.findDownloadHistoryGroups(prjctIdx, sids)) { counts.merge(projection.getSid(), 1, Integer::sum); @@ -270,9 +270,9 @@ public class ListSearchService { } @Transactional(readOnly = true) - public Map> findUpdateHistoryGroupsForDownload( + public Map> findUpdateHistoryGroupsForDownload( Long prjctIdx, - Collection sids + Collection sids ) { if (sids == null || sids.isEmpty()) { return Collections.emptyMap(); @@ -294,7 +294,7 @@ public class ListSearchService { Collectors.toList() )); - Map> result = new LinkedHashMap<>(); + Map> result = new LinkedHashMap<>(); for (Map.Entry> entry : grouped.entrySet()) { List groupHistories = entry.getValue().stream() .sorted(Comparator.comparing( @@ -328,20 +328,20 @@ public class ListSearchService { @Transactional(readOnly = true) public List findUpdateTargetRows( Long prjctIdx, - Collection sids, + Collection sids, Collection headerIds ) { if (sids == null || sids.isEmpty()) { return Collections.emptyList(); } - Set sidSet = new LinkedHashSet<>(sids); + Set sidSet = new LinkedHashSet<>(sids); List listEntities = listRepository.findByIdPrjctIdxAndIdSidIn(prjctIdx, sidSet); if (listEntities.isEmpty()) { return Collections.emptyList(); } - Map> itemMapBySid = createItemMapBySid(prjctIdx, sidSet, headerIds); + Map> itemMapBySid = createItemMapBySid(prjctIdx, sidSet, headerIds); List rows = new ArrayList<>(listEntities.size()); for (TListEntity entity : listEntities) { rows.add(new ListUpdateTargetRow( @@ -371,7 +371,7 @@ public class ListSearchService { return listRepository.findAllListEntities(prjctIdx, exactMatchHeaderIds, listFilter); } - private List findAllSids(Long prjctIdx, ListFilterDto listFilter) { + private List findAllSids(Long prjctIdx, ListFilterDto listFilter) { List exactMatchHeaderIds = listHeaderService.getExactMatchHeaderId(prjctIdx); return listRepository.findAllSids(prjctIdx, exactMatchHeaderIds, listFilter); } @@ -388,7 +388,7 @@ public class ListSearchService { return Collections.emptyList(); } - List sids = rows.stream() + List sids = rows.stream() .map(row -> row.listEntity().getSid()) .toList(); @@ -398,7 +398,7 @@ public class ListSearchService { return rows.stream() .map(row -> { - Integer sid = row.listEntity().getSid(); + String sid = row.listEntity().getSid(); return ListSearchWithResultDto.from( row.listEntity(), row.itemList(), @@ -423,7 +423,7 @@ public class ListSearchService { return Collections.emptyList(); } - List sids = rows.stream() + List sids = rows.stream() .map(row -> row.listEntity().getSid()) .toList(); @@ -437,12 +437,12 @@ public class ListSearchService { .with("prjctIdx", prjctIdx); } - Map mailSendResultMap = messageResultService.findSendResultMap( + Map mailSendResultMap = messageResultService.findSendResultMap( ChannelType.EMAIL, project.getPrjctCd(), sids ); - Map smsSendResultMap = messageResultService.findSendResultMap( + Map smsSendResultMap = messageResultService.findSendResultMap( ChannelType.SMS, project.getPrjctCd(), sids @@ -450,7 +450,7 @@ public class ListSearchService { return rows.stream() .map(row -> { - Integer sid = row.listEntity().getSid(); + String sid = row.listEntity().getSid(); ListSendResultDto mailSendResult = mailSendResultMap.get(sid); ListSendResultDto smsSendResult = smsSendResultMap.get(sid); return ListSearchWithFullResultDto.from( @@ -473,7 +473,7 @@ public class ListSearchService { .toList(); } - private Map createLatestResultMap(Long prjctIdx, List sids) { + private Map createLatestResultMap(Long prjctIdx, List sids) { return listEventHistRepository .findLatestListByEventTyFromLatest(prjctIdx, sids) .stream() @@ -486,7 +486,7 @@ public class ListSearchService { } private List createSurveyResults( - Integer sid, + String sid, Map resultMap, Map attemptCountMap, Map surveyMap @@ -518,7 +518,7 @@ public class ListSearchService { LinkedHashMap::new )); } - private Map findAttemptCountMap(Long prjctIdx, Collection sids) { + private Map findAttemptCountMap(Long prjctIdx, Collection sids) { if (sids == null || sids.isEmpty()) { return Collections.emptyMap(); } @@ -564,11 +564,11 @@ public class ListSearchService { return Collections.emptyList(); } - Set sidSet = listEntities.stream() + Set sidSet = listEntities.stream() .map(TListEntity::getSid) .collect(Collectors.toCollection(LinkedHashSet::new)); - Map> itemMapBySid = createItemMapBySid(prjctIdx, sidSet, null); - Map assignMapBySid = createAssignMapBySid(prjctIdx, sidSet); + Map> itemMapBySid = createItemMapBySid(prjctIdx, sidSet, null); + Map assignMapBySid = createAssignMapBySid(prjctIdx, sidSet); return listEntities.stream() .map(entity -> new ListSearchRow( @@ -579,9 +579,9 @@ public class ListSearchService { .toList(); } - private Map> createItemMapBySid( + private Map> createItemMapBySid( Long prjctIdx, - Set sidSet, + Set sidSet, Collection headerIds ) { List itemEntities = headerIds == null || headerIds.isEmpty() @@ -601,14 +601,14 @@ public class ListSearchService { )); } - private Map createAssignMapBySid(Long prjctIdx, Set sidSet) { + private Map createAssignMapBySid(Long prjctIdx, Set sidSet) { List assignRows = assignService.findListAssignUserRoles(prjctIdx, sidSet); List assignCmpnRows = assignService.findListAssignCmpns(prjctIdx, sidSet); if (assignRows.isEmpty() && assignCmpnRows.isEmpty()) { return Collections.emptyMap(); } - Map result = new LinkedHashMap<>(); + Map result = new LinkedHashMap<>(); for (ListAssignCmpn assignCmpnRow : assignCmpnRows) { AssignValues assignValues = result.computeIfAbsent(assignCmpnRow.sid(), ignored -> AssignValues.empty()); assignValues.outsourceUserIds().add(assignCmpnRow.cmpnId()); @@ -683,13 +683,13 @@ public class ListSearchService { ) {} private record ListResultKey( - Integer sid, + String sid, Short eventTy, Long prjctSurveyIdx ) {} private record UpdateHistoryGroupKey( - Integer sid, + String sid, LocalDateTime regDt, String regUser ) {} @@ -705,7 +705,7 @@ public class ListSearchService { } public record DownloadListRow( - Integer sid, + String sid, Short isUse, String memo, Map itemMap, @@ -730,10 +730,9 @@ public class ListSearchService { ) {} public record ListUpdateTargetRow( - Integer sid, + String 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 index 6e0b47d..630e8a1 100644 --- a/src/main/java/com/kri/contact/server/service/ListUpdateService.java +++ b/src/main/java/com/kri/contact/server/service/ListUpdateService.java @@ -84,7 +84,7 @@ public class ListUpdateService { } validateResultCodes(prjctIdx, updateResultCodes); - Set sids = resolveTargetSids(prjctIdx, request.getListFilter()); + Set sids = resolveTargetSids(prjctIdx, request.getListFilter()); if (sids.isEmpty()) { return 0; } @@ -97,9 +97,9 @@ public class ListUpdateService { if (!updateContents.isEmpty()) { List itemHeaderIds = updateContents.keySet().stream().toList(); - List sidList = new ArrayList<>(sids); + 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 sidChunk = sidList.subList(i, Math.min(sidList.size(), i + chunkSize)); List targetRows = listSearchService.findUpdateTargetRows( prjctIdx, sidChunk, @@ -174,13 +174,13 @@ public class ListUpdateService { private void insertResultCodeHistories( Long prjctIdx, - Collection sids, + Collection sids, Map resultCodes, String regUser, LocalDateTime regDt ) { List rows = new ArrayList<>(); - for (Integer sid : sids) { + for (String sid : sids) { for (Map.Entry entry : resultCodes.entrySet()) { rows.add(new ListEventHistInsertRow( entry.getKey().getCode(), @@ -197,7 +197,7 @@ public class ListUpdateService { listUpdateJdbcSupport.batchInsertListEventHist(rows, ContactConstant.INSERT_CHUNK_SIZE); } - private void validateEventHistoryTarget(Long prjctIdx, Integer sid) { + private void validateEventHistoryTarget(Long prjctIdx, String sid) { if (!listRepository.existsByIdPrjctIdxAndIdSid(prjctIdx, sid)) { throw BusinessException.badRequest("LIST_NOT_FOUND", "이력을 추가할 리스트를 찾을 수 없습니다."); } @@ -289,7 +289,7 @@ public class ListUpdateService { LocalDateTime regDt ) { List updateHistRows = new ArrayList<>(); - Map listUpdates = new LinkedHashMap<>(); + Map listUpdates = new LinkedHashMap<>(); Map itemUpdates = new LinkedHashMap<>(); Map itemInserts = new LinkedHashMap<>(); Map itemDeletes = new LinkedHashMap<>(); @@ -302,7 +302,7 @@ public class ListUpdateService { for (Map.Entry entry : updateContents.entrySet()) { Integer headerId = entry.getKey(); - Integer sid = targetRow.sid(); + String sid = targetRow.sid(); TListHeaderEntity header = headerMap.get(headerId); boolean deleteFile = isFileDeleteCommand(header, entry.getValue()); String newValue = deleteFile ? "" : normalizeUpdateValue(header, entry.getValue()); @@ -428,7 +428,7 @@ public class ListUpdateService { return; } - Set sids = fileDeleteKeys.stream() + Set sids = fileDeleteKeys.stream() .map(ListItemKey::sid) .collect(LinkedHashSet::new, LinkedHashSet::add, LinkedHashSet::addAll); Set headerIds = fileDeleteKeys.stream() @@ -455,7 +455,7 @@ public class ListUpdateService { } } - private Set resolveTargetSids(Long prjctIdx, ListFilterDto listFilter) { + private Set resolveTargetSids(Long prjctIdx, ListFilterDto listFilter) { return new LinkedHashSet<>(listSearchService.findTargetSids(prjctIdx, listFilter)); } @@ -545,8 +545,7 @@ public class ListUpdateService { } private record ListItemKey( - Integer sid, + String 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 80db0eb..9484038 100644 --- a/src/main/java/com/kri/contact/server/service/ListUploadService.java +++ b/src/main/java/com/kri/contact/server/service/ListUploadService.java @@ -111,7 +111,7 @@ public class ListUploadService { @Transactional public void uploadItemFile( Long prjctIdx, - Integer sid, + String sid, Map files, Integer userRole, String regUser, @@ -376,7 +376,7 @@ public class ListUploadService { } } - private String buildItemStoredFileName(Integer sid, String headerName, String originalFileName) { + private String buildItemStoredFileName(String sid, String headerName, String originalFileName) { return sanitizeFileName(sid + "_" + headerName + "_" + originalFileName); } @@ -414,7 +414,7 @@ public class ListUploadService { List resolvedHeaders, Map cmpnByUploadText, String listUploadLogId, - Set uploadedSids, + Set uploadedSids, String uploadUser, LocalDateTime uploadDt ) { @@ -451,7 +451,7 @@ public class ListUploadService { List assignCmpnRows = new ArrayList<>(); ExcelMapper.readStreaming(listFilePath, UPPER_CASE_HEADER_OPTIONS, (row, rowNo) -> { - Integer sid = parseOnlyInteger(row.get(sidHeaderName)); + String sid = parseNumericSid(row.get(sidHeaderName)); short isUse = parseIsUseSafe(row.get(isUseHeaderName)); String memo = normalizeBlank(row.get(memoHeaderName)); @@ -581,7 +581,7 @@ public class ListUploadService { String outsourceHeaderName = findOptionalHeaderNameByType(resolvedHeaders, ListHeaderType.OUTSOURCE); Set prjctAssignUserSet = new LinkedHashSet<>(prjctAssignList); - Set uploadedSids = new LinkedHashSet<>(); + Set uploadedSids = new LinkedHashSet<>(); List errors = new ArrayList<>(); List tempBuffer = new ArrayList<>(); AtomicInteger totalCount = new AtomicInteger(); @@ -591,7 +591,7 @@ public class ListUploadService { ExcelMapper.readStreaming(listFilePath, UPPER_CASE_HEADER_OPTIONS, (row, rowNo) -> { totalCount.incrementAndGet(); - Integer sid = parseOnlyInteger(row.get(sidHeaderName)); + String sid = parseNumericSid(row.get(sidHeaderName)); if (sid == null) { errors.add(ListUploadErrorDto.of(rowNo, sidHeaderName, "SID는 필수이며 정수여야 합니다.")); return; @@ -800,9 +800,14 @@ public class ListUploadService { return parseIsUse(s); } + private String parseNumericSid(String raw) { + Integer parsed = parseOnlyInteger(raw); + return parsed == null ? null : String.valueOf(parsed); + } + private record ValidationSummary( int totalCount, - Set uploadedSids, + Set uploadedSids, List errors ) {} diff --git a/src/main/java/com/kri/contact/server/service/MessageResultService.java b/src/main/java/com/kri/contact/server/service/MessageResultService.java index b3ef1e1..989081d 100644 --- a/src/main/java/com/kri/contact/server/service/MessageResultService.java +++ b/src/main/java/com/kri/contact/server/service/MessageResultService.java @@ -44,10 +44,10 @@ import org.springframework.transaction.annotation.Transactional; public class MessageResultService { private final NotiHubApiClient notiHubApiClient; - public Map findSendResultMap( + public Map findSendResultMap( ChannelType channelTy, String prjctCd, - List sids + List sids ) { if (sids == null || sids.isEmpty()) { return Collections.emptyMap(); @@ -64,20 +64,10 @@ public class MessageResultService { return notiHubApiClient.getLastSendResults(channelTy, REQUEST_SERVICE, prjctCd, sidValues) .stream() .collect(Collectors.toMap( - dto -> parseSid(dto.getSid()), + dto -> dto.getSid(), ListSendResultDto::from, (left, right) -> left, LinkedHashMap::new )); } - private Integer parseSid(String sid) { - if (sid == null || sid.isBlank()) { - return null; - } - try { - return Integer.valueOf(sid); - } catch (NumberFormatException e) { - return null; - } - } } 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 5149442..7e466e2 100644 --- a/src/main/java/com/kri/contact/server/service/MessageService.java +++ b/src/main/java/com/kri/contact/server/service/MessageService.java @@ -183,7 +183,7 @@ public class MessageService { ) { List destInfos = new ArrayList<>(); Set dedupeKeys = new LinkedHashSet<>(); - Integer lastSid = null; + String lastSid = null; while (true) { List rows = listSearchService.findDownloadListRows( @@ -445,7 +445,7 @@ public class MessageService { ) {} private static class ListFilterDtoFactory { - static com.kri.contact.server.dto.list.ListFilterDto onlySid(Integer sid) { + static com.kri.contact.server.dto.list.ListFilterDto onlySid(String sid) { return com.kri.contact.server.dto.list.ListFilterDto.onlyOneSid(sid); } } diff --git a/src/main/java/com/kri/contact/server/service/ReserveService.java b/src/main/java/com/kri/contact/server/service/ReserveService.java index 3cfa212..200e08b 100644 --- a/src/main/java/com/kri/contact/server/service/ReserveService.java +++ b/src/main/java/com/kri/contact/server/service/ReserveService.java @@ -49,7 +49,7 @@ public class ReserveService { } @Transactional(readOnly = true) - public List findBySid(Long prjctIdx, Integer sid) { + public List findBySid(Long prjctIdx, String sid) { return listReserveRepository.findByPrjctIdxAndSidOrderByResveDtAscListResveIdxAsc(prjctIdx, sid) .stream() .map(ListReserveDto::from) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9a8da93..472d7d4 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -64,7 +64,7 @@ kri: temp-cleanup-cron: "0 0 0 * * *" # 매일 00:00(초 분 시 일 월 요일) list-upload-file: - cleanup-expire-days: 7 + cleanup-expire-months: 3 cleanup-cron: "0 30 0 * * SUN" web: