Merge pull request #7093 from ORCID/revert-7091-9339-delete-orgaffiliationrelation-rows-in-panoply-for-affiliations-deleted-in-the-registry

Revert "Added the code to store deleted items in panoply dw_deleted_items table"

Author: cryptalith

orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/OrgAffiliationRelationDaoImpl.java

@@ -3,32 +3,19 @@
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
 
-import javax.annotation.Resource;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
-import org.orcid.utils.panoply.PanoplyDeletedItem;
-import org.orcid.utils.panoply.PanoplyRedshiftClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.commons.logging.Log;
 import org.orcid.persistence.aop.UpdateProfileLastModified;
 import org.orcid.persistence.aop.UpdateProfileLastModifiedAndIndexingStatus;
 import org.orcid.persistence.dao.OrgAffiliationRelationDao;
 import org.orcid.persistence.jpa.entities.OrgAffiliationRelationEntity;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.transaction.annotation.Transactional;
 
 public class OrgAffiliationRelationDaoImpl extends GenericDaoImpl<OrgAffiliationRelationEntity, Long> implements OrgAffiliationRelationDao {
-    
-    private static final Logger LOG = LoggerFactory.getLogger(OrgAffiliationRelationDaoImpl.class);
-    
-    @Value("${org.orcid.persistence.panoply.cleanup.production:false}")
-    private boolean enablePanoplyCleanupInProduction; 
-    
+
     private static final String AFFILIATION_TYPE_DISTINCTION = "DISTINCTION";
 
     private static final String AFFILIATION_TYPE_EDUCATION = "EDUCATION";
@@ -42,11 +29,6 @@ public class OrgAffiliationRelationDaoImpl extends GenericDaoImpl<OrgAffiliation
     private static final String AFFILIATION_TYPE_QUALIFICATION = "QUALIFICATION";
 
     private static final String AFFILIATION_TYPE_SERVICE = "SERVICE";
-    
-    private static final String DW_PANOPLY_AFFILIATION_TABLE = "dw_org_affiliation_relation";
-    
-    @Resource
-    private PanoplyRedshiftClient panoplyClient;  
 
     public OrgAffiliationRelationDaoImpl() {
         super(OrgAffiliationRelationEntity.class);
@@ -69,34 +51,7 @@ public boolean removeOrgAffiliationRelation(String userOrcid, Long orgAffiliatio
         Query query = entityManager.createQuery("delete from OrgAffiliationRelationEntity where orcid=:userOrcid and id=:orgAffiliationRelationId");
         query.setParameter("userOrcid", userOrcid);
         query.setParameter("orgAffiliationRelationId", orgAffiliationRelationId);
-        if(query.executeUpdate() > 0) {
-            if(enablePanoplyCleanupInProduction) {
-                PanoplyDeletedItem item = new PanoplyDeletedItem();
-                item.setItemId(orgAffiliationRelationId);
-                item.setDwTable(DW_PANOPLY_AFFILIATION_TABLE);
-                storeDeletedItemInPanoply(item);
-             }
-            return true;
-        }
-        return   false;
-    }
-    
-    private void storeDeletedItemInPanoply(PanoplyDeletedItem item) {
-        //Store the deleted item in panoply Db without blocking
-        CompletableFuture.supplyAsync(() -> {
-            try {
-                panoplyClient.addPanoplyDeletedItem(item);
-                return true;
-            } catch (Exception e) {
-                LOG.error("Cannot store deleted affiliation in panoply ", e);
-                return false;
-            }
-        }).thenAccept(result -> {            
-            if(! result) {
-                LOG.error("Async call to panoply for : " + item.toString() + " Stored: "+ result);
-            }
-            
-        });
+        return query.executeUpdate() > 0 ? true : false;
     }
 
     /**
@@ -241,14 +196,6 @@ public void removeOrgAffiliationByClientSourceId(String clientSourceId) {
         Query query = entityManager.createNativeQuery("DELETE FROM org_affiliation_relation WHERE client_source_id=:clientSourceId");
         query.setParameter("clientSourceId", clientSourceId);
         query.executeUpdate();
-        if(query.executeUpdate() > 0) {
-            if(enablePanoplyCleanupInProduction) {
-                PanoplyDeletedItem item = new PanoplyDeletedItem();
-                item.setClientSourceId(clientSourceId);
-                item.setDwTable(DW_PANOPLY_AFFILIATION_TABLE);
-                storeDeletedItemInPanoply(item);
-             }
-        }
     }
 
     @Override
@@ -334,15 +281,6 @@ public void removeAllAffiliations(String orcid) {
         Query query = entityManager.createQuery("delete from OrgAffiliationRelationEntity where orcid = :orcid");
         query.setParameter("orcid", orcid);
         query.executeUpdate();
-        if(query.executeUpdate() > 0) {
-            if(enablePanoplyCleanupInProduction) {
-                PanoplyDeletedItem item = new PanoplyDeletedItem();
-                item.setOrcid(orcid);
-                item.setDwTable(DW_PANOPLY_AFFILIATION_TABLE);
-                storeDeletedItemInPanoply(item);
-             }
-        }
-        
     }
 
     @Override

orcid-persistence/src/main/resources/orcid-persistence-context.xml

@@ -457,22 +457,6 @@
         <property name="entityManager" ref="entityManagerReadOnly" />
     </bean>
 
-    
-    <!-- Panoply Redshift -->
-	<bean id="panoplyRedshiftDataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
-		<property name="driverClassName" value="\${org.orcid.core.utils.panoply.driver}" />
-        <property name="jdbcUrl" value="\${org.orcid.core.utils.panoply.jdbcUrl}" />
-        <property name="username" value="\${org.orcid.core.utils.panoply.username}" />
-        <property name="password" value="\${org.orcid.core.utils.panoply.password}" />
-        <property name="maximumPoolSize" value="\${org.orcid.core.utils.panoply.maxPoolSize}" />
-        <property name="idleTimeout" value="\${org.orcid.core.utils.panoply.idleConnectionTimeout}" />
-        <property name="connectionTimeout" value="\${org.orcid.core.utils.panoply.connectionTimeout}" />
-	</bean>
-	
-	<!-- Panoply JdbcTemplate Bean Definition -->
-    <bean id="panoplyJdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
-        <property name="dataSource" ref="panoplyRedshiftDataSource" />
-    </bean>
 
     <!-- Statistics -->
     <bean id="statisticsDao" class="org.orcid.persistence.dao.impl.StatisticsDaoImpl">

orcid-utils/pom.xml

@@ -43,10 +43,6 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 		</dependency>
-		<dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-        </dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
@@ -117,22 +113,6 @@
 			<artifactId>jsoup</artifactId>
 			<version>1.15.4</version>
 		</dependency>
-		
-		<!-- https://mvnrepository.com/artifact/com.amazon.redshift/redshift-jdbc42 -->
-		<dependency>
-		    <groupId>com.amazon.redshift</groupId>
-		    <artifactId>redshift-jdbc42</artifactId>
-		    <version>2.1.0.30</version>
-		</dependency>
-
-
-		<!-- https://mvnrepository.com/artifact/com.zaxxer/HikariCP -->
-		<dependency>
-		    <groupId>com.zaxxer</groupId>
-		    <artifactId>HikariCP</artifactId>
-		    <version>5.0.1</version>
-		</dependency>
-
 
 		<!-- Test dependencies -->
 

orcid-utils/src/main/java/org/orcid/utils/panoply/PanoplyDeletedItem.java

@@ -258,15 +258,5 @@ org.orcid.scheduler.autospam.enabled=true
 org.orcid.core.autospam.slackChannel=collab-spam-reports
 org.orcid.core.autospam.webhookUrl=
 
-org.orcid.persistence.liquibase.enabled=false
+#org.orcid.persistence.liquibase.enabled=false
 org.orcid.persistence.solr.read.only.url=http://localhost:8983/solr
-
-org.orcid.persistence.panoply.cleanup.production=false
-# Panoply redshift database 
-org.orcid.core.utils.panoply.driver=com.amazon.redshift.jdbc.Driver
-org.orcid.core.utils.panoply.maxPoolSize=20
-org.orcid.core.utils.panoply.password=xxx
-org.orcid.core.utils.panoply.idleConnectionTimeout=3600
-org.orcid.core.utils.panoply.connectionTimeout=36000
-org.orcid.core.utils.panoply.jdbcUrl=xxx
-org.orcid.core.utils.panoply.username=xxx