Merge pull request #6816 from ORCID/RemoveRinggoldFromSolrIndex

Use REMOVED org status to remove RINGGOLD orgs from the index
ORCID · Jun 19, 2023 · 9f0e420 · 9f0e420
2 parents b8d5dc0 + 6e1e18b
commit 9f0e420
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/orcid-message-listener/src/main/java/org/orcid/listener/solr/SolrOrgsMessageProcessor.java b/orcid-message-listener/src/main/java/org/orcid/listener/solr/SolrOrgsMessageProcessor.java
@@ -57,7 +57,7 @@ public void accept(OrgDisambiguatedSolrDocument t) {
 
     private void process(OrgDisambiguatedSolrDocument t, Integer retryCount) {
         try {
-            if("DEPRECATED".equals(t.getOrgDisambiguatedStatus()) || "OBSOLETE".equals(t.getOrgDisambiguatedStatus()) || "PART_OF_GROUP".equals(t.getOrgDisambiguatedStatus()) ) {
+            if("DEPRECATED".equals(t.getOrgDisambiguatedStatus()) || "OBSOLETE".equals(t.getOrgDisambiguatedStatus()) || "PART_OF_GROUP".equals(t.getOrgDisambiguatedStatus()) || "REMOVED".equals(t.getOrgDisambiguatedStatus())) {
                 solrUpdater.delete(String.valueOf(t.getOrgDisambiguatedId()));
             } else {
                 solrUpdater.persist(t);                

diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/constants/OrganizationStatus.java b/orcid-persistence/src/main/java/org/orcid/persistence/constants/OrganizationStatus.java
@@ -6,5 +6,5 @@
  * 
  */
 public enum OrganizationStatus {
-    DEPRECATED, OBSOLETE, PART_OF_GROUP;
+    DEPRECATED, OBSOLETE, PART_OF_GROUP, REMOVED;
 }
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/OrgDisambiguatedDaoImpl.java b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/OrgDisambiguatedDaoImpl.java
@@ -109,9 +109,8 @@ public List<OrgDisambiguatedEntity> findOrgsToGroup(int firstResult, int maxResu
 
     @Override
     public List<OrgDisambiguatedEntity> findOrgsPendingIndexing(int firstResult, int maxResult) {
-        TypedQuery<OrgDisambiguatedEntity> query = entityManager.createQuery("from OrgDisambiguatedEntity where indexingStatus != :indexingStatus",
+        TypedQuery<OrgDisambiguatedEntity> query = entityManager.createQuery("from OrgDisambiguatedEntity where indexingStatus not in ('DONE', 'IGNORE')",
                 OrgDisambiguatedEntity.class);
-        query.setParameter("indexingStatus", IndexingStatus.DONE);
         query.setFirstResult(0);
         query.setMaxResults(maxResult);
         return query.getResultList();