From ee3ecf4f0fb18211950822e3f4bf3d677d7f8f07 Mon Sep 17 00:00:00 2001 From: amontenegro Date: Tue, 13 Jun 2023 13:50:18 -0600 Subject: [PATCH 1/3] Use the IGNORE indexing status to ignore the RINGGOLD orgs --- .../orcid/persistence/dao/impl/OrgDisambiguatedDaoImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 index bf1a640d663..6366242fa09 100644 --- 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 @@ -99,9 +99,8 @@ public List findOrgsToGroup(int firstResult, int maxResu @Override public List findOrgsPendingIndexing(int firstResult, int maxResult) { - TypedQuery query = entityManager.createQuery("from OrgDisambiguatedEntity where indexingStatus != :indexingStatus", + TypedQuery 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(); From 543164a122beab3ec0b9119ecdc71ed6a0c394d9 Mon Sep 17 00:00:00 2001 From: amontenegro Date: Tue, 13 Jun 2023 14:18:10 -0600 Subject: [PATCH 2/3] Add new organization status 'DELETED' --- .../java/org/orcid/listener/solr/SolrOrgsMessageProcessor.java | 2 +- .../org/orcid/persistence/constants/OrganizationStatus.java | 2 +- 2 files changed, 2 insertions(+), 2 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 index 7f33e4f0c93..8e08fd09917 100644 --- 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 index b60e8e3bbd6..dff4f2f1067 100644 --- 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; } From 6e1e18ba606c97cd8365e6d8e86b68bdae6b200b Mon Sep 17 00:00:00 2001 From: amontenegro Date: Wed, 14 Jun 2023 13:36:27 -0600 Subject: [PATCH 3/3] Fix bug --- .../org/orcid/persistence/dao/impl/OrgDisambiguatedDaoImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 6366242fa09..1c477e6f4bb 100644 --- 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 @@ -99,7 +99,7 @@ public List findOrgsToGroup(int firstResult, int maxResu @Override public List findOrgsPendingIndexing(int firstResult, int maxResult) { - TypedQuery query = entityManager.createQuery("from OrgDisambiguatedEntity where indexingStatus not in ('DONE, 'IGNORE')", + TypedQuery query = entityManager.createQuery("from OrgDisambiguatedEntity where indexingStatus not in ('DONE', 'IGNORE')", OrgDisambiguatedEntity.class); query.setFirstResult(0); query.setMaxResults(maxResult);