Remove entity specific reindexing check on scheduled job, check if any reindex is running for tenant

Author: viacheslavkol

src/main/java/org/folio/search/service/reindex/ReindexStatusService.java

@@ -132,15 +132,13 @@ public boolean isMergeCompleted() {
   }
 
   /**
-   * Checks if a reindex operation for the given entity type is currently in progress or has failed.
+   * Checks if any reindex operation is currently in progress or has failed.
    *
-   * @param entityType the entity type to check
-   * @return true if the entity type has a status of MERGE_IN_PROGRESS, UPLOAD_IN_PROGRESS, STAGING_IN_PROGRESS,
+   * @return true if any entity type has a status of MERGE_IN_PROGRESS, UPLOAD_IN_PROGRESS, STAGING_IN_PROGRESS,
    *     MERGE_FAILED, STAGING_FAILED or UPLOAD_FAILED
    */
-  public boolean isReindexInProgressOrFailed(ReindexEntityType entityType) {
+  public boolean isReindexInProgressOrFailed() {
     return statusRepository.getReindexStatuses().stream()
-      .filter(status -> status.getEntityType() == entityType)
       .anyMatch(status -> status.getStatus() == ReindexStatus.MERGE_IN_PROGRESS
                           || status.getStatus() == ReindexStatus.UPLOAD_IN_PROGRESS
                           || status.getStatus() == ReindexStatus.STAGING_IN_PROGRESS

src/main/java/org/folio/search/service/scheduled/ScheduledInstanceSubResourcesService.java

@@ -119,7 +119,7 @@ private void processEntityTypeWithLock(ReindexEntityType entityType, String tena
   }
 
   private void handleLockAcquisitionFailure(ReindexEntityType entityType, String tenant) {
-    if (isReindexInProgressOrFailed(entityType)) {
+    if (isReindexInProgressOrFailed()) {
       log.info(
         "persistChildren::Skipping stale lock check for entity type {} in tenant {} - reindex is in progress or failed",
         entityType, tenant);
@@ -133,9 +133,9 @@ private void handleLockAcquisitionFailure(ReindexEntityType entityType, String t
     }
   }
 
-  private boolean isReindexInProgressOrFailed(ReindexEntityType entityType) {
+  private boolean isReindexInProgressOrFailed() {
     try {
-      return reindexStatusService.isReindexInProgressOrFailed(entityType);
+      return reindexStatusService.isReindexInProgressOrFailed();
     } catch (Exception e) {
       log.warn("persistChildren::Failed to check reindex status, assuming no reindex in progress or failed", e);
       return false;

src/test/java/org/folio/search/service/reindex/ReindexStatusServiceTest.java

@@ -373,37 +373,37 @@ void isReindexInProgressOrFailed_true(ReindexStatus status) {
       new ReindexStatusEntity(ReindexEntityType.HOLDINGS, ReindexStatus.MERGE_COMPLETED)));
 
     // act
-    var actual = service.isReindexInProgressOrFailed(ReindexEntityType.INSTANCE);
+    var actual = service.isReindexInProgressOrFailed();
 
     // assert
     assertThat(actual).isTrue();
   }
 
   @Test
-  void isReindexInProgressOrFailed_false_whenEntityTypeHasCompletedStatus() {
+  void isReindexInProgressOrFailed_false_whenAllEntityTypesHaveCompletedStatus() {
     // given
     when(statusRepository.getReindexStatuses()).thenReturn(List.of(
       new ReindexStatusEntity(ReindexEntityType.INSTANCE, ReindexStatus.UPLOAD_COMPLETED),
       new ReindexStatusEntity(ReindexEntityType.HOLDINGS, ReindexStatus.MERGE_COMPLETED)));
 
     // act
-    var actual = service.isReindexInProgressOrFailed(ReindexEntityType.INSTANCE);
+    var actual = service.isReindexInProgressOrFailed();
 
     // assert
     assertThat(actual).isFalse();
   }
 
   @Test
-  void isReindexInProgressOrFailed_false_whenDifferentEntityTypeIsInProgress() {
+  void isReindexInProgressOrFailed_true_whenAnyEntityTypeIsInProgress() {
     // given
     when(statusRepository.getReindexStatuses()).thenReturn(List.of(
       new ReindexStatusEntity(ReindexEntityType.INSTANCE, ReindexStatus.MERGE_IN_PROGRESS),
       new ReindexStatusEntity(ReindexEntityType.HOLDINGS, ReindexStatus.MERGE_COMPLETED)));
 
     // act
-    var actual = service.isReindexInProgressOrFailed(ReindexEntityType.HOLDINGS);
+    var actual = service.isReindexInProgressOrFailed();
 
     // assert
-    assertThat(actual).isFalse();
+    assertThat(actual).isTrue();
   }
 }

src/test/java/org/folio/search/service/scheduled/ScheduledInstanceSubResourcesServiceTest.java

@@ -182,15 +182,15 @@ void persistChildren_ShouldReleaseStaleLockWhenLockAcquisitionFails() {
       .when(executionService).executeSystemUserScoped(anyString(), any());
     when(tenantRepository.fetchDataTenantIds()).thenReturn(List.of(TENANT_ID));
     when(subResourcesLockRepository.lockSubResource(any(), eq(TENANT_ID))).thenReturn(Optional.empty());
-    when(reindexStatusService.isReindexInProgressOrFailed(any())).thenReturn(false);
+    when(reindexStatusService.isReindexInProgressOrFailed()).thenReturn(false);
     when(subResourcesLockRepository.checkAndReleaseStaleLock(any(), eq(TENANT_ID), anyLong())).thenReturn(true);
 
     // Act
     service.persistChildren();
 
     // Assert
     verify(subResourcesLockRepository, times(3)).lockSubResource(any(), eq(TENANT_ID));
-    verify(reindexStatusService, times(3)).isReindexInProgressOrFailed(any());
+    verify(reindexStatusService, times(3)).isReindexInProgressOrFailed();
     verify(subResourcesLockRepository, times(3)).checkAndReleaseStaleLock(any(), eq(TENANT_ID), anyLong());
     verify(subResourcesLockRepository, never()).unlockSubResource(any(), any(), any());
     verify(subjectRepository, never()).fetchByTimestamp(anyString(), any(), anyInt());
@@ -204,15 +204,15 @@ void persistChildren_ShouldNotProcessWhenLockFailsAndNoStaleLock() {
       .when(executionService).executeSystemUserScoped(anyString(), any());
     when(tenantRepository.fetchDataTenantIds()).thenReturn(List.of(TENANT_ID));
     when(subResourcesLockRepository.lockSubResource(any(), eq(TENANT_ID))).thenReturn(Optional.empty());
-    when(reindexStatusService.isReindexInProgressOrFailed(any())).thenReturn(false);
+    when(reindexStatusService.isReindexInProgressOrFailed()).thenReturn(false);
     when(subResourcesLockRepository.checkAndReleaseStaleLock(any(), eq(TENANT_ID), anyLong())).thenReturn(false);
 
     // Act
     service.persistChildren();
 
     // Assert
     verify(subResourcesLockRepository, times(3)).lockSubResource(any(), eq(TENANT_ID));
-    verify(reindexStatusService, times(3)).isReindexInProgressOrFailed(any());
+    verify(reindexStatusService, times(3)).isReindexInProgressOrFailed();
     verify(subResourcesLockRepository, times(3)).checkAndReleaseStaleLock(any(), eq(TENANT_ID), anyLong());
     verify(subResourcesLockRepository, never()).unlockSubResource(any(), any(), any());
     verify(subjectRepository, never()).fetchByTimestamp(anyString(), any(), anyInt());
@@ -226,14 +226,14 @@ void persistChildren_ShouldSkipStaleLockCheckWhenReindexInProgress() {
       .when(executionService).executeSystemUserScoped(anyString(), any());
     when(tenantRepository.fetchDataTenantIds()).thenReturn(List.of(TENANT_ID));
     when(subResourcesLockRepository.lockSubResource(any(), eq(TENANT_ID))).thenReturn(Optional.empty());
-    when(reindexStatusService.isReindexInProgressOrFailed(any())).thenReturn(true);
+    when(reindexStatusService.isReindexInProgressOrFailed()).thenReturn(true);
 
     // Act
     service.persistChildren();
 
     // Assert
     verify(subResourcesLockRepository, times(3)).lockSubResource(any(), eq(TENANT_ID));
-    verify(reindexStatusService, times(3)).isReindexInProgressOrFailed(any());
+    verify(reindexStatusService, times(3)).isReindexInProgressOrFailed();
     verify(subResourcesLockRepository, never()).checkAndReleaseStaleLock(any(), any(), anyLong());
     verify(subResourcesLockRepository, never()).unlockSubResource(any(), any(), any());
     verify(subjectRepository, never()).fetchByTimestamp(anyString(), any(), anyInt());