gemcap-be-common 1.2.25 → 1.2.27

package/models/LoanCharges.model.js

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoanCharge = exports.defaultChargeList = exports.chargeViewValidationSchema = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const joi_1 = __importDefault(require("joi"));
-const enums_1 = require("../enums");
+const loan_types_enum_1 = require("../enums/loan-types.enum");
+const loan_charge_type_enum_1 = require("../enums/loan-charge-type.enum");
 const _models_1 = require("./_models");
 exports.chargeViewValidationSchema = joi_1.default.object({
     valid: joi_1.default.boolean(),
@@ -18,116 +19,117 @@ exports.chargeViewValidationSchema = joi_1.default.object({
     productId: joi_1.default.string().required(),
     percent: joi_1.default.number().required().min(0),
     minimumAmount: joi_1.default.number().required().min(0),
-    frequency: joi_1.default.string().required().valid(...Object.keys(enums_1.EChargeFrequencies)),
+    frequency: joi_1.default.string().required().valid(...Object.keys(loan_types_enum_1.EChargeFrequencies)),
     applyFrom: joi_1.default.date().required(),
-    calculationBasis: joi_1.default.string().required().valid(...Object.keys(enums_1.EChargeCalculationBasis)),
-    chargeType: joi_1.default.string().required().valid(...Object.keys(enums_1.ELoanChargeType)),
+    calculationBasis: joi_1.default.string().required().valid(...Object.keys(loan_types_enum_1.EChargeCalculationBasis)),
+    chargeType: joi_1.default.string().required().valid(...Object.keys(loan_charge_type_enum_1.ELoanChargeType)),
     includeInYield: joi_1.default.boolean().required(),
+    paymentOrder: joi_1.default.number(),
 });
 exports.defaultChargeList = [
     {
         _id: null,
         active: true,
         name: 'Interest',
-        code: enums_1.ELoanChargeType.INTEREST_FEE,
+        code: loan_charge_type_enum_1.ELoanChargeType.INTEREST_FEE,
         PLCode: '',
-        chargeType: enums_1.ELoanChargeType.INTEREST_FEE,
+        chargeType: loan_charge_type_enum_1.ELoanChargeType.INTEREST_FEE,
         productId: null,
         percent: 0,
         minimumAmount: 0,
-        frequency: enums_1.EChargeFrequencies.DAILY,
+        frequency: loan_types_enum_1.EChargeFrequencies.DAILY,
         applyFrom: null,
-        calculationBasis: enums_1.EChargeCalculationBasis.DAILY_BALANCE,
+        calculationBasis: loan_types_enum_1.EChargeCalculationBasis.DAILY_BALANCE,
         includeInYield: false,
     },
     {
         _id: null,
         active: true,
         name: 'Admin Fees',
-        code: enums_1.ELoanChargeType.ADMIN_FEE,
+        code: loan_charge_type_enum_1.ELoanChargeType.ADMIN_FEE,
         PLCode: '',
-        chargeType: enums_1.ELoanChargeType.ADMIN_FEE,
+        chargeType: loan_charge_type_enum_1.ELoanChargeType.ADMIN_FEE,
         productId: null,
         percent: 0,
         minimumAmount: 0,
-        frequency: enums_1.EChargeFrequencies.MONTHLY,
+        frequency: loan_types_enum_1.EChargeFrequencies.MONTHLY,
         applyFrom: null,
-        calculationBasis: enums_1.EChargeCalculationBasis.AVERAGE_MONTHLY_BALANCE,
+        calculationBasis: loan_types_enum_1.EChargeCalculationBasis.AVERAGE_MONTHLY_BALANCE,
         includeInYield: false,
     },
     {
         _id: null,
         active: true,
         name: 'Unused Line Fee',
-        code: enums_1.ELoanChargeType.UNUSED_LINE_FEE,
+        code: loan_charge_type_enum_1.ELoanChargeType.UNUSED_LINE_FEE,
         PLCode: '',
-        chargeType: enums_1.ELoanChargeType.UNUSED_LINE_FEE,
+        chargeType: loan_charge_type_enum_1.ELoanChargeType.UNUSED_LINE_FEE,
         productId: null,
         percent: 0,
         minimumAmount: 0,
-        frequency: enums_1.EChargeFrequencies.DAILY,
+        frequency: loan_types_enum_1.EChargeFrequencies.DAILY,
         applyFrom: null,
-        calculationBasis: enums_1.EChargeCalculationBasis.UNUSED_AMOUNT,
+        calculationBasis: loan_types_enum_1.EChargeCalculationBasis.UNUSED_AMOUNT,
         includeInYield: false,
     },
     {
         _id: null,
         active: true,
         name: 'Annual Line Fee',
-        code: enums_1.ELoanChargeType.ANNUAL_LINE_FEE,
+        code: loan_charge_type_enum_1.ELoanChargeType.ANNUAL_LINE_FEE,
         PLCode: '',
-        chargeType: enums_1.ELoanChargeType.ANNUAL_LINE_FEE,
+        chargeType: loan_charge_type_enum_1.ELoanChargeType.ANNUAL_LINE_FEE,
         productId: null,
         percent: 0,
         minimumAmount: 0,
-        frequency: enums_1.EChargeFrequencies.ANNUAL,
+        frequency: loan_types_enum_1.EChargeFrequencies.ANNUAL,
         applyFrom: null,
-        calculationBasis: enums_1.EChargeCalculationBasis.COMMITMENT,
+        calculationBasis: loan_types_enum_1.EChargeCalculationBasis.COMMITMENT,
         includeInYield: false,
     },
     {
         _id: null,
         active: true,
         name: 'Wire Fee',
-        code: enums_1.ELoanChargeType.WIRE_FEE,
+        code: loan_charge_type_enum_1.ELoanChargeType.WIRE_FEE,
         PLCode: '',
-        chargeType: enums_1.ELoanChargeType.WIRE_FEE,
+        chargeType: loan_charge_type_enum_1.ELoanChargeType.WIRE_FEE,
         productId: null,
         percent: 0,
         minimumAmount: 0,
-        frequency: enums_1.EChargeFrequencies.DISBURSEMENT,
+        frequency: loan_types_enum_1.EChargeFrequencies.DISBURSEMENT,
         applyFrom: null,
-        calculationBasis: enums_1.EChargeCalculationBasis.DISBURSEMENT_AMOUNT,
+        calculationBasis: loan_types_enum_1.EChargeCalculationBasis.DISBURSEMENT_AMOUNT,
         includeInYield: false,
     },
     {
         _id: null,
         active: true,
         name: 'Forbearance',
-        code: enums_1.ELoanChargeType.OTHER,
+        code: loan_charge_type_enum_1.ELoanChargeType.OTHER,
         PLCode: '',
-        chargeType: enums_1.ELoanChargeType.OTHER,
+        chargeType: loan_charge_type_enum_1.ELoanChargeType.OTHER,
         productId: null,
         percent: 0,
         minimumAmount: 0,
-        frequency: enums_1.EChargeFrequencies.ONE_TIME,
+        frequency: loan_types_enum_1.EChargeFrequencies.ONE_TIME,
         applyFrom: null,
-        calculationBasis: enums_1.EChargeCalculationBasis.FIXED,
+        calculationBasis: loan_types_enum_1.EChargeCalculationBasis.FIXED,
         includeInYield: false,
     },
     {
         _id: null,
         active: true,
         name: 'Overline/Over-advance',
-        code: enums_1.ELoanChargeType.OTHER,
+        code: loan_charge_type_enum_1.ELoanChargeType.OTHER,
         PLCode: '',
-        chargeType: enums_1.ELoanChargeType.OTHER,
+        chargeType: loan_charge_type_enum_1.ELoanChargeType.OTHER,
         productId: null,
         percent: 0,
         minimumAmount: 0,
-        frequency: enums_1.EChargeFrequencies.ONE_TIME,
+        frequency: loan_types_enum_1.EChargeFrequencies.ONE_TIME,
         applyFrom: null,
-        calculationBasis: enums_1.EChargeCalculationBasis.FIXED,
+        calculationBasis: loan_types_enum_1.EChargeCalculationBasis.FIXED,
         includeInYield: false,
     },
 ];

package/models/LoanCharges.model.ts

@@ -1,10 +1,10 @@
 import mongoose, { Document } from 'mongoose';
 import Joi from 'joi';
 
-import { EChargeCalculationBasis, EChargeFrequencies, ELoanChargeType } from '../enums';
+import { EChargeCalculationBasis, EChargeFrequencies } from '../enums/loan-types.enum';
+import { ELoanChargeType } from '../enums/loan-charge-type.enum';
 import { MODEL_NAMES } from './_models';
 
-
 export const chargeViewValidationSchema = Joi.object<ILoanChargeView & { valid: boolean }>({
   valid: Joi.boolean(),
   _id: Joi.string(),
@@ -20,6 +20,7 @@ export const chargeViewValidationSchema = Joi.object<ILoanChargeView & { valid:
   calculationBasis: Joi.string().required().valid(...Object.keys(EChargeCalculationBasis)),
   chargeType: Joi.string().required().valid(...Object.keys(ELoanChargeType)),
   includeInYield: Joi.boolean().required(),
+  paymentOrder: Joi.number(),
 });
 
 export interface ILoanCharge {

package/models/LoanProducts.model.d.ts

@@ -23,7 +23,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Document } from 'mongoose';
-import { ELoanTypes } from '../enums';
+import { ELoanTypes } from '../enums/loan-types.enum';
 export interface ILoanProduct {
     borrowerId: mongoose.Types.ObjectId;
     order: number;

package/models/LoanProducts.model.ts

@@ -1,7 +1,7 @@
 import mongoose, { Document } from 'mongoose';
 
 import { MODEL_NAMES } from './_models';
-import { ELoanTypes } from '../enums';
+import { ELoanTypes } from '../enums/loan-types.enum';
 
 export interface ILoanProduct {
   borrowerId: mongoose.Types.ObjectId;

package/models/LoanTransaction.model.js

@@ -8,7 +8,7 @@ const mongoose_1 = __importDefault(require("mongoose"));
 const _models_1 = require("./_models");
 const UserLog_model_1 = require("./UserLog.model");
 const DeletedRecords_model_1 = require("./DeletedRecords.model");
-const db_1 = require("../db");
+const user_logs_db_1 = require("../db/user-logs.db");
 var ELoanTransactionTypes;
 (function (ELoanTransactionTypes) {
     ELoanTransactionTypes["COLLECTION"] = "COLLECTION";
@@ -111,7 +111,7 @@ LoanTransactionSchema.statics.findByIdAndDeleteWithUserId = async function (id,
         record: foundDoc,
     });
     await deletedRecord.save();
-    await (0, db_1.createLog)({
+    await (0, user_logs_db_1.createLog)({
         action: UserLog_model_1.ELogActionType.DELETE,
         logType: UserLog_model_1.ELogType.LOAN_TRANSACTION,
         userId: userId,
@@ -123,7 +123,7 @@ LoanTransactionSchema.statics.findByIdAndDeleteWithUserId = async function (id,
 };
 LoanTransactionSchema.pre(/^(save)/, async function () {
     const myDoc = this;
-    await (0, db_1.createLog)({
+    await (0, user_logs_db_1.createLog)({
         action: UserLog_model_1.ELogActionType.CREATE,
         logType: UserLog_model_1.ELogType.LOAN_TRANSACTION,
         userId: myDoc.userId,
@@ -143,9 +143,9 @@ LoanTransactionSchema.pre(/^(updateOne|updateMany|findOneAndUpdate)/, async func
         const oldDoc = await myDoc.model.findById(conditions._id);
         let changes = {};
         if (oldDoc) {
-            changes = (0, db_1.getLogChanges)(oldDoc, update);
+            changes = (0, user_logs_db_1.getLogChanges)(oldDoc, update);
         }
-        await (0, db_1.createLog)({
+        await (0, user_logs_db_1.createLog)({
             action: UserLog_model_1.ELogActionType.EDIT,
             logType: UserLog_model_1.ELogType.LOAN_TRANSACTION,
             userId: update.userId,

package/models/LoanTransaction.model.ts

@@ -5,7 +5,7 @@ import { MODEL_NAMES } from './_models';
 import { ELogActionType, ELogType } from './UserLog.model';
 import { IBankDoc } from './Banks.model';
 import { DeletedRecord } from './DeletedRecords.model';
-import { createLog, getLogChanges } from '../db';
+import { createLog, getLogChanges } from '../db/user-logs.db';
 
 export enum ELoanTransactionTypes {
   COLLECTION = 'COLLECTION',

package/models/MicroserviceTask.model.d.ts

@@ -23,7 +23,8 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Document } from 'mongoose';
-import { EMicroserviceTask, EMicroserviceTaskStatuses } from '../enums';
+import { EMicroserviceTask } from '../enums/microservice-task.enum';
+import { EMicroserviceTaskStatuses } from '../enums/microservice-task-statuses.enum';
 export interface IMicroserviceTask {
     cmd: EMicroserviceTask;
     params: any;

package/models/MicroserviceTask.model.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MicroserviceTaskModel = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const _models_1 = require("./_models");
+const mongooseLeanId = require('../plugins/id.plugin');
 const MicroserviceTaskSchema = new mongoose_1.default.Schema({
     cmd: {
         type: String,
@@ -27,5 +28,5 @@ const MicroserviceTaskSchema = new mongoose_1.default.Schema({
     },
     __v: { type: Number, select: false },
 }, { timestamps: true });
-// MicroserviceTaskSchema.plugin(mongooseLeanId);
+MicroserviceTaskSchema.plugin(mongooseLeanId);
 exports.MicroserviceTaskModel = mongoose_1.default.model(_models_1.MODEL_NAMES.microserviceTasks, MicroserviceTaskSchema);

package/models/MicroserviceTask.model.ts

@@ -1,9 +1,10 @@
 import mongoose, { Document } from 'mongoose';
 
-import { EMicroserviceTask, EMicroserviceTaskStatuses } from '../enums';
+import { EMicroserviceTask } from '../enums/microservice-task.enum';
+import { EMicroserviceTaskStatuses } from '../enums/microservice-task-statuses.enum';
 import { MODEL_NAMES } from './_models';
 
-// const mongooseLeanId = require('../plugins/id.plugin');
+const mongooseLeanId = require('../plugins/id.plugin');
 
 export interface IMicroserviceTask {
   cmd: EMicroserviceTask;
@@ -41,6 +42,6 @@ const MicroserviceTaskSchema = new mongoose.Schema(
   { timestamps: true }
 );
 
-// MicroserviceTaskSchema.plugin(mongooseLeanId);
+MicroserviceTaskSchema.plugin(mongooseLeanId);
 
 export const MicroserviceTaskModel: mongoose.Model<IMicroserviceTaskDoc> = mongoose.model<IMicroserviceTaskDoc>(MODEL_NAMES.microserviceTasks, MicroserviceTaskSchema);

package/models/ReceivableItem.model.d.ts

@@ -23,7 +23,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Document } from 'mongoose';
-import { ICollateralItem } from '../interfaces';
+import { ICollateralItem } from '../interfaces/collaterals.interface';
 import { IBBCSheetDoc } from './BBCSheet.model';
 import { IBBCDateDoc } from './BBCDate.model';
 export declare const RECEIVABLE_FIELDS: string[];

package/models/ReceivableItem.model.ts

@@ -1,6 +1,6 @@
 import mongoose, { Document } from 'mongoose';
 
-import { ICollateralItem } from '../interfaces';
+import { ICollateralItem } from '../interfaces/collaterals.interface';
 import { IBBCSheetDoc } from './BBCSheet.model';
 import { IBBCDateDoc } from './BBCDate.model';
 

package/models/Yield.model.d.ts

@@ -24,7 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import Joi from 'joi';
 import mongoose, { Model } from 'mongoose';
-import { ISelectedMonth } from '../helpers';
+import { ISelectedMonth } from '../helpers/date.helper';
 export declare const yieldParamsValidationSchema: Joi.ObjectSchema<IYieldParams>;
 export interface IYieldParams {
     periodStart?: ISelectedMonth;

package/models/Yield.model.ts

@@ -1,7 +1,7 @@
 import Joi from 'joi';
 import mongoose, { Model } from 'mongoose';
 
-import { ISelectedMonth } from '../helpers';
+import { ISelectedMonth } from '../helpers/date.helper';
 import { MODEL_NAMES } from './_models';
 
 interface IYieldRawData {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.2.25",
+  "version": "1.2.27",
   "description": "",
   "main": "index.js",
   "scripts": {