creditu-common-library 1.2.9 → 1.2.12

package/debt/models/dto/debt-inputs.dto.d.ts

@@ -35,4 +35,13 @@ export declare class DebtInputs {
      * Key: Date YYYY/MM/DD format, Value: number format
      */
     IPCAmap: Record<string, number>;
+    /**
+     * Mapa de IPCAs en el rango de fechas de la mora a calcular
+     * Key: Date YYYY/MM/DD format, Value: number format
+     */
+    IPCAmapLate: Record<string, number>;
+    /**
+     * Fecha a sobre la cuál se desea calcular la mora
+     */
+    today?: string;
 }

package/debt/models/dto/debt-response.dto.d.ts

@@ -60,4 +60,20 @@ export declare class DebtResponse {
      * Cuota de seguro de incendio o propiedad
      */
     propertyInsuranceFee: number;
+    /**
+     * Valor de la cuota considerando los intereses y la mora
+     */
+    monthlyPaymentWithLate: number;
+    /**
+     * Días de mora
+     */
+    lateDays: number;
+    /**
+     * Interés en la mora
+     */
+    lateInterest: number;
+    /**
+     * Cargo por mora
+     */
+    lateCharges: number;
 }

package/debt/services/installment-service.d.ts

@@ -11,6 +11,7 @@ export declare class InstallmentService {
     private readonly paymentService;
     private readonly interestService;
     private readonly balanceService;
+    private readonly lateService;
     private fixIPCAmap;
     /**
      * Calcula el total del pago mensual para una cuota

package/debt/services/installment-service.js

@@ -12,6 +12,7 @@ var payment_service_1 = require("./payment-service");
 var interest_service_1 = require("./interest.service");
 var balance_service_1 = require("./balance-service");
 var amortization_method_enum_1 = require("../../shared/models/enum/amortization-method.enum");
+var late_service_1 = require("./late.service");
 var InstallmentService = /** @class */ (function () {
     function InstallmentService(math) {
         this.math = math;
@@ -21,6 +22,7 @@ var InstallmentService = /** @class */ (function () {
         this.paymentService = new payment_service_1.PaymentService(this.math);
         this.interestService = new interest_service_1.InterestService(this.math);
         this.balanceService = new balance_service_1.BalanceService(this.math);
+        this.lateService = new late_service_1.LateService(this.math);
         this.math = new math_1.MathService(true, 10);
     }
     InstallmentService.prototype.fixIPCAmap = function (IPCAmap) {
@@ -55,7 +57,8 @@ var InstallmentService = /** @class */ (function () {
         var balance = this.balanceService.getBalance(balanceValues.balances);
         var startDate = Object.keys(inputs.IPCAmap)[0];
         var endDate = Object.keys(inputs.IPCAmap).pop();
-        var interest = this.interestService.getInterest(balanceValues.balances, params.annualRate, startDate, endDate, inputs.paymentNumber.value());
+        var proportionalDays = inputs.paymentNumber.value() === 1 ? this.interestService.getProportionalDays(startDate, endDate) : 1;
+        var interest = this.interestService.getInterest(balanceValues.balances, params.annualRate, proportionalDays);
         var amortization;
         var amortizationDiff;
         if (inputs.amortizationMethod === amortization_method_enum_1.AmortizationMethod.GERMAN) {
@@ -71,10 +74,19 @@ var InstallmentService = /** @class */ (function () {
         var amortizationIPCA = this.amortizationService.getAmortizationIPC(inputs.previousBalance.value(), inputs.inflationaryUpperBound, amortizationDiff, ipcaUpdate);
         var monthlyPayment = this.paymentService.getMonthlyPayment(interest, amortization, amortizationIPCA);
         var balanceAfter = this.balanceService.getBalanceAfter(inputs.previousBalance, ipcaUpdate, amortization, amortizationIPCA);
-        var debtorLifeInsuranceFee = this.insuranceService.getLifeInsurance(params.debtorLifeInsuranceRate, balance);
-        var codebtorLifeInsuranceFee = params.codebtorLifeInsuranceRate ? this.insuranceService.getLifeInsurance(params.codebtorLifeInsuranceRate, balance) : 0;
-        var propertyInsuranceFee = this.insuranceService.getPropertyInsurance(inputs.propertyAmount, params.propertyInsuranceRate, inputs.IPCAmap);
+        var insurancePeriods = this.insuranceService.getInsurancePeriods(inputs.IPCAmap, inputs.paymentNumber.value(), inputs.numberOfMonths.value());
+        var debtorLifeInsuranceFee = this.insuranceService.getInsuranceFee(balance, params.debtorLifeInsuranceRate, insurancePeriods);
+        var codebtorLifeInsuranceFee = params.codebtorLifeInsuranceRate ? this.insuranceService.getInsuranceFee(balance, params.codebtorLifeInsuranceRate, insurancePeriods) : 0;
+        var propertyInsuranceFee = this.insuranceService.getInsuranceFee(inputs.propertyAmount, params.propertyInsuranceRate, insurancePeriods);
         var monthlyPaymentWithInsurances = this.math.add(monthlyPayment, debtorLifeInsuranceFee, codebtorLifeInsuranceFee, propertyInsuranceFee);
+        // const totalLateByDates = lateService.getTotalMonthlyPayment(payment.dueDate, today,
+        // installment.monthlyPaymentWithInsurances, lateChargesFineRate,
+        // dailyInterestRate, IPCAmapLate, lateChargesInterestRate);
+        var lateChargesFineRate = params.lateChargesFineRate, lateChargesInterestRate = params.lateChargesInterestRate;
+        var IPCAmapLate = inputs.IPCAmapLate, todayIn = inputs.today;
+        var today = todayIn || new creditu_date_model_1.DateModel().toString();
+        var dailyInterestRate = this.interestService.getDailyInterestValue(params.annualRate);
+        var totalLateByDates = this.lateService.getTotalMonthlyPayment(endDate, today, monthlyPaymentWithInsurances, lateChargesFineRate, dailyInterestRate, IPCAmapLate, lateChargesInterestRate);
         return {
             IPCAByDates: IPCAByDates,
             balanceValues: balanceValues,
@@ -85,11 +97,15 @@ var InstallmentService = /** @class */ (function () {
             interest: interest,
             monthlyPayment: monthlyPayment,
             monthlyPaymentWithInsurances: monthlyPaymentWithInsurances,
+            monthlyPaymentWithLate: totalLateByDates.totalMonthlyPayment,
             amortization: amortization,
             amortizationIPCA: amortizationIPCA,
             debtorLifeInsuranceFee: debtorLifeInsuranceFee,
             codebtorLifeInsuranceFee: codebtorLifeInsuranceFee,
-            propertyInsuranceFee: propertyInsuranceFee
+            propertyInsuranceFee: propertyInsuranceFee,
+            lateDays: totalLateByDates.lateDays,
+            lateInterest: totalLateByDates.lateInterest,
+            lateCharges: totalLateByDates.lateChargesInterest
         };
     };
     return InstallmentService;

package/debt/services/insurance-service.d.ts

@@ -4,15 +4,16 @@ export declare class InsuranceService {
     private readonly math;
     constructor(math: MathService);
     /**
-     * Calcula el seguro de propiedad
-     * @param propertyAmount
-     * @param propertyInsuranceRate
+     * Gives apropiate qty of months to apply insurances
+     * @param IPCAmap dates keyed object to know start and end dates
+     * @param paymentNumber to validate if it is first or last payment
+     * @param numberOfMonths to validate if it is last payment
      */
-    getPropertyInsurance(propertyAmount: number, propertyInsuranceRate: CreditInsuranceRate, IPCAmap: Record<string, number>): number;
+    getInsurancePeriods(IPCAmap: any, paymentNumber: number, numberOfMonths: number): number;
     /**
-     * Calcula el seguro de vida
-     * @param lifeInsuranceRate // tasa sobre la que se calcula el valor de un seguro
-     * @param balance // Balance actualizado por corrección monetaria
+     * Calcula el cobro de un seguro
+     * @param propertyAmount
+     * @param propertyInsuranceRate
      */
-    getLifeInsurance(lifeInsuranceRate: CreditInsuranceRate, balance: number): number;
+    getInsuranceFee(baseAmount: number, insuranceRate: CreditInsuranceRate, insurancePeriods: number): number;
 }

package/debt/services/insurance-service.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InsuranceService = void 0;
+var creditu_date_model_1 = require("creditu-date-model");
 var math_1 = require("../../math");
 var guarder_1 = require("../../shared/models/guarder");
 var InsuranceService = /** @class */ (function () {
@@ -9,40 +10,35 @@ var InsuranceService = /** @class */ (function () {
         this.math = new math_1.MathService(true, 10);
     }
     /**
-     * Calcula el seguro de propiedad
-     * @param propertyAmount
-     * @param propertyInsuranceRate
+     * Gives apropiate qty of months to apply insurances
+     * @param IPCAmap dates keyed object to know start and end dates
+     * @param paymentNumber to validate if it is first or last payment
+     * @param numberOfMonths to validate if it is last payment
      */
-    InsuranceService.prototype.getPropertyInsurance = function (propertyAmount, propertyInsuranceRate, IPCAmap) {
-        var _this = this;
-        guarder_1.Guarder.defined(propertyInsuranceRate, 'CreditInsuranceRate');
-        var getLifeInsurancePeriods = function (IPCAmap) {
-            var result = Object.keys(IPCAmap)
-                .map(function (date) {
-                var days = date.split(',').map(function (strNum) { return parseInt(strNum, 10); }).pop();
-                return days > 5 ? 1 : 2;
-            })
-                .reduce(function (a, b) { return _this.math.add(a, b); }, 0);
-            return result - 1;
-        };
-        var lifeInsurancePeriods = getLifeInsurancePeriods(IPCAmap);
-        if (propertyInsuranceRate.value() === 0)
-            throw new Error('Invalid property insurance rate');
-        var propertyInsurance = this.math.multiply(propertyAmount, propertyInsuranceRate.value());
-        return this.math.round(this.math.multiply(propertyInsurance, lifeInsurancePeriods), 2);
+    // eslint-disable-next-line class-methods-use-this
+    InsuranceService.prototype.getInsurancePeriods = function (IPCAmap, paymentNumber, numberOfMonths) {
+        if (paymentNumber === numberOfMonths) {
+            return 0;
+        }
+        if (paymentNumber !== 1) {
+            return 1;
+        }
+        var datesMap = Object.keys(IPCAmap);
+        var firstDate = new creditu_date_model_1.DateModel(datesMap[0]);
+        var lastDate = new creditu_date_model_1.DateModel(datesMap[datesMap.length - 1]);
+        return lastDate.monthsDiff(firstDate) + 2;
     };
     /**
-     * Calcula el seguro de vida
-     * @param lifeInsuranceRate // tasa sobre la que se calcula el valor de un seguro
-     * @param balance // Balance actualizado por corrección monetaria
+     * Calcula el cobro de un seguro
+     * @param propertyAmount
+     * @param propertyInsuranceRate
      */
-    InsuranceService.prototype.getLifeInsurance = function (lifeInsuranceRate, balance) {
-        guarder_1.Guarder.defined(lifeInsuranceRate, 'CreditInsuranceRate');
-        if (lifeInsuranceRate.value() === 0)
-            throw new Error('Invalid life insurance rate');
-        var lifeInsurance = this.math.multiply(balance, lifeInsuranceRate.value());
-        var result = this.math.round(lifeInsurance, 2);
-        return result;
+    InsuranceService.prototype.getInsuranceFee = function (baseAmount, insuranceRate, insurancePeriods) {
+        guarder_1.Guarder.defined(insuranceRate, 'CreditInsuranceRate');
+        if (insuranceRate.value() === 0)
+            throw new Error('Invalid insurance rate');
+        var propertyInsurance = this.math.multiply(baseAmount, insuranceRate.value());
+        return this.math.round(this.math.multiply(propertyInsurance, insurancePeriods), 2);
     };
     return InsuranceService;
 }());

package/debt/services/interest.service.d.ts

@@ -2,7 +2,6 @@ import { MathService } from '../../math';
 export declare class InterestService {
     private readonly math;
     constructor(math: MathService);
-    private calculateDaysOfMonth;
     /**
      * Método que calcula el interés diario a partir del interés anual.
      * @param annyalRate Tasa de interés anual.
@@ -22,13 +21,17 @@ export declare class InterestService {
      * @returns
      */
     private getPeriodInterestValue;
-    private findPeriodIndex;
+    /**
+     * Taking past month as base, returns days between start and end date over past month's total days
+     * @param startDate
+     * @param endDate
+     */
+    getProportionalDays(startDate: string, endDate: string): number;
     /**
      * Calcula el interes a partir del interes diario
      * @param balanceValues
      * @param annualRate
-     * @param startDate
-     * @param endDate
+     * @param proportion
      */
-    getInterest(balanceValues: number[], annualRate: number, startDate: string, endDate: string, paymentNumber: number): number;
+    getInterest(balanceValues: number[], annualRate: number, proportion: number): number;
 }

package/debt/services/interest.service.js

@@ -1,6 +1,4 @@
 "use strict";
-// import { MathService } from '../../math';
-// import { PreviousBalance } from '../../shared/models/previous-balance';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InterestService = void 0;
 var creditu_date_model_1 = require("creditu-date-model");
@@ -8,24 +6,8 @@ var math_1 = require("../../math");
 var InterestService = /** @class */ (function () {
     function InterestService(math) {
         this.math = math;
-        this.findPeriodIndex = function (periodArray, period) {
-            var periodIndex;
-            // eslint-disable-next-line no-loop-func
-            periodArray.find(function (element, index) {
-                if (element.period === period) {
-                    periodIndex = index;
-                    return true;
-                }
-                return false;
-            });
-            return periodIndex;
-        };
         this.math = new math_1.MathService(true, 10);
     }
-    // eslint-disable-next-line class-methods-use-this
-    InterestService.prototype.calculateDaysOfMonth = function (year, month) {
-        return new Date(year, month, 0).getDate();
-    };
     /**
      * Método que calcula el interés diario a partir del interés anual.
      * @param annyalRate Tasa de interés anual.
@@ -57,44 +39,46 @@ var InterestService = /** @class */ (function () {
         return this.math.round(this.math.subtract(preResult, 1), 10);
     };
     /**
-     * Calcula el interes a partir del interes diario
-     * @param balanceValues
-     * @param annualRate
+     * Taking past month as base, returns days between start and end date over past month's total days
      * @param startDate
      * @param endDate
      */
-    InterestService.prototype.getInterest = function (balanceValues, annualRate, startDate, endDate, paymentNumber) {
+    InterestService.prototype.getProportionalDays = function (startDate, endDate) {
         var _this = this;
-        var periodArray = [];
-        var startDateModel = new creditu_date_model_1.DateModel(startDate);
-        if (paymentNumber === 1) {
-            startDateModel = startDateModel.addDays(1);
-        }
+        var startDateModel = new creditu_date_model_1.DateModel(startDate).addDays(1);
         var endDateModel = new creditu_date_model_1.DateModel(endDate);
-        while (startDateModel <= endDateModel) {
-            var _a = startDateModel.toString().split('-'), year = _a[0], month = _a[1];
-            var period = "".concat(year, "-").concat(month);
-            var periodIndex = this.findPeriodIndex(periodArray, period);
-            if (periodIndex === undefined) {
-                periodArray.push({ period: period, days: 1 });
+        var periodArray = [];
+        var _loop_1 = function () {
+            var _b = startDateModel.toString().split('-'), year_1 = _b[0], month_1 = _b[1];
+            var currentPeriod = "".concat(year_1, "-").concat(month_1);
+            var periodIndex = periodArray.findIndex(function (periodObject) { return periodObject.period === currentPeriod; });
+            if (periodIndex === -1) {
+                periodArray.push({ currentPeriod: currentPeriod, days: 1 });
             }
             else {
                 periodArray[periodIndex].days += 1;
             }
             startDateModel = startDateModel.addDays(1);
+        };
+        while (startDateModel <= endDateModel) {
+            _loop_1();
         }
+        // Se utiliza el primer mes antes del vencimiento de la cuota para el total de días a considerar en la proporción para el interés.
+        var monthBeforeEndDate = endDateModel.substractMonths(1);
+        var _a = monthBeforeEndDate.toString().split('-'), year = _a[0], month = _a[1];
+        var daysOfMonth = new Date(Number(year), Number(month), 0).getDate();
+        var proportion = periodArray.reduce(function (proportion, element) { return proportion + _this.math.multiply(_this.math.divide(1, daysOfMonth), element.days); }, 0);
+        // return this.math.round(proportion, 2);
+        return proportion;
+    };
+    /**
+     * Calcula el interes a partir del interes diario
+     * @param balanceValues
+     * @param annualRate
+     * @param proportion
+     */
+    InterestService.prototype.getInterest = function (balanceValues, annualRate, proportion) {
         var interest = this.math.multiply(balanceValues[balanceValues.length - 1], this.getMonthlyInterestValue(annualRate));
-        var proportion = 1;
-        if (paymentNumber === 1) {
-            // Se utiliza el primer mes antes del vencimiento de la cuota para el total de días a considerar en la proporción para el interés.
-            var yearMonth = periodArray[periodArray.length - 2].period.split('-');
-            var daysOfMonth_1 = this.calculateDaysOfMonth(yearMonth[0], yearMonth[1]);
-            proportion = periodArray.reduce(function (proportion, element) {
-                // eslint-disable-next-line no-param-reassign
-                proportion += _this.math.multiply(_this.math.divide(1, daysOfMonth_1), element.days);
-                return proportion;
-            }, 0);
-        }
         return this.math.round(this.math.multiply(interest, proportion), 2);
     };
     return InterestService;

package/debt/services/late.service.d.ts

@@ -7,7 +7,7 @@ export declare class LateService {
     private getDailyIPCA;
     getLate(dueDate: string, date: string, totalMonthlyPayment: number, rate: number): number;
     getLateChargesInterest(dueDate: string, date: string, totalMonthlyPayment: number, rate: number): number;
-    getTotalLate(dueDate: string, date: string, totalMonthlyPayment: number, rateInterest: number, rateIPCA: number, rateChargesInterest: number): {
+    getTotalLate(dueDate: string, date: string, totalMonthlyPayment: number, dailyRateInterest: number, rateIPCA: number, lateChargesInterestRate: number): {
         lateInterest: number;
         lateAmotizationIPCA: number;
         lateChargesInterest: number;
@@ -20,7 +20,7 @@ export declare class LateService {
      */
     getLateDaysAndIPCA(startDate: string, endDate: string, ipcaValues: Record<string, number>): any[];
     getTotalLateByDates(dueDate: string, date: string, totalMonthlyPayment: number, lateChargesFineRate: number, dailyRateInterest: number, ipcaValues: Record<string, number>, lateChargesInterestRate: number): any[];
-    getTotalMonthlyPayment(dueDateIn: string, date: string, totalMonthlyPayment: number, rateCharges: number, rateInterest: number, ipcaValues: Record<string, number>, rateChargesInterest: number): {
+    getTotalMonthlyPayment(dueDateIn: string, date: string, totalMonthlyPayment: number, lateChargesFineRate: number, dailyInterestRate: number, ipcaValues: Record<string, number>, lateChargesInterestRate: number): {
         totalMonthlyPayment: any;
         lateInterest: any;
         lateAmotizationIPCA: any;

package/debt/services/late.service.js

@@ -35,10 +35,10 @@ var LateService = /** @class */ (function () {
         var op3 = Math.pow(op1, op2);
         return this.math.multiply(totalMonthlyPayment, this.math.subtract(op3, 1));
     };
-    LateService.prototype.getTotalLate = function (dueDate, date, totalMonthlyPayment, rateInterest, rateIPCA, rateChargesInterest) {
-        var lateInterest = this.getLate(dueDate, date, totalMonthlyPayment, rateInterest);
+    LateService.prototype.getTotalLate = function (dueDate, date, totalMonthlyPayment, dailyRateInterest, rateIPCA, lateChargesInterestRate) {
+        var lateInterest = this.getLate(dueDate, date, totalMonthlyPayment, dailyRateInterest);
         var lateAmotizationIPCA = this.getLate(dueDate, date, totalMonthlyPayment, rateIPCA);
-        var lateChargesInterest = this.getLateChargesInterest(dueDate, date, totalMonthlyPayment, rateChargesInterest);
+        var lateChargesInterest = this.getLateChargesInterest(dueDate, date, totalMonthlyPayment, lateChargesInterestRate);
         var updatedLateMonthlyPayment = this.math.add(totalMonthlyPayment, lateInterest, lateAmotizationIPCA, lateChargesInterest);
         return { lateInterest: lateInterest, lateAmotizationIPCA: lateAmotizationIPCA, lateChargesInterest: lateChargesInterest, updatedLateMonthlyPayment: updatedLateMonthlyPayment };
     };
@@ -71,19 +71,6 @@ var LateService = /** @class */ (function () {
     // eslint-disable-next-line max-len
     LateService.prototype.getTotalLateByDates = function (dueDate, date, totalMonthlyPayment, lateChargesFineRate, dailyRateInterest, ipcaValues, lateChargesInterestRate) {
         var _this = this;
-        // console.log('file: late.service.ts ~ line 76 ~ date', date);
-        // console.log('file: late.service.ts ~ line 76 ~ dueDate', dueDate);
-        // const lateDays = new DateModel(date).daysDiff(new DateModel(dueDate));
-        // if (lateDays <= 0) {
-        //   const result = {} as any;
-        //   result[date] = {
-        //     lateInterest: 0,
-        //     lateAmotizationIPCA: 0,
-        //     lateChargesInterest: 0,
-        //     updatedLateMonthlyPayment: totalMonthlyPayment
-        //   };
-        //   return [result];
-        // }
         var lateDaysArray = this.getLateDaysAndIPCA(dueDate, date, ipcaValues);
         var lateCharges = this.getLate(dueDate, date, totalMonthlyPayment, lateChargesFineRate);
         var totalLateBefore = totalMonthlyPayment;
@@ -104,7 +91,7 @@ var LateService = /** @class */ (function () {
         return totalLateByDates;
     };
     // eslint-disable-next-line no-param-reassign
-    LateService.prototype.getTotalMonthlyPayment = function (dueDateIn, date, totalMonthlyPayment, rateCharges, rateInterest, ipcaValues, rateChargesInterest) {
+    LateService.prototype.getTotalMonthlyPayment = function (dueDateIn, date, totalMonthlyPayment, lateChargesFineRate, dailyInterestRate, ipcaValues, lateChargesInterestRate) {
         var _this = this;
         var lateDays = new creditu_date_model_1.DateModel(date).daysDiff(new creditu_date_model_1.DateModel(dueDateIn));
         if (lateDays <= 0) {
@@ -117,7 +104,7 @@ var LateService = /** @class */ (function () {
             };
         }
         var dueDate = new creditu_date_model_1.DateModel(dueDateIn).addDays(1).toString();
-        var totalLateByDates = this.getTotalLateByDates(dueDate, date, totalMonthlyPayment, rateCharges, rateInterest, ipcaValues, rateChargesInterest);
+        var totalLateByDates = this.getTotalLateByDates(dueDate, date, totalMonthlyPayment, lateChargesFineRate, dailyInterestRate, ipcaValues, lateChargesInterestRate);
         var _a = totalLateByDates.reduce(function (sum, item) {
             var _a = Object.values(item).pop(), lateInterest = _a.lateInterest, lateAmotizationIPCA = _a.lateAmotizationIPCA, lateChargesInterest = _a.lateChargesInterest;
             sum.lateInterest = _this.math.add(sum.lateInterest, lateInterest);

package/math/math.service.js

@@ -20,9 +20,9 @@ var Operation;
 })(Operation || (Operation = {}));
 var MathService = /** @class */ (function () {
     function MathService(useRound, precision) {
-        var _this = this;
         if (useRound === void 0) { useRound = true; }
         if (precision === void 0) { precision = 6; }
+        var _this = this;
         this.useRound = useRound;
         this.precision = precision;
         this.round = function (num, resolution) {

package/offer/services/installment.service.js

@@ -7,8 +7,8 @@ var finance_service_1 = require("./finance.service");
 var date_1 = require("../../util/date");
 var InstallmentService = /** @class */ (function () {
     function InstallmentService(math) {
-        var _this = this;
         if (math === void 0) { math = new math_service_1.MathService(); }
+        var _this = this;
         this.math = math;
         this.finance = new finance_service_1.FinanceService(this.math);
         /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "creditu-common-library",
-  "version": "1.2.9",
+  "version": "1.2.12",
   "description": "",
   "main": "lib/index.js",
   "files": [

package/shared/models/investment-weight.js

@@ -21,10 +21,8 @@ var range_vo_config_1 = require("./range-vo-config");
 var InvestmentWeight = /** @class */ (function (_super) {
     __extends(InvestmentWeight, _super);
     function InvestmentWeight(value) {
-        var _this = this;
         var config = new range_vo_config_1.RangeVoConfig(0, 1, false, true);
-        _this = _super.call(this, 'InvestmentWeight', value, config) || this;
-        return _this;
+        return _super.call(this, 'InvestmentWeight', value, config) || this;
     }
     return InvestmentWeight;
 }(range_vo_1.RangeVo));

package/test/installment.service.spec.ts

@@ -3,7 +3,7 @@ import { NumberOfMonths } from '../src/shared/models/number-of-months';
 import { PreviousBalance } from '../src/shared/models/previous-balance';
 import { DebtInputs } from '../src/debt/models/dto/debt-inputs.dto';
 import { DebtParams } from '../src/debt/models/dto/debt-params.dto';
-import { InstallmentService, LateService } from '../src/debt/services';
+import { InstallmentService } from '../src/debt/services';
 import { MathService } from '../src/math';
 import { CreditInsuranceRate } from '../src/shared/models/credit-insurance-rate';
 import { PaymentNumber } from '../src/shared/models/payment-number';
@@ -79,12 +79,16 @@ describe('installment-service for german method', () => {
       dailyRate: 0.0002009109,
       interest: 330.09,
       monthlyPayment: 819.68713637,
-      monthlyPaymentWithInsurances: 846.62713637,
+      monthlyPaymentWithInsurances: 873.55713637,
       amortization: 361.70713637,
       amortizationIPCA: 127.89,
-      debtorLifeInsuranceFee: 22.14,
+      debtorLifeInsuranceFee: 44.27,
       codebtorLifeInsuranceFee: 0,
-      propertyInsuranceFee: 4.8
+      propertyInsuranceFee: 9.6,
+      monthlyPaymentWithLate: 873.55713637,
+      lateCharges: 0,
+      lateDays: 0,
+      lateInterest: 0
     };
 
     const amortizationMethod = AmortizationMethod.GERMAN;
@@ -107,7 +111,9 @@ describe('installment-service for german method', () => {
       previousBalance,
       inflationaryUpperBound,
       propertyAmount,
-      IPCAmap
+      IPCAmap,
+      IPCAmapLate: { '2022-01-05': 0.0095 },
+      today: '2022-01-05'
     };
     const params: DebtParams = {
       annualRate,
@@ -177,12 +183,16 @@ describe('installment-service for german method', () => {
       dailyRate: 0.0002009109,
       interest: 330.09,
       monthlyPayment: 1304.656229564,
-      monthlyPaymentWithInsurances: 1331.596229564,
+      monthlyPaymentWithInsurances: 1358.526229564,
       amortization: 361.70713637,
       amortizationIPCA: 612.859093194,
-      debtorLifeInsuranceFee: 22.14,
-      propertyInsuranceFee: 4.8,
-      codebtorLifeInsuranceFee: 0
+      debtorLifeInsuranceFee: 44.27,
+      codebtorLifeInsuranceFee: 0,
+      propertyInsuranceFee: 9.6,
+      monthlyPaymentWithLate: 1358.526229564,
+      lateCharges: 0,
+      lateDays: 0,
+      lateInterest: 0
     };
     const amortizationMethod = AmortizationMethod.GERMAN;
     const paymentNumber = new PaymentNumber(1);
@@ -204,7 +214,9 @@ describe('installment-service for german method', () => {
       previousBalance,
       inflationaryUpperBound,
       propertyAmount,
-      IPCAmap
+      IPCAmap,
+      IPCAmapLate: { '2022-01-05': 0.0095 },
+      today: '2022-01-05'
     };
     const params: DebtParams = {
       annualRate,
@@ -212,7 +224,6 @@ describe('installment-service for german method', () => {
       propertyInsuranceRate
     };
     const result = service.getTotalMonthlyPayment(inputs, params);
-    // console.log('file: installment.service.spec.ts ~ line 216 ~ result', result);
     expect(result).toEqual(expectedResult);
   });
   it('(WEDSON (Case 1 inflationaryUpperBound) should return the calculated installment with 1 day late', () => {
@@ -275,20 +286,16 @@ describe('installment-service for german method', () => {
       dailyRate: 0.0002009109,
       interest: 330.09,
       monthlyPayment: 1304.656229564,
-      monthlyPaymentWithInsurances: 1331.596229564,
+      monthlyPaymentWithInsurances: 1358.526229564,
       amortization: 361.70713637,
       amortizationIPCA: 612.859093194,
-      debtorLifeInsuranceFee: 22.14,
-      propertyInsuranceFee: 4.8,
-      codebtorLifeInsuranceFee: 0
-    };
-
-    const expectedLateResult = {
-      lateInterest: 0.2675321969,
-      lateAmotizationIPCA: 0.4062055604,
-      lateChargesInterest: 0.4274822044,
+      debtorLifeInsuranceFee: 44.27,
+      codebtorLifeInsuranceFee: 0,
+      propertyInsuranceFee: 9.6,
+      lateInterest: 0.2729427275,
+      lateCharges: 0.4361275396,
       lateDays: 1,
-      totalMonthlyPayment: 1359.329374117
+      monthlyPaymentWithLate: 1386.8202450224
     };
 
     const amortizationMethod = AmortizationMethod.GERMAN;
@@ -311,28 +318,19 @@ describe('installment-service for german method', () => {
       previousBalance,
       inflationaryUpperBound,
       propertyAmount,
-      IPCAmap
+      IPCAmap,
+      IPCAmapLate: { '2022-01-05': 0.0095 },
+      today: '2022-01-06'
     };
     const params: DebtParams = {
       annualRate,
       debtorLifeInsuranceRate,
-      propertyInsuranceRate
+      propertyInsuranceRate,
+      lateChargesFineRate: 0.02,
+      lateChargesInterestRate: 0.01
     };
     const result = service.getTotalMonthlyPayment(inputs, params);
-    // console.log('file: installment.service.spec.ts ~ line 216 ~ result', result);
     expect(result).toEqual(expectedResult);
-
-    const totalMonthlyPayment = result.monthlyPaymentWithInsurances;
-    const dueDate = '2022-01-05';
-    const today = '2022-01-06';
-    // 1331.60, 0.02, 0.0002009109
-    const rateCharges = 0.02;
-    const rateChargesInterest = 0.01;
-    const dailyRateInterest = 0.0002009109;
-    const ipcaMapLate = { '2022-01-05': 0.0095 };
-    const lateService = new LateService(new MathService(true, 6));
-    const resultLate = lateService.getTotalMonthlyPayment(dueDate, today, totalMonthlyPayment, rateCharges, dailyRateInterest, ipcaMapLate, rateChargesInterest);
-    expect(resultLate).toEqual(expectedLateResult);
   });
   it('(Cuota > 1 (no es la primera cuota) WEDSON (Case 1 inflationaryUpperBound) should return the calculated installment', () => {
     const expectedResult = {
@@ -425,7 +423,11 @@ describe('installment-service for german method', () => {
       amortizationIPCA: 1194.9427816632,
       debtorLifeInsuranceFee: 22.17,
       propertyInsuranceFee: 4.8,
-      codebtorLifeInsuranceFee: 0
+      codebtorLifeInsuranceFee: 0,
+      monthlyPaymentWithLate: 2373.7405888545,
+      lateCharges: 0,
+      lateDays: 0,
+      lateInterest: 0
     };
     const amortizationMethod = AmortizationMethod.GERMAN;
     const paymentNumber = new PaymentNumber(2);
@@ -447,7 +449,9 @@ describe('installment-service for german method', () => {
       previousBalance,
       inflationaryUpperBound,
       propertyAmount,
-      IPCAmap
+      IPCAmap,
+      IPCAmapLate: { '2022-01-05': 0.0095 },
+      today: '2022-01-05'
     };
     const params: DebtParams = {
       annualRate,
@@ -562,7 +566,11 @@ describe('installment-service for german method', () => {
       amortizationIPCA: 642.87,
       debtorLifeInsuranceFee: 22.17,
       propertyInsuranceFee: 4.8,
-      codebtorLifeInsuranceFee: 0
+      codebtorLifeInsuranceFee: 0,
+      monthlyPaymentWithLate: 1821.6678071913,
+      lateCharges: 0,
+      lateDays: 0,
+      lateInterest: 0
     };
     const amortizationMethod = AmortizationMethod.GERMAN;
     const paymentNumber = new PaymentNumber(2);
@@ -584,7 +592,9 @@ describe('installment-service for german method', () => {
       previousBalance,
       inflationaryUpperBound,
       propertyAmount,
-      IPCAmap
+      IPCAmap,
+      IPCAmapLate: { '2022-01-05': 0.0095 },
+      today: '2022-01-05'
     };
     const params: DebtParams = {
       annualRate,
@@ -617,7 +627,9 @@ describe('installment-service for german method', () => {
       previousBalance,
       inflationaryUpperBound,
       propertyAmount,
-      IPCAmap
+      IPCAmap,
+      IPCAmapLate: { '2022-01-05': 0.0095 },
+      today: '2022-01-05'
     };
     const params: DebtParams = {
       annualRate,
@@ -871,7 +883,11 @@ describe('installment-service for german method', () => {
       amortizationIPCA: 642.87,
       debtorLifeInsuranceFee: 22.17,
       propertyInsuranceFee: 4.8,
-      codebtorLifeInsuranceFee: 0
+      codebtorLifeInsuranceFee: 0,
+      monthlyPaymentWithLate: 1821.6678071913,
+      lateCharges: 0,
+      lateDays: 0,
+      lateInterest: 0
     };
 
     const amortizationMethod = AmortizationMethod.GERMAN;
@@ -891,7 +907,9 @@ describe('installment-service for german method', () => {
       previousBalance,
       inflationaryUpperBound,
       propertyAmount,
-      IPCAmap
+      IPCAmap,
+      IPCAmapLate: { '2022-01-05': 0.0095 },
+      today: '2022-01-05'
     };
     const params: DebtParams = {
       annualRate,
@@ -961,29 +979,28 @@ describe('installment-service for german method', () => {
       dailyRate: 0.0002009109,
       interest: 330.09,
       monthlyPayment: 1304.656229564,
-      monthlyPaymentWithInsurances: 1331.596229564,
+      monthlyPaymentWithInsurances: 1358.526229564,
       amortization: 361.70713637,
       amortizationIPCA: 612.859093194,
-      debtorLifeInsuranceFee: 22.14,
+      debtorLifeInsuranceFee: 44.27,
       codebtorLifeInsuranceFee: 0,
-      propertyInsuranceFee: 4.8
+      propertyInsuranceFee: 9.6,
+      monthlyPaymentWithLate: 1358.526229564,
+      lateCharges: 0,
+      lateDays: 0,
+      lateInterest: 0
     };
     const amortizationMethod = AmortizationMethod.GERMAN;
     const paymentNumber = new PaymentNumber(1);
     const numberOfMonths = new NumberOfMonths(360);
     const previousBalance = new PreviousBalance(129600);
     const annualRate = 0.075;
-    // const debtorLifeInsuranceRate = new CreditInsuranceRate(0.00017); // 0.00017
-    const debtorLifeInsuranceRate = new CreditInsuranceRate(0.00017); // 0.00017
+    const debtorLifeInsuranceRate = new CreditInsuranceRate(0.00017);
     const inflationaryUpperBound = 1;
     const propertyAmount = 160000;
-    // const propertyInsuranceRate = new CreditInsuranceRate(0.00003); // 0.00003
-    const propertyInsuranceRate = new CreditInsuranceRate(0.00003); // 0.00003
-    // const IPCAmap = { '2022-01-05': 0.0095, '2022-02-05': 0.0073 };
+    const propertyInsuranceRate = new CreditInsuranceRate(0.00003);
     const IPCAmap = {
-      // '2021-12-23': 1.25,
       '2021-12-23': 0.0125,
-      // '2022-01-05': 0.95,
       '2022-01-05': 0.0095
     };
     const inputs: DebtInputs = {
@@ -993,7 +1010,9 @@ describe('installment-service for german method', () => {
       previousBalance,
       inflationaryUpperBound,
       propertyAmount,
-      IPCAmap
+      IPCAmap,
+      IPCAmapLate: { '2022-01-05': 0.0095 },
+      today: '2022-01-05'
     };
     const params: DebtParams = {
       annualRate,
@@ -1069,12 +1088,16 @@ describe('installment-service for french method', () => {
       dailyRate: 0.0002266368,
       interest: 1804.52,
       monthlyPayment: 5821.2051403922,
-      monthlyPaymentWithInsurances: 5928.5651403922,
+      monthlyPaymentWithInsurances: 6035.9151403922,
       amortization: 1638.6085052585,
       amortizationIPCA: 2378.0766351337,
-      debtorLifeInsuranceFee: 82.01,
-      propertyInsuranceFee: 25.35,
-      codebtorLifeInsuranceFee: 0
+      debtorLifeInsuranceFee: 164.01,
+      codebtorLifeInsuranceFee: 0,
+      propertyInsuranceFee: 50.7,
+      monthlyPaymentWithLate: 6035.9151403922,
+      lateCharges: 0,
+      lateDays: 0,
+      lateInterest: 0
     };
 
     const amortizationMethod = AmortizationMethod.FRENCH;
@@ -1094,7 +1117,9 @@ describe('installment-service for french method', () => {
       previousBalance,
       inflationaryUpperBound,
       propertyAmount,
-      IPCAmap
+      IPCAmap,
+      IPCAmapLate: { '2022-01-05': 0.0095 },
+      today: '2022-01-05'
     };
     const params: DebtParams = {
       annualRate,
@@ -1102,7 +1127,6 @@ describe('installment-service for french method', () => {
       propertyInsuranceRate
     };
     const result = service.getTotalMonthlyPayment(inputs, params);
-    // console.log('file: installment.service.spec.ts ~ line 883 ~ result', result);
     expect(result).toEqual(expectedResult);
   });
   // Falla en el cálculo de la amortizationIPC
@@ -1235,7 +1259,9 @@ describe('installment-service for french method', () => {
       previousBalance,
       inflationaryUpperBound,
       propertyAmount,
-      IPCAmap
+      IPCAmap,
+      IPCAmapLate: { '2022-01-05': 0.0095 },
+      today: '2022-01-05'
     };
     const params: DebtParams = {
       annualRate,
@@ -1347,7 +1373,9 @@ describe('installment-service for french method', () => {
       previousBalance,
       inflationaryUpperBound,
       propertyAmount,
-      IPCAmap
+      IPCAmap,
+      IPCAmapLate: { '2022-01-05': 0.0095 },
+      today: '2022-01-05'
     };
     const params: DebtParams = {
       annualRate,