gemcap-be-common 1.5.40 → 1.5.42

package/models/SalesItem.model.ts

@@ -0,0 +1,84 @@
+import mongoose, { Document } from 'mongoose';
+
+import { MODEL_NAMES } from './_models';
+import { ICollateralItem } from '../interfaces/collaterals.interface';
+import { IBBCSheetDoc } from './BBCSheet.model';
+import { IBBCDateDoc } from './BBCDate.model';
+
+export const SALES_FIELDS = [
+  '_id',
+  'sku',
+  'skuName',
+  'unitsSold',
+  'unitSalePrice',
+];
+
+
+export interface ISalesItem extends ICollateralItem {
+  sku: string;
+  skuName?: string;
+  unitsSold: number;
+  unitSalePrice: number;
+}
+
+export interface ISalesItemDoc extends Document, ISalesItem {
+}
+
+export interface ISalesItemDocWithCalculation extends ISalesItemDoc {
+  bbcSheet: IBBCSheetDoc;
+  bbc: IBBCDateDoc;
+  expireDays: number;
+  skuDays: number;
+  sheetName: string;
+  inventoryName: string;
+  advanceRate: number;
+  availability: number;
+}
+
+export interface ISalesItemAvailabilityWithGroups extends ISalesItemDocWithCalculation {
+  groups: string[];
+}
+
+interface IMatchedGroup {
+  groups: string[];
+  items: ISalesItemAvailabilityWithGroups[];
+}
+
+export interface IMatchedGroups {
+  [groupName: string]: IMatchedGroup;
+}
+
+export const SalesItemSchema = new mongoose.Schema(
+  {
+    bbcSheetId: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: MODEL_NAMES.BBCSheets,
+      required: true,
+    },
+    order: {
+      type: Number,
+      required: true,
+    },
+    sku: {
+      type: String,
+      trim: true,
+      required: true,
+    },
+    skuName: {
+      type: String,
+      trim: true,
+    },
+    unitsSold: {
+      type: Number,
+      required: true,
+    },
+    unitSalePrice: {
+      type: Number,
+      required: true,
+    },
+    __v: { type: Number, select: false },
+  },
+  { timestamps: true }
+);
+
+export const SalesItemModel: mongoose.Model<ISalesItemDoc> = mongoose.model<ISalesItemDoc>(MODEL_NAMES.salesItem, SalesItemSchema);

package/models/TermLoan.model.d.ts

@@ -74,11 +74,11 @@ export declare const TermLoanSchema: mongoose.Schema<any, mongoose.Model<any, an
     productId: mongoose.Types.ObjectId;
     actual: boolean;
     lastCalculated: Date;
+    primeRate: number;
     loanStartDate: Date;
     initialBalance: number;
     interestRate: number;
     adminRate: number;
-    primeRate: number;
     isMismatched: boolean;
     calculationStatus: string;
     __v?: number;
@@ -89,11 +89,11 @@ export declare const TermLoanSchema: mongoose.Schema<any, mongoose.Model<any, an
     productId: mongoose.Types.ObjectId;
     actual: boolean;
     lastCalculated: Date;
+    primeRate: number;
     loanStartDate: Date;
     initialBalance: number;
     interestRate: number;
     adminRate: number;
-    primeRate: number;
     isMismatched: boolean;
     calculationStatus: string;
     __v?: number;
@@ -104,11 +104,11 @@ export declare const TermLoanSchema: mongoose.Schema<any, mongoose.Model<any, an
     productId: mongoose.Types.ObjectId;
     actual: boolean;
     lastCalculated: Date;
+    primeRate: number;
     loanStartDate: Date;
     initialBalance: number;
     interestRate: number;
     adminRate: number;
-    primeRate: number;
     isMismatched: boolean;
     calculationStatus: string;
     __v?: number;

package/models/TermLoanCalculated.model.d.ts

@@ -74,6 +74,11 @@ export declare const TermLoanCalculatedSchema: mongoose.Schema<any, mongoose.Mod
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
+    payments: mongoose.Types.DocumentArray<{
+        amount: number;
+        paymentId: mongoose.Types.ObjectId;
+    }>;
+    adminFee: number;
     interestRate: number;
     termLoanId: mongoose.Types.ObjectId;
     relevantStatement: string;
@@ -81,20 +86,15 @@ export declare const TermLoanCalculatedSchema: mongoose.Schema<any, mongoose.Mod
     monthlyInterest: number;
     monthlyPrincipal: number;
     closingBalance: number;
-    adminFee: number;
     interestDaily: number;
     gracePeriod: boolean;
     amortization: boolean;
-    payments: mongoose.Types.DocumentArray<{
-        amount: number;
-        paymentId: mongoose.Types.ObjectId;
-    }>;
     disbursements: number;
     dailyResults: mongoose.Types.DocumentArray<{
-        interestRate: number;
         day: string;
         interest: number;
         paymentDate: boolean;
+        interestRate: number;
     }>;
     __v?: number;
     paymentDueDate?: Date;
