gemcap-be-common 1.5.74 → 1.5.76

package/classes/sales-item.d.ts

@@ -7,6 +7,7 @@ interface ISalesLocal {
     unitSalePrice?: number;
     salesPeriodStart?: Date;
     salesPeriodEnd?: Date;
+    salesPerDay?: number;
 }
 export declare class SalesItem implements ISalesLocal {
     bbcDate: Date;
@@ -17,6 +18,9 @@ export declare class SalesItem implements ISalesLocal {
     unitSalePrice: number;
     salesPeriodStart: Date | null;
     salesPeriodEnd: Date | null;
-    constructor(item: Partial<SalesItem>, bbcDate?: any);
+    salesPerDay?: number;
+    constructor(item: Partial<SalesItem>, bbcDate: any, options: {
+        [extraOption: string]: string;
+    });
 }
 export {};

package/classes/sales-item.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SalesItem = void 0;
 const lodash_1 = __importDefault(require("lodash"));
+const dayjs_1 = __importDefault(require("dayjs"));
 const column_desciptions_helper_1 = require("../helpers/column-desciptions.helper");
 const collaterals_enum_1 = require("../enums/collaterals.enum");
 class SalesItem {
@@ -16,7 +17,16 @@ class SalesItem {
     unitSalePrice = 0;
     salesPeriodStart = null;
     salesPeriodEnd = null;
-    constructor(item, bbcDate = null) {
+    salesPerDay = 0;
+    constructor(item, bbcDate = null, options) {
+        if (options && options.salesPeriodStart) {
+            item.salesPeriodStart = dayjs_1.default.utc(options.salesPeriodStart).toDate();
+        }
+        if (options && options.salesPeriodEnd) {
+            item.salesPeriodEnd = dayjs_1.default.utc(options.salesPeriodEnd).toDate();
+        }
+        const salesPeriod = dayjs_1.default.utc(item.salesPeriodStart).diff(dayjs_1.default.utc(options.salesPeriodEnd), 'day');
+        this.salesPerDay = salesPeriod > 0 ? item.unitsSold / salesPeriod : 0;
         const itemWithDates = (0, column_desciptions_helper_1.convertIntoDates)(item, collaterals_enum_1.ECollaterals.SALES);
         const itemWithoutNulls = lodash_1.default.omitBy(itemWithDates, (value) => value === null);
         Object.assign(this, itemWithoutNulls);

package/classes/sales-item.ts

@@ -1,4 +1,5 @@
 import _ from 'lodash';
+import dayjs from 'dayjs';
 
 import { convertIntoDates } from '../helpers/column-desciptions.helper';
 import { ECollaterals } from '../enums/collaterals.enum';
@@ -12,6 +13,7 @@ interface ISalesLocal {
   unitSalePrice?: number;
   salesPeriodStart?: Date;
   salesPeriodEnd?: Date;
+  salesPerDay?: number;
 }
 
 export class SalesItem implements ISalesLocal {
@@ -24,8 +26,17 @@ export class SalesItem implements ISalesLocal {
   unitSalePrice: number = 0;
   salesPeriodStart: Date | null = null;
   salesPeriodEnd: Date | null = null;
+  salesPerDay?: number = 0;
 
-  constructor(item: Partial<SalesItem>, bbcDate = null) {
+  constructor(item: Partial<SalesItem>, bbcDate = null, options: { [extraOption: string]: string }) {
+    if (options && options.salesPeriodStart) {
+      item.salesPeriodStart = dayjs.utc(options.salesPeriodStart).toDate();
+    }
+    if (options && options.salesPeriodEnd) {
+      item.salesPeriodEnd = dayjs.utc(options.salesPeriodEnd).toDate();
+    }
+    const salesPeriod = dayjs.utc(item.salesPeriodStart).diff(dayjs.utc(options.salesPeriodEnd), 'day');
+    this.salesPerDay = salesPeriod > 0 ? item.unitsSold / salesPeriod : 0;
     const itemWithDates = convertIntoDates(item, ECollaterals.SALES);
     const itemWithoutNulls = _.omitBy(itemWithDates, (value) => value === null);
     Object.assign(this, itemWithoutNulls);

package/db/collaterals.db.d.ts

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

package/helpers/column-desciptions.helper.js

@@ -260,14 +260,14 @@ exports.COLLATERALS = {
             title: 'Sales period start',
             required: true,
             items: [],
-            validators: [validators_enums_1.EValidators.NOT_EMPTY, validators_enums_1.EValidators.IS_DATE],
+            validators: [validators_enums_1.EValidators.IS_DATE],
         },
         {
             db_title: 'salesPeriodEnd',
             title: 'Sales period end',
             required: true,
             items: [],
-            validators: [validators_enums_1.EValidators.NOT_EMPTY, validators_enums_1.EValidators.IS_DATE],
+            validators: [validators_enums_1.EValidators.IS_DATE],
         },
     ],
     [collaterals_enum_1.ECollaterals.LOAN_TRANSACTIONS]: [

package/helpers/column-desciptions.helper.ts

@@ -260,14 +260,14 @@ COLLATERALS = {
       title: 'Sales period start',
       required: true,
       items: [],
-      validators: [EValidators.NOT_EMPTY, EValidators.IS_DATE],
+      validators: [EValidators.IS_DATE],
     },
     {
       db_title: 'salesPeriodEnd',
       title: 'Sales period end',
       required: true,
       items: [],
-      validators: [EValidators.NOT_EMPTY, EValidators.IS_DATE],
+      validators: [EValidators.IS_DATE],
     },
   ],
   [ECollaterals.LOAN_TRANSACTIONS]: [

package/models/SalesItem.model.d.ts

@@ -37,6 +37,7 @@ export interface ISalesItem extends ICollateralItem {
     unitSalePrice?: number;
     salesPeriodStart: Date;
     salesPeriodEnd: Date;
+    salesPerDay: number;
 }
 export interface ISalesItemLean extends ISalesItem {
     _id: mongoose.Types.ObjectId;
@@ -66,6 +67,7 @@ export declare const SalesItemSchema: mongoose.Schema<any, mongoose.Model<any, a
     unitSalePrice?: number;
     salesPeriodStart?: Date;
     salesPeriodEnd?: Date;
+    salesPerDay?: number;
     __v?: number;
 }, mongoose.Document<unknown, {}, mongoose.FlatRecord<{
     createdAt: NativeDate;
@@ -80,6 +82,7 @@ export declare const SalesItemSchema: mongoose.Schema<any, mongoose.Model<any, a
     unitSalePrice?: number;
     salesPeriodStart?: Date;
     salesPeriodEnd?: Date;
+    salesPerDay?: number;
     __v?: number;
 }>> & mongoose.FlatRecord<{
     createdAt: NativeDate;
@@ -94,6 +97,7 @@ export declare const SalesItemSchema: mongoose.Schema<any, mongoose.Model<any, a
     unitSalePrice?: number;
     salesPeriodStart?: Date;
     salesPeriodEnd?: Date;
+    salesPerDay?: number;
     __v?: number;
 }> & {
     _id: mongoose.Types.ObjectId;

package/models/SalesItem.model.js

@@ -15,6 +15,7 @@ exports.SALES_FIELDS = [
     'unitSalePrice',
     'salesPeriodStart',
     'salesPeriodEnd',
+    'salesPerDay',
 ];
 exports.SalesItemSchema = new mongoose_1.default.Schema({
     bbcSheetId: {
@@ -54,6 +55,9 @@ exports.SalesItemSchema = new mongoose_1.default.Schema({
     salesPeriodEnd: {
         type: Date,
     },
+    salesPerDay: {
+        type: Number,
+    },
     __v: { type: Number, select: false },
 }, { timestamps: true });
 exports.SalesItem = mongoose_1.default.model(_models_1.MODEL_NAMES.salesItem, exports.SalesItemSchema);

package/models/SalesItem.model.ts

@@ -12,6 +12,7 @@ export const SALES_FIELDS = [
   'unitSalePrice',
   'salesPeriodStart',
   'salesPeriodEnd',
+  'salesPerDay',
 ];
 
 export interface ISalesItem extends ICollateralItem {
@@ -22,6 +23,7 @@ export interface ISalesItem extends ICollateralItem {
   unitSalePrice?: number;
   salesPeriodStart: Date;
   salesPeriodEnd: Date;
+  salesPerDay: number;
 }
 
 export interface ISalesItemLean extends ISalesItem {
@@ -80,9 +82,12 @@ export const SalesItemSchema = new mongoose.Schema(
     salesPeriodEnd: {
       type: Date,
     },
+    salesPerDay: {
+      type: Number,
+    },
     __v: { type: Number, select: false },
   },
   { timestamps: true }
 );
 
-export const SalesItem = mongoose.model<ICollateralItem, TSalesItemModel>(MODEL_NAMES.salesItem, SalesItemSchema);
+export const SalesItem = mongoose.model<ISalesItem, TSalesItemModel>(MODEL_NAMES.salesItem, SalesItemSchema);

package/models/_index.d.ts

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

package/package.json

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

package/services/borrowers.service.d.ts

@@ -86,10 +86,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/uploads.service.js

@@ -458,7 +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.SALES]: () => new sales_item_1.SalesItem(row, bbcDate, mapData.extraOptions),
                     [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

@@ -515,7 +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.SALES]: () => new SalesItem(row, bbcDate, mapData.extraOptions),
           [ECollaterals.LOAN_TRANSACTIONS]: async () => {
             const newItem = new LoanTransactionItem(row, this.borrowersDB);
             const classErrors = await newItem.initialize();