Merge pull request #363 from fiterlatam/FBR-497

FBR-497 retain loan external id for bulk import and fix 500 exception…
fiterlatam · Dec 26, 2023 · 3a1afd2 · 3a1afd2
2 parents 87a290b + 66609e1
commit 3a1afd2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...t/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java b/...t/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java
@@ -508,7 +508,10 @@ public CommandProcessingResult submitApplication(final JsonCommand command) {
 
             this.loanRepositoryWrapper.saveAndFlush(newLoanApplication);
             final Long newLoanApplicationId = newLoanApplication.getId();
-            newLoanApplication.setExternalId(String.valueOf(newLoanApplicationId));
+            final Boolean isBulkImport = this.fromJsonHelper.extractBooleanNamed("isBulkImport", command.parsedJson());
+            if (isBulkImport == null || !isBulkImport) {
+                newLoanApplication.setExternalId(String.valueOf(newLoanApplicationId));
+            }
 
             Long facilitatorId = command.longValueOfParameterNamed("facilitator");
             AppUser facilitator = null;

diff --git a/...n/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java b/...n/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
@@ -2588,7 +2588,12 @@ public Collection<LoanAccountData> retrieveClientActiveLoans(Long clientId) {
     public GroupLoanAdditionalData retrieveAdditionalData(Long loanId) {
         final AdditionalGroupLoanData mapper = new AdditionalGroupLoanData(sqlGenerator);
         String sql = "select " + mapper.schema();
-        GroupLoanAdditionalData groupLoanAdditionalData = this.jdbcTemplate.queryForObject(sql, mapper, loanId);
+        GroupLoanAdditionalData groupLoanAdditionalData = null;
+        try {
+            groupLoanAdditionalData = this.jdbcTemplate.queryForObject(sql, mapper, loanId);
+        } catch (EmptyResultDataAccessException e) {
+            return null;
+        }
 
         if (groupLoanAdditionalData!=null){
             AdditionalDataExtraLoansMapper extraLoansMapper = new AdditionalDataExtraLoansMapper(sqlGenerator);