diff --git a/src/main/java/com/kri/contact/server/dto/list/async/ListAsyncAvailabilityDto.java b/src/main/java/com/kri/contact/server/dto/list/async/ListAsyncAvailabilityDto.java index 25d5d5e..046ad89 100644 --- a/src/main/java/com/kri/contact/server/dto/list/async/ListAsyncAvailabilityDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/async/ListAsyncAvailabilityDto.java @@ -7,7 +7,8 @@ import java.time.LocalDateTime; import java.util.List; public record ListAsyncAvailabilityDto(ListAsyncJobType requestedJobType, boolean allowed, - String reasonCode, int blockerCount, List blockers) { + String reasonCode, int blockerCount, List blockers, + ListAsyncMutationCompletionDto mutationCompletion) { public record Blocker(ListAsyncJobType jobType, ListAsyncJobStatus jobStatus, String blockingPhase, String requestUserId, String requestUserName, boolean mine, String jobKey, LocalDateTime regDt, ListAsyncAssignOperation operation) {} diff --git a/src/main/java/com/kri/contact/server/dto/list/async/ListAsyncMutationCompletionDto.java b/src/main/java/com/kri/contact/server/dto/list/async/ListAsyncMutationCompletionDto.java new file mode 100644 index 0000000..b37860c --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/async/ListAsyncMutationCompletionDto.java @@ -0,0 +1,6 @@ +package com.kri.contact.server.dto.list.async; + +import java.time.LocalDateTime; + +/** Existing job history summary; no separate data version is stored. */ +public record ListAsyncMutationCompletionDto(long finishedCount, LocalDateTime lastFinishedAt) {} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListAsyncJobRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListAsyncJobRepository.java index 29f50cb..4b2ddf6 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListAsyncJobRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListAsyncJobRepository.java @@ -3,6 +3,7 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.common.enums.ListAsyncJobStatus; import com.kri.contact.server.common.enums.ListAsyncJobType; import com.kri.contact.server.dto.list.async.ListAsyncJobActivity; +import com.kri.contact.server.dto.list.async.ListAsyncMutationCompletionDto; import com.kri.contact.server.persistence.entity.TListAsyncJobEntity; import jakarta.persistence.LockModeType; import java.time.LocalDateTime; @@ -27,6 +28,18 @@ public interface ListAsyncJobRepository extends JpaRepository statuses, @Param("heldKeys") Collection heldKeys); + @Query(""" + select new com.kri.contact.server.dto.list.async.ListAsyncMutationCompletionDto( + count(j), max(j.finishedDt)) + from TListAsyncJobEntity j + where j.prjctIdx = :projectId and j.jobType in :types and j.jobStatus in :statuses + and j.finishedDt is not null and j.jobKey not in :heldKeys + """) + ListAsyncMutationCompletionDto summarizeFinishedMutations( + @Param("projectId") Long projectId, @Param("types") Collection types, + @Param("statuses") Collection statuses, + @Param("heldKeys") Collection heldKeys); + Optional findFirstByPrjctIdxAndJobTypeInAndJobStatusInOrderByRegDtDescJobKeyDesc( Long projectId, Collection types, Collection statuses); diff --git a/src/main/java/com/kri/contact/server/service/async/ListAsyncJobStore.java b/src/main/java/com/kri/contact/server/service/async/ListAsyncJobStore.java index 9626855..3a79a16 100644 --- a/src/main/java/com/kri/contact/server/service/async/ListAsyncJobStore.java +++ b/src/main/java/com/kri/contact/server/service/async/ListAsyncJobStore.java @@ -6,6 +6,7 @@ import com.kri.contact.server.common.enums.ListAsyncJobStatus; import com.kri.contact.server.common.enums.ListAsyncJobType; import com.kri.contact.server.dto.list.async.ListAsyncResultFileDto; import com.kri.contact.server.dto.list.async.ListAsyncJobActivity; +import com.kri.contact.server.dto.list.async.ListAsyncMutationCompletionDto; import com.kri.contact.server.persistence.entity.TListAsyncJobChunkEntity; import com.kri.contact.server.persistence.entity.TListAsyncJobEntity; import com.kri.contact.server.persistence.entity.id.TListAsyncJobChunkId; @@ -106,6 +107,17 @@ public class ListAsyncJobStore { heldKeys.isEmpty() ? List.of("") : heldKeys); } + @Transactional(readOnly = true, propagation = Propagation.REQUIRES_NEW) + public ListAsyncMutationCompletionDto mutationCompletion(Long projectId, List heldKeys) { + // Include failures/cancellations because earlier chunks may already be committed. + // A held terminal job is still finalizing and must become visible only after release. + return jobs.summarizeFinishedMutations(projectId, + List.of(ListAsyncJobType.LIST_UPLOAD, ListAsyncJobType.LIST_RESET, + ListAsyncJobType.LIST_UPDATE, ListAsyncJobType.LIST_ASSIGN), + List.of(ListAsyncJobStatus.SUCCEEDED, ListAsyncJobStatus.FAILED, ListAsyncJobStatus.CANCELLED), + heldKeys.isEmpty() ? List.of("") : heldKeys); + } + @Transactional(readOnly = true) public java.util.Optional activeUploadReset(Long projectId) { return jobs.findFirstByPrjctIdxAndJobTypeInAndJobStatusInOrderByRegDtDescJobKeyDesc(projectId, diff --git a/src/main/java/com/kri/contact/server/service/async/ProjectJobPermits.java b/src/main/java/com/kri/contact/server/service/async/ProjectJobPermits.java index 85d73e2..3f49711 100644 --- a/src/main/java/com/kri/contact/server/service/async/ProjectJobPermits.java +++ b/src/main/java/com/kri/contact/server/service/async/ProjectJobPermits.java @@ -41,7 +41,10 @@ public class ProjectJobPermits { public ListAsyncAvailabilityDto availability(Long projectId, String user, ListAsyncJobType type) { Slot slot = slots.computeIfAbsent(projectId, ignored -> new Slot()); synchronized (slot) { - return availabilityLocked(projectId, user, type, slot); + var view = availabilityLocked(projectId, user, type, slot); + var completion = store.mutationCompletion(projectId, List.copyOf(slot.held.keySet())); + return new ListAsyncAvailabilityDto(view.requestedJobType(), view.allowed(), view.reasonCode(), + view.blockerCount(), view.blockers(), completion); } } @@ -78,7 +81,7 @@ public class ProjectJobPermits { job.regDt(), operation); }).toList(); return new ListAsyncAvailabilityDto(type, blockers.isEmpty(), blockers.isEmpty() ? null - : groupConflict ? "LIST_JOB_PROJECT_CONFLICT" : "LIST_JOB_USER_BUSY", blockers.size(), views); + : groupConflict ? "LIST_JOB_PROJECT_CONFLICT" : "LIST_JOB_USER_BUSY", blockers.size(), views, null); } private String conflictMessage(ListAsyncAvailabilityDto view) {