gemcap-be-common 1.5.47 → 1.5.49

package/classes/sales-item.d.ts

@@ -3,13 +3,15 @@ interface ISalesLocal {
     sku: string;
     skuName: string;
     unitsSold: number;
-    unitSalePrice: number;
+    unitsCost?: number;
+    unitSalePrice?: number;
 }
 export declare class SalesItem implements ISalesLocal {
     bbcDate: Date;
     sku: string;
     skuName: string;
     unitsSold: number;
+    unitsCost: number;
     unitSalePrice: number;
     constructor(item: Partial<SalesItem>, bbcDate?: any);
 }

package/classes/sales-item.js

@@ -12,6 +12,7 @@ class SalesItem {
     sku = '';
     skuName = '';
     unitsSold = 0;
+    unitsCost = 0;
     unitSalePrice = 0;
     constructor(item, bbcDate = null) {
         const itemWithDates = (0, column_desciptions_helper_1.convertIntoDates)(item, collaterals_enum_1.ECollaterals.SALES);

package/classes/sales-item.ts

@@ -8,7 +8,8 @@ interface ISalesLocal {
   sku: string;
   skuName: string;
   unitsSold: number;
-  unitSalePrice: number;
+  unitsCost?: number;
+  unitSalePrice?: number;
 }
 
 export class SalesItem implements ISalesLocal {
@@ -17,6 +18,7 @@ export class SalesItem implements ISalesLocal {
   sku: string = '';
   skuName: string = '';
   unitsSold: number = 0;
+  unitsCost: number = 0;
   unitSalePrice: number = 0;
 
   constructor(item: Partial<SalesItem>, bbcDate = null) {

package/db/collaterals.db.d.ts

@@ -77,7 +77,7 @@ export declare const createQuery: (groupFields: {
         };
     };
     itemQueries: any;
-    enumKey: "INVENTORY" | "RECEIVABLE" | "ACCOUNT_PAYABLE" | "SALES" | "OTHER" | "CASH" | "LOAN_TRANSACTIONS" | "QUICKBOOKS" | "UPLOADED_BANK_TRANSACTIONS";
+    enumKey: "INVENTORY" | "RECEIVABLE" | "ACCOUNT_PAYABLE" | "SALES" | "LOAN_TRANSACTIONS" | "UPLOADED_BANK_TRANSACTIONS" | "QUICKBOOKS" | "OTHER" | "CASH";
 };
 export declare const ITEMS_PAGINATION: (paginatorOptions: IPaginatorOptions) => ({
     $skip: number;

package/helpers/column-desciptions.helper.js

@@ -236,17 +236,24 @@ exports.COLLATERALS = {
         },
         {
             db_title: 'unitsSold',
-            title: 'Units Sold',
+            title: 'Units sold',
             required: true,
             items: [],
             validators: [validators_enums_1.EValidators.NOT_EMPTY, validators_enums_1.EValidators.IS_NUMBER, validators_enums_1.EValidators.NUMBER_GT_NULL],
         },
+        {
+            db_title: 'unitsCost',
+            title: 'Units cost',
+            required: true,
+            items: [],
+            validators: [validators_enums_1.EValidators.IS_NUMBER],
+        },
         {
             db_title: 'unitSalePrice',
-            title: 'Unit Sale Price',
+            title: 'Unit sale price',
             required: true,
             items: [],
-            validators: [validators_enums_1.EValidators.NOT_EMPTY, validators_enums_1.EValidators.IS_NUMBER, validators_enums_1.EValidators.NUMBER_GT_NULL],
+            validators: [validators_enums_1.EValidators.IS_NUMBER],
         },
     ],
     [collaterals_enum_1.ECollaterals.LOAN_TRANSACTIONS]: [

package/helpers/column-desciptions.helper.ts

@@ -236,17 +236,24 @@ COLLATERALS = {
     },
     {
       db_title: 'unitsSold',
-      title: 'Units Sold',
+      title: 'Units sold',
       required: true,
       items: [],
       validators: [EValidators.NOT_EMPTY, EValidators.IS_NUMBER, EValidators.NUMBER_GT_NULL],
     },
+    {
+      db_title: 'unitsCost',
+      title: 'Units cost',
+      required: true,
+      items: [],
+      validators: [EValidators.IS_NUMBER],
+    },
     {
       db_title: 'unitSalePrice',
-      title: 'Unit Sale Price',
+      title: 'Unit sale price',
       required: true,
       items: [],
-      validators: [EValidators.NOT_EMPTY, EValidators.IS_NUMBER, EValidators.NUMBER_GT_NULL],
+      validators: [EValidators.IS_NUMBER],
     },
   ],
   [ECollaterals.LOAN_TRANSACTIONS]: [

package/models/BBCDate.model.js

@@ -7,6 +7,7 @@ exports.BBCDateModel = exports.BBCDateSchema = exports.ICreateBBCDateSchema = vo
 const joi_1 = __importDefault(require("joi"));
 const mongoose_1 = __importDefault(require("mongoose"));
 const _models_1 = require("./_models");
+const BBCSheet_model_1 = require("./BBCSheet.model");
 const mongooseLeanId = require('../plugins/id.plugin');
 exports.ICreateBBCDateSchema = joi_1.default.object({
     date: joi_1.default.date().required(),
@@ -27,4 +28,8 @@ exports.BBCDateSchema = new mongoose_1.default.Schema({
     __v: { type: Number, select: false },
 }, { timestamps: true });
 exports.BBCDateSchema.plugin(mongooseLeanId);
+BBCSheet_model_1.BBCSheetSchema.index({
+    borrowerId: 1,
+    bbcDate: 1,
+});
 exports.BBCDateModel = mongoose_1.default.model(_models_1.MODEL_NAMES.BBCDates, exports.BBCDateSchema);

package/models/BBCDate.model.ts

@@ -3,6 +3,7 @@ import mongoose, { Document } from 'mongoose';
 
 import { MODEL_NAMES } from './_models';
 import { ILoanStatementStatus } from './LoanStatementStatus.model';
+import { BBCSheetSchema } from './BBCSheet.model';
 
 const mongooseLeanId = require('../plugins/id.plugin');
 
@@ -67,4 +68,9 @@ export const BBCDateSchema = new mongoose.Schema(
 
 BBCDateSchema.plugin(mongooseLeanId);
 
+BBCSheetSchema.index({
+  borrowerId: 1,
+  bbcDate: 1,
+});
+
 export const BBCDateModel: mongoose.Model<IBBCDateDoc> = mongoose.model<IBBCDateDoc>(MODEL_NAMES.BBCDates, BBCDateSchema);

package/models/SalesItem.model.d.ts

@@ -29,7 +29,8 @@ export interface ISalesItem extends ICollateralItem {
     sku: string;
     skuName?: string;
     unitsSold: number;
-    unitSalePrice: number;
+    unitsCost?: number;
+    unitSalePrice?: number;
 }
 export interface ISalesItemLean extends ISalesItem {
     _id: mongoose.Types.ObjectId;
@@ -50,35 +51,38 @@ export declare const SalesItemSchema: mongoose.Schema<any, mongoose.Model<any, a
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    bbcSheetId: mongoose.Types.ObjectId;
-    order: number;
     sku: string;
     unitsSold: number;
-    unitSalePrice: number;
-    __v?: number;
+    bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     skuName?: string;
+    unitsCost?: number;
+    unitSalePrice?: number;
+    __v?: number;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    bbcSheetId: mongoose.Types.ObjectId;
-    order: number;
     sku: string;
     unitsSold: number;
-    unitSalePrice: number;
-    __v?: number;
+    bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     skuName?: string;
+    unitsCost?: number;
+    unitSalePrice?: number;
+    __v?: number;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
     updatedAt: NativeDate;
 } & {
-    bbcSheetId: mongoose.Types.ObjectId;
-    order: number;
     sku: string;
     unitsSold: number;
-    unitSalePrice: number;
-    __v?: number;
+    bbcSheetId: mongoose.Types.ObjectId;
+    order: number;
     skuName?: string;
+    unitsCost?: number;
+    unitSalePrice?: number;
+    __v?: number;
 }> & {
     _id: mongoose.Types.ObjectId;
 }>;

package/models/SalesItem.model.js

@@ -11,6 +11,7 @@ exports.SALES_FIELDS = [
     'sku',
     'skuName',
     'unitsSold',
+    'unitsCost',
     'unitSalePrice',
 ];
 exports.SalesItemSchema = new mongoose_1.default.Schema({
@@ -31,14 +32,19 @@ exports.SalesItemSchema = new mongoose_1.default.Schema({
     skuName: {
         type: String,
         trim: true,
+        required: false,
     },
     unitsSold: {
         type: Number,
         required: true,
     },
+    unitsCost: {
+        type: Number,
+        required: false,
+    },
     unitSalePrice: {
         type: Number,
-        required: true,
+        required: false,
     },
     __v: { type: Number, select: false },
 }, { timestamps: true });

package/models/SalesItem.model.ts

@@ -8,6 +8,7 @@ export const SALES_FIELDS = [
   'sku',
   'skuName',
   'unitsSold',
+  'unitsCost',
   'unitSalePrice',
 ];
 
@@ -15,7 +16,8 @@ export interface ISalesItem extends ICollateralItem {
   sku: string;
   skuName?: string;
   unitsSold: number;
-  unitSalePrice: number;
+  unitsCost?: number;
+  unitSalePrice?: number;
 }
 
 export interface ISalesItemLean extends ISalesItem {
@@ -54,14 +56,19 @@ export const SalesItemSchema = new mongoose.Schema(
     skuName: {
       type: String,
       trim: true,
+      required: false,
     },
     unitsSold: {
       type: Number,
       required: true,
     },
+    unitsCost: {
+      type: Number,
+      required: false,
+    },
     unitSalePrice: {
       type: Number,
-      required: true,
+      required: false,
     },
     __v: { type: Number, select: false },
   },

package/models/_index.d.ts

@@ -31,44 +31,44 @@ export declare const allSchemas: {
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
-        order: number;
         apDate: Date;
         amount: number;
-        __v?: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
+        order: number;
         poNumber?: string;
         customerName?: string;
         otherInformation1?: string;
         otherInformation2?: string;
         otherInformation3?: string;
+        __v?: number;
     }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
-        order: number;
         apDate: Date;
         amount: number;
-        __v?: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
+        order: number;
         poNumber?: string;
         customerName?: string;
         otherInformation1?: string;
         otherInformation2?: string;
         otherInformation3?: string;
+        __v?: number;
     }>> & import("mongoose").FlatRecord<{
         createdAt: NativeDate;
         updatedAt: NativeDate;
     } & {
-        bbcSheetId: import("mongoose").Types.ObjectId;
-        order: number;
         apDate: Date;
         amount: number;
-        __v?: number;
+        bbcSheetId: import("mongoose").Types.ObjectId;
+        order: number;
         poNumber?: string;
         customerName?: string;
         otherInformation1?: string;
         otherInformation2?: string;
         otherInformation3?: string;
+        __v?: number;
     }> & {
         _id: import("mongoose").Types.ObjectId;
     }>;

package/package.json

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

package/services/brokers.service.d.ts

@@ -46,9 +46,9 @@ export declare class BrokersService {
     getAllProductBrokers(): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & Required<{
         _id: import("mongoose").Types.ObjectId;
     }>)[]>;
-    getBorrowerBrokers(borrowerId: string): Promise<(import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & Required<{
+    getBorrowerBrokers(borrowerId: string): Promise<BrokerView[] | (import("mongoose").FlattenMaps<import("../models/ProductBroker.model").IProductBrokerDoc> & Required<{
         _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[]>;

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, "borrower" | "fundingStatus" | "items"> | {
+    getAllBorrowersShortened(userAccess: IUserAccess): Promise<(Pick<IComplianceBorrowerWithBorrower, "items" | "borrower" | "fundingStatus"> | {
         items: {
             instances: any[];
             item: import("../models/ComplianceItem.model").IComplianceItemDocument;

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 | Date | string[])[];
+            [x: string]: (string | number | string[] | Date)[];
         }[];
     }>;
     getBorrowerIdsForFile(transactionFileId: string): Promise<{