FINERACT-2455: Working Capital product near breach configuration

Author: alberto-art3ch

fineract-client-feign/src/main/java/org/apache/fineract/client/feign/FineractFeignClient.java

@@ -162,6 +162,7 @@
 import org.apache.fineract.client.feign.services.WorkingCapitalLoanProductsApi;
 import org.apache.fineract.client.feign.services.WorkingCapitalLoanTransactionsApi;
 import org.apache.fineract.client.feign.services.WorkingCapitalLoansApi;
+import org.apache.fineract.client.feign.services.WorkingCapitalNearBreachApi;
 import org.apache.fineract.client.feign.services.WorkingDaysApi;
 
 /**
@@ -787,6 +788,10 @@ public WorkingCapitalBreachApi workingCapitalBreaches() {
         return create(WorkingCapitalBreachApi.class);
     }
 
+    public WorkingCapitalNearBreachApi workingCapitalNearBreaches() {
+        return create(WorkingCapitalNearBreachApi.class);
+    }
+
     public WorkingDaysApi workingDays() {
         return create(WorkingDaysApi.class);
     }

fineract-core/src/main/java/org/apache/fineract/commands/service/CommandWrapperBuilder.java

@@ -790,6 +790,30 @@ public CommandWrapperBuilder deleteWorkingCapitalBreach(final Long breachId) {
         return this;
     }
 
+    public CommandWrapperBuilder createWorkingCapitalNearBreach() {
+        this.actionName = "CREATE";
+        this.entityName = "WORKINGCAPITALNEARBREACH";
+        this.entityId = null;
+        this.href = "/working-capital/near-breach";
+        return this;
+    }
+
+    public CommandWrapperBuilder updateWorkingCapitalNearBreach(final Long breachId) {
+        this.actionName = "UPDATE";
+        this.entityName = "WORKINGCAPITALNEARBREACH";
+        this.entityId = breachId;
+        this.href = "/working-capital/near-breach/" + breachId;
+        return this;
+    }
+
+    public CommandWrapperBuilder deleteWorkingCapitalNearBreach(final Long breachId) {
+        this.actionName = "DELETE";
+        this.entityName = "WORKINGCAPITALNEARBREACH";
+        this.entityId = breachId;
+        this.href = "/working-capital/near-breach/" + breachId;
+        return this;
+    }
+
     public CommandWrapperBuilder createWorkingCapitalLoanApplication() {
         this.actionName = ACTION_CREATE;
         this.entityName = ENTITY_WORKINGCAPITALLOAN;

fineract-core/src/main/java/org/apache/fineract/infrastructure/core/data/DataValidatorBuilder.java

@@ -383,6 +383,31 @@ public DataValidatorBuilder positiveAmount() {
         return this;
     }
 
+    public DataValidatorBuilder percentage() {
+        if (this.value == null && this.ignoreNullValue) {
+            return this;
+        }
+
+        if (this.value != null) {
+            final BigDecimal number = new BigDecimal(this.value.toString());
+            if (number.compareTo(BigDecimal.ZERO) <= 0) {
+                String validationErrorCode = "validation.msg." + this.resource + "." + this.parameter + ".not.greater.than.zero";
+                String defaultEnglishMessage = "The parameter `" + this.parameter + "` must be greater than 0.";
+                final ApiParameterError error = ApiParameterError.parameterError(validationErrorCode, defaultEnglishMessage, this.parameter,
+                        number, 0);
+                this.dataValidationErrors.add(error);
+            }
+            if (number.compareTo(BigDecimal.valueOf(100.0)) > 0) {
+                String validationErrorCode = "validation.msg." + this.resource + "." + this.parameter + ".greater.than.one.hundred";
+                String defaultEnglishMessage = "The parameter `" + this.parameter + "` must be not greater than 100.";
+                final ApiParameterError error = ApiParameterError.parameterError(validationErrorCode, defaultEnglishMessage, this.parameter,
+                        number, 0);
+                this.dataValidationErrors.add(error);
+            }
+        }
+        return this;
+    }
+
     /*
      * should be used with .notNull() before it
      */

fineract-core/src/main/java/org/apache/fineract/infrastructure/core/service/FrequencyTypeUtil.java

@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.infrastructure.core.service;
+
+public final class FrequencyTypeUtil {
+
+    private FrequencyTypeUtil() {}
+
+    public static int compareFrequencies(final Integer frequency1, final String frequencyType1, final Integer frequency2,
+            final String frequencyType2) {
+        return frequencyToDays(frequency1, frequencyType1).compareTo(frequencyToDays(frequency2, frequencyType2));
+    }
+
+    public static Integer frequencyToDays(final Integer frequency, final String frequencyType) {
+        return switch (frequencyType) {
+            case "DAYS" -> frequency;
+            case "WEEKS" -> frequency * 7;
+            case "MONTHS" -> frequency * 30;
+            case "YEARS" -> frequency * 365;
+            default -> 0;
+        };
+    }
+}

fineract-core/src/main/java/org/apache/fineract/portfolio/common/service/Validator.java

@@ -18,6 +18,7 @@
  */
 package org.apache.fineract.portfolio.common.service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
@@ -55,4 +56,21 @@ private static List<ApiParameterError> getApiParameterErrors(String resource, Co
         baseDataValidator.accept(dataValidatorBuilder);
         return dataValidationErrors;
     }
