@contrail/flexplm 1.1.15 → 1.1.16

package/lib/util/data-converter.d.ts

@@ -21,6 +21,8 @@ export declare class DataConverter {
     setEnumerationKeys(prop: any, nd: any, matchByDisplay: any): any;
     getPersistableChanges(entity: object, changes: object): object;
     setUserListValue(prop: any, nd: any): Promise<any>;
+    getUserByEmail(nd: any): Promise<any>;
     processGroupMemberCheck(prop: any, userEmail: any): Promise<void>;
     getUserListValue(prop: any, newData: any): Promise<any>;
+    getUserById(userId: any): Promise<any>;
 }

package/lib/util/data-converter.js

@@ -332,17 +332,28 @@ class DataConverter {
             await this.processGroupMemberCheck(prop, nd.email);
             return this.userRefCache[nd.email];
         }
-        const entities = await new sdk_1.Entities().get({
-            entityName: 'user-org',
-            take: 1000
-        });
-        const result = entities.find(element => element['userEmail'] === nd.email);
-        const value = (result) ? result.id : undefined;
-        if (value) {
-            this.userRefCache[nd.email] = value;
+        const user = await this.getUserByEmail(nd);
+        const userId = (user) ? user.id : undefined;
+        if (userId) {
+            this.userRefCache[nd.email] = userId;
             await this.processGroupMemberCheck(prop, nd.email);
         }
-        return value;
+        return userId;
+    }
+    async getUserByEmail(nd) {
+        let userOrg = undefined;
+        let count = 0;
+        let size = 0;
+        const entities = new sdk_1.Entities();
+        const getOptionsCriteria = {
+            entityName: 'user-org',
+            take: 1000
+        };
+        do {
+            const userBatch = await entities.get(getOptionsCriteria);
+            userOrg = userBatch.find(uo => uo?.userEmail === nd?.email);
+        } while (!userOrg && size == getOptionsCriteria.take && count < 15);
+        return userOrg?.user;
     }
     async processGroupMemberCheck(prop, userEmail) {
         let arrUserList = [];
@@ -381,20 +392,32 @@ class DataConverter {
             }
             return this.userRefCache[entityId];
         }
-        const entities = await new sdk_1.Entities().get({
-            entityName: 'user-org',
-            id: entityId
-        });
-        const value = (entities) ? {
-            email: entities.userEmail,
-            firstName: entities.first,
-            lastName: entities.last,
-            isSsoUser: entities.isSsoUser,
+        const user = await this.getUserById(entityId);
+        const value = (user) ? {
+            email: user.email,
+            firstName: user.first,
+            lastName: user.last,
+            isSsoUser: user.isSsoUser,
         } : undefined;
         if (value) {
             this.userRefCache[entityId] = value;
         }
         return value;
     }
+    async getUserById(userId) {
+        let userOrg = undefined;
+        let count = 0;
+        let size = 0;
+        const entities = new sdk_1.Entities();
+        const getOptionsCriteria = {
+            entityName: 'user-org',
+            take: 1000
+        };
+        do {
+            const userBatch = await entities.get(getOptionsCriteria);
+            userOrg = userBatch.find(uo => uo?.user?.id === userId);
+        } while (!userOrg && size == getOptionsCriteria.take && count < 15);
+        return userOrg?.user;
+    }
 }
 exports.DataConverter = DataConverter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/flexplm",
-  "version": "1.1.15",
+  "version": "1.1.16",
   "description": "Library used for integration with flexplm.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/util/data-converter.ts

@@ -415,20 +415,41 @@ export class DataConverter {
         return this.userRefCache[nd.email];
     }
 
-    const entities = await new Entities().get({
-        entityName: 'user-org',
-        take: 1000
-    });
+    const user = await this.getUserByEmail(nd);
+    const userId = (user)?user.id:undefined;
 
-    const result = entities.find(element => element['userEmail'] === nd.email);
-    const value = (result) ? result.id : undefined;
-
-    if(value) {
-      this.userRefCache[nd.email] = value;
+    if(userId) {
+      this.userRefCache[nd.email] = userId;
       await this.processGroupMemberCheck(prop, nd.email);
     }
 
-    return value;
+    return userId;
+  }
+
+  /** Makes batch calls of 1000 of user-org entities until
+   * it find one with userEmail of passed in nd.email.
+   * Maxes out after querying for 15,000 user-org entities
+   *
+   * @param nd
+   * @returns
+   */
+  async getUserByEmail(nd: any) {
+    let userOrg = undefined;
+    let count =0;
+    let size = 0;
+    const entities = new Entities();
+    const getOptionsCriteria = {
+      entityName: 'user-org',
+      take:1000
+    }
+
+    do {
+      const userBatch: [any] = await entities.get(getOptionsCriteria);
+      userOrg = userBatch.find(uo => uo?.userEmail === nd?.email);
+
+    }while( !userOrg && size == getOptionsCriteria.take && count < 15);
+    return userOrg?.user
+
   }
 
   /** Shows warning if user email address not present in group associated to property
@@ -485,16 +506,13 @@ export class DataConverter {
           return this.userRefCache[entityId];
       }
 
-      const entities = await new Entities().get({
-          entityName: 'user-org',
-          id: entityId
-      });
+      const user = await this.getUserById(entityId);
 
-      const value = (entities) ? {
-          email: entities.userEmail, 
-          firstName: entities.first, 
-          lastName: entities.last,
-          isSsoUser: entities.isSsoUser,
+      const value = (user) ? {
+          email: user.email,
+          firstName: user.first,
+          lastName: user.last,
+          isSsoUser: user.isSsoUser,
       } : undefined;
 
       if(value) {
@@ -504,4 +522,29 @@ export class DataConverter {
       return value;
   }
 
+  /** Makes batch calls of 1000 of user-org entities until
+   * it find one with user.id of passed in userId.
+   * Maxes out after querying for 15,000 user-org entities
+   *
+   * @param userId
+   * @returns
+   */
+  async getUserById(userId: any) {
+    let userOrg = undefined;
+    let count =0;
+    let size = 0;
+    const entities = new Entities();
+    const getOptionsCriteria = {
+      entityName: 'user-org',
+      take:1000
+    }
+
+    do {
+      const userBatch: [any] = await entities.get(getOptionsCriteria);
+      userOrg = userBatch.find(uo => uo?.user?.id === userId);
+
+    }while( !userOrg && size == getOptionsCriteria.take && count < 15);
+    return userOrg?.user
+  }
+
 }