develop #27

Merged
gitadmin merged 3 commits from develop into master 2026-09-29 10:25:53 +09:00
12 changed files with 287 additions and 144 deletions

View File

@@ -1,4 +1,4 @@
package com.kri.contact.server.persistence.query;
package com.kri.contact.server.persistence.support;
import com.kri.contact.server.persistence.entity.QTCmpnEntity;
import com.kri.contact.server.persistence.entity.QTListAssignCmpnEntity;

View File

@@ -0,0 +1,108 @@
package com.kri.contact.server.persistence.support;
import jakarta.persistence.EntityManager;
import java.time.LocalDateTime;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
@Component
@RequiredArgsConstructor
public class ListDeleteSessionContext {
private final EntityManager entityManager;
public Scope openReset(String listResetLogId, String delUser) {
return open(() -> {
entityManager.createNativeQuery("SET @list_reset_log_id = :listResetLogId")
.setParameter("listResetLogId", listResetLogId)
.executeUpdate();
entityManager.createNativeQuery("SET @del_user = :delUser")
.setParameter("delUser", delUser)
.executeUpdate();
}, this::clearReset);
}
public Scope openEventHistory(String directDeleteId, String delUser, LocalDateTime delDt) {
return open(() -> {
entityManager.createNativeQuery("SET @skip_delete_backup = NULL").executeUpdate();
entityManager.createNativeQuery("SET @list_reset_log_id = :directDeleteId")
.setParameter("directDeleteId", directDeleteId)
.executeUpdate();
entityManager.createNativeQuery("SET @del_user = :delUser")
.setParameter("delUser", delUser)
.executeUpdate();
entityManager.createNativeQuery("SET @del_dt = :delDt")
.setParameter("delDt", delDt)
.executeUpdate();
}, this::clearEventHistory);
}
public Scope openSkipDeleteBackup() {
return open(
() -> entityManager.createNativeQuery("SET @skip_delete_backup = 1").executeUpdate(),
() -> entityManager.createNativeQuery("SET @skip_delete_backup = NULL").executeUpdate()
);
}
private Scope open(Runnable initialize, Runnable cleanup) {
try {
initialize.run();
return new Scope(cleanup);
} catch (RuntimeException failure) {
try {
cleanup.run();
} catch (RuntimeException cleanupFailure) {
failure.addSuppressed(cleanupFailure);
}
throw failure;
}
}
private void clearReset() {
clear(
"SET @list_reset_log_id = NULL",
"SET @del_user = NULL"
);
}
private void clearEventHistory() {
clear(
"SET @list_reset_log_id = NULL",
"SET @del_user = NULL",
"SET @del_dt = NULL",
"SET @skip_delete_backup = NULL"
);
}
private void clear(String... statements) {
RuntimeException failure = null;
for (String statement : statements) {
try {
entityManager.createNativeQuery(statement).executeUpdate();
} catch (RuntimeException cleanupFailure) {
if (failure == null) {
failure = cleanupFailure;
} else {
failure.addSuppressed(cleanupFailure);
}
}
}
if (failure != null) {
throw failure;
}
}
public static final class Scope implements AutoCloseable {
private final Runnable cleanup;
private Scope(Runnable cleanup) {
this.cleanup = cleanup;
}
@Override
public void close() {
cleanup.run();
}
}
}

View File

@@ -0,0 +1,27 @@
package com.kri.contact.server.persistence.support;
import com.kri.contact.server.persistence.entity.TListEventHistEntity;
import com.kri.contact.server.persistence.repository.ListEventHistRepository;
import java.time.LocalDateTime;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
@Component
@RequiredArgsConstructor
public class ListEventHistDeleteSupport {
private final ListEventHistRepository listEventHistRepository;
private final ListDeleteSessionContext deleteSessionContext;
public void deleteWithAuditContext(
TListEventHistEntity eventHistory,
String directDeleteId,
String delUser,
LocalDateTime delDt
) {
try (var ignored = deleteSessionContext.openEventHistory(directDeleteId, delUser, delDt)) {
listEventHistRepository.delete(eventHistory);
listEventHistRepository.flush();
}
}
}

View File

