gemcap-be-common 1.4.5 → 1.4.7

package/package.json

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

package/services/loan-transactions.service.d.ts

@@ -155,7 +155,7 @@ export declare class LoanTransactionsService {
     getTransactionReport(transactionIds: string[], borrowerId: string, effectiveDate: Date): Promise<{
         transactionIdsToMark: any[];
         transactions: {
-            [x: string]: (string | number | string[] | Date)[];
+            [x: string]: (string | number | Date | string[])[];
         }[];
     }>;
     getBorrowerIdsForFile(transactionFileId: string): Promise<{

package/services/signs.service.d.ts

@@ -48,11 +48,8 @@ export declare class SignsService {
     private readonly loanStatementService;
     private readonly usersService;
     constructor(lockService: LockService, loanTransactionsService: LoanTransactionsService, loanStatementService: LoanStatementService, usersService: UsersService);
-    users: IUser[];
-    fulfillUserList(): Promise<void>;
-    clearUserList(): void;
     getAvailabilitiesSigns(bbcDateIds: string[]): Promise<IAvailabilitySignView[]>;
-    getAvailabilitySigns(bbcDateId: string): Promise<IAvailabilitySignView>;
+    getAvailabilitySigns(bbcDateIds: string[]): Promise<IAvailabilitySignView[]>;
     revokeAvailability(bbcDateId: string, userId: string, userIdRevoked: string): Promise<void>;
     signAvailability(bbcDateId: string, user: IUser): Promise<IResult>;
     isBBCLocked(bbcDateId: string): Promise<boolean>;

package/services/signs.service.js

@@ -32,13 +32,6 @@ class SignsService {
         this.loanStatementService = loanStatementService;
         this.usersService = usersService;
     }
-    users = null;
-    async fulfillUserList() {
-        this.users = await this.usersService.getUserList();
-    }
-    clearUserList() {
-        this.users = null;
-    }
     async getAvailabilitiesSigns(bbcDateIds) {
         const availabilitySigns = await (0, availability_db_1.getAvailabilitySigns)(bbcDateIds);
         const users = await this.usersService.getUserList();
@@ -52,32 +45,37 @@ class SignsService {
                     ...sign,
                     userSigned: usersMap[sign.userSignedId],
                     userRevoked: usersMap[sign.userRevokedId],
-                }))
+                })),
             };
         });
     }
-    async getAvailabilitySigns(bbcDateId) {
-        const availabilitiesSigns = await this.getAvailabilitiesSigns([bbcDateId]);
-        if (!availabilitiesSigns.length) {
+    async getAvailabilitySigns(bbcDateIds) {
+        const availabilitiesSigns = await this.getAvailabilitiesSigns(bbcDateIds);
+        const availabilitiesSignsFull = bbcDateIds.map((bbcDateId) => {
+            const foundAvailabilitySigns = availabilitiesSigns.find((signs) => signs.bbcDateId.toString() === bbcDateId);
+            if (foundAvailabilitySigns) {
+                return foundAvailabilitySigns;
+            }
             return {
                 _id: null,
                 bbcDateId: new mongoose_1.default.Types.ObjectId(bbcDateId),
                 requiredSigns: AvailabilitySigns_model_1.REQUIRED_SIGNS,
                 signs: [],
             };
-        }
-        const availabilitySigns = availabilitiesSigns[0];
-        availabilitySigns.signs = availabilitySigns.signs.reduce((acc, userSign) => {
-            if (!userSign.userSigned) {
-                return acc;
-            }
-            userSign.userSigned = (lodash_1.default.pick(userSign.userSigned, ['_id', 'firstName', 'lastName']));
-            if (userSign.userRevoked) {
-                userSign.userRevoked = (lodash_1.default.pick(userSign.userRevoked, ['_id', 'firstName', 'lastName']));
-            }
-            return [...acc, lodash_1.default.pick(userSign, ['userSigned', 'signedAt', 'userRevoked', 'revokedAt'])];
-        }, []);
-        return availabilitySigns;
+        });
+        return availabilitiesSignsFull.map((availabilitySigns) => {
+            const signs = availabilitySigns.signs.reduce((acc, userSign) => {
+                if (!userSign.userSigned) {
+                    return acc;
+                }
+                userSign.userSigned = (lodash_1.default.pick(userSign.userSigned, ['_id', 'firstName', 'lastName']));
+                if (userSign.userRevoked) {
+                    userSign.userRevoked = (lodash_1.default.pick(userSign.userRevoked, ['_id', 'firstName', 'lastName']));
+                }
+                return [...acc, lodash_1.default.pick(userSign, ['userSigned', 'signedAt', 'userRevoked', 'revokedAt'])];
+            }, []);
+            return { ...availabilitySigns, signs };
+        });
     }
     async revokeAvailability(bbcDateId, userId, userIdRevoked) {
         const availability = await (0, availability_db_1.findAvailabilitySignsByBBCDateId)(bbcDateId);
@@ -166,7 +164,12 @@ class SignsService {
         const loanBalances = await this.loanTransactionsService.getLoanBalanceForBBCDateId(bbcDateId);
         const accruedStatement = await this.loanStatementService.calculateAccruedStatementForBBC(bbcDateId);
         console.log({ bbcDateId });
-        await AvilabilitySignedData_model_1.AvailabilitySignedData.findOneAndUpdate({ bbcDateId }, { data: { loanBalances, accruedStatement } }, { upsert: true });
+        await AvilabilitySignedData_model_1.AvailabilitySignedData.findOneAndUpdate({ bbcDateId }, {
+            data: {
+                loanBalances,
+                accruedStatement,
+            },
+        }, { upsert: true });
     }
     async clearAvailabilityStoredData(bbcDateId) {
         await AvilabilitySignedData_model_1.AvailabilitySignedData.findOneAndDelete({ bbcDateId });

package/services/signs.service.ts

@@ -50,16 +50,6 @@ export class SignsService {
   ) {
   }
 
-  users: IUser[] = null;
-
-  async fulfillUserList() {
-    this.users = await this.usersService.getUserList();
-  }
-
-  clearUserList() {
-    this.users = null;
-  }
-
   async getAvailabilitiesSigns(bbcDateIds: string[]): Promise<IAvailabilitySignView[]> {
     const availabilitySigns = await getAvailabilitySigns(bbcDateIds);
     const users = await this.usersService.getUserList();
@@ -73,33 +63,38 @@ export class SignsService {
           ...sign,
           userSigned: usersMap[sign.userSignedId],
           userRevoked: usersMap[sign.userRevokedId],
-        }))
-      }
+        })),
+      };
     }) as unknown as IAvailabilitySignView[];
   }
 