+
+    public static boolean isChanged(final Object newValue, final Object currentValue) {
+        if (newValue == null) {
+            return currentValue != null;
+        }
+        return !newValue.equals(currentValue);
+    }
+
+    public static boolean isBigDecimalChanged(final BigDecimal newValue, final BigDecimal currentValue) {
+        if (newValue == null) {
+            return currentValue != null;
+        }
+        if (currentValue == null) {
+            return true;
+        }
+        return newValue.compareTo(currentValue) != 0;
+    }
 }

fineract-provider/src/main/resources/jpa/static-weaving/module/fineract-provider/persistence.xml

@@ -310,6 +310,7 @@
         <class>org.apache.fineract.portfolio.workingcapitalloanbreach.domain.WorkingCapitalBreach</class>
         <class>org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransaction</class>
         <class>org.apache.fineract.portfolio.workingcapitalloan.domain.WorkingCapitalLoanTransactionAllocation</class>
+        <class>org.apache.fineract.portfolio.workingcapitalloannearbreach.domain.WorkingCapitalNearBreach</class>
         <class>org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProduct</class>
         <class>org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductConfigurableAttributes</class>
         <class>org.apache.fineract.portfolio.workingcapitalloanproduct.domain.WorkingCapitalLoanProductPaymentAllocationRule</class>

fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/api/WorkingCapitalLoanApiResourceSwagger.java

@@ -195,6 +195,7 @@ private GetWorkingCapitalLoansLoanIdResponse() {}
         public BigDecimal discount;
         @Schema(description = "Working capital breach)")
         public WorkingCapitalLoanProductApiResourceSwagger.GetWorkingCapitalLoanProductsResponse.GetWorkingCapitalLoanBreach breach;
+        public WorkingCapitalLoanProductApiResourceSwagger.GetWorkingCapitalLoanNearBreach nearBreach;
         public WorkingCapitalLoanProductApiResourceSwagger.GetWorkingCapitalLoanProductsResponse.GetDelinquencyBucket delinquencyBucket;
         @Schema(example = "3", description = "Number of grace days before delinquency tracking starts")
         public Integer delinquencyGraceDays;
@@ -319,6 +320,8 @@ private PostWorkingCapitalLoansRequest() {}
         @Schema(example = "1")
         public Long breachId;
         @Schema(example = "1")
+        public Long nearBreachId;
+        @Schema(example = "1")
         public Long delinquencyBucketId;
         @Schema(example = "3")
         public Integer delinquencyGraceDays;
@@ -424,6 +427,8 @@ private PutWorkingCapitalLoansLoanIdRequest() {}
         @Schema(example = "1")
         public Long breachId;
         @Schema(example = "1")
+        public Long nearBreachId;
+        @Schema(example = "1")
         public Long delinquencyBucketId;
         @Schema(example = "3")
         public Integer delinquencyGraceDays;

fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanData.java

@@ -35,6 +35,7 @@
 import org.apache.fineract.portfolio.loanaccount.data.LoanApplicationTimelineData;
 import org.apache.fineract.portfolio.loanaccount.data.LoanStatusEnumData;
 import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachData;
+import org.apache.fineract.portfolio.workingcapitalloannearbreach.data.WorkingCapitalNearBreachData;
 import org.apache.fineract.portfolio.workingcapitalloanproduct.data.WorkingCapitalLoanProductData;
 import org.apache.fineract.portfolio.workingcapitalloanproduct.data.WorkingCapitalPaymentAllocationData;
 
@@ -70,6 +71,7 @@ public class WorkingCapitalLoanData implements Serializable {
     private BigDecimal discount;
     private DelinquencyBucketData delinquencyBucket;
     private WorkingCapitalBreachData breach;
+    private WorkingCapitalNearBreachData nearBreach;
     private LocalDate lastClosedBusinessDate;
     private List<WorkingCapitalPaymentAllocationData> paymentAllocation;
     private LoanApplicationTimelineData timeline;

fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/data/WorkingCapitalLoanTemplateData.java

@@ -29,6 +29,7 @@
 import org.apache.fineract.portfolio.delinquency.data.DelinquencyBucketData;
 import org.apache.fineract.portfolio.fund.data.FundData;
 import org.apache.fineract.portfolio.workingcapitalloanbreach.data.WorkingCapitalBreachData;
+import org.apache.fineract.portfolio.workingcapitalloannearbreach.data.WorkingCapitalNearBreachData;
 import org.apache.fineract.portfolio.workingcapitalloanproduct.data.WorkingCapitalLoanProductData;
 
 /**
@@ -50,4 +51,5 @@ public class WorkingCapitalLoanTemplateData {
     private List<StringEnumOptionData> delinquencyStartTypeOptions;
     private List<WorkingCapitalBreachData> breachOptions;
     private List<StringEnumOptionData> delinquencyMinimumPaymentTypeOptions;
+    private List<WorkingCapitalNearBreachData> nearBreachOptions;
 }

fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/domain/WorkingCapitalLoanPeriodFrequencyType.java

@@ -65,6 +65,15 @@ public static WorkingCapitalLoanPeriodFrequencyType fromString(final String peri
         return null;
     }
 
+    public long toDays(int amount) {
+        return switch (this) {
+            case DAYS -> amount;
+            case WEEKS -> (long) amount * 7;
+            case MONTHS -> (long) amount * 30;
+            case YEARS -> (long) amount * 365;
+        };
+    }
+
     public StringEnumOptionData toStringEnumOptionData() {
         return new StringEnumOptionData(name(), getCode(), name());
     }