From ba93ff65ac586d60ea27d9c59a251fcd87eff6e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Lindo?= <alindo@keep.pt>
Date: Thu, 30 Nov 2023 14:37:08 +0000
Subject: [PATCH] new findall and filter

---
 .../common/server/ViewerFactory.java           | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/databasepreservation/common/server/ViewerFactory.java b/src/main/java/com/databasepreservation/common/server/ViewerFactory.java
index 899170b3..99b745e1 100644
--- a/src/main/java/com/databasepreservation/common/server/ViewerFactory.java
+++ b/src/main/java/com/databasepreservation/common/server/ViewerFactory.java
@@ -7,13 +7,16 @@
  */
 package com.databasepreservation.common.server;
 
+import com.databasepreservation.common.client.ViewerConstants;
 import com.databasepreservation.common.client.index.IndexResult;
+import com.databasepreservation.common.client.index.filter.BasicSearchFilterParameter;
 import com.databasepreservation.common.client.index.filter.Filter;
 import com.databasepreservation.common.client.index.sort.Sorter;
 import com.databasepreservation.common.client.models.structure.ViewerDatabase;
 import com.databasepreservation.common.client.index.facets.Facets;
 import com.databasepreservation.common.client.models.structure.ViewerDatabaseStatus;
 import com.databasepreservation.common.client.models.structure.ViewerDatabaseValidationStatus;
+import com.databasepreservation.common.server.index.utils.IterableDatabaseResult;
 import org.apache.solr.client.solrj.SolrClient;
 import org.roda.core.data.exceptions.GenericException;
 import org.roda.core.data.exceptions.RequestNotValidException;
@@ -25,6 +28,8 @@
 import com.databasepreservation.common.server.index.DatabaseRowsSolrManager;
 import com.databasepreservation.common.server.index.factory.SolrClientFactory;
 
+import java.util.ArrayList;
+
 /**
  * @author Bruno Ferreira <bferreira@keep.pt>
  */
@@ -55,17 +60,12 @@ private static synchronized void instantiate() {
   }
 
   public static void checkIngestingDBs() throws RequestNotValidException, GenericException {
-    Filter emptyFilter = new Filter();
-    Facets emptyFacet = new Facets();
+    Filter ingestingFilter = new Filter(new BasicSearchFilterParameter(ViewerConstants.SOLR_DATABASES_STATUS, ViewerDatabaseStatus.INGESTING.toString()));
 
-    int dbCounter = solrManager.count(ViewerDatabase.class, emptyFilter).intValue();
-    IndexResult<ViewerDatabase> dataBases = solrManager.find(ViewerDatabase.class, emptyFilter, Sorter.NONE,
-      new Sublist(0, dbCounter), emptyFacet);
+    IterableDatabaseResult<ViewerDatabase> dataBases = solrManager.findAll(ViewerDatabase.class, ingestingFilter, Sorter.NONE, new ArrayList<>());
 
-    for (ViewerDatabase db : dataBases.getResults()) {
-      if (db.getStatus().equals(ViewerDatabaseStatus.INGESTING)) {
-        solrManager.markDatabaseCollection(db.getUuid(), ViewerDatabaseStatus.ERROR);
-      }
+    for (ViewerDatabase db : dataBases) {
+      solrManager.markDatabaseCollection(db.getUuid(), ViewerDatabaseStatus.ERROR);
     }
   }