gemcap-be-common 1.4.64 → 1.4.66

package/helpers/main.helper.d.ts

@@ -26,6 +26,7 @@ import mongoose from 'mongoose';
 import Joi from 'joi';
 export type TDictionary = Record<string, string | object>;
 export declare const fieldsToUnset: string[];
-export declare const removeFields: <T>(document: mongoose.Document, fieldsToUnset: string[]) => T;
+export declare function removeFields<T extends object>(document: T, fieldsToUnset: string[]): T;
+export declare function removeFields<T extends mongoose.Document>(document: T, fieldsToUnset: string[]): T;
 export declare const replaceErrors: (error: Joi.ValidationError, dictionary: TDictionary) => string;
 export declare const getUUID: () => string;

package/helpers/main.helper.js

@@ -32,14 +32,13 @@ const deepCloneAndConvertMaps = (obj) => {
     }
     return obj;
 };
-const removeFields = (document, fieldsToUnset) => {
-    return document.toObject({
-        transform: (_doc, ret) => {
-            fieldsToUnset.forEach((field) => delete ret[field]);
-            return deepCloneAndConvertMaps(ret);
-        },
-    });
-};
+function removeFields(document, fieldsToUnset) {
+    const plainObject = typeof document.toObject === 'function'
+        ? document.toObject()
+        : deepCloneAndConvertMaps(document);
+    fieldsToUnset.forEach((field) => delete plainObject[field]);
+    return deepCloneAndConvertMaps(plainObject);
+}
 exports.removeFields = removeFields;
 const replaceErrors = (error, dictionary) => {
     const getValue = (d, keys) => {

package/helpers/main.helper.ts

@@ -32,14 +32,18 @@ const deepCloneAndConvertMaps = <T>(obj: T): T => {
   return obj;
 };
 
-export const removeFields = <T>(document: mongoose.Document, fieldsToUnset: string[]): T => {
-  return document.toObject({
-    transform: (_doc, ret) => {
-      fieldsToUnset.forEach((field) => delete ret[field]);
-      return deepCloneAndConvertMaps(ret) as Omit<T, keyof T>;
-    },
-  });
-};
+export function removeFields<T extends object>(document: T, fieldsToUnset: string[]): T;
+export function removeFields<T extends mongoose.Document>(document: T, fieldsToUnset: string[]): T;
+export function removeFields<T>(document: any, fieldsToUnset: string[]): T {
+  const plainObject =
+    typeof document.toObject === 'function'
+      ? document.toObject()
+      : deepCloneAndConvertMaps(document);
+
+  fieldsToUnset.forEach((field) => delete plainObject[field]);
+
+  return deepCloneAndConvertMaps(plainObject) as T;
+}
 
 export const replaceErrors = (error: Joi.ValidationError, dictionary: TDictionary) => {
   const getValue = (d: TDictionary, keys: string[]): string => {

package/models/Company.model.d.ts

@@ -24,15 +24,26 @@
 /// <reference types="mongoose/types/inferschematype" />
 import mongoose, { Model } from 'mongoose';
 export interface ICompany {
-    _id?: mongoose.Types.ObjectId;
     name: string;
+    isDeleted?: boolean;
 }
-export type ICompanyStringified = {
-    [K in keyof ICompany]: K extends '_id' | 'productId' ? string : ICompany[K];
-};
-type CompanyModel = Model<ICompany>;
-export declare const CompanySchema: mongoose.Schema<ICompany, CompanyModel, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, ICompany, mongoose.Document<unknown, {}, mongoose.FlatRecord<ICompany>> & mongoose.FlatRecord<ICompany> & Required<{
+export interface ICompanyDoc extends ICompany, Document {
     _id: mongoose.Types.ObjectId;
-}>>;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export interface ICompanyLean extends ICompany {
+    _id: mongoose.Types.ObjectId;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export interface ICompanyPlain extends ICompany {
+    _id: string;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export type CompanyModel = Model<ICompany>;
+export declare const CompanySchema: mongoose.Schema<ICompany, CompanyModel, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, ICompany, mongoose.Document<unknown, {}, mongoose.FlatRecord<ICompany>> & mongoose.FlatRecord<ICompany> & {
+    _id: mongoose.Types.ObjectId;
+}>;
 export declare const Company: CompanyModel;
-export {};

package/models/Company.model.js

@@ -12,6 +12,9 @@ exports.CompanySchema = new mongoose_1.default.Schema({
         required: true,
         trim: true,
     },
+    isDeleted: {
+        type: Boolean,
+    },
 }, {
     timestamps: { createdAt: true, updatedAt: false },
 });

package/models/Company.model.ts

@@ -3,15 +3,29 @@ import mongoose, { Model } from 'mongoose';
 import { MODEL_NAMES } from './_models';
 
 export interface ICompany {
-  _id?: mongoose.Types.ObjectId;
   name: string;
+  isDeleted?: boolean;
 }
 
-export type ICompanyStringified = {
-  [K in keyof ICompany]: K extends '_id' | 'productId' ? string : ICompany[K];
-};
+export interface ICompanyDoc extends ICompany, Document {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface ICompanyLean extends ICompany {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+}
 
-type CompanyModel = Model<ICompany>;
+export interface ICompanyPlain extends ICompany {
+  _id: string;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export type CompanyModel = Model<ICompany>;
 
 export const CompanySchema = new mongoose.Schema<ICompany, CompanyModel>(
   {
@@ -20,6 +34,9 @@ export const CompanySchema = new mongoose.Schema<ICompany, CompanyModel>(
       required: true,
       trim: true,
     },
+    isDeleted: {
+      type: Boolean,
+    },
   },
   {
     timestamps: { createdAt: true, updatedAt: false },

package/models/_index.d.ts

@@ -31,10 +31,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
         order: number;
-        apDate: Date;
         amount: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
+        apDate: Date;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -45,10 +45,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
         order: number;
-        apDate: Date;
         amount: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
+        apDate: Date;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -59,10 +59,10 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
         order: number;
-        apDate: Date;
         amount: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
+        apDate: Date;
         __v?: number;
         poNumber?: string;
         customerName?: string;

package/package.json

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

package/services/companies.service.d.ts

@@ -1,5 +1,4 @@
-import { ICompany } from '../models/Company.model';
+import { ICompanyLean } from '../models/Company.model';
 export declare class CompaniesService {
-    getCompanies(): Promise<ICompany[]>;
-    createCompanies(): Promise<void>;
+    getCompanies(): Promise<ICompanyLean[]>;
 }

package/services/companies.service.js

@@ -5,17 +5,12 @@ const Company_model_1 = require("../models/Company.model");
 const main_helper_1 = require("../helpers/main.helper");
 class CompaniesService {
     async getCompanies() {
-        const companies = await Company_model_1.Company.find().sort({ name: 1 });
+        const companies = await Company_model_1.Company
+            .find({ isDeleted: { $ne: true } })
+            .sort({ name: 1 })
+            .lean()
+            .exec();
         return companies.map((i) => (0, main_helper_1.removeFields)(i, main_helper_1.fieldsToUnset));
     }
-    async createCompanies() {
-        const companies = [
-            { name: 'AssetCo' },
-            { name: 'OpCo' },
-        ];
-        await Promise.all(companies.map(async (company) => {
-            await Company_model_1.Company.findOneAndUpdate({ name: company.name }, { $setOnInsert: { name: company.name } }, { upsert: true, new: true });
-        }));
-    }
 }
 exports.CompaniesService = CompaniesService;

package/services/companies.service.ts

@@ -1,23 +1,13 @@
-import { Company, ICompany } from '../models/Company.model';
+import { Company, ICompanyLean } from '../models/Company.model';
 import { fieldsToUnset, removeFields } from '../helpers/main.helper';
 
 export class CompaniesService {
   async getCompanies() {
-    const companies = await Company.find().sort({ name: 1 });
-    return companies.map((i) => removeFields<ICompany>(i, fieldsToUnset));
-  }
-
-  async createCompanies() {
-    const companies: ICompany[] = [
-      { name: 'AssetCo' },
-      { name: 'OpCo' },
-    ];
-    await Promise.all(companies.map(async (company) => {
-      await Company.findOneAndUpdate(
-        { name: company.name },
-        { $setOnInsert: { name: company.name } },
-        { upsert: true, new: true },
-      );
-    }));
+    const companies = await Company
+      .find({ isDeleted: { $ne: true } })
+      .sort({ name: 1 })
+      .lean<ICompanyLean[]>()
+      .exec();
+    return companies.map((i) => removeFields(i, fieldsToUnset));
   }
 }

package/services/loan-transactions.service.d.ts

@@ -155,7 +155,7 @@ export declare class LoanTransactionsService {
     getTransactionReport(transactionIds: string[], borrowerId: string, effectiveDate: Date): Promise<{
         transactionIdsToMark: any[];
         transactions: {
-            [x: string]: (string | number | Date | string[])[];
+            [x: string]: (string | number | string[] | Date)[];
         }[];
     }>;
     getBorrowerIdsForFile(transactionFileId: string): Promise<{