From e303dc2989f333b21661ac7ea7e7fbab8ec1a202 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Fri, 10 Apr 2026 10:28:12 +0900 Subject: [PATCH] =?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,