gemcap-be-common 1.4.118 → 1.4.120

package/models/Banks.model.d.ts

@@ -22,7 +22,7 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import mongoose, { Document } from 'mongoose';
+import mongoose, { Document, Model } from 'mongoose';
 export interface IBank {
     isDeleted?: boolean;
     active: boolean;
@@ -36,56 +36,27 @@ export interface IBank {
 export interface IBankWithId extends IBank {
     _id: mongoose.Types.ObjectId;
 }
-export type IBankView = Omit<IBankWithId, 'order'>;
 export interface IBankDoc extends IBank, Document {
+    _id: mongoose.Types.ObjectId;
+    createdAt: Date;
+    updatedAt: Date;
 }
-export declare const BankSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
-    timestamps: true;
-}, {
-    createdAt: NativeDate;
-    updatedAt: NativeDate;
-} & {
-    name: string;
-    order: number;
-    isDeleted: boolean;
-    active: boolean;
-    bankAccountNumber: string;
-    ledgerAccountCodes: Map<string, {
-        type?: mongoose.Types.ObjectId;
-        ref?: unknown;
-    }>;
-    __v?: number;
-}, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
-    createdAt: NativeDate;
-    updatedAt: NativeDate;
-} & {
-    name: string;
-    order: number;
-    isDeleted: boolean;
-    active: boolean;
-    bankAccountNumber: string;
-    ledgerAccountCodes: Map<string, {
-        type?: mongoose.Types.ObjectId;
-        ref?: unknown;
-    }>;
-    __v?: number;
-}>> & mongoose.FlatRecord<{
-    createdAt: NativeDate;
-    updatedAt: NativeDate;
-} & {
-    name: string;
-    order: number;
-    isDeleted: boolean;
-    active: boolean;
-    bankAccountNumber: string;
-    ledgerAccountCodes: Map<string, {
-        type?: mongoose.Types.ObjectId;
-        ref?: unknown;
-    }>;
-    __v?: number;
-}> & {
+export interface IBankLean extends IBank {
     _id: mongoose.Types.ObjectId;
-}>;
-export declare const Bank: mongoose.Model<IBankDoc, {}, {}, {}, mongoose.Document<unknown, {}, IBankDoc> & IBankDoc & {
+    createdAt: Date;
+    updatedAt: Date;
+}
+export interface IBankPlain extends Omit<IBank, 'ledgerAccountCodes'> {
+    _id: string;
+    createdAt: Date;
+    updatedAt: Date;
+    ledgerAccountCodes: {
+        [companyId: string]: string;
+    };
+}
+export type IBankView = Omit<IBankWithId, 'order'>;
+export type IBankModel = Model<IBank>;
+export declare const BankSchema: mongoose.Schema<IBank, IBankModel, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, IBank, mongoose.Document<unknown, {}, mongoose.FlatRecord<IBank>> & mongoose.FlatRecord<IBank> & {
     _id: mongoose.Types.ObjectId;
-}, any>;
+}>;
+export declare const Bank: IBankModel;

package/models/Banks.model.js

@@ -36,9 +36,5 @@ exports.BankSchema = new mongoose_1.default.Schema({
         of: { type: mongoose_1.default.Schema.Types.ObjectId, ref: _models_1.MODEL_NAMES.quickbooksAccounts },
         default: {},
     },
-    __v: {
-        type: Number,
-        select: false
-    },
 }, { timestamps: true });
 exports.Bank = mongoose_1.default.model(_models_1.MODEL_NAMES.banks, exports.BankSchema);

package/models/Banks.model.ts

@@ -1,4 +1,4 @@
-import mongoose, { Document } from 'mongoose';
+import mongoose, { Document, Model } from 'mongoose';
 
 import { MODEL_NAMES } from './_models';
 
@@ -17,12 +17,32 @@ export interface IBankWithId extends IBank {
   _id: mongoose.Types.ObjectId;
 }
 