-  async getAvailabilitySigns(bbcDateId: string): Promise<IAvailabilitySignView> {
-    const availabilitiesSigns = await this.getAvailabilitiesSigns([bbcDateId]);
-    if (!availabilitiesSigns.length) {
+  async getAvailabilitySigns(bbcDateIds: string[]): Promise<IAvailabilitySignView[]> {
+    const availabilitiesSigns = await this.getAvailabilitiesSigns(bbcDateIds);
+    const availabilitiesSignsFull = bbcDateIds.map((bbcDateId) => {
+      const foundAvailabilitySigns = availabilitiesSigns.find((signs) => signs.bbcDateId.toString() === bbcDateId);
+      if (foundAvailabilitySigns) {
+        return foundAvailabilitySigns;
+      }
       return <IAvailabilitySignView>{
         _id: null,
         bbcDateId: new mongoose.Types.ObjectId(bbcDateId),
         requiredSigns: REQUIRED_SIGNS,
         signs: [],
       };
-    }
-    const availabilitySigns = availabilitiesSigns[0];
-    availabilitySigns.signs = availabilitySigns.signs.reduce((acc, userSign) => {
-      if (!userSign.userSigned) {
-        return acc;
-      }
-      userSign.userSigned = (_.pick(userSign.userSigned, ['_id', 'firstName', 'lastName'])) as IUser;
-      if (userSign.userRevoked) {
-        userSign.userRevoked = (_.pick(userSign.userRevoked, ['_id', 'firstName', 'lastName'])) as IUser;
-      }
-      return [...acc, _.pick(userSign, ['userSigned', 'signedAt', 'userRevoked', 'revokedAt'])];
-    }, []);
-    return availabilitySigns;
+    });
+    return availabilitiesSignsFull.map((availabilitySigns) => {
+      const signs = availabilitySigns.signs.reduce((acc, userSign) => {
+        if (!userSign.userSigned) {
+          return acc;
+        }
+        userSign.userSigned = (_.pick(userSign.userSigned, ['_id', 'firstName', 'lastName'])) as IUser;
+        if (userSign.userRevoked) {
+          userSign.userRevoked = (_.pick(userSign.userRevoked, ['_id', 'firstName', 'lastName'])) as IUser;
+        }
+        return [...acc, _.pick(userSign, ['userSigned', 'signedAt', 'userRevoked', 'revokedAt'])];
+      }, []);
+      return { ...availabilitySigns, signs };
+    });
   }
 
   async revokeAvailability(bbcDateId: string, userId: string, userIdRevoked: string): Promise<void> {
@@ -194,7 +189,12 @@ export class SignsService {
     const loanBalances = await this.loanTransactionsService.getLoanBalanceForBBCDateId(bbcDateId);
     const accruedStatement = await this.loanStatementService.calculateAccruedStatementForBBC(bbcDateId);
     console.log({ bbcDateId });
-    await AvailabilitySignedData.findOneAndUpdate({ bbcDateId }, { data: { loanBalances, accruedStatement } }, { upsert: true });
+    await AvailabilitySignedData.findOneAndUpdate({ bbcDateId }, {
+      data: {
+        loanBalances,
+        accruedStatement,
+      },
+    }, { upsert: true });
   }
 
   async clearAvailabilityStoredData(bbcDateId: string) {
@@ -239,7 +239,7 @@ export class SignsService {
 
     const availabilitiesSigns = await this.getAvailabilitiesSigns(BBCDates.map((bbcDate) => bbcDate._id.toString()));
     await Promise.all(BBCDates.slice().map(async (bbcDate) => {
-      const foundAvailabilitySigns = availabilitiesSigns.find((aSigns) => aSigns.bbcDateId.toString() ===bbcDate._id.toString());
+      const foundAvailabilitySigns = availabilitiesSigns.find((aSigns) => aSigns.bbcDateId.toString() === bbcDate._id.toString());
       if (!foundAvailabilitySigns) {
         bbcDate.signStatus = ESignStatus.STARTED;
       }