CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 46 Packages Projects Releases Wiki Activity

FINERACT-1971: Fixing Loan COB error on startup when Loan COB is disabled

Browse Source
This commit is contained in:
Peter Bagrij
2024-03-22 12:16:40 +01:00
committed by Adam Saghy
parent c34f2b4f59
commit c404f474e9
6 changed files with 16 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/cob/conditions/LoanCOBWorkerCondition.java → fineract-provider/src/main/java/org/apache/fineract/cob/conditions/BatchManagerCondition.java
+2 -4
View File
@@ -21,12 +21,10 @@ package org.apache.fineract.cob.conditions;
import org.apache.fineract.infrastructure.core.condition.PropertiesCondition;
import org.apache.fineract.infrastructure.core.config.FineractProperties;
public class LoanCOBWorkerCondition extends PropertiesCondition {
public class BatchManagerCondition extends PropertiesCondition {
@Override
protected boolean matches(FineractProperties properties) {
boolean loanCobEnabled = properties.getJob().isLoanCobEnabled();
boolean batchWorkerEnabled = properties.getMode().isBatchWorkerEnabled();
return loanCobEnabled && batchWorkerEnabled;
return properties.getMode().isBatchManagerEnabled();
}
}
fineract-provider/src/main/java/org/apache/fineract/cob/conditions/LoanCOBManagerCondition.java → fineract-provider/src/main/java/org/apache/fineract/cob/conditions/BatchWorkerCondition.java
+2 -4
View File
@@ -21,12 +21,10 @@ package org.apache.fineract.cob.conditions;
import org.apache.fineract.infrastructure.core.condition.PropertiesCondition;
import org.apache.fineract.infrastructure.core.config.FineractProperties;
public class LoanCOBManagerCondition extends PropertiesCondition {
public class BatchWorkerCondition extends PropertiesCondition {
@Override
protected boolean matches(FineractProperties properties) {
boolean loanCobEnabled = properties.getJob().isLoanCobEnabled();
boolean batchManagerEnabled = properties.getMode().isBatchManagerEnabled();
return loanCobEnabled && batchManagerEnabled;
return properties.getMode().isBatchWorkerEnabled();
}
}
fineract-provider/src/main/java/org/apache/fineract/cob/loan/LoanCOBManagerConfiguration.java
+2 -2
View File
@@ -20,7 +20,7 @@ package org.apache.fineract.cob.loan;
import org.apache.fineract.cob.COBBusinessStepService;
import org.apache.fineract.cob.common.CustomJobParameterResolver;
import org.apache.fineract.cob.conditions.LoanCOBManagerCondition;
import org.apache.fineract.cob.conditions.BatchManagerCondition;
import org.apache.fineract.cob.listener.COBExecutionListenerRunner;
import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
import org.apache.fineract.infrastructure.jobs.service.JobName;
@@ -47,7 +47,7 @@ import org.springframework.transaction.PlatformTransactionManager;
@Configuration
@EnableBatchIntegration
@Conditional(LoanCOBManagerCondition.class)
@Conditional(BatchManagerCondition.class)
public class LoanCOBManagerConfiguration {
@Autowired
fineract-provider/src/main/java/org/apache/fineract/cob/loan/LoanCOBWorkerConfiguration.java
+2 -2
View File
@@ -22,7 +22,7 @@ import org.apache.fineract.cob.COBBusinessStepService;
import org.apache.fineract.cob.common.CustomJobParameterResolver;
import org.apache.fineract.cob.common.InitialisationTasklet;
import org.apache.fineract.cob.common.ResetContextTasklet;
import org.apache.fineract.cob.conditions.LoanCOBWorkerCondition;
import org.apache.fineract.cob.conditions.BatchWorkerCondition;
import org.apache.fineract.cob.listener.ChunkProcessingLoanItemListener;
import org.apache.fineract.infrastructure.core.config.FineractProperties;
import org.apache.fineract.infrastructure.jobs.service.JobName;
@@ -51,7 +51,7 @@ import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.support.TransactionTemplate;
@Configuration
@Conditional(LoanCOBWorkerCondition.class)
@Conditional(BatchWorkerCondition.class)
public class LoanCOBWorkerConfiguration {
@Autowired