Fixed the failing tests

ORCID · Oct 11, 2024 · 128c27d · 128c27d
1 parent a9da77d
commit 128c27d
Show file tree

Hide file tree

Showing 11 changed files with 75 additions and 11 deletions.
diff --git a/...rsistence/src/main/java/org/orcid/persistence/dao/impl/OrgAffiliationRelationDaoImpl.java b/...rsistence/src/main/java/org/orcid/persistence/dao/impl/OrgAffiliationRelationDaoImpl.java
@@ -9,15 +9,15 @@
 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.orcid.persistence.panoply.PanoplyDeletedItem;
+import org.orcid.persistence.panoply.PanoplyRedshiftClient;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.transaction.annotation.Transactional;

diff --git a/...cid/utils/panoply/PanoplyDeletedItem.java → ...rsistence/panoply/PanoplyDeletedItem.java b/...cid/utils/panoply/PanoplyDeletedItem.java → ...rsistence/panoply/PanoplyDeletedItem.java
@@ -1,4 +1,4 @@
-package org.orcid.utils.panoply;
+package org.orcid.persistence.panoply;
 
 public class PanoplyDeletedItem {
     private Long id;

diff --git a/.../utils/panoply/PanoplyRedshiftClient.java → ...stence/panoply/PanoplyRedshiftClient.java b/.../utils/panoply/PanoplyRedshiftClient.java → ...stence/panoply/PanoplyRedshiftClient.java
@@ -1,4 +1,4 @@
-package org.orcid.utils.panoply;
+package org.orcid.persistence.panoply;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

diff --git a/orcid-persistence/src/main/resources/orcid-persistence-context.xml b/orcid-persistence/src/main/resources/orcid-persistence-context.xml
@@ -458,6 +458,9 @@
     </bean>
 
 
+    <bean id="panoplyClient" class="org.orcid.persistence.panoply.PanoplyRedshiftClient" />
+
+
     <!-- Panoply Redshift -->
 	<bean id="panoplyRedshiftDataSource" class="com.zaxxer.hikari.HikariDataSource" destroy-method="close">
 		<property name="driverClassName" value="\${org.orcid.core.utils.panoply.driver}" />

diff --git a/orcid-test/src/main/resources/properties/test-api-common.properties b/orcid-test/src/main/resources/properties/test-api-common.properties
@@ -9,4 +9,14 @@ org.orcid.swagger.authendpoint=https://localhost:8443/orcid-web/oauth/authorize
 # Redis
 org.orcid.core.utils.cache.redis.host=xxx.xxx.com
 org.orcid.core.utils.cache.redis.port=6379
-org.orcid.core.utils.cache.redis.password=XXXX
+org.orcid.core.utils.cache.redis.password=XXXX
+
+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
diff --git a/orcid-test/src/main/resources/properties/test-api-internal.properties b/orcid-test/src/main/resources/properties/test-api-internal.properties
@@ -9,4 +9,14 @@ org.orcid.persistence.internal_api.db.readonly.maxPoolSize=3
 # Redis
 org.orcid.core.utils.cache.redis.host=xxx.xxx.com
 org.orcid.core.utils.cache.redis.port=6379
-org.orcid.core.utils.cache.redis.password=XXXX
+org.orcid.core.utils.cache.redis.password=XXXX
+
+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
diff --git a/orcid-test/src/main/resources/properties/test-core.properties b/orcid-test/src/main/resources/properties/test-core.properties
@@ -76,4 +76,14 @@ org.orcid.core.orgsToGroup.query=select a.* from org_disambiguated a full outer
 # Redis
 org.orcid.core.utils.cache.redis.host=xxx.xxx.com
 org.orcid.core.utils.cache.redis.port=6379
-org.orcid.core.utils.cache.redis.password=XXXX
+org.orcid.core.utils.cache.redis.password=XXXX
+
+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
diff --git a/orcid-test/src/main/resources/properties/test-db.properties b/orcid-test/src/main/resources/properties/test-db.properties
@@ -46,3 +46,13 @@ org.orcid.persistence.togglz.db.testConnectionOnCheckin=true
 org.orcid.persistence.togglz.db.preferredTestQuery=select 1
 org.orcid.persistence.togglz.db.numHelperThreads=5
 org.orcid.persistence.togglz.cache.ttl=60000
+
+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
diff --git a/orcid-test/src/main/resources/properties/test-scheduler.properties b/orcid-test/src/main/resources/properties/test-scheduler.properties
@@ -42,3 +42,13 @@ org.orcid.core.orgs.ror.localZipPath=/tmp/ror/ror.zip
 org.orcid.core.utils.cache.redis.host=xxx.xxx.com
 org.orcid.core.utils.cache.redis.port=6379
 org.orcid.core.utils.cache.redis.password=XXXX
+
+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
diff --git a/orcid-test/src/main/resources/properties/test-ui.properties b/orcid-test/src/main/resources/properties/test-ui.properties
@@ -28,4 +28,14 @@ org.orcid.core.profile.lockout.threshhold=10
 # Redis
 org.orcid.core.utils.cache.redis.host=xxx.xxx.com
 org.orcid.core.utils.cache.redis.port=6379
-org.orcid.core.utils.cache.redis.password=XXXX
+org.orcid.core.utils.cache.redis.password=XXXX
+
+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
diff --git a/properties/development.properties b/properties/development.properties
@@ -265,8 +265,9 @@ 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.password=!RH!7jBgte8CbBPA
 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
+#jdbc:redshift://<host>:<port>/<database>
+org.orcid.core.utils.panoply.jdbcUrl=jdbc:redshift://db.panoply.io:5439/orcid
+org.orcid.core.utils.panoply.username=[email protected]