gemcap-be-common 1.4.254 → 1.4.256

package/models/AllocatedBankTransaction.model.ts

@@ -1,6 +1,8 @@
 import mongoose, { Model } from 'mongoose';
 
-import { IUploadedBankTransactionWithInfo } from './UploadedBankTransaction.model';
+import {
+  IUploadedBankTransactionWithInfo,
+} from './UploadedBankTransaction.model';
 import { AccountSchema } from './CashAllocationProduct.model';
 import { MODEL_NAMES } from './_models';
 

package/models/UploadedBankTransaction.model.d.ts

@@ -22,7 +22,7 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import mongoose, { Model } from 'mongoose';
+import mongoose from 'mongoose';
 export interface ISplitTransaction {
     _id?: mongoose.Types.ObjectId;
     reference: string;
@@ -46,12 +46,27 @@ export interface IUploadedBankTransaction {
     isConverted: boolean;
     loanTransactionIds?: mongoose.Types.ObjectId[];
     splitTransactions: ISplitTransaction[];
+    bankIntegrationTransactionId?: mongoose.Types.ObjectId;
+}
+export type IUploadedBankTransactionDoc = mongoose.HydratedDocument<IUploadedBankTransaction>;
+export interface IUploadedBankTransactionWithMemo extends IUploadedBankTransaction {
+    splitMemo: string;
 }
 export interface IUploadedBankTransactionWithInfo extends IUploadedBankTransaction {
     hasMatch: boolean;
     canSplit: boolean;
 }
-type UploadedBankTransactionModel = Model<IUploadedBankTransaction>;
+export interface IUploadedBankTransactionLean extends IUploadedBankTransaction {
+    _id: mongoose.Types.ObjectId;
+    createdAt: Date;
+    updatedAt: Date;
+}
+export interface IUploadedBankTransactionPlain extends Omit<IUploadedBankTransaction, '_id' | 'loanTransactionIds' | 'bankIntegrationTransactionId'> {
+    _id: string;
+    loanTransactionIds: string[];
+    bankIntegrationTransactionId: string;
+}
+type UploadedBankTransactionModel = mongoose.Model<IUploadedBankTransaction>;
 export declare const UploadedBankTransactionSchema: mongoose.Schema<IUploadedBankTransaction, UploadedBankTransactionModel, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, IUploadedBankTransaction, mongoose.Document<unknown, {}, mongoose.FlatRecord<IUploadedBankTransaction>> & mongoose.FlatRecord<IUploadedBankTransaction> & Required<{
     _id: mongoose.Types.ObjectId;
 }>>;

package/models/UploadedBankTransaction.model.js

@@ -74,5 +74,10 @@ exports.UploadedBankTransactionSchema = new mongoose_1.default.Schema({
             required: false,
         }],
     splitTransactions: [SplitTransactionSchema],
+    bankIntegrationTransactionId: {
+        type: mongoose_1.default.Schema.Types.ObjectId,
+        ref: _models_1.MODEL_NAMES.bankIntegrationTransactions,
+        required: false,
+    },
 }, { timestamps: { createdAt: true, updatedAt: false } });
 exports.UploadedBankTransaction = mongoose_1.default.model(_models_1.MODEL_NAMES.uploadedBankTransactions, exports.UploadedBankTransactionSchema);

package/models/UploadedBankTransaction.model.ts

@@ -26,6 +26,13 @@ export interface IUploadedBankTransaction {
   isConverted: boolean;
   loanTransactionIds?: mongoose.Types.ObjectId[];
   splitTransactions: ISplitTransaction[];
+  bankIntegrationTransactionId?: mongoose.Types.ObjectId;
+}
+
+export type IUploadedBankTransactionDoc = mongoose.HydratedDocument<IUploadedBankTransaction>;
+
+export interface IUploadedBankTransactionWithMemo extends IUploadedBankTransaction {
+  splitMemo: string;
 }
 
 export interface IUploadedBankTransactionWithInfo extends IUploadedBankTransaction {
@@ -33,8 +40,20 @@ export interface IUploadedBankTransactionWithInfo extends IUploadedBankTransacti
   canSplit: boolean;
 }
 
