Feature/EA-80: Fondo Nacional de Garantías

fineract-core/src/main/java/org/apache/fineract/infrastructure/configuration/domain/ConfigurationDomainService.java

@@ -162,4 +162,6 @@ public interface ConfigurationDomainService {
 
     Integer retriveIvaConfiguration();
 
+    LocalDate retrievePenaltyStartDate();
+
 }

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

@@ -59,7 +59,6 @@ public enum JobName {
     PURGE_PROCESSED_COMMANDS("Purge Processed Commands"), //
     REACTIVATE_BLOCKED_APP_USERS("Reactivate Blocked App Users"), //
     BLOCK_INACTIVE_CLIENTS("Block Inactive Clients"), //
-    LOAN_CUSTOM_CHARGE_HONORARIO_UPDATE("Loans - Custom Charge Honorario Update"), //
     LIQUIDACION_DE_RECAUDOS("Liquidacion de Recaudos"), //
     RECALCULATE_LOAN_INTEREST_AFTER_MAXIMUM_LEGAL_RATE_CHANGE("Recalculate Loan Interest After Maximum Legal Rate Change"), //
     LIQUIDACION_DE_COMPRAS("Liquidacion de Compras"), //

fineract-core/src/main/java/org/apache/fineract/portfolio/charge/domain/Charge.java

@@ -1061,7 +1061,7 @@ public void validateChargeIsSetupCorrectly() {
                         this.getName());
             }
 
-            if (!this.isPenalty() && !ChargeTimeType.fromInt(this.getChargeTimeType()).isInstalmentFee()) {
+            if (!this.isPenalty() && !ChargeTimeType.fromInt(this.getChargeTimeType()).isInstalmentFee() && !this.isDisbursementCharge()) {
                 throw new GeneralPlatformDomainRuleException("error.msg.charge.not.setup.correctly", "Charge not setup correctly",
                         this.getName());
             }
@@ -1075,7 +1075,7 @@ private void verifyChargeConfiguration(String code, Integer index1, Integer inde
                         this.getName());
             }
         }
-        if (!this.isPenalty() && !this.isInstallmentFee()) {
+        if (!this.isPenalty() && !this.isInstallmentFee() && !this.isDisbursementCharge()) {
             throw new GeneralPlatformDomainRuleException("error.msg.charge.not.setup.correctly", "Charge not setup correctly",
                     this.getName());
         }

fineract-core/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeTimeType.java

@@ -182,6 +182,11 @@ public boolean isInstalmentFee() {
         return this.value.equals(ChargeTimeType.INSTALMENT_FEE.getValue());
     }
 
+    public boolean isDisbursementCharge() {
+        return ChargeTimeType.DISBURSEMENT.getValue().equals(this.value)
+                || ChargeTimeType.TRANCHE_DISBURSEMENT.getValue().equals(this.value);
+    }
+
     public boolean isOverdueInstallment() {
         return this.value.equals(ChargeTimeType.OVERDUE_INSTALLMENT.getValue());
     }

fineract-loan/src/main/java/org/apache/fineract/custom/portfolio/externalcharge/honoratio/domain/CustomChargeHonorarioMap.java

@@ -77,6 +77,12 @@ public class CustomChargeHonorarioMap extends AbstractPersistableCustom {
     @Column(name = "loan_charge_id", nullable = true)
     private Long loanChargeId;
 
+    // This column is used to identify the batch inserted so that on transaction reversal the latest batch can be
+    // identified and removed from the table to
+    // recalculate the installment fee
+    @Column(name = "version", nullable = true)
+    private Long version;
+
     // @Column(name = "is_installment_already_paid")
     @Transient
     private boolean isInstallmentAlreadyPaid;

fineract-loan/src/main/java/org/apache/fineract/custom/portfolio/externalcharge/honoratio/domain/CustomChargeHonorarioMapRepository.java

@@ -21,6 +21,7 @@
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
@@ -36,4 +37,11 @@ public interface CustomChargeHonorarioMapRepository
     @Query(FIND_BY_NIT_LOAN_INSTALLMENT_ACTIVE)
     Optional<CustomChargeHonorarioMap> findByNitLoanIdLoanInstallmentNr(@Param("nit") String nit, @Param("loanId") Long loanId,
             @Param("loanInstallmentNr") Integer loanInstallmentNr);
+
+    @Query("SELECT MAX(c.version) FROM CustomChargeHonorarioMap c WHERE c.loanId = :loanId")
+    Long getMaxVersionByLoan(@Param("loanId") Long loanId);
+
+    @Modifying
+    @Query("DELETE FROM CustomChargeHonorarioMap p WHERE p.loanId = :loanId and p.version = :version")
+    int deleteLatestVersionMapEntryOnReversal(@Param("loanId") Long loanId, @Param("version") Long version);
 }

fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanChargePaidByData.java

@@ -22,6 +22,7 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
+import org.apache.fineract.portfolio.loanaccount.domain.LoanChargePaidBy;
 
 @Getter
 @Setter
@@ -39,5 +40,15 @@ public class LoanChargePaidByData {
     private BigDecimal aval;
     private BigDecimal hono;
     private BigDecimal penalty;
+    private boolean penaltyCharge;
 
+    public LoanChargePaidByData(LoanChargePaidBy originalData) {
+        this.id = originalData.getId();
+        this.amount = originalData.getAmount();
+        this.installmentNumber = originalData.getInstallmentNumber();
+        this.chargeId = originalData.getLoanCharge().getId();
+        this.transactionId = originalData.getLoanTransaction().getId();
+        this.penaltyCharge = originalData.getLoanCharge().isPenaltyCharge();
+        this.name = "";
+    }
 }

fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanTransactionData.java

@@ -468,4 +468,8 @@ public void setLoanChargePaidBySummary(LoanChargePaidByData loanChargePaidBySumm
         this.loanChargePaidBySummary = loanChargePaidBySummary;
     }
 
+    public void updateFeeChargesPortion(BigDecimal amount) {
+        this.feeChargesPortion = this.feeChargesPortion.add(amount);
+    }
+
 }