FINERACT-2455: Add accounting configuration support for Working Capital loan products

Author: oleksii-novikov-onix

fineract-core/src/main/java/org/apache/fineract/portfolio/PortfolioProductType.java

@@ -18,13 +18,17 @@
  */
 package org.apache.fineract.portfolio;
 
+import lombok.Getter;
+
+@Getter
 public enum PortfolioProductType {
 
     LOAN(1, "productType.loan"), //
     SAVING(2, "productType.saving"), //
     CLIENT(5, "productType.client"), //
     PROVISIONING(3, "productType.provisioning"), //
-    SHARES(4, "productType.shares"); //
+    SHARES(4, "productType.shares"), //
+    WORKING_CAPITAL_LOAN(6, "productType.workingCapitalLoan"); //
 
     private final Integer value;
     private final String code;
@@ -39,33 +43,20 @@ public String toString() {
         return name().replace("_", " ");
     }
 
-    public Integer getValue() {
-        return this.value;
-    }
-
-    public String getCode() {
-        return this.code;
-    }
-
     public static PortfolioProductType fromInt(final Integer v) {
         if (v == null) {
             return null;
         }
 
-        switch (v) {
-            case 1:
-                return LOAN;
-            case 2:
-                return SAVING;
-            case 3:
-                return CLIENT;
-            case 4:
-                return PROVISIONING;
-            case 5:
-                return SHARES;
-            default:
-                return null;
-        }
+        return switch (v) {
+            case 1 -> LOAN;
+            case 2 -> SAVING;
+            case 3 -> CLIENT;
+            case 4 -> PROVISIONING;
+            case 5 -> SHARES;
+            case 6 -> WORKING_CAPITAL_LOAN;
+            default -> null;
+        };
     }
 
     public boolean isSavingProduct() {
@@ -84,4 +75,8 @@ public boolean isShareProduct() {
         return this.equals(SHARES);
     }
 
+    public boolean isWorkingCapitalLoanProduct() {
+        return this.equals(WORKING_CAPITAL_LOAN);
+    }
+
 }

fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/WorkingCapitalRequestFactory.java

@@ -38,7 +38,10 @@
 import org.apache.fineract.client.models.PostAllowAttributeOverrides;
 import org.apache.fineract.client.models.PostPaymentAllocation;
 import org.apache.fineract.client.models.PostWorkingCapitalLoanProductsRequest;
+import org.apache.fineract.client.models.PostWorkingCapitalLoanProductsRequest.AccountingRuleEnum;
 import org.apache.fineract.client.models.PutWorkingCapitalLoanProductsProductIdRequest;
+import org.apache.fineract.test.data.accounttype.AccountTypeResolver;
+import org.apache.fineract.test.data.accounttype.DefaultAccountType;
 import org.apache.fineract.test.data.delinquency.DelinquencyBucketType;
 import org.apache.fineract.test.data.delinquency.DelinquencyFrequencyType;
 import org.apache.fineract.test.data.delinquency.DelinquencyMinimumPayment;
@@ -50,13 +53,37 @@
 public class WorkingCapitalRequestFactory {
 
     private final LoanProductsRequestFactory loanProductsRequestFactory;
+    private final AccountTypeResolver accountTypeResolver;
 
     public static final String WCLP_NAME_PREFIX = "WCLP-";
     public static final String WCLP_DESCRIPTION = "Working Capital Loan Product";
     public static final String PENALTY = "PENALTY";
     public static final String FEE = "FEE";
     public static final String PRINCIPAL = "PRINCIPAL";
 
+    public PostWorkingCapitalLoanProductsRequest defaultWorkingCapitalLoanProductRequestWithCashAccounting() {
+        return defaultWorkingCapitalLoanProductRequest()//
+                .accountingRule(AccountingRuleEnum.CASH_BASED)//
+                .fundSourceAccountId(accountTypeResolver.resolve(DefaultAccountType.SUSPENSE_CLEARING_ACCOUNT))//
+                .loanPortfolioAccountId(accountTypeResolver.resolve(DefaultAccountType.LOANS_RECEIVABLE))//
+                .transfersInSuspenseAccountId(accountTypeResolver.resolve(DefaultAccountType.TRANSFER_IN_SUSPENSE_ACCOUNT))//
+                .interestOnLoanAccountId(accountTypeResolver.resolve(DefaultAccountType.INTEREST_INCOME))//
+                .incomeFromFeeAccountId(accountTypeResolver.resolve(DefaultAccountType.FEE_INCOME))//
+                .incomeFromPenaltyAccountId(accountTypeResolver.resolve(DefaultAccountType.FEE_INCOME))//
+                .incomeFromRecoveryAccountId(accountTypeResolver.resolve(DefaultAccountType.RECOVERIES))//
+                .writeOffAccountId(accountTypeResolver.resolve(DefaultAccountType.WRITTEN_OFF))//
+                .overpaymentLiabilityAccountId(accountTypeResolver.resolve(DefaultAccountType.OVERPAYMENT_ACCOUNT))//
+                .goodwillCreditAccountId(accountTypeResolver.resolve(DefaultAccountType.GOODWILL_EXPENSE_ACCOUNT))//
+                .incomeFromGoodwillCreditInterestAccountId(accountTypeResolver.resolve(DefaultAccountType.INTEREST_INCOME_CHARGE_OFF))//
+                .incomeFromGoodwillCreditFeesAccountId(accountTypeResolver.resolve(DefaultAccountType.FEE_CHARGE_OFF))//
+                .incomeFromGoodwillCreditPenaltyAccountId(accountTypeResolver.resolve(DefaultAccountType.FEE_CHARGE_OFF))//
+                .incomeFromChargeOffInterestAccountId(accountTypeResolver.resolve(DefaultAccountType.INTEREST_INCOME_CHARGE_OFF))//
+                .incomeFromChargeOffFeesAccountId(accountTypeResolver.resolve(DefaultAccountType.FEE_CHARGE_OFF))//
+                .incomeFromChargeOffPenaltyAccountId(accountTypeResolver.resolve(DefaultAccountType.FEE_CHARGE_OFF))//
+                .chargeOffExpenseAccountId(accountTypeResolver.resolve(DefaultAccountType.CREDIT_LOSS_BAD_DEBT))//
+                .chargeOffFraudExpenseAccountId(accountTypeResolver.resolve(DefaultAccountType.CREDIT_LOSS_BAD_DEBT_FRAUD));//
+    }
+
     public PostWorkingCapitalLoanProductsRequest defaultWorkingCapitalLoanProductRequest() {
         String name = Utils.randomStringGenerator(WCLP_NAME_PREFIX, 10);
         String shortName = loanProductsRequestFactory.generateShortNameSafely();
@@ -82,6 +109,7 @@ public PostWorkingCapitalLoanProductsRequest defaultWorkingCapitalLoanProductReq
                 .delinquencyBucketId(DELINQUENCY_BUCKET_ID.longValue())//
                 .dateFormat(DATE_FORMAT)//
                 .locale(LOCALE_EN)//
+                .accountingRule(AccountingRuleEnum.NONE)//
                 .paymentAllocation(List.of(//
                         createPaymentAllocation(PostPaymentAllocation.TransactionTypeEnum.DEFAULT.getValue(),
                                 List.of(PENALTY, FEE, PRINCIPAL))));//