-type UploadedBankTransactionModel = Model<IUploadedBankTransaction>;
-type SplitTransactionModel = Model<ISplitTransaction>;
+export interface IUploadedBankTransactionLean extends IUploadedBankTransaction {
+  _id: mongoose.Types.ObjectId;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface IUploadedBankTransactionPlain extends Omit<IUploadedBankTransaction, '_id' | 'loanTransactionIds' | 'bankIntegrationTransactionId'> {
+  _id: string;
+  loanTransactionIds: string[];
+  bankIntegrationTransactionId: string;
+}
+
+type UploadedBankTransactionModel = mongoose.Model<IUploadedBankTransaction>;
+type SplitTransactionModel = mongoose.Model<ISplitTransaction>;
 
 const SplitTransactionSchema = new mongoose.Schema<ISplitTransaction, SplitTransactionModel>({
   reference: {
@@ -105,6 +124,11 @@ export const UploadedBankTransactionSchema = new mongoose.Schema<IUploadedBankTr
     required: false,
   }],
   splitTransactions: [SplitTransactionSchema],
+  bankIntegrationTransactionId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: MODEL_NAMES.bankIntegrationTransactions,
+    required: false,
+  },
 }, { timestamps: { createdAt: true, updatedAt: false } });
 
 export const UploadedBankTransaction = mongoose.model<IUploadedBankTransaction, UploadedBankTransactionModel>(MODEL_NAMES.uploadedBankTransactions, UploadedBankTransactionSchema);

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.254",
+  "version": "1.4.256",
   "description": "",
   "main": "index.js",
   "scripts": {

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

@@ -362,7 +362,10 @@ class BankUploadedTransactionsService {
         await UploadedBankTransaction_model_1.UploadedBankTransaction.updateOne({ _id: new mongoose_1.default.Types.ObjectId(transactionId) }, { splitTransactions: mappedSplitTransactions });
     }
     async deleteBankTransaction(transactionIds) {
-        await UploadedBankTransaction_model_1.UploadedBankTransaction.deleteMany({ _id: { $in: transactionIds }, isConverted: false });
+        await UploadedBankTransaction_model_1.UploadedBankTransaction.deleteMany({
+            _id: { $in: transactionIds },
+            isConverted: { $ne: true },
+        });
     }
     async revertAllBankTransactions(startDate, endDate, userId) {
         const transactions = await this.getUploadedBankTransactions(startDate, endDate);

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

@@ -403,7 +403,10 @@ export class BankUploadedTransactionsService {
   }
 
   async deleteBankTransaction(transactionIds: string[]) {
-    await UploadedBankTransaction.deleteMany({ _id: { $in: transactionIds }, isConverted: false });
+    await UploadedBankTransaction.deleteMany({
+      _id: { $in: transactionIds },
+      isConverted: { $ne: true },
+    });
   }
 
   async revertAllBankTransactions(startDate: Date, endDate: Date, userId: string) {

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

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

package/services/quickbooks.service.ts

@@ -13,7 +13,7 @@ import { EChargeType } from '../db/reports.db';
 import { IBankView } from '../models/Banks.model';
 import { IQuickbooksAccount, QuickbooksAccount } from '../models/QuickbooksAccount.model';
 import { IQuickbooksUploadItem } from '../classes/quickbook-item';
-import { IUploadedBankTransaction } from '../models/UploadedBankTransaction.model';
+import { IUploadedBankTransactionWithMemo } from '../models/UploadedBankTransaction.model';
 import { BanksService } from './banks.service';
 import { BankUploadedTransactionsService } from './bank-uploaded-transactions.service';
 import { BorrowersDB } from './borrowers.db';
@@ -51,11 +51,6 @@ interface IQBOReportTransaction {
   class: string;
 }
 
-
-interface IUploadedBankTransactionWithMemo extends IUploadedBankTransaction {
-  splitMemo: string;
-}
-
 const headersIIF: IQBReportTransaction[] = [
   {
     service: '!TRNS',