FINERACT-1806: fix ProductToGLAccountMapping

magyari-adam · Dec 16, 2024 · 7879ccf · 7879ccf
1 parent 136bb00
commit 7879ccf
Show file tree

Hide file tree

Showing 8 changed files with 159 additions and 196 deletions.
diff --git a/.../apache/fineract/accounting/producttoaccountmapping/domain/ProductToGLAccountMapping.java b/.../apache/fineract/accounting/producttoaccountmapping/domain/ProductToGLAccountMapping.java
@@ -29,6 +29,7 @@
 import lombok.Setter;
 import lombok.experimental.Accessors;
 import org.apache.fineract.accounting.glaccount.domain.GLAccount;
+import org.apache.fineract.infrastructure.codes.domain.CodeValue;
 import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
 import org.apache.fineract.portfolio.charge.domain.Charge;
 import org.apache.fineract.portfolio.paymenttype.domain.PaymentType;
@@ -63,13 +64,14 @@ public class ProductToGLAccountMapping extends AbstractPersistableCustom<Long> {
     @Column(name = "financial_account_type", nullable = true)
     private int financialAccountType;
 
-    @Column(name = "charge_off_reason_id", nullable = true)
-    private Long chargeOffReasonId;
+    @ManyToOne
+    @JoinColumn(name = "charge_off_reason_id", nullable = true)
+    private CodeValue chargeOffReason;
 
     public static ProductToGLAccountMapping createNew(final GLAccount glAccount, final Long productId, final int productType,
-            final int financialAccountType, final Long chargeOffReasonId) {
+            final int financialAccountType, final CodeValue chargeOffReasonId) {
 
         return new ProductToGLAccountMapping().setGlAccount(glAccount).setProductId(productId).setProductType(productType)
-                .setFinancialAccountType(financialAccountType).setChargeOffReasonId(chargeOffReasonId);
+                .setFinancialAccountType(financialAccountType).setChargeOffReason(chargeOffReasonId);
     }
 }
diff --git a/...neract/accounting/producttoaccountmapping/domain/ProductToGLAccountMappingRepository.java b/...neract/accounting/producttoaccountmapping/domain/ProductToGLAccountMappingRepository.java
@@ -35,7 +35,7 @@ ProductToGLAccountMapping findProductIdAndProductTypeAndFinancialAccountTypeAndC
             @Param("productType") int productType, @Param("financialAccountType") int financialAccountType,
             @Param("chargeId") Long ChargeId);
 
-    @Query("select mapping from ProductToGLAccountMapping mapping where mapping.productId =:productId and mapping.productType =:productType and mapping.financialAccountType=:financialAccountType and mapping.paymentType is NULL and mapping.charge is NULL and mapping.chargeOffReasonId is NULL")
+    @Query("select mapping from ProductToGLAccountMapping mapping where mapping.productId =:productId and mapping.productType =:productType and mapping.financialAccountType=:financialAccountType and mapping.paymentType is NULL and mapping.charge is NULL and mapping.chargeOffReason.id is NULL")
     ProductToGLAccountMapping findCoreProductToFinAccountMapping(@Param("productId") Long productId, @Param("productType") int productType,
             @Param("financialAccountType") int financialAccountType);
 
@@ -62,10 +62,20 @@ List<ProductToGLAccountMapping> findAllPenaltyToIncomeAccountMappings(@Param("pr
 
     List<ProductToGLAccountMapping> findByProductIdAndProductType(Long productId, int productType);
 
-    @Query("select mapping from ProductToGLAccountMapping mapping where mapping.productId =:productId and mapping.productType =:productType and mapping.chargeOffReasonId is not NULL")
+    @Query("select mapping from ProductToGLAccountMapping mapping where mapping.productId =:productId and mapping.productType =:productType and mapping.chargeOffReason.id is not NULL")
     List<ProductToGLAccountMapping> findAllChargesOffReasonsMappings(@Param("productId") Long productId,
             @Param("productType") int productType);
 
-    @Query("select mapping from ProductToGLAccountMapping mapping where mapping.chargeOffReasonId =:chargeOffReasonId")
+    @Query("select mapping from ProductToGLAccountMapping mapping where mapping.chargeOffReason.id =:chargeOffReasonId")
     ProductToGLAccountMapping findChargesOffReasonMappingById(@Param("chargeOffReasonId") Integer chargeOffReasonId);
+
+    List<ProductToGLAccountMapping> findAllByProductIdAndProductTypeAndPaymentTypeIsNullAndChargeIsNull(Long productId,
+            Integer productType);
+
+    List<ProductToGLAccountMapping> findAllByProductIdAndProductTypeAndChargeOffReasonIdIsNotNull(Long productId, Integer productType);
+
+    List<ProductToGLAccountMapping> findAllByProductIdAndProductTypeAndPaymentTypeIsNotNull(Long productId, Integer productType);
+
+    List<ProductToGLAccountMapping> findAllByProductIdAndProductTypeAndCharge_PenaltyAndCharge_IdIsNotNull(Long productId,
+            Integer productType, boolean isPenalty);
 }
diff --git a/.../fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingHelper.java b/.../fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingHelper.java
@@ -414,7 +414,7 @@ public void updateChargeOffReasonToGLAccountMappings(final JsonCommand command,
                 this.accountMappingRepository.deleteAllInBatch(existingChargeOffReasonToGLAccountMappings);
             } else {
                 for (final ProductToGLAccountMapping existingChargeOffReasonToGLAccountMapping : existingChargeOffReasonToGLAccountMappings) {
-                    final Long currentChargeOffReasonId = existingChargeOffReasonToGLAccountMapping.getChargeOffReasonId();
+                    final Long currentChargeOffReasonId = existingChargeOffReasonToGLAccountMapping.getChargeOffReason().getId();
                     if (currentChargeOffReasonId != null) {
                         existingChargeOffReasons.add(currentChargeOffReasonId);
                         // update existing mappings (if required)
@@ -496,12 +496,14 @@ private void saveChargeOffReasonToExpenseMapping(final Long productId, final Lon
 
         final boolean reasonMappingExists = this.accountMappingRepository
                 .findAllChargesOffReasonsMappings(productId, portfolioProductType.getValue()).stream()
-                .anyMatch(mapping -> mapping.getChargeOffReasonId().equals(reasonId));
+                .anyMatch(mapping -> mapping.getChargeOffReason().getId().equals(reasonId));
 
-        if (glAccount.isPresent() && !reasonMappingExists) {
+        final Optional<CodeValue> codeValueOptional = codeValueRepository.findById(reasonId);
+
+        if (glAccount.isPresent() && !reasonMappingExists && codeValueOptional.isPresent()) {
             final ProductToGLAccountMapping accountMapping = new ProductToGLAccountMapping().setGlAccount(glAccount.get())
                     .setProductId(productId).setProductType(portfolioProductType.getValue())
-                    .setFinancialAccountType(CashAccountsForLoan.CHARGE_OFF_EXPENSE.getValue()).setChargeOffReasonId(reasonId);
+                    .setFinancialAccountType(CashAccountsForLoan.CHARGE_OFF_EXPENSE.getValue()).setChargeOffReason(codeValueOptional.get());
 
             this.accountMappingRepository.saveAndFlush(accountMapping);
         }