gemcap-be-common 1.5.122 → 1.5.124

package/services/availability.service.ts

@@ -31,10 +31,10 @@ import { MODEL_NAMES } from '../models/_models';
 import { setReceivableManualInputsToggle } from '../db/receivables.db';
 import { IInventoryAvailabilitySummary, InventoryAvailabilityPaginators } from '../models/InventoryAvailability.model';
 import { getBBCSheetsByType } from '../db/bbcSheets.db';
-import { CustomerGroupModel } from '../models/CustomerGroup.model';
+import { CustomerGroup } from '../models/CustomerGroup.model';
 import { getPartialPaid } from '../queries/receivable/partially-paid-restated';
 import MappedGroup from '../models/MappedGroup.model';
-import CustomerAPGroup from '../models/CustomerAPGroup.model';
+import { CustomerAPGroup } from '../models/CustomerAPGroup.model';
 import { getReserveDocs } from '../db/reserve.db';
 import { IReserveSummary } from '../models/Reserve.model';
 import { IEquipmentSummary } from '../models/Equipment.model';
@@ -120,7 +120,7 @@ export class AvailabilityService {
       const customerGroupMapped = await Promise.all(calculationsSettings[settingsKey].map(async (customerGroup) => {
         const idIsValid = isValidId(customerGroup.customer);
         if (idIsValid) {
-          const foundCustomerGroup = await CustomerGroupModel.findById(customerGroup.customer);
+          const foundCustomerGroup = await CustomerGroup.findById(customerGroup.customer);
           if (foundCustomerGroup) {
             return foundCustomerGroup.items.reduce((innerAcc, item) => ({
               ...innerAcc,
@@ -175,7 +175,7 @@ export class AvailabilityService {
 
     calculation.borrowerId = new mongoose.Types.ObjectId(receivables.borrowerId.toString());
 
-    const allCustomerGroups = await CustomerGroupModel.find({ borrowerId: receivables.borrowerId }).lean();
+    const allCustomerGroups = await CustomerGroup.find({ borrowerId: receivables.borrowerId }).lean();
 
     const enrichedEnrichedSettings = await this.recombineGroups(calculationsSettings);
 
@@ -411,7 +411,7 @@ export class AvailabilityService {
       const foundCustomerGroup = allCustomerGroups.find((group) => group.items.includes(data.customerTitle));
       if (foundCustomerGroup) {
         data.customer = foundCustomerGroup.groupName;
-        data.customerGroupId = foundCustomerGroup.id;
+        data.customerGroupId = foundCustomerGroup._id;
         data.customerGroup = foundCustomerGroup.groupName;
       }
 
@@ -468,7 +468,7 @@ export class AvailabilityService {
       switch (group.groupType) {
         case 'contras':
           if (isValidId(group.group1)) {
-            const foundGroup = await CustomerGroupModel.findById(group.group1).lean();
+            const foundGroup = await CustomerGroup.findById(group.group1).lean();
             groupCopy.items = foundGroup ? foundGroup.items.slice() : [];
           }
           if (isValidId(group.group2)) {

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]: {
-            SELECTED_PERIOD?: boolean;
             ENTIRE_LOAN?: boolean;
-            LAST_MONTH?: boolean;
+            SELECTED_PERIOD?: boolean;
             CURRENT_MONTH?: boolean;
+            LAST_MONTH?: boolean;
             TERM_LOAN?: boolean;
         };
     }>;

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

@@ -60,7 +60,7 @@ export declare class ComplianceBorrowersService {
     isComplianceBorrowerAllowed(userAccess: IUserAccess, requestedBorrowerId: string): boolean;
     calculateInstanceStatuses(instance: IBorrowerItemInstance, item: IBorrowerItemLean): IInstanceStatus;
     getFullComplianceBorrowerById(complianceBorrowerId: string): Promise<IComplianceBorrowerDocumentFullWithStatuses>;
-    getAllBorrowersShortened(userAccess: IUserAccess): Promise<Pick<IComplianceBorrowerWithBorrower, "borrower" | "fundingStatus" | "items">[]>;
+    getAllBorrowersShortened(userAccess: IUserAccess): Promise<Pick<IComplianceBorrowerWithBorrower, "items" | "borrower" | "fundingStatus">[]>;
     generateInstances(complianceBorrowerId: any): Promise<IComplianceBorrowerDocumentFullWithStatuses>;
     calculateAndUpdateFundingStatus(complianceBorrowerId: string): Promise<void>;
     calculateFundingStatus(complianceBorrower: IComplianceBorrowerDocumentFull): string;

package/services/groups.service.js

@@ -26,16 +26,7 @@ class GroupsService {
         }));
     }
     async getBorrowerGroups(borrowerId, relationshipGroups) {
-        if (typeof relationshipGroups == 'string') {
-            relationshipGroups = [relationshipGroups];
-        }
-        const allCustomerGroups = await Promise.all(relationshipGroups.map(async (groupName) => {
-            const groups = await groups_db_1.groupsMap[groupName].Model.find({ borrowerId }).sort({ 'createdAt': 1 });
-            return { [groupName]: groups };
-        }));
-        return allCustomerGroups.reduce((acc, group) => {
-            return { ...acc, ...group };
-        }, {});
+        return (0, groups_db_1.getBorrowerGroups)(borrowerId, relationshipGroups);
     }
     async createMappedGroups(borrowerId, groupType, groups) {
         await MappedGroup_model_1.default.deleteMany({ borrowerId, groupType });

package/services/groups.service.ts

@@ -1,13 +1,13 @@
 import { IBorrowerGroupWithId } from '../interfaces/group.interface';
-import { ICustomerGroupDocument } from '../models/CustomerGroup.model';
-import { groupsMap } from '../db/groups.db';
+import { TCustomerGroupDoc } from '../models/CustomerGroup.model';
+import { getBorrowerGroups, groupsMap } from '../db/groups.db';
 
 import MappedGroup, { IMappedGroup } from '../models/MappedGroup.model';
 
 export class GroupsService {
   async createBorrowerGroups(borrowerId: string, groupType: string, groups: IBorrowerGroupWithId[]) {
     const groupIds = groups.map((group) => group._id);
-    const allExistedGroups: ICustomerGroupDocument[] = await groupsMap[groupType].Model.find({ borrowerId }).lean();
+    const allExistedGroups: TCustomerGroupDoc[] = await groupsMap[groupType].Model.find({ borrowerId }).lean();
     await Promise.all(allExistedGroups.map(async (group) => {
       if (!groupIds.includes(group._id.toString())) {
         await groupsMap[groupType].Model.findByIdAndDelete(group._id.toString());
@@ -24,16 +24,7 @@ export class GroupsService {
   }
 
   async getBorrowerGroups(borrowerId: string, relationshipGroups: string | string[]) {
-    if (typeof relationshipGroups == 'string') {
-      relationshipGroups = [relationshipGroups];
-    }
-    const allCustomerGroups = await Promise.all(relationshipGroups.map(async (groupName) => {
-      const groups = await groupsMap[groupName].Model.find({ borrowerId }).sort({ 'createdAt': 1 });
-      return { [groupName]: groups };
-    }))
-    return allCustomerGroups.reduce((acc, group) => {
-      return { ...acc, ...group };
-    }, {});
+    return getBorrowerGroups(borrowerId, relationshipGroups);
   }
 
   async createMappedGroups(borrowerId: string, groupType: string, groups: IMappedGroup[]) {

package/services/inventory.service.js

@@ -214,7 +214,7 @@ class InventoryService {
             if (customerAPGroup) {
                 const mappedGroup = await (0, groups_1.getMappedGroups)({ group2: customerAPGroup._id.toString() });
                 if (mappedGroup && mappedGroup.length) {
-                    const customerGroup = await CustomerGroup_model_1.CustomerGroupModel.findById(mappedGroup[0].group1);
+                    const customerGroup = await CustomerGroup_model_1.CustomerGroup.findById(mappedGroup[0].group1);
                     if (customerGroup) {
                         contra.newAPName = customerAPGroup.groupName;
                         contra.contra = 1;

package/services/inventory.service.ts

@@ -18,7 +18,7 @@ import { getInventoryTurn } from '../queries/inventory/turn';
 import { getInconsistentData } from '../queries/inventory/inconsistent-data';
 import { getInvoiceMovement } from '../queries/inventory/movement';
 import { getExtension } from '../queries/inventory/extension';
-import { CustomerGroupModel } from '../models/CustomerGroup.model';
+import { CustomerGroup } from '../models/CustomerGroup.model';
 import { getInventoryDifference } from '../queries/inventory/invoice-difference';
 
 import {
@@ -250,7 +250,7 @@ export class InventoryService {
       if (customerAPGroup) {
         const mappedGroup = await getMappedGroups({ group2: customerAPGroup._id.toString() });
         if (mappedGroup && mappedGroup.length) {
-          const customerGroup = await CustomerGroupModel.findById(mappedGroup[0].group1);
+          const customerGroup = await CustomerGroup.findById(mappedGroup[0].group1);
           if (customerGroup) {
             contra.newAPName = customerAPGroup.groupName;
             contra.contra = 1;

package/services/quickbooks.service.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="mongoose/types/document" />
 /// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/document" />
 /// <reference types="mongoose/types/aggregate" />
 /// <reference types="mongoose/types/callback" />
 /// <reference types="mongoose/types/collection" />