gemcap-be-common 1.5.42 → 1.5.44

package/helpers/column-desciptions.helper.js

@@ -221,25 +221,33 @@ exports.COLLATERALS = {
             validators: [validators_enums_1.EValidators.NOT_EMPTY, validators_enums_1.EValidators.IS_DATE],
         },
         {
-            db_title: 'apDate',
-            title: 'AP date',
-            required: false,
+            db_title: 'sku',
+            title: 'SKU',
+            required: true,
             items: [],
-            validators: [validators_enums_1.EValidators.NOT_EMPTY, validators_enums_1.EValidators.IS_DATE],
-            isDate: true,
+            validators: [validators_enums_1.EValidators.NOT_EMPTY],
         },
-        { db_title: 'poNumber', title: 'PO number', required: false, items: [] },
-        { db_title: 'customerName', title: 'Customer name', required: false, items: [] },
         {
-            db_title: 'amount',
-            title: 'Amount',
+            db_title: 'skuName',
+            title: 'SKU Name',
+            required: true,
+            items: [],
+            validators: [validators_enums_1.EValidators.NOT_EMPTY],
+        },
+        {
+            db_title: 'unitsSold',
+            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: 'unitSalePrice',
+            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],
         },
-        { db_title: 'otherInformation1', title: 'Other Information 1', required: false, items: [] },
-        { db_title: 'otherInformation2', title: 'Other Information 2', required: false, items: [] },
-        { db_title: 'otherInformation3', title: 'Other Information 3', required: false, items: [] },
     ],
     [collaterals_enum_1.ECollaterals.LOAN_TRANSACTIONS]: [
         {

package/helpers/column-desciptions.helper.ts

@@ -221,25 +221,33 @@ COLLATERALS = {
       validators: [EValidators.NOT_EMPTY, EValidators.IS_DATE],
     },
     {
-      db_title: 'apDate',
-      title: 'AP date',
-      required: false,
+      db_title: 'sku',
+      title: 'SKU',
+      required: true,
       items: [],
-      validators: [EValidators.NOT_EMPTY, EValidators.IS_DATE],
-      isDate: true,
+      validators: [EValidators.NOT_EMPTY],
     },
-    { db_title: 'poNumber', title: 'PO number', required: false, items: [] },
-    { db_title: 'customerName', title: 'Customer name', required: false, items: [] },
     {
-      db_title: 'amount',
-      title: 'Amount',
+      db_title: 'skuName',
+      title: 'SKU Name',
+      required: true,
+      items: [],
+      validators: [EValidators.NOT_EMPTY],
+    },
+    {
+      db_title: 'unitsSold',
+      title: 'Units Sold',
+      required: true,
+      items: [],
+      validators: [EValidators.NOT_EMPTY, EValidators.IS_NUMBER, EValidators.NUMBER_GT_NULL],
+    },
+    {
+      db_title: 'unitSalePrice',
+      title: 'Unit Sale Price',
       required: true,
       items: [],
       validators: [EValidators.NOT_EMPTY, EValidators.IS_NUMBER, EValidators.NUMBER_GT_NULL],
     },
-    { db_title: 'otherInformation1', title: 'Other Information 1', required: false, items: [] },
-    { db_title: 'otherInformation2', title: 'Other Information 2', required: false, items: [] },
-    { db_title: 'otherInformation3', title: 'Other Information 3', required: false, items: [] },
   ],
   [ECollaterals.LOAN_TRANSACTIONS]: [
     {

package/models/QueryResult.model.d.ts

@@ -36,7 +36,8 @@ export declare enum EQueriesGroups {
     INVENTORY = "INVENTORY",
     RECEIVABLE = "RECEIVABLE",
     OTHER = "OTHER",
-    CASH = "CASH"
+    CASH = "CASH",
+    SALES = "SALES"
 }
 export declare enum EChartsInventory {
     BENFORD = "BENFORD",
@@ -71,6 +72,9 @@ export declare enum EChartsCash {
     TRANSACTIONS = "TRANSACTIONS",
     DELUTION = "DELUTION"
 }
+export declare enum EChartsSales {
+    FOR_PERIOD = "FOR_PERIOD"
+}
 export declare enum EFilterParams {
     NONE = "NONE",
     BBC = "BBC",
@@ -97,6 +101,9 @@ type TQueryGroups = {
     [EQueriesGroups.CASH]: {
         [key in EChartsCash]: IQueryDetail;
     };
+    [EQueriesGroups.SALES]: {
+        [key in EChartsSales]: IQueryDetail;
+    };
 };
 export declare const QUERY_GROUPS: TQueryGroups;
 export interface IQueryResult {

package/models/QueryResult.model.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryResult = exports.QueryResultSchema = exports.QUERY_GROUPS = exports.EFilterParams = exports.EChartsCash = exports.EChartsMisc = exports.EChartsReceivable = exports.EChartsInventory = exports.EQueriesGroups = void 0;
+exports.QueryResult = exports.QueryResultSchema = exports.QUERY_GROUPS = exports.EFilterParams = exports.EChartsSales = exports.EChartsCash = exports.EChartsMisc = exports.EChartsReceivable = exports.EChartsInventory = exports.EQueriesGroups = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const _models_1 = require("./_models");
 const unit_cost_difference_1 = require("../queries/inventory/unit-cost-difference");
@@ -24,6 +24,7 @@ var EQueriesGroups;
     EQueriesGroups["RECEIVABLE"] = "RECEIVABLE";
     EQueriesGroups["OTHER"] = "OTHER";
     EQueriesGroups["CASH"] = "CASH";
+    EQueriesGroups["SALES"] = "SALES";
 })(EQueriesGroups || (exports.EQueriesGroups = EQueriesGroups = {}));
 var EChartsInventory;
 (function (EChartsInventory) {
@@ -62,6 +63,10 @@ var EChartsCash;
     EChartsCash["TRANSACTIONS"] = "TRANSACTIONS";
     EChartsCash["DELUTION"] = "DELUTION";
 })(EChartsCash || (exports.EChartsCash = EChartsCash = {}));
+var EChartsSales;
+(function (EChartsSales) {
+    EChartsSales["FOR_PERIOD"] = "FOR_PERIOD";
+})(EChartsSales || (exports.EChartsSales = EChartsSales = {}));
 var EFilterParams;
 (function (EFilterParams) {
     EFilterParams["NONE"] = "NONE";
@@ -179,6 +184,9 @@ exports.QUERY_GROUPS = {
         [EChartsCash.TRANSACTIONS]: { scheduled: false, queryAPI: 'transactions', queryFunction: null },
         [EChartsCash.DELUTION]: { scheduled: false, queryAPI: 'delution', queryFunction: null },
     },
+    [EQueriesGroups.SALES]: {
+        [EChartsSales.FOR_PERIOD]: { scheduled: false, queryAPI: 'sales-for-period', queryFunction: null },
+    }
 };
 exports.QueryResultSchema = new mongoose_1.default.Schema({
     query: {

package/models/QueryResult.model.ts

@@ -27,6 +27,7 @@ export enum EQueriesGroups {
   RECEIVABLE = 'RECEIVABLE',
   OTHER = 'OTHER',
   CASH = 'CASH',
+  SALES = 'SALES',
 }
 
 export enum EChartsInventory {
@@ -66,6 +67,11 @@ export enum EChartsCash {
   DELUTION = 'DELUTION',
 }
 
+export enum EChartsSales {
+  FOR_PERIOD = 'FOR_PERIOD',
+}
+
+
 export enum EFilterParams {
   NONE = 'NONE',
   BBC = 'BBC',
@@ -94,6 +100,9 @@ type TQueryGroups = {
   [EQueriesGroups.CASH]: {
     [key in EChartsCash]: IQueryDetail;
   };
+  [EQueriesGroups.SALES]: {
+    [key in EChartsSales]: IQueryDetail;
+  };
 };
 
 export const QUERY_GROUPS: TQueryGroups = {
@@ -209,6 +218,10 @@ export const QUERY_GROUPS: TQueryGroups = {
     [EChartsCash.TRANSACTIONS]: { scheduled: false, queryAPI: 'transactions', queryFunction: null },
     [EChartsCash.DELUTION]: { scheduled: false, queryAPI: 'delution', queryFunction: null },
   },
+
+  [EQueriesGroups.SALES]: {
+    [EChartsSales.FOR_PERIOD]: { scheduled: false, queryAPI: 'sales-for-period', queryFunction: null },
+  }
 };
 
 

package/models/_index.d.ts

@@ -32,9 +32,9 @@ export declare const allSchemas: {
         updatedAt: NativeDate;
     } & {
         order: number;
-        amount: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
+        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -46,9 +46,9 @@ export declare const allSchemas: {
         updatedAt: NativeDate;
     } & {
         order: number;
-        amount: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
+        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;
@@ -60,9 +60,9 @@ export declare const allSchemas: {
         updatedAt: NativeDate;
     } & {
         order: number;
-        amount: number;
         bbcSheetId: import("mongoose").Types.ObjectId;
         apDate: Date;
+        amount: number;
         __v?: number;
         poNumber?: string;
         customerName?: string;

package/package.json

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

package/services/borrowers.service.js

@@ -17,6 +17,7 @@ const BorrowerDataReceivable_model_1 = require("../models/BorrowerDataReceivable
 const BorrowerDataInventory_model_1 = require("../models/BorrowerDataInventory.model");
 const BorrowerDataTerm_model_1 = require("../models/BorrowerDataTerm.model");
 const BorrowerDataBootCollateral_model_1 = require("../models/BorrowerDataBootCollateral.model");
+const collaterals_enum_1 = require("../enums/collaterals.enum");
 exports.borrowerDataModels = {
     receivables: BorrowerDataReceivable_model_1.BorrowerDataReceivableModel,
     inventories: BorrowerDataInventory_model_1.BorrowerDataInventoryModel,
@@ -80,11 +81,11 @@ class BorrowerService {
         const defaultSettings = {
             borrower: new mongoose_1.default.Types.ObjectId(borrowerId),
             queries: {
-                inventory: {},
-                receivable: {},
-                'account payable': {},
-                other: {},
-                cash: {},
+                [collaterals_enum_1.ECollaterals.INVENTORY]: {},
+                [collaterals_enum_1.ECollaterals.RECEIVABLE]: {},
+                [collaterals_enum_1.ECollaterals.OTHER]: {},
+                [collaterals_enum_1.ECollaterals.CASH]: {},
+                [collaterals_enum_1.ECollaterals.SALES]: {},
             },
             dataTypes: {
                 upload: [],

package/services/borrowers.service.ts

@@ -25,6 +25,7 @@ import { LoanStatementStatusService } from './loan-statement-status.service';
 import { LoanTransactionsService } from './loan-transactions.service';
 import { SignsService } from './signs.service';
 import { IUser, IUserAccess } from '../interfaces/auth-user.interface';
+import { ECollaterals } from '../enums/collaterals.enum';
 
 export const borrowerDataModels: {
   [modelName: string]: mongoose.Model<any>
@@ -96,11 +97,11 @@ export class BorrowerService {
     const defaultSettings: IBorrowerSettings = {
       borrower: new mongoose.Types.ObjectId(borrowerId),
       queries: {
-        inventory: {},
-        receivable: {},
-        'account payable': {},
-        other: {},
-        cash: {},
+        [ECollaterals.INVENTORY]: {},
+        [ECollaterals.RECEIVABLE]: {},
+        [ECollaterals.OTHER]: {},
+        [ECollaterals.CASH]: {},
+        [ECollaterals.SALES]: {},
       },
       dataTypes: {
         upload: [],