Context fixes

ORCID · Aug 11, 2023 · 4f5edcc · 4f5edcc
1 parent 3d731c7
commit 4f5edcc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/orcid-scheduler-web/src/main/java/org/orcid/scheduler/autospam/cli/AutoLockSpamRecords.java b/orcid-scheduler-web/src/main/java/org/orcid/scheduler/autospam/cli/AutoLockSpamRecords.java
@@ -89,7 +89,7 @@ public class AutoLockSpamRecords {
     @Resource(name = "notificationManagerV3")
     private NotificationManager notificationManager;
 
-    @Resource
+    @Resource(name="orcidOauth2TokenDetailDao")
     private OrcidOauth2TokenDetailDao orcidOauthDao;
 
     private static int ONE_DAY = 86400000;

diff --git a/orcid-scheduler-web/src/main/resources/orcid-scheduler-context.xml b/orcid-scheduler-web/src/main/resources/orcid-scheduler-context.xml
@@ -35,7 +35,7 @@
         <task:scheduled ref="publicProfileValidator" method="processValidationCycle" cron="${org.orcid.scheduler.api.profile.validation.cronConfig:0 */10 * * * *}"/>
         <task:scheduled ref="orgLoadManager" method="loadOrgs" cron="${org.orcid.scheduler.web.orgImportsCronConfig}" />
         <task:scheduled ref="issnLoadManager" method="loadIssn" cron="${org.orcid.scheduler.web.loadIssnCronConfig:0 0 0 * * FRI}"/>
-        <task:scheduled ref="issnLoadManager" method="scheduledProcess" cron="${org.orcid.scheduler.autospam.process:0 0 0 * * TUE}"/>
+        <task:scheduled ref="autoLockSpamRecords" method="scheduledProcess" cron="${org.orcid.scheduler.autospam.process:0 0 0 * * TUE}"/>
 
     </task:scheduled-tasks>
 
@@ -133,5 +133,5 @@
 	</bean>
 
 	<bean id="issnLoadManager"  class="org.orcid.scheduler.loader.manager.impl.IssnLoadManagerImpl"/>
-
+    <bean id="autoLockSpamRecords" class="org.orcid.scheduler.autospam.cli.AutoLockSpamRecords" />
 </beans>
diff --git a/properties/development.properties b/properties/development.properties
@@ -236,3 +236,16 @@ org.orcid.scheduler.web.loadIssnCronConfig=0 0 0 * * FRI
 
 # Added the config to index all RORs not only the changed ones
 org.orcid.core.orgs.ror.indexAllEnabled=false
+
+#Autospam config
+org.orcid.scheduler.autospam.daily.batch.size=20000
+org.orcid.message-listener.s3.accessKey=X
+org.orcid.message-listener.s3.secretKey=X
+org.orcid.scheduler.aws.bucket=auto-spam-folder
+org.orcid.scheduler.aws.file=orcidspam.csv
+org.orcid.scheduler.autospam.enabled=false
+org.orcid.scheduler.autospam.file=orcidspam.csv
+org.orcid.scheduler.autospam.daily.batch:20000
+
+
+