-export type IBankView = Omit<IBankWithId, 'order'>
-
 export interface IBankDoc extends IBank, Document {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface IBankLean extends IBank {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
 }
 
-export const BankSchema = new mongoose.Schema(
+export interface IBankPlain extends Omit<IBank, 'ledgerAccountCodes'> {
+  _id: string;
+  createdAt: Date;
+  updatedAt: Date;
+  ledgerAccountCodes: {
+    [companyId: string]: string;
+  };
+}
+
+export type IBankView = Omit<IBankWithId, 'order'>
+
+export type IBankModel = Model<IBank>;
+
+export const BankSchema = new mongoose.Schema<IBank, IBankModel>(
   {
     isDeleted: {
       type: Boolean,
@@ -53,12 +73,8 @@ export const BankSchema = new mongoose.Schema(
       of: { type: mongoose.Schema.Types.ObjectId, ref: MODEL_NAMES.quickbooksAccounts },
       default: {},
     },
-    __v: {
-      type: Number,
-      select: false
-    },
   },
   { timestamps: true },
 );
 
-export const Bank = mongoose.model<IBankDoc>(MODEL_NAMES.banks, BankSchema);
+export const Bank = mongoose.model<IBank, IBankModel>(MODEL_NAMES.banks, BankSchema);

package/package.json

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

package/services/bank-uploaded-transactions.service.js

@@ -295,7 +295,7 @@ class BankUploadedTransactionsService {
         const productIds = new Set();
         await Promise.all(allocatedTransactions.map(async (transactionToConvert) => {
             const transaction = transactions.find((tr) => tr._id.toString() === transactionToConvert.uploadedBankTransactionId.toString());
-            if (transaction.isConverted) {
+            if (!transaction || transaction.isConverted) {
                 return;
             }
             const splitTransaction = transactionToConvert.splitTransactionId

package/services/bank-uploaded-transactions.service.ts

@@ -332,7 +332,7 @@ export class BankUploadedTransactionsService {
     const productIds = new Set<string>();
     await Promise.all(allocatedTransactions.map(async (transactionToConvert) => {
       const transaction = transactions.find((tr) => tr._id.toString() === transactionToConvert.uploadedBankTransactionId.toString());
-      if (transaction.isConverted) {
+      if (!transaction || transaction.isConverted) {
         return;
       }
       const splitTransaction = transactionToConvert.splitTransactionId

package/services/banks.service.d.ts

@@ -28,7 +28,7 @@ export declare class BanksService {
     getBanks(): Promise<IBankView[]>;
     createBank(bank: IBankView): Promise<void>;
     editBank(bank: IBankView): Promise<void>;
-    findBankByNumber(bankAccountNumber: string): Promise<import("mongoose").FlattenMaps<import("../models/Banks.model").IBankDoc> & {
+    findBankByNumber(bankAccountNumber: string): Promise<import("mongoose").FlattenMaps<import("../models/Banks.model").IBank> & {
         _id: import("mongoose").Types.ObjectId;
     }>;
     findBankByAccountCode(accountCode: string): Promise<IBankWithId>;

package/services/borrowers.service.d.ts

@@ -84,10 +84,10 @@ export declare class BorrowerService {
     getBorrowerCodesMap(): Promise<Map<string, string>>;
     getBorrowerStatementDetails(borrowers: IBorrowerDoc[]): Promise<{
         [x: string]: {
-            LAST_MONTH?: boolean;
-            CURRENT_MONTH?: boolean;
             ENTIRE_LOAN?: boolean;
             SELECTED_PERIOD?: boolean;
+            CURRENT_MONTH?: boolean;
+            LAST_MONTH?: boolean;
             TERM_LOAN?: boolean;
         };
     }>;

package/services/brokers.service.d.ts

@@ -46,9 +46,9 @@ export declare class BrokersService {
     getAllProductBrokers(): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
         _id: import("mongoose").Types.ObjectId;
     })[]>;
-    getBorrowerBrokers(borrowerId: string): Promise<BrokerView[] | (import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
+    getBorrowerBrokers(borrowerId: string): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & {
         _id: import("mongoose").Types.ObjectId;
-    })[]>;
+    })[] | BrokerView[]>;
     getProductBrokers(productId: string): Promise<import("../models/ProductBroker.model").IProductBrokerDocWithBroker[]>;
     getTotalShares(borrowerId: string, brokers: IProductBrokerView[], replaceNames?: boolean): Promise<ProductTotal>;
     getTotals(borrowerId: string): Promise<BrokerTotalView[]>;