261020_01_FIX: 짧은 비동기 작업 종료 시 리스트 및 배정 목록이 갱신되지 않는 오류 수정
This commit is contained in:
@@ -7,7 +7,8 @@ import java.time.LocalDateTime;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public record ListAsyncAvailabilityDto(ListAsyncJobType requestedJobType, boolean allowed,
|
public record ListAsyncAvailabilityDto(ListAsyncJobType requestedJobType, boolean allowed,
|
||||||
String reasonCode, int blockerCount, List<Blocker> blockers) {
|
String reasonCode, int blockerCount, List<Blocker> blockers,
|
||||||
|
ListAsyncMutationCompletionDto mutationCompletion) {
|
||||||
public record Blocker(ListAsyncJobType jobType, ListAsyncJobStatus jobStatus,
|
public record Blocker(ListAsyncJobType jobType, ListAsyncJobStatus jobStatus,
|
||||||
String blockingPhase, String requestUserId, String requestUserName,
|
String blockingPhase, String requestUserId, String requestUserName,
|
||||||
boolean mine, String jobKey, LocalDateTime regDt, ListAsyncAssignOperation operation) {}
|
boolean mine, String jobKey, LocalDateTime regDt, ListAsyncAssignOperation operation) {}
|
||||||
|
|||||||
@@ -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) {}
|
||||||
@@ -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.ListAsyncJobStatus;
|
||||||
import com.kri.contact.server.common.enums.ListAsyncJobType;
|
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.ListAsyncJobActivity;
|
||||||
|
import com.kri.contact.server.dto.list.async.ListAsyncMutationCompletionDto;
|
||||||
import com.kri.contact.server.persistence.entity.TListAsyncJobEntity;
|
import com.kri.contact.server.persistence.entity.TListAsyncJobEntity;
|
||||||
import jakarta.persistence.LockModeType;
|
import jakarta.persistence.LockModeType;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
@@ -27,6 +28,18 @@ public interface ListAsyncJobRepository extends JpaRepository<TListAsyncJobEntit
|
|||||||
@Param("projectId") Long projectId, @Param("statuses") Collection<ListAsyncJobStatus> statuses,
|
@Param("projectId") Long projectId, @Param("statuses") Collection<ListAsyncJobStatus> statuses,
|
||||||
@Param("heldKeys") Collection<String> heldKeys);
|
@Param("heldKeys") Collection<String> 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<ListAsyncJobType> types,
|
||||||
|
@Param("statuses") Collection<ListAsyncJobStatus> statuses,
|
||||||
|
@Param("heldKeys") Collection<String> heldKeys);
|
||||||
|
|
||||||
Optional<TListAsyncJobEntity> findFirstByPrjctIdxAndJobTypeInAndJobStatusInOrderByRegDtDescJobKeyDesc(
|
Optional<TListAsyncJobEntity> findFirstByPrjctIdxAndJobTypeInAndJobStatusInOrderByRegDtDescJobKeyDesc(
|
||||||
Long projectId, Collection<ListAsyncJobType> types, Collection<ListAsyncJobStatus> statuses);
|
Long projectId, Collection<ListAsyncJobType> types, Collection<ListAsyncJobStatus> statuses);
|
||||||
|
|
||||||
|
|||||||
@@ -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.common.enums.ListAsyncJobType;
|
||||||
import com.kri.contact.server.dto.list.async.ListAsyncResultFileDto;
|
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.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.TListAsyncJobChunkEntity;
|
||||||
import com.kri.contact.server.persistence.entity.TListAsyncJobEntity;
|
import com.kri.contact.server.persistence.entity.TListAsyncJobEntity;
|
||||||
import com.kri.contact.server.persistence.entity.id.TListAsyncJobChunkId;
|
import com.kri.contact.server.persistence.entity.id.TListAsyncJobChunkId;
|
||||||
@@ -106,6 +107,17 @@ public class ListAsyncJobStore {
|
|||||||
heldKeys.isEmpty() ? List.of("") : heldKeys);
|
heldKeys.isEmpty() ? List.of("") : heldKeys);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true, propagation = Propagation.REQUIRES_NEW)
|
||||||
|
public ListAsyncMutationCompletionDto mutationCompletion(Long projectId, List<String> 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)
|
@Transactional(readOnly = true)
|
||||||
public java.util.Optional<TListAsyncJobEntity> activeUploadReset(Long projectId) {
|
public java.util.Optional<TListAsyncJobEntity> activeUploadReset(Long projectId) {
|
||||||
return jobs.findFirstByPrjctIdxAndJobTypeInAndJobStatusInOrderByRegDtDescJobKeyDesc(projectId,
|
return jobs.findFirstByPrjctIdxAndJobTypeInAndJobStatusInOrderByRegDtDescJobKeyDesc(projectId,
|
||||||
|
|||||||
@@ -41,7 +41,10 @@ public class ProjectJobPermits {
|
|||||||
public ListAsyncAvailabilityDto availability(Long projectId, String user, ListAsyncJobType type) {
|
public ListAsyncAvailabilityDto availability(Long projectId, String user, ListAsyncJobType type) {
|
||||||
Slot slot = slots.computeIfAbsent(projectId, ignored -> new Slot());
|
Slot slot = slots.computeIfAbsent(projectId, ignored -> new Slot());
|
||||||
synchronized (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);
|
job.regDt(), operation);
|
||||||
}).toList();
|
}).toList();
|
||||||
return new ListAsyncAvailabilityDto(type, blockers.isEmpty(), blockers.isEmpty() ? null
|
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) {
|
private String conflictMessage(ListAsyncAvailabilityDto view) {
|
||||||
|
|||||||
Reference in New Issue
Block a user