@@ -102,6 +102,11 @@ export declare const TermLoanCalculatedSchema: mongoose.Schema<any, mongoose.Mod
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
+    payments: mongoose.Types.DocumentArray<{
+        amount: number;
+        paymentId: mongoose.Types.ObjectId;
+    }>;
+    adminFee: number;
     interestRate: number;
     termLoanId: mongoose.Types.ObjectId;
     relevantStatement: string;
@@ -109,20 +114,15 @@ export declare const TermLoanCalculatedSchema: mongoose.Schema<any, mongoose.Mod
     monthlyInterest: number;
     monthlyPrincipal: number;
     closingBalance: number;
-    adminFee: number;
     interestDaily: number;
     gracePeriod: boolean;
     amortization: boolean;
-    payments: mongoose.Types.DocumentArray<{
-        amount: number;
-        paymentId: mongoose.Types.ObjectId;
-    }>;
     disbursements: number;
     dailyResults: mongoose.Types.DocumentArray<{
-        interestRate: number;
         day: string;
         interest: number;
         paymentDate: boolean;
+        interestRate: number;
     }>;
     __v?: number;
     paymentDueDate?: Date;
@@ -130,6 +130,11 @@ export declare const TermLoanCalculatedSchema: mongoose.Schema<any, mongoose.Mod
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
+    payments: mongoose.Types.DocumentArray<{
+        amount: number;
+        paymentId: mongoose.Types.ObjectId;
+    }>;
+    adminFee: number;
     interestRate: number;
     termLoanId: mongoose.Types.ObjectId;
     relevantStatement: string;
@@ -137,20 +142,15 @@ export declare const TermLoanCalculatedSchema: mongoose.Schema<any, mongoose.Mod
     monthlyInterest: number;
     monthlyPrincipal: number;
     closingBalance: number;
-    adminFee: number;
     interestDaily: number;
     gracePeriod: boolean;
     amortization: boolean;
-    payments: mongoose.Types.DocumentArray<{
-        amount: number;
-        paymentId: mongoose.Types.ObjectId;
-    }>;
     disbursements: number;
     dailyResults: mongoose.Types.DocumentArray<{
-        interestRate: number;
         day: string;
         interest: number;
         paymentDate: boolean;
+        interestRate: number;
     }>;
     __v?: number;
     paymentDueDate?: Date;

package/models/UploadedFile.model.d.ts