@@ -0,0 +1,67 @@
package com.kri.contact.server.persistence.support;
import com.kri.contact.server.persistence.entity.TListItemFileEntity;
import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport;
import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.ListItemDeleteRow;
import com.kri.contact.server.persistence.repository.ListItemFileRepository;
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
@Component
@RequiredArgsConstructor
public class ListItemDeleteSupport {
private final ListUpdateJdbcSupport listUpdateJdbcSupport;
private final ListItemFileRepository listItemFileRepository;
private final ListDeleteSessionContext deleteSessionContext;
public List<FileToDelete> deleteItemsWithoutBackup(
Long prjctIdx,
List<ListItemDeleteRow> itemDeletes,
Collection<ListItemDeleteRow> fileDeleteRows,
int batchSize
) {
if (itemDeletes.isEmpty() && fileDeleteRows.isEmpty()) {
return List.of();
}
try (var ignored = deleteSessionContext.openSkipDeleteBackup()) {
listUpdateJdbcSupport.batchDeleteListItem(itemDeletes, batchSize);
if (fileDeleteRows.isEmpty()) {
return List.of();
}
Set<String> sids = new LinkedHashSet<>();
Set<Integer> headerIds = new LinkedHashSet<>();
Set<FileKey> fileKeys = new LinkedHashSet<>();
for (ListItemDeleteRow row : fileDeleteRows) {
sids.add(row.sid());
headerIds.add(row.listHderId());
fileKeys.add(new FileKey(row.sid(), row.listHderId()));
}
List<TListItemFileEntity> fileEntities = listItemFileRepository
.findByIdPrjctIdxAndIdSidInAndIdListHderIdInOrderByIdSidAscIdListHderIdAsc(
prjctIdx, sids, headerIds)
.stream()
.filter(entity -> fileKeys.contains(new FileKey(entity.getSid(), entity.getListHderId())))
.toList();
if (fileEntities.isEmpty()) {
return List.of();
}
listItemFileRepository.deleteAllInBatch(fileEntities);
return fileEntities.stream()
.map(entity -> new FileToDelete(entity.getFilePath(), entity.getFileNm()))
.toList();
}
}
private record FileKey(String sid, Integer listHderId) {}
public record FileToDelete(String filePath, String fileName) {}
}

View File

@@ -0,0 +1,60 @@
package com.kri.contact.server.persistence.support;
import com.kri.common.feature.web.BusinessException;
import com.kri.contact.server.common.enums.ListResetMode;
import com.kri.contact.server.persistence.entity.TListResetLogEntity;
import com.kri.contact.server.persistence.jdbc.ListResetJdbcSupport;
import com.kri.contact.server.persistence.jdbc.ListResetJdbcSupport.DeleteCounts;
import com.kri.contact.server.persistence.repository.ListResetLogRepository;
import jakarta.persistence.EntityManager;
import java.util.Collection;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
@Component
@RequiredArgsConstructor
public class ListResetPersistenceSupport {
private final ListResetJdbcSupport listResetJdbcSupport;
private final ListResetLogRepository listResetLogRepository;
private final ListDeleteSessionContext deleteSessionContext;
private final EntityManager entityManager;
public int resetWithAuditContext(
Long prjctIdx,
Collection<String> sids,
ListResetMode mode,
String listResetLogId,
String delUser,
int chunkSize
) {
int resetCount = mode == ListResetMode.HIST ? sids.size() : 0;
try (var ignored = deleteSessionContext.openReset(listResetLogId, delUser)) {
entityManager.flush();
entityManager.clear();
switch (mode) {
case HIST -> listResetJdbcSupport.deleteHistories(prjctIdx, sids, chunkSize);
case ALL -> {
listResetJdbcSupport.deleteHistories(prjctIdx, sids, chunkSize);
DeleteCounts counts = listResetJdbcSupport.deleteListData(prjctIdx, sids, true, true, chunkSize);
resetCount = counts.listCount();
}
case LIST_UPLOAD -> {
DeleteCounts counts = listResetJdbcSupport.deleteListData(prjctIdx, sids, false, false, chunkSize);
resetCount = counts.listCount();
}
}
entityManager.flush();
entityManager.clear();
TListResetLogEntity log = listResetLogRepository.findById(listResetLogId)
.orElseThrow(() -> BusinessException.internalError("List reset log not found."));
log.setListCnt(resetCount);
listResetLogRepository.saveAndFlush(log);
}
return resetCount;
}
}

View File

@@ -1,4 +1,4 @@
package com.kri.contact.server.persistence.query;
package com.kri.contact.server.persistence.support;
import com.kri.contact.server.persistence.entity.QTListAssignUserEntity;
import com.kri.contact.server.persistence.entity.QTListEntity;

