move dryTransition to validation

kjozsa · Jun 19, 2024 · 37ddc6c · 37ddc6c
1 parent e75da79
commit 37ddc6c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleAssembler.java b/...org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleAssembler.java
@@ -100,7 +100,6 @@
 import org.apache.fineract.portfolio.loanaccount.domain.LoanOfficerAssignmentHistory;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanRepaymentScheduleInstallment;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanRepositoryWrapper;
-import org.apache.fineract.portfolio.loanaccount.domain.LoanStatus;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanTermVariationType;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanTermVariations;
 import org.apache.fineract.portfolio.loanaccount.domain.transactionprocessor.LoanRepaymentScheduleTransactionProcessor;
@@ -1386,11 +1385,6 @@ public Pair<Loan, Map<String, Object>> assembleLoanApproval(AppUser currentUser,
         final JsonArray disbursementDataArray = command.arrayOfParameterNamed(LoanApiConstants.disbursementDataParameterName);
         final Loan loan = this.loanRepositoryWrapper.findOneWithNotFoundDetection(loanId, true);
 
-        final LoanStatus newStatus = defaultLoanLifecycleStateMachine.dryTransition(LoanEvent.LOAN_APPROVED, loan);
-        if (newStatus.hasStateOf(loan.getStatus())) {
-            return Pair.of(loan, Map.of()); // no status change happened
-        }
-
         final Map<String, Object> actualChanges = new HashMap<>();
         defaultLoanLifecycleStateMachine.transition(LoanEvent.LOAN_APPROVED, loan);
         actualChanges.put(PARAM_STATUS, LoanEnumerations.status(loan.getStatus()));

diff --git a/...ava/org/apache/fineract/portfolio/loanaccount/serialization/LoanApplicationValidator.java b/...ava/org/apache/fineract/portfolio/loanaccount/serialization/LoanApplicationValidator.java
@@ -90,6 +90,7 @@
 import org.apache.fineract.portfolio.loanaccount.api.LoanApiConstants;
 import org.apache.fineract.portfolio.loanaccount.domain.Loan;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanCollateralManagement;
+import org.apache.fineract.portfolio.loanaccount.domain.LoanEvent;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanLifecycleStateMachine;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanRepaymentScheduleTransactionProcessorFactory;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanRepositoryWrapper;
@@ -2047,6 +2048,13 @@ public void validateApproval(JsonCommand command, Long loanId) {
                 throw new InvalidLoanStateTransitionException("approval", "cannot.be.a.future.date", errorMessage, approvedOnDate);
             }
 
+            final LoanStatus newStatus = defaultLoanLifecycleStateMachine.dryTransition(LoanEvent.LOAN_APPROVED, loan);
+            if (newStatus.hasStateOf(loan.getStatus())) {
+                final String defaultUserMessage = "Loan is already approved.";
+                final ApiParameterError error = ApiParameterError
+                        .generalError("error.msg.loan.approve.account.is.not.submitted.and.pending.state", defaultUserMessage);
+                baseDataValidator.getDataValidationErrors().add(error);
+            }
         }); // end validation
     }