@@ -42,8 +42,8 @@ export declare const UploadedFileSchema: mongoose.Schema<any, mongoose.Model<any
 } & {
     type: string;
     converted: boolean;
-    __v?: number;
     borrowerId?: mongoose.Types.ObjectId;
+    __v?: number;
     userId?: string;
     filename?: string;
     originalName?: string;
@@ -53,8 +53,8 @@ export declare const UploadedFileSchema: mongoose.Schema<any, mongoose.Model<any
 } & {
     type: string;
     converted: boolean;
-    __v?: number;
     borrowerId?: mongoose.Types.ObjectId;
+    __v?: number;
     userId?: string;
     filename?: string;
     originalName?: string;
@@ -64,8 +64,8 @@ export declare const UploadedFileSchema: mongoose.Schema<any, mongoose.Model<any
 } & {
     type: string;
     converted: boolean;
-    __v?: number;
     borrowerId?: mongoose.Types.ObjectId;
+    __v?: number;
     userId?: string;
     filename?: string;
     originalName?: string;

package/models/UploadedSheet.model.d.ts

@@ -46,24 +46,24 @@ export declare const UploadedSheetSchema: mongoose.Schema<any, mongoose.Model<an
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    sheetName: string;
     fileId: mongoose.Types.ObjectId;
+    sheetName: string;
     total: number;
     __v?: number;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    sheetName: string;
     fileId: mongoose.Types.ObjectId;
+    sheetName: string;
     total: number;
     __v?: number;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    sheetName: string;
     fileId: mongoose.Types.ObjectId;
+    sheetName: string;
     total: number;
     __v?: number;
 }> & {

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/models/_models.d.ts

@@ -111,6 +111,8 @@ export declare const MODEL_NAMES: {
     reserves: string;
     quickbooksAccounts: string;
     receivableItems: string;
+    sales: string;
+    salesItem: string;
     scorecard: string;
     scorecardAnswer: string;
     scorecardSubmission: string;

package/models/_models.js

@@ -114,6 +114,8 @@ exports.MODEL_NAMES = {
     reserves: 'reserves',
     quickbooksAccounts: 'quickbooks_accounts',
     receivableItems: 'receivableitems',
+    sales: 'sales',
+    salesItem: 'sales_items',
     scorecard: 'scorecards',
     scorecardAnswer: 'scorecard_answers',
     scorecardSubmission: 'scorecard_submissions',

package/models/_models.ts

@@ -113,6 +113,8 @@ export const MODEL_NAMES = {
   reserves: 'reserves',
   quickbooksAccounts: 'quickbooks_accounts',
   receivableItems: 'receivableitems',
+  sales: 'sales',
+  salesItem: 'sales_items',
   scorecard: 'scorecards',
   scorecardAnswer: 'scorecard_answers',
   scorecardSubmission: 'scorecard_submissions',

package/package.json

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

package/services/compliance-borrowers.service.d.ts

@@ -45,7 +45,7 @@ export declare class ComplianceBorrowersService {
         };
     };
     getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<any>;
-    getAllBorrowersShortened(userAccess: IUserAccess): Promise<(Pick<IComplianceBorrowerWithBorrower, "items" | "borrower" | "fundingStatus"> | {
+    getAllBorrowersShortened(userAccess: IUserAccess): Promise<(Pick<IComplianceBorrowerWithBorrower, "borrower" | "fundingStatus" | "items"> | {
         items: {
             instances: any[];
             item: import("../models/ComplianceItem.model").IComplianceItemDocument;

package/services/nodemailer.service.js

@@ -116,6 +116,7 @@ class NodemailerService {
             this.sentryService.catchErrorBySentry(null, err);
             throw err;
         }
+        console.debug({ info });
         console.log(info.envelope);
         console.log(info.messageId);
         console.log('Message sent: %s', info.messageId);
@@ -520,11 +521,9 @@ class NodemailerService {
             .replace('${signature}', signature);
         try {
             this.transporter.sendMail({
-                from: 'dev@blackfeatherfunding.com',
-                to: 'echonok@gmail.com',
-                // from: `${senderEmail.title} <${senderEmail.address}>`,
-                // to: email.addresses,
-                // cc: `${senderEmail.title} <${senderEmail.address}>`,
+                from: `${senderEmail.title} <${senderEmail.address}>`,
+                to: email.addresses,
+                cc: `${senderEmail.title} <${senderEmail.address}>`,
                 subject: email.subject,
                 text: email.subject,
                 html: replacedData,

package/services/nodemailer.service.ts

@@ -128,6 +128,7 @@ export class NodemailerService {
       this.sentryService.catchErrorBySentry(null, err);
       throw err;
     }
+    console.debug({ info });
     console.log(info.envelope);
     console.log(info.messageId);
     console.log('Message sent: %s', info.messageId);

package/services/uploads.service.js

@@ -61,6 +61,7 @@ const Equipment_model_1 = __importDefault(require("../models/Equipment.model"));
 const Reserve_model_1 = __importDefault(require("../models/Reserve.model"));
 const quickbook_item_1 = require("../classes/quickbook-item");
 const bank_uploaded_transaction_1 = require("../classes/bank-uploaded-transaction");
+const sales_item_1 = require("../classes/sales-item");
 const validators = {
     [validators_enums_1.EValidators.NOT_EMPTY]: (field, value) => {
         if (!value || value.toString().trim() === '') {
@@ -457,6 +458,7 @@ class UploadsService {
                     [collaterals_enum_1.ECollaterals.INVENTORY]: () => new inventory_item_1.InventoryItem(row, bbcDate, skuDates),
                     [collaterals_enum_1.ECollaterals.RECEIVABLE]: () => new receivable_item_1.ReceivableItem(row, bbcDate),
                     [collaterals_enum_1.ECollaterals.ACCOUNT_PAYABLE]: () => new payable_account_item_1.PayableAccountItem(row, bbcDate),
+                    [collaterals_enum_1.ECollaterals.SALES]: () => new sales_item_1.SalesItem(row, bbcDate),
                     [collaterals_enum_1.ECollaterals.LOAN_TRANSACTIONS]: async () => {
                         const newItem = new bank_transaction_item_1.LoanTransactionItem(row, this.borrowersDB);
                         const classErrors = await newItem.initialize();

package/services/uploads.service.ts

@@ -53,6 +53,7 @@ import { UserLogsService } from './user-logs.service';
 import { LockService } from './lock.service';
 import { BorrowersDB } from './borrowers.db';
 import { UsersService } from './users.service';
+import { SalesItem } from '../classes/sales-item';
 
 interface IMappedColumns {
   [columnName: string]: number;
@@ -514,6 +515,7 @@ export class UploadsService {
           [ECollaterals.INVENTORY]: () => new InventoryItem(row, bbcDate, skuDates),
           [ECollaterals.RECEIVABLE]: () => new ReceivableItem(row, bbcDate),
           [ECollaterals.ACCOUNT_PAYABLE]: () => new PayableAccountItem(row, bbcDate),
+          [ECollaterals.SALES]: () => new SalesItem(row, bbcDate),
           [ECollaterals.LOAN_TRANSACTIONS]: async () => {
             const newItem = new LoanTransactionItem(row, this.borrowersDB);
             const classErrors = await newItem.initialize();