View File

@@ -1,4 +1,4 @@
package com.kri.contact.server.persistence.query;
package com.kri.contact.server.persistence.support;
import com.kri.contact.server.persistence.entity.TPrjctAssignCmpnEntity;
import com.kri.contact.server.persistence.entity.TPrjctAssignUserEntity;

View File

@@ -19,8 +19,8 @@ import com.kri.contact.server.persistence.entity.TPrjctAssignCmpnEntity;
import com.kri.contact.server.persistence.entity.TPrjctAssignUserEntity;
import com.kri.contact.server.persistence.entity.TUserEntity;
import com.kri.contact.server.persistence.jdbc.ListAssignJdbcSupport;
import com.kri.contact.server.persistence.query.AssignSummaryQuerySupport;
import com.kri.contact.server.persistence.query.AssignSummaryQuerySupport.ScopeCountRow;
import com.kri.contact.server.persistence.support.AssignSummaryQuerySupport;
import com.kri.contact.server.persistence.support.AssignSummaryQuerySupport.ScopeCountRow;
import com.kri.contact.server.persistence.repository.ListAssignCmpnRepository;
import com.kri.contact.server.persistence.repository.ListAssignUserRepository;
import com.kri.contact.server.persistence.repository.ListAssignUserRoleMapRepository;

View File

