creditu-common-library 2.0.0 → 2.1.0

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

@@ -38,6 +38,10 @@ export declare class DebtParams {
     * Peridiocidad de los intereses, por defecto es Compuesta
     */
     inflationExchangeMethodMonthlyToDaily?: InterestType;
+    /**
+    * Peridiocidad de los intereses, por defecto es Compuesta
+    */
+    inflationExchangeMethodYearlyToMonthly?: InterestType;
     /**
      * Estrategia a usar para el calculo de los seguros.
      * Por defecto es PERIODS, que es el cálculo que ya veníamos haciendo.

package/debt/models/dto/debt-params.dto.js

@@ -18,6 +18,10 @@ var DebtParams = /** @class */ (function () {
         * Peridiocidad de los intereses, por defecto es Compuesta
         */
         this.inflationExchangeMethodMonthlyToDaily = models_1.InterestType.COMPOUND;
+        /**
+        * Peridiocidad de los intereses, por defecto es Compuesta
+        */
+        this.inflationExchangeMethodYearlyToMonthly = models_1.InterestType.COMPOUND;
         /**
          * Estrategia a usar para el calculo de los seguros.
          * Por defecto es PERIODS, que es el cálculo que ya veníamos haciendo.

package/debt/models/lates-input.dto.d.ts

@@ -1,3 +1,5 @@
+import { InterestType } from '../../shared/models';
+import { MonthNominalLength } from '../../shared/models/enum/month-nominal-length.enum';
 export declare class LatesInput {
     dueDate: string;
     today: string;
@@ -7,4 +9,6 @@ export declare class LatesInput {
     annualCreditInterestRate: number;
     inflationMap: Record<string, number>;
     considerNegativeInflation: boolean;
+    monthNominalLength: number | MonthNominalLength;
+    inflationExchangeMethodYearlyToMonthly: InterestType;
 }

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

@@ -33,7 +33,7 @@ export declare class AmortizationService {
         amortizationIUB: any;
         amortizationDiff: any;
     };
-    getAmortization(amortizationIUB: number, postponedInflationaryUpdate: number, amortizationDiff: number): number;
+    getAmortization(amortizationIUB: number, amortizationDiff: number, postponedInflationaryUpdate: number): number;
     getAmortizationInflation(upperBound: number, amortizationDiff: number, inflationaryUpdate: number): number;
     getAmortizations(inputs: DebtInputs, balance: number, annualRate: number, inflationaryUpdate: number): {
         inflationaryUpdate: number;

package/debt/services/amortization.service.js

@@ -79,8 +79,8 @@ var AmortizationService = /** @class */ (function () {
         }
         return { amortizationIUB: amortizationIUB, amortizationDiff: amortizationDiff };
     };
-    AmortizationService.prototype.getAmortization = function (amortizationIUB, postponedInflationaryUpdate, amortizationDiff) {
-        return this.math.subtract(amortizationIUB, postponedInflationaryUpdate, amortizationDiff);
+    AmortizationService.prototype.getAmortization = function (amortizationIUB, amortizationDiff, postponedInflationaryUpdate) {
+        return this.math.subtract(amortizationIUB, amortizationDiff, postponedInflationaryUpdate);
     };
     AmortizationService.prototype.getAmortizationInflation = function (upperBound, amortizationDiff, inflationaryUpdate) {
         var amortizationInflation = this.math.round(upperBound < inflationaryUpdate
@@ -93,7 +93,7 @@ var AmortizationService = /** @class */ (function () {
         var upperBound = this.math.multiply(inputs.previousBalance.value(), inputs.inflationaryUpperBound);
         var amortizationInflation = this.getAmortizationInflation(upperBound, amortizationDiff, inflationaryUpdate);
         var postponedInflationaryUpdate = this.inflationService.getPosponedInflationaryUpdate(upperBound, inflationaryUpdate, inputs.upperBoundBehaviour);
-        var amortization = this.getAmortization(amortizationIUB, postponedInflationaryUpdate, amortizationDiff);
+        var amortization = this.getAmortization(amortizationIUB, amortizationDiff, postponedInflationaryUpdate);
         return {
             inflationaryUpdate: inflationaryUpdate,
             upperBound: upperBound,

package/debt/services/installment.service.js

@@ -37,12 +37,18 @@ var InstallmentService = /** @class */ (function () {
         var _a = this.interestService.getInterests(inputs, balanceValues, params, dueDate), interest = _a.interest, interestIUB = _a.interestIUB, interestDiff = _a.interestDiff;
         var inflationaryUpdate = this.inflationService.getInflationaryUpdate(balanceValues.balanceMonetaryUpdateValues);
         var _b = this.amortizationService.getAmortizations(inputs, balanceInflationaryUpdated, params.annualRate, inflationaryUpdate), upperBound = _b.upperBound, postponedInflationaryUpdate = _b.postponedInflationaryUpdate, amortizationInflation = _b.amortizationInflation, amortization = _b.amortization, amortizationIUB = _b.amortizationIUB, amortizationDiff = _b.amortizationDiff;
-        var monthlyPayment = this.monthlyPaymentService.getMonthlyPayment(interest, amortization);
+        var monthlyPayment = this.monthlyPaymentService.getMonthlyPayment({
+            interestIUB: interestIUB,
+            amortizationIUB: amortizationIUB,
+            amortizationDiff: amortizationDiff,
+            inflationaryUpdate: inflationaryUpdate,
+            postponedInflationaryUpdate: postponedInflationaryUpdate
+        });
         // TODO: Cambiar monthlyPayment para que use valores IUB
         // Antes debemos verificar que monthlyPayment no lo estamos usando en el backend o en otro lugar.
         var balanceAfter = this.math.subtract(inputs.previousBalance.value(), amortization);
         var _c = this.insuranceService.getInsurances(inputs, params, inflationByDates, balanceValues, balanceAfter), totalLifeInsuranceFee = _c.totalLifeInsuranceFee, debtorLifeInsuranceFee = _c.debtorLifeInsuranceFee, codebtorLifeInsuranceFee = _c.codebtorLifeInsuranceFee, propertyInsuranceFee = _c.propertyInsuranceFee, monthlyCreditInsurance = _c.monthlyCreditInsurance, monthlyCreditInsuranceExpenses = _c.monthlyCreditInsuranceExpenses, monthlyCreditInsurancePrize = _c.monthlyCreditInsurancePrize;
-        var monthlyPaymentWithInsurances = this.monthlyPaymentService.getMonthlyPaymentWithInsurances(interestIUB, amortizationIUB, amortizationInflation, debtorLifeInsuranceFee, codebtorLifeInsuranceFee, propertyInsuranceFee, monthlyCreditInsurance || 0);
+        var monthlyPaymentWithInsurances = this.monthlyPaymentService.getMonthlyPaymentWithInsurances(monthlyPayment, debtorLifeInsuranceFee, codebtorLifeInsuranceFee, propertyInsuranceFee, monthlyCreditInsurance || 0);
         var TACValue = inputs.considerTAC === true ? inputs.TACValue : 0;
         var monthlyPaymentWithTAC = this.monthlyPaymentService.getMonthlyPaymentWithTAC(monthlyPaymentWithInsurances, TACValue);
         var walletBalance = inputs.considerWallet === true ? inputs.walletBalance : 0;
@@ -57,7 +63,9 @@ var InstallmentService = /** @class */ (function () {
             lateChargesInterestRate: params.lateChargesInterestRate,
             annualCreditInterestRate: params.annualRate,
             inflationMap: inflationMapLate,
-            considerNegativeInflation: inputs.considerNegativeInflation
+            considerNegativeInflation: inputs.considerNegativeInflation,
+            monthNominalLength: params.monthNominalLength,
+            inflationExchangeMethodYearlyToMonthly: params.inflationExchangeMethodYearlyToMonthly
         }), lateDays = _d.lateDays, lateChargesFine = _d.lateChargesFine, lateInflation = _d.lateInflation, lateInflationaryCorrection = _d.lateInflationaryCorrection, lateChargesInterestRate = _d.lateChargesInterestRate, lateChargesInterest = _d.lateChargesInterest, lateInterestRate = _d.lateInterestRate, lateInterest = _d.lateInterest, lastMonthLateInflation = _d.lastMonthLateInflation, lastMonthLateChargesInterestRate = _d.lastMonthLateChargesInterestRate, lastMonthLateInterestRate = _d.lastMonthLateInterestRate, lastMonthTotalLateRate = _d.lastMonthTotalLateRate, totalLateRate = _d.totalLateRate, totalLateInterest = _d.totalLateInterest, totalLate = _d.totalLate, monthlyPaymentWithLate = _d.monthlyPaymentWithLate;
         var totalMonthlyPayment = monthlyPaymentWithLate;
         var response = {

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

@@ -6,7 +6,6 @@ export declare class LateService {
     constructor(math: MathService);
     private readonly interestService;
     private readonly MONTHS_ON_YEAR;
-    private readonly DAYS_ON_MONTH;
     getLate(base: number, rate: number): number;
     private getLateDailyRate;
     /**
@@ -27,5 +26,5 @@ export declare class LateService {
         monthlyPaymentWithLate: number;
     };
     getTotalMonthlyPayment(dueDate: string, today: string, monthlyPaymentWithTAC: number, lateChargesFineRate: number, lateChargesInterestRate: number, interestRate: number, inflationMapLate: Record<string, number>, dailyinflationvalues: number[]): Record<string, number>;
-    getLates({ dueDate, today, totalMonthlyPaymentBeforeLate, lateChargesFineRate, lateChargesInterestRate, annualCreditInterestRate, inflationMap, considerNegativeInflation }: LatesInput): LatesOutput;
+    getLates({ dueDate, today, totalMonthlyPaymentBeforeLate, lateChargesFineRate, lateChargesInterestRate, annualCreditInterestRate, inflationMap, considerNegativeInflation, monthNominalLength, inflationExchangeMethodYearlyToMonthly }: LatesInput): LatesOutput;
 }

package/debt/services/late.service.js

@@ -17,12 +17,12 @@ exports.LateService = void 0;
 var creditu_date_model_1 = require("creditu-date-model");
 var math_1 = require("../../math");
 var interest_service_1 = require("./interest.service");
+var month_nominal_length_enum_1 = require("../../shared/models/enum/month-nominal-length.enum");
 var LateService = /** @class */ (function () {
     function LateService(math) {
         this.math = math;
         this.interestService = new interest_service_1.InterestService(this.math);
         this.MONTHS_ON_YEAR = 12;
-        this.DAYS_ON_MONTH = 30;
         this.math = new math_1.MathService(true, 10);
     }
     LateService.prototype.getLate = function (base, rate) {
@@ -124,7 +124,8 @@ var LateService = /** @class */ (function () {
         return lates;
     };
     LateService.prototype.getLates = function (_a) {
-        var dueDate = _a.dueDate, today = _a.today, totalMonthlyPaymentBeforeLate = _a.totalMonthlyPaymentBeforeLate, lateChargesFineRate = _a.lateChargesFineRate, lateChargesInterestRate = _a.lateChargesInterestRate, annualCreditInterestRate = _a.annualCreditInterestRate, inflationMap = _a.inflationMap, considerNegativeInflation = _a.considerNegativeInflation;
+        var _this = this;
+        var dueDate = _a.dueDate, today = _a.today, totalMonthlyPaymentBeforeLate = _a.totalMonthlyPaymentBeforeLate, lateChargesFineRate = _a.lateChargesFineRate, lateChargesInterestRate = _a.lateChargesInterestRate, annualCreditInterestRate = _a.annualCreditInterestRate, inflationMap = _a.inflationMap, considerNegativeInflation = _a.considerNegativeInflation, monthNominalLength = _a.monthNominalLength, inflationExchangeMethodYearlyToMonthly = _a.inflationExchangeMethodYearlyToMonthly;
         var lates = {
             lateDays: 0,
             lateChargesFine: 0,
@@ -146,6 +147,8 @@ var LateService = /** @class */ (function () {
         var todayDateModel = new creditu_date_model_1.DateModel(today);
         var dueDateDateModel = new creditu_date_model_1.DateModel(dueDate);
         var lateDays = todayDateModel.daysDiff(dueDateDateModel);
+        // FIXME: La fórmula para calcular lateDays debería depender de si estamos usando days360 (ver monthNominalLength)
+        // const lateDays = DateModel.days360(dueDate, today);
         var todayMonth = todayDateModel.monthAsNumber();
         var dueDateMonth = dueDateDateModel.monthAsNumber();
         var lateMonths = todayMonth - dueDateMonth;
@@ -156,9 +159,15 @@ var LateService = /** @class */ (function () {
         if (lateDays > 0) {
             Object.assign(lates, { lateChargesFine: this.math.multiply(lateChargesFineRate, totalMonthlyPaymentBeforeLate) });
         }
+        var monthlyInterestTypeFunction = {
+            COMPOUND: function (a, b, proportion) { return _this.math.subtract(_this.math.multiply(_this.math.add(1 + a), Math.pow(_this.math.add(1 + b), proportion)), 1); },
+            SIMPLE: function (a, b) { return _this.math.add(a, b); }
+        }[inflationExchangeMethodYearlyToMonthly];
         var monthlyCreditInterestRate = this.interestService.getCompoundPeriodicRate(annualCreditInterestRate, this.MONTHS_ON_YEAR);
+        // fecha de inicio de loop es la fecha más temprana entre today y dueDate
         var whileDate = todayDateModel.isSameOrAfter(dueDateDateModel) ? dueDateDateModel : todayDateModel;
-        var _b = whileDate.toString('YYYY-MM-DD').split('-'), startingYear = _b[0], startingMonth = _b[1], startingDay = _b[2];
+        var _b = whileDate.toString('YYYY-MM-DD').split('-'), startingYear = _b[0], startingMonth = _b[1];
+        // fecha de fin de loop es la fecha más tardía entre today y dueDate
         var endDate = todayDateModel.isSameOrAfter(dueDateDateModel) ? todayDateModel : dueDateDateModel;
         var isDueDate = whileDate.daysDiff(endDate) === 0;
         var monthlyInflationMap = Object.entries(inflationMap).reduce(function (acc, _a) {
@@ -173,11 +182,14 @@ var LateService = /** @class */ (function () {
             }
             var isStartingMonth = "".concat(startingYear, "-").concat(startingMonth) === whileDate.toString('YYYY-MM-DD').substring(0, 7);
             var _c = whileDate.toString('YYYY-MM-DD').split('-'), whileYear = _c[0], whileMonth = _c[1], whileDay = _c[2];
-            var totalDaysInMonth = (new Date(Number(whileYear), Number(whileMonth), 0)).getDate();
+            var totalDaysInMonth = (new Date(Number(whileYear), Number(whileMonth), 0)).getDate(); // Deberíamos usar monthNominalLength??
             var isLastMonthsDay = totalDaysInMonth === Number(whileDay);
             var isLastDay = whileDate.toString('YYYY-MM-DD') === endDate.toString('YYYY-MM-DD');
             var actualInflation = monthlyInflationMap["".concat(whileYear, "-").concat(whileMonth)];
             actualInflation = actualInflation < 0 && !considerNegativeInflation ? 0 : actualInflation;
+            var daysOnMonth = monthNominalLength === month_nominal_length_enum_1.MonthNominalLength.REAL
+                ? this.interestService.getTotalMonthDays(whileDate.toString())
+                : monthNominalLength;
             if (isLastMonthsDay || isLastDay || isDueDate) {
                 var lastMonthLateInflation = actualInflation;
                 var lastMonthLateChargesInterestRate = lateChargesInterestRate;
@@ -196,11 +208,27 @@ var LateService = /** @class */ (function () {
                     });
                     break;
                 }
-                var lateDaysInMonth = Number(whileDay) - (isStartingMonth ? Number(startingDay) : 0);
-                var proportion = this.math.divide(lateDaysInMonth, this.DAYS_ON_MONTH);
+                // const lateDaysInMonth = Number(whileDay) - (isStartingMonth ? Number(startingDay) : 0);
+                // FIXME: lateDaysInMonth debe usar days360 o no dependiendo de monthNominalLength
+                var lateDaysInMonth = void 0;
+                if (isStartingMonth) {
+                    lateDaysInMonth = creditu_date_model_1.DateModel.days360(dueDate, "".concat(startingYear, "-").concat(startingMonth, "-").concat(Number(whileDay)));
+                }
+                else if (isLastDay) {
+                    lateDaysInMonth = Number(whileDay);
+                }
+                else {
+                    lateDaysInMonth = daysOnMonth;
+                }
+                // lateDaysInMonth usó dueDate porque es la startingDate para este caso
+                var proportion = this.math.divide(lateDaysInMonth, daysOnMonth);
                 var accLateInflation = lateDays > 0 ? this.math.add(lates.lateInflation, this.math.multiply(proportion, actualInflation)) : 0;
-                var accLateChargesInterestRate = lateDays > 0 ? this.math.add(lates.lateChargesInterestRate, this.math.multiply(proportion, lateChargesInterestRate)) : 0;
-                var accLateInterestRate = lateDays > 0 ? this.math.add(lates.lateInterestRate, this.math.multiply(proportion, monthlyCreditInterestRate)) : 0;
+                var accLateChargesInterestRate = lateDays > 0
+                    ? monthlyInterestTypeFunction(lates.lateChargesInterestRate, lateChargesInterestRate, proportion)
+                    : 0;
+                var accLateInterestRate = lateDays > 0
+                    ? monthlyInterestTypeFunction(lates.lateInterestRate, monthlyCreditInterestRate, proportion)
+                    : 0;
                 var totalLateRate = this.interestService.getTotalInterestRate([
                     accLateInflation,
                     accLateChargesInterestRate,

package/debt/services/monthly-payment.service.d.ts

@@ -9,7 +9,7 @@ export declare class MonthlyPaymentService {
      * @param amortization
      * @param amortizationIinflation
      */
-    getMonthlyPayment(interest: number, amortization: number): number;
+    getMonthlyPayment({ interestIUB, amortizationIUB, amortizationDiff, inflationaryUpdate, postponedInflationaryUpdate }: Record<string, number>): number;
     /**
      * Calcula el pago de la cuota mensual considerando la tasa de administración de contrato
      * @param monthlyPaymentWithInsurances
@@ -22,7 +22,7 @@ export declare class MonthlyPaymentService {
      * @param amortization
      * @param amortizationIinflation
      */
-    getMonthlyPaymentWithInsurances(interestIUB: number, amortizationIUB: number, amortizationIinflation: number, debtorLifeInsuranceFee: number, codebtorLifeInsuranceFee: number, propertyInsuranceFee: number, monthlyCreditInsurance: number): number;
+    getMonthlyPaymentWithInsurances(monthlyPayment: number, debtorLifeInsuranceFee: number, codebtorLifeInsuranceFee: number, propertyInsuranceFee: number, monthlyCreditInsurance: number): number;
     /**
      * Calcula el monto de la cuota considerando el saldo en wallet
      *

package/debt/services/monthly-payment.service.js

@@ -24,12 +24,17 @@ var MonthlyPaymentService = /** @class */ (function () {
      * @param amortization
      * @param amortizationIinflation
      */
-    MonthlyPaymentService.prototype.getMonthlyPayment = function (interest, amortization) {
+    MonthlyPaymentService.prototype.getMonthlyPayment = function (_a) {
+        var interestIUB = _a.interestIUB, amortizationIUB = _a.amortizationIUB, amortizationDiff = _a.amortizationDiff, inflationaryUpdate = _a.inflationaryUpdate, postponedInflationaryUpdate = _a.postponedInflationaryUpdate;
         this.paramsValidator({
-            interest: interest,
-            amortization: amortization
+            interestIUB: interestIUB,
+            amortizationIUB: amortizationIUB,
+            amortizationDiff: amortizationDiff,
+            inflationaryUpdate: inflationaryUpdate,
+            postponedInflationaryUpdate: postponedInflationaryUpdate
         });
-        return this.math.add(interest, amortization);
+        var monthlyPayment = this.math.add(interestIUB, this.math.subtract(amortizationIUB, amortizationDiff), this.math.subtract(inflationaryUpdate, postponedInflationaryUpdate));
+        return monthlyPayment;
     };
     /**
      * Calcula el pago de la cuota mensual considerando la tasa de administración de contrato
@@ -49,17 +54,15 @@ var MonthlyPaymentService = /** @class */ (function () {
      * @param amortization
      * @param amortizationIinflation
      */
-    MonthlyPaymentService.prototype.getMonthlyPaymentWithInsurances = function (interestIUB, amortizationIUB, amortizationIinflation, debtorLifeInsuranceFee, codebtorLifeInsuranceFee, propertyInsuranceFee, monthlyCreditInsurance) {
+    MonthlyPaymentService.prototype.getMonthlyPaymentWithInsurances = function (monthlyPayment, debtorLifeInsuranceFee, codebtorLifeInsuranceFee, propertyInsuranceFee, monthlyCreditInsurance) {
         this.paramsValidator({
-            interestIUB: interestIUB,
-            amortizationIUB: amortizationIUB,
-            amortizationIinflation: amortizationIinflation,
+            monthlyPayment: monthlyPayment,
             debtorLifeInsuranceFee: debtorLifeInsuranceFee,
             codebtorLifeInsuranceFee: codebtorLifeInsuranceFee,
             propertyInsuranceFee: propertyInsuranceFee,
             monthlyCreditInsurance: monthlyCreditInsurance
         });
-        return this.math.add(interestIUB, amortizationIUB, amortizationIinflation, debtorLifeInsuranceFee, codebtorLifeInsuranceFee, propertyInsuranceFee, monthlyCreditInsurance);
+        return this.math.add(monthlyPayment, debtorLifeInsuranceFee, codebtorLifeInsuranceFee, propertyInsuranceFee, monthlyCreditInsurance);
     };
     /**
      * Calcula el monto de la cuota considerando el saldo en wallet

package/package.json

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