@@ -7,10 +7,8 @@ import com.kri.contact.server.common.consts.ContactConstant;
import com.kri.contact.server.common.enums.ListResetMode;
import com.kri.contact.server.dto.list.ListFilterDto;
import com.kri.contact.server.persistence.entity.TListResetLogEntity;
import com.kri.contact.server.persistence.jdbc.ListResetJdbcSupport;
import com.kri.contact.server.persistence.jdbc.ListResetJdbcSupport.DeleteCounts;
import com.kri.contact.server.persistence.support.ListResetPersistenceSupport;
import com.kri.contact.server.persistence.repository.ListResetLogRepository;
import jakarta.persistence.EntityManager;
import java.time.LocalDateTime;
import java.util.Set;
import java.util.UUID;
@@ -24,8 +22,7 @@ public class ListResetService {
private final ListResetLogRepository listResetLogRepository;
private final ListSearchService listSearchService;
private final ListResetJdbcSupport listResetJdbcSupport;
private final EntityManager entityManager;
private final ListResetPersistenceSupport listResetPersistenceSupport;
@Transactional
public int resetByFilter(
@@ -56,35 +53,8 @@ public class ListResetService {
}
String listResetLogId = createResetLog(prjctIdx, mode, 0, regUser, regDt);
int chunkSize = ContactConstant.INSERT_CHUNK_SIZE;
int resetCount = mode == ListResetMode.HIST ? sids.size() : 0;
try {
setDeleteContext(listResetLogId, regUser);
entityManager.flush();
entityManager.clear();
switch (mode) {
case HIST -> listResetJdbcSupport.deleteHistories(prjctIdx, sids, chunkSize);
case ALL -> {
listResetJdbcSupport.deleteHistories(prjctIdx, sids, chunkSize);
DeleteCounts counts = listResetJdbcSupport.deleteListData(prjctIdx, sids, true, true, chunkSize);
resetCount = counts.listCount();
}
case LIST_UPLOAD -> {
DeleteCounts counts = listResetJdbcSupport.deleteListData(prjctIdx, sids, false, false, chunkSize);
resetCount = counts.listCount();
}
}
entityManager.flush();
entityManager.clear();
updateResetCount(listResetLogId, resetCount);
} finally {
clearDeleteContext();
}
return resetCount;
return listResetPersistenceSupport.resetWithAuditContext(
prjctIdx, sids, mode, listResetLogId, regUser, ContactConstant.INSERT_CHUNK_SIZE);
}
private String createResetLog(
@@ -108,24 +78,4 @@ public class ListResetService {
return listResetLogId;
}
private void updateResetCount(String listResetLogId, int resetCount) {
TListResetLogEntity log = listResetLogRepository.findById(listResetLogId)
.orElseThrow(() -> BusinessException.internalError("List reset log not found."));
log.setListCnt(resetCount);
listResetLogRepository.saveAndFlush(log);
}
private void setDeleteContext(String listResetLogId, String delUser) {
entityManager.createNativeQuery("SET @list_reset_log_id = :listResetLogId")
.setParameter("listResetLogId", listResetLogId)
.executeUpdate();
entityManager.createNativeQuery("SET @del_user = :delUser")
.setParameter("delUser", delUser)
.executeUpdate();
}
private void clearDeleteContext() {
entityManager.createNativeQuery("SET @list_reset_log_id = NULL").executeUpdate();
entityManager.createNativeQuery("SET @del_user = NULL").executeUpdate();
}
}

View File

@@ -23,7 +23,6 @@ import com.kri.contact.server.dto.list.ListHeaderDto;
import com.kri.contact.server.dto.list.ListUpdateRequestDto;
import com.kri.contact.server.persistence.entity.TListEventHistEntity;
import com.kri.contact.server.persistence.entity.TListHeaderEntity;
import com.kri.contact.server.persistence.entity.TListItemFileEntity;
import com.kri.contact.server.persistence.entity.TPrjctSurveyEntity;
import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport;
import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.ListItemDeleteRow;
@@ -32,13 +31,14 @@ import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.ListItemUpd
import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.ListEventHistInsertRow;
import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.ListUpdateRow;
import com.kri.contact.server.persistence.jdbc.ListUpdateJdbcSupport.UpdateHistRow;
import com.kri.contact.server.persistence.support.ListEventHistDeleteSupport;
import com.kri.contact.server.persistence.support.ListItemDeleteSupport;
import com.kri.contact.server.persistence.support.ListItemDeleteSupport.FileToDelete;
import com.kri.contact.server.persistence.repository.ListEventHistRepository;
import com.kri.contact.server.persistence.repository.ListHeaderRepository;
import com.kri.contact.server.persistence.repository.ListItemFileRepository;
import com.kri.contact.server.persistence.repository.ListRepository;
import com.kri.contact.server.persistence.repository.ProjectSurveyRepository;
import com.kri.contact.server.service.file.ListItemFileService;
import jakarta.persistence.EntityManager;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
@@ -69,14 +69,14 @@ public class ListUpdateService {
private final ListUpdateJdbcSupport listUpdateJdbcSupport;
private final ListRepository listRepository;
private final ListEventHistRepository listEventHistRepository;
private final ListItemFileRepository listItemFileRepository;
private final ListEventHistDeleteSupport listEventHistDeleteSupport;
private final ListItemDeleteSupport listItemDeleteSupport;
private final ProjectSurveyRepository projectSurveyRepository;
private final ListItemFileService listItemFileService;
private final ResultCodeService resultCodeService;
private final ListCallHistService listCallHistService;
private final ReserveService reserveService;
private final ObjectMapper objectMapper;
private final EntityManager entityManager;
@Transactional
public int updateList(
@@ -183,13 +183,7 @@ public class ListUpdateService {
}
String directDeleteId = createUserDirectDeleteId(delDt);
try {
setEventHistoryDeleteContext(directDeleteId, delUser, delDt);
listEventHistRepository.delete(eventHistory);
entityManager.flush();
} finally {
clearEventHistoryDeleteContext();
}
listEventHistDeleteSupport.deleteWithAuditContext(eventHistory, directDeleteId, delUser, delDt);
}
@Transactional
@@ -499,44 +493,13 @@ public class ListUpdateService {
return;
}
setSkipDeleteBackup();
try {
listUpdateJdbcSupport.batchDeleteListItem(itemDeletes, ContactConstant.INSERT_CHUNK_SIZE);
deleteListItemFiles(prjctIdx, fileDeleteKeys);
} finally {
clearSkipDeleteBackup();
}
}
private void deleteListItemFiles(Long prjctIdx, Set<ListItemKey> fileDeleteKeys) {
if (fileDeleteKeys.isEmpty()) {
return;
}
Set<String> sids = fileDeleteKeys.stream()
.map(ListItemKey::sid)
.collect(LinkedHashSet::new, LinkedHashSet::add, LinkedHashSet::addAll);
Set<Integer> headerIds = fileDeleteKeys.stream()
.map(ListItemKey::listHderId)
.collect(LinkedHashSet::new, LinkedHashSet::add, LinkedHashSet::addAll);
List<TListItemFileEntity> fileEntities = listItemFileRepository
.findByIdPrjctIdxAndIdSidInAndIdListHderIdInOrderByIdSidAscIdListHderIdAsc(
prjctIdx,
sids,
headerIds
)
.stream()
.filter(entity -> fileDeleteKeys.contains(new ListItemKey(entity.getSid(), entity.getListHderId())))
List<ListItemDeleteRow> fileDeleteRows = fileDeleteKeys.stream()
.map(key -> new ListItemDeleteRow(prjctIdx, key.sid(), key.listHderId()))
.toList();
if (fileEntities.isEmpty()) {
return;
}
listItemFileRepository.deleteAllInBatch(fileEntities);
for (TListItemFileEntity fileEntity : fileEntities) {
listItemFileService.deleteItemFile(fileEntity.getFilePath(), fileEntity.getFileNm());
List<FileToDelete> files = listItemDeleteSupport.deleteItemsWithoutBackup(
prjctIdx, itemDeletes, fileDeleteRows, ContactConstant.INSERT_CHUNK_SIZE);
for (FileToDelete file : files) {
listItemFileService.deleteItemFile(file.filePath(), file.fileName());
}
}
@@ -605,44 +568,12 @@ public class ListUpdateService {
&& Objects.equals(normalizeBlank(value), FILE_DELETE);
}
private void setSkipDeleteBackup() {
entityManager.createNativeQuery("SET @skip_delete_backup = 1").executeUpdate();
}
private void clearSkipDeleteBackup() {
entityManager.createNativeQuery("SET @skip_delete_backup = NULL").executeUpdate();
}
private String createUserDirectDeleteId(LocalDateTime delDt) {
String date = delDt.format(USER_DIRECT_DELETE_DATE_FORMAT);
String random = UUID.randomUUID().toString().replace("-", "").substring(0, 4);
return USER_DIRECT_DELETE_PREFIX + date + "_" + random;
}
private void setEventHistoryDeleteContext(
String directDeleteId,
String delUser,
LocalDateTime delDt
) {
entityManager.createNativeQuery("SET @skip_delete_backup = NULL").executeUpdate();
entityManager.createNativeQuery("SET @list_reset_log_id = :directDeleteId")
.setParameter("directDeleteId", directDeleteId)
.executeUpdate();
entityManager.createNativeQuery("SET @del_user = :delUser")
.setParameter("delUser", delUser)
.executeUpdate();
entityManager.createNativeQuery("SET @del_dt = :delDt")
.setParameter("delDt", delDt)
.executeUpdate();
}
private void clearEventHistoryDeleteContext() {
entityManager.createNativeQuery("SET @list_reset_log_id = NULL").executeUpdate();
entityManager.createNativeQuery("SET @del_user = NULL").executeUpdate();
entityManager.createNativeQuery("SET @del_dt = NULL").executeUpdate();
entityManager.createNativeQuery("SET @skip_delete_backup = NULL").executeUpdate();
}
private short parseIsUseCode(String value) {
String normalized = defaultString(normalizeBlank(value)).toUpperCase();
return switch (normalized) {

View File

@@ -6,9 +6,9 @@ import com.kri.contact.server.common.enums.ResultCodeType;
import com.kri.contact.server.dto.progress.ProgressDateResponseDto;
import com.kri.contact.server.dto.progress.ProgressSearchRequestDto;
import com.kri.contact.server.dto.progress.ProgressUserResponseDto;
import com.kri.contact.server.persistence.query.ProgressQuerySupport;
import com.kri.contact.server.persistence.query.ProgressQuerySupport.DateProgressRow;
import com.kri.contact.server.persistence.query.ProgressQuerySupport.UserProgressRow;
import com.kri.contact.server.persistence.support.ProgressQuerySupport;
import com.kri.contact.server.persistence.support.ProgressQuerySupport.DateProgressRow;
import com.kri.contact.server.persistence.support.ProgressQuerySupport.UserProgressRow;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;

View File

@@ -19,7 +19,7 @@ import com.kri.contact.server.dto.project.ProjectUpdateRequestDto;
import com.kri.contact.server.persistence.entity.TPrjctEntity;
import com.kri.contact.server.persistence.entity.TPrjctMainTmplatEntity;
import com.kri.contact.server.persistence.entity.TPrjctSurveyEntity;
import com.kri.contact.server.persistence.query.ProjectSpecs;
import com.kri.contact.server.persistence.support.ProjectSpecs;
import com.kri.contact.server.persistence.repository.ProjectMainTemplateRepository;
import com.kri.contact.server.persistence.repository.ProjectRepository;
import com.kri.contact.server.persistence.repository.ProjectSurveyRepository;