@contrail/flexplm 1.1.15 → 1.1.17

package/lib/entity-processor/base-entity-processor.d.ts

@@ -16,13 +16,15 @@ export declare abstract class BaseEntityProcessor {
     protected entities: any;
     constructor(config: FCConfig, dc: DataConverter, mapFileUtil: MapFileUtil, baseType: string);
     inbound(event: EntityPayloadType): Promise<any>;
-    handleIncomingUpdate(event: EntityPayloadType): Promise<any>;
+    handleIncomingUpsert(event: EntityPayloadType): Promise<any>;
     handleIncomingDelete(event: any): Promise<void>;
     getTransformedData(event: any): Promise<any>;
     getUpdatesForEntity(entity: any, inboundData: any): Promise<object>;
     getVibeOwningKeys(entity: any): Promise<any[]>;
+    createEntity(entityName: any, changes: any): Promise<any>;
     updateEntity(entityName: any, entity: any, diffs: any): Promise<any>;
     protected abstract getIncomingEntity(event: any, inboundData: any): Promise<IncomingEntityResponse>;
+    protected abstract getCreateEntity(inboundData: any): Promise<IncomingEntityResponse>;
     outbound(event: any): Promise<void | import("../interfaces/interfaces").FlexPLMResponseData>;
     handleOutgoingUpsert(entityType: any, event: any): Promise<import("../interfaces/interfaces").FlexPLMResponseData>;
     handleOutgoingDelete(entityType: any, event: any): Promise<void>;

package/lib/entity-processor/base-entity-processor.js

@@ -25,7 +25,7 @@ class BaseEntityProcessor {
         console.log(`inbound entity: ${eventType}:${event.objectClass}`);
         switch (eventType) {
             case 'PERSIST':
-                return await this.handleIncomingUpdate(event);
+                return await this.handleIncomingUpsert(event);
             case 'DELETE':
                 return await this.handleIncomingDelete(event);
             default:
@@ -36,7 +36,7 @@ class BaseEntityProcessor {
                 };
         }
     }
-    async handleIncomingUpdate(event) {
+    async handleIncomingUpsert(event) {
         const inboundData = await this.getTransformedData(event);
         const incomingEntityResponse = await this.getIncomingEntity(event, inboundData);
         if (incomingEntityResponse.earlyReturn) {
@@ -44,12 +44,11 @@ class BaseEntityProcessor {
         }
         const entity = incomingEntityResponse.entity;
         if (!entity) {
-            const message = 'No entity found';
-            console.debug(message);
-            return {
-                status: 404,
-                data: { message }
-            };
+            const createEntityResponse = await this.getCreateEntity(inboundData);
+            if (createEntityResponse.earlyReturn) {
+                return createEntityResponse.earlyReturn;
+            }
+            return this.createEntity(this.baseType, createEntityResponse.entity);
         }
         const diffs = await this.getUpdatesForEntity(entity, inboundData);
         if (Object.getOwnPropertyNames(diffs).length == 0) {
@@ -68,8 +67,8 @@ class BaseEntityProcessor {
     async getTransformedData(event) {
         let inboundData = event.data;
         console.debug('inboundData: ' + JSON.stringify(inboundData));
-        const objectClass = event.objectClass;
-        inboundData = await map_utils_1.MapUtil.applyTransformMap(this.transformMapFile, this.mapFileUtil, inboundData, objectClass, 'flex2vibe');
+        const mapKey = await type_conversion_utils_1.TypeConversionUtils.getMapKeyFromObject(this.transformMapFile, this.mapFileUtil, inboundData, type_conversion_utils_1.TypeConversionUtils.FLEX2VIBE_DIRECTION);
+        inboundData = await map_utils_1.MapUtil.applyTransformMap(this.transformMapFile, this.mapFileUtil, inboundData, mapKey, type_conversion_utils_1.TypeConversionUtils.FLEX2VIBE_DIRECTION);
         console.debug('Transformed-inboundData: ' + JSON.stringify(inboundData));
         return inboundData;
     }
@@ -88,7 +87,7 @@ class BaseEntityProcessor {
     }
     async getVibeOwningKeys(entity) {
         let vibeOwningKeys = [];
-        if (this.transformMapFile) {
+        if (this.transformMapFile && entity) {
             const mapKey = await type_conversion_utils_1.TypeConversionUtils.getMapKey(this.transformMapFile, this.mapFileUtil, entity, type_conversion_utils_1.TypeConversionUtils.VIBE2FLEX_DIRECTION);
             const mapSection = await map_utils_1.MapUtil.getFullMapSection(this.transformMapFile, this.mapFileUtil, mapKey);
             vibeOwningKeys = mapSection?.vibeOwningKeys || [];
@@ -96,6 +95,14 @@ class BaseEntityProcessor {
         console.debug('vibeOwningKeys: ' + vibeOwningKeys);
         return vibeOwningKeys;
     }
+    async createEntity(entityName, changes) {
+        const options = {
+            entityName: entityName,
+            object: changes,
+        };
+        console.log("options: " + JSON.stringify(options));
+        return await new sdk_1.Entities().create(options);
+    }
     async updateEntity(entityName, entity, diffs) {
         const options = {
             entityName: entityName,

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

@@ -192,7 +192,7 @@ class DataConverter {
     }
     async setEntityValues(entity, data, keysToSkip = []) {
         const type = await this.typeUtils.getTypeById(entity.typeId);
-        keysToSkip = keysToSkip.concat(['updatedOn', 'updatedById', 'createdOn', 'createdById', 'modifiedAt', 'orgId', 'createdAt', 'id', 'typeId', 'workspaceId']);
+        keysToSkip = keysToSkip.concat(['updatedOn', 'updatedById', 'createdOn', 'createdById', 'modifiedAt', 'orgId', 'createdAt', 'id', 'typeId', 'typePath', 'workspaceId']);
         let typeProps = this.typeUtils.filterTypeProperties(type, entity);
         typeProps = typeProps.filter(prop => !keysToSkip.includes(prop['slug']));
         const dataKeys = Object.getOwnPropertyNames(data);
@@ -210,7 +210,7 @@ class DataConverter {
     }
     async getEntityValues(objectClass, data, keysToSkip = []) {
         const entityValues = {};
-        const tco = this.typeUtils.getEntityTypeClientOptions(objectClass, data);
+        const tco = await this.typeUtils.getEntityTypeClientOptionsUsingMapping(this.transformMapFile, this.mapFileUtil, data);
         const type = await this.typeUtils.getByRootAndPath(tco);
         const typePath = type['typePath'];
         if (typePath && (typePath.startsWith('item') || typePath.startsWith('project-item'))) {
@@ -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/lib/util/type-conversion-utils.js

@@ -181,7 +181,7 @@ class TypeConversionUtils {
         }
     }
     static getObjectType(object) {
-        let objectType = object['objectClass'];
+        let objectType = object['flexPLMObjectClass'];
         return objectType;
     }
 }

package/lib/util/type-conversion-utils.spec.js

@@ -290,7 +290,7 @@ describe('conversion-utils', () => {
         it('uses mapping-catName', async () => {
             const expectedClass = 'custom-entity';
             const object = {
-                objectClass: 'LCSLast',
+                flexPLMObjectClass: 'LCSLast',
                 flexPLMTypePath: 'Last\\catName'
             };
             const spy = jest.spyOn(mapFileUtil, 'getMapFile')
@@ -308,7 +308,7 @@ describe('conversion-utils', () => {
         it('uses default-noMap', async () => {
             const expectedClass = 'color';
             const entity = {
-                objectClass: 'LCSColor',
+                flexPLMObjectClass: 'LCSColor',
                 flexPLMTypePath: 'Color'
             };
             const spy = jest.spyOn(mapFileUtil, 'getMapFile')
@@ -341,7 +341,7 @@ describe('conversion-utils', () => {
         it('uses mapping-catName', async () => {
             const expectedTypePath = 'custom-entity:catName';
             const entity = {
-                objectClass: 'LCSLast',
+                flexPLMObjectClass: 'LCSLast',
                 flexPLMTypePath: 'Last\\catName'
             };
             const spy = jest.spyOn(mapFileUtil, 'getMapFile')
@@ -359,7 +359,7 @@ describe('conversion-utils', () => {
         it('uses default-noMap', async () => {
             const expectedTypePath = 'color';
             const entity = {
-                objectClass: 'LCSColor',
+                flexPLMObjectClass: 'LCSColor',
                 flexPLMTypePath: 'Color'
             };
             const spy = jest.spyOn(mapFileUtil, 'getMapFile')
@@ -393,7 +393,7 @@ describe('conversion-utils', () => {
         it('uses mapping-catName', async () => {
             const properties = ['catName', 'catNumber'];
             const object = {
-                objectClass: 'LCSLast',
+                flexPLMObjectClass: 'LCSLast',
                 flexPLMTypePath: 'Last\\catName'
             };
             const spy = jest.spyOn(mapFileUtil, 'getMapFile')
@@ -412,7 +412,7 @@ describe('conversion-utils', () => {
         it('uses default-noMap', async () => {
             const properties = ['itemNumber'];
             const object = {
-                objectClass: 'LCSProduct',
+                flexPLMObjectClass: 'LCSProduct',
                 flexPLMTypePath: 'Product'
             };
             const spy = jest.spyOn(mapFileUtil, 'getMapFile')
@@ -447,7 +447,7 @@ describe('conversion-utils', () => {
         it('uses mapping-catName', async () => {
             const properties = ['longName'];
             const object = {
-                objectClass: 'LCSLast',
+                flexPLMObjectClass: 'LCSLast',
                 flexPLMTypePath: 'Last\\catName'
             };
             const spy = jest.spyOn(mapFileUtil, 'getMapFile')
@@ -466,7 +466,7 @@ describe('conversion-utils', () => {
         it('uses default-noMap', async () => {
             const properties = ['optionName', 'description'];
             const object = {
-                objectClass: 'LCSSKU',
+                flexPLMObjectClass: 'LCSSKU',
                 typePath: 'Product'
             };
             const spy = jest.spyOn(mapFileUtil, 'getMapFile')
@@ -495,7 +495,7 @@ describe('conversion-utils', () => {
                 return mapping;
             });
             const object = {
-                objectClass: 'LCSRevisableEntity',
+                flexPLMObjectClass: 'LCSRevisableEntity',
                 flexPLMTypePath: 'Revisable Entity\\packaging'
             };
             const expectedMapKey = 'packaging';
@@ -513,7 +513,7 @@ describe('conversion-utils', () => {
                 return mapping;
             });
             const object = {
-                objectClass: 'LCSRevisableEntity',
+                flexPLMObjectClass: 'LCSRevisableEntity',
                 flexPLMTypePath: 'Revisable Entity\\prefix'
             };
             const expectedMapKey = 'prefix';
@@ -531,7 +531,7 @@ describe('conversion-utils', () => {
                 return mapping;
             });
             const object = {
-                objectClass: 'LCSColor',
+                flexPLMObjectClass: 'LCSColor',
                 flexPLMTypePath: 'Color'
             };
             const expectedMapKey = 'LCSColor';

package/lib/util/type-defaults.js

@@ -136,6 +136,12 @@ class TypeDefaults {
         else if ('LCSColor' === objectClass) {
             entityClass = 'color';
         }
+        else if (['LCSSeason', 'SeasonGroup'].includes(objectClass)) {
+            entityClass = 'assortment';
+        }
+        else if (['LCSRevisableEntity', 'LCSLifecycleManaged'].includes(objectClass)) {
+            entityClass = 'custom-entity';
+        }
         return entityClass;
     }
     static getDefaultEntityTypePath(object) {
@@ -191,7 +197,7 @@ class TypeDefaults {
         return properties;
     }
     static getObjectClass(object) {
-        return (object) ? object['objectClass'] : '';
+        return (object) ? object['flexPLMObjectClass'] : '';
     }
 }
 exports.TypeDefaults = TypeDefaults;

package/lib/util/type-defaults.spec.js

@@ -308,58 +308,86 @@ describe('Type Defaults', () => {
     describe('getDefaultEntityClass', () => {
         it('item - LCSProduct', () => {
             const object = {
-                objectClass: 'LCSProduct'
+                flexPLMObjectClass: 'LCSProduct'
             };
             const entityClass = type_defaults_1.TypeDefaults.getDefaultEntityClass(object);
             expect(entityClass).toBe('item');
         });
         it('item - LCSSKU', () => {
             const object = {
-                objectClass: 'LCSSKU'
+                flexPLMObjectClass: 'LCSSKU'
             };
             const entityClass = type_defaults_1.TypeDefaults.getDefaultEntityClass(object);
             expect(entityClass).toBe('item');
         });
         it('color - LCSColor', () => {
             const object = {
-                objectClass: 'LCSColor'
+                flexPLMObjectClass: 'LCSColor'
             };
             const entityClass = type_defaults_1.TypeDefaults.getDefaultEntityClass(object);
             expect(entityClass).toBe('color');
         });
+        it('assortment - LCSSeason', () => {
+            const object = {
+                flexPLMObjectClass: 'LCSSeason'
+            };
+            const entityClass = type_defaults_1.TypeDefaults.getDefaultEntityClass(object);
+            expect(entityClass).toBe('assortment');
+        });
+        it('assortment - SeasonGroup', () => {
+            const object = {
+                flexPLMObjectClass: 'SeasonGroup'
+            };
+            const entityClass = type_defaults_1.TypeDefaults.getDefaultEntityClass(object);
+            expect(entityClass).toBe('assortment');
+        });
+        it('custom-entity - LCSRevisableEntity', () => {
+            const object = {
+                flexPLMObjectClass: 'LCSRevisableEntity'
+            };
+            const entityClass = type_defaults_1.TypeDefaults.getDefaultEntityClass(object);
+            expect(entityClass).toBe('custom-entity');
+        });
+        it('custom-entity - LCSLifecycleManaged', () => {
+            const object = {
+                flexPLMObjectClass: 'LCSLifecycleManaged'
+            };
+            const entityClass = type_defaults_1.TypeDefaults.getDefaultEntityClass(object);
+            expect(entityClass).toBe('custom-entity');
+        });
     });
     describe('getDefaultEntityTypePath', () => {
         it('LCSProduct', () => {
             const object = {
-                objectClass: 'LCSProduct'
+                flexPLMObjectClass: 'LCSProduct'
             };
             const typePath = type_defaults_1.TypeDefaults.getDefaultEntityTypePath(object);
             expect(typePath).toBe('item');
         });
         it('LCSSKU', () => {
             const object = {
-                objectClass: 'LCSSKU'
+                flexPLMObjectClass: 'LCSSKU'
             };
             const typePath = type_defaults_1.TypeDefaults.getDefaultEntityTypePath(object);
             expect(typePath).toBe('item');
         });
         it('LCSProductSeasonLink', () => {
             const object = {
-                objectClass: 'LCSProductSeasonLink'
+                flexPLMObjectClass: 'LCSProductSeasonLink'
             };
             const typePath = type_defaults_1.TypeDefaults.getDefaultEntityTypePath(object);
             expect(typePath).toBe('item');
         });
         it('LCSSKUSeasonLink', () => {
             const object = {
-                objectClass: 'LCSSKUSeasonLink'
+                flexPLMObjectClass: 'LCSSKUSeasonLink'
             };
             const typePath = type_defaults_1.TypeDefaults.getDefaultEntityTypePath(object);
             expect(typePath).toBe('item');
         });
         it('LCSColor', () => {
             const object = {
-                objectClass: 'LCSColor'
+                flexPLMObjectClass: 'LCSColor'
             };
             const typePath = type_defaults_1.TypeDefaults.getDefaultEntityTypePath(object);
             expect(typePath).toBe('color');
@@ -368,7 +396,7 @@ describe('Type Defaults', () => {
     describe('getDefaultIdentifierPropertiesFromObject', () => {
         it('LCSProduct', () => {
             const object = {
-                objectClass: 'LCSProduct'
+                flexPLMObjectClass: 'LCSProduct'
             };
             const defaultIdentifiers = type_defaults_1.TypeDefaults.getDefaultIdentifierPropertiesFromObject(object);
             expect(defaultIdentifiers).toContain('itemNumber');
@@ -376,7 +404,7 @@ describe('Type Defaults', () => {
         });
         it('LCSSKU', () => {
             const object = {
-                objectClass: 'LCSSKU'
+                flexPLMObjectClass: 'LCSSKU'
             };
             const defaultIdentifiers = type_defaults_1.TypeDefaults.getDefaultIdentifierPropertiesFromObject(object);
             expect(defaultIdentifiers).toContain('itemNumber');
@@ -384,7 +412,7 @@ describe('Type Defaults', () => {
         });
         it('LCSSeason', () => {
             const object = {
-                objectClass: 'LCSSeason'
+                flexPLMObjectClass: 'LCSSeason'
             };
             const defaultIdentifiers = type_defaults_1.TypeDefaults.getDefaultIdentifierPropertiesFromObject(object);
             expect(defaultIdentifiers).toContain('flexPLMSeasonName');
@@ -392,7 +420,7 @@ describe('Type Defaults', () => {
         });
         it('SeasonGroup', () => {
             const object = {
-                objectClass: 'SeasonGroup'
+                flexPLMObjectClass: 'SeasonGroup'
             };
             const defaultIdentifiers = type_defaults_1.TypeDefaults.getDefaultIdentifierPropertiesFromObject(object);
             expect(defaultIdentifiers).toContain('seasonGroupName');
@@ -400,7 +428,7 @@ describe('Type Defaults', () => {
         });
         it('LCSColor', () => {
             const object = {
-                objectClass: 'LCSColor'
+                flexPLMObjectClass: 'LCSColor'
             };
             const defaultIdentifiers = type_defaults_1.TypeDefaults.getDefaultIdentifierPropertiesFromObject(object);
             expect(defaultIdentifiers).toContain('name');
@@ -408,7 +436,7 @@ describe('Type Defaults', () => {
         });
         it('LCSRevisableEntity', () => {
             const object = {
-                objectClass: 'LCSRevisableEntity'
+                flexPLMObjectClass: 'LCSRevisableEntity'
             };
             const defaultIdentifiers = type_defaults_1.TypeDefaults.getDefaultIdentifierPropertiesFromObject(object);
             expect(defaultIdentifiers).toContain('name');
@@ -416,7 +444,7 @@ describe('Type Defaults', () => {
         });
         it('LCSLifecycleManaged', () => {
             const object = {
-                objectClass: 'LCSLifecycleManaged'
+                flexPLMObjectClass: 'LCSLifecycleManaged'
             };
             const defaultIdentifiers = type_defaults_1.TypeDefaults.getDefaultIdentifierPropertiesFromObject(object);
             expect(defaultIdentifiers).toContain('name');
@@ -426,7 +454,7 @@ describe('Type Defaults', () => {
     describe('getDefaultInformationalPropertiesFromObject', () => {
         it('LCSProduct', () => {
             const object = {
-                objectClass: 'LCSProduct'
+                flexPLMObjectClass: 'LCSProduct'
             };
             const defaultIdentifiers = type_defaults_1.TypeDefaults.getDefaultInformationalPropertiesFromObject(object);
             expect(defaultIdentifiers).toContain('name');
@@ -434,7 +462,7 @@ describe('Type Defaults', () => {
         });
         it('LCSSKU', () => {
             const object = {
-                objectClass: 'LCSSKU'
+                flexPLMObjectClass: 'LCSSKU'
             };
             const defaultIdentifiers = type_defaults_1.TypeDefaults.getDefaultInformationalPropertiesFromObject(object);
             expect(defaultIdentifiers).toContain('optionName');
@@ -442,7 +470,7 @@ describe('Type Defaults', () => {
         });
         it('LCSSeason', () => {
             const object = {
-                objectClass: 'LCSSeason'
+                flexPLMObjectClass: 'LCSSeason'
             };
             const defaultIdentifiers = type_defaults_1.TypeDefaults.getDefaultInformationalPropertiesFromObject(object);
             expect(defaultIdentifiers).toContain('name');
@@ -450,7 +478,7 @@ describe('Type Defaults', () => {
         });
         it('SeasonGroup', () => {
             const object = {
-                objectClass: 'SeasonGroup'
+                flexPLMObjectClass: 'SeasonGroup'
             };
             const defaultIdentifiers = type_defaults_1.TypeDefaults.getDefaultInformationalPropertiesFromObject(object);
             expect(defaultIdentifiers).toContain('name');

package/lib/util/type-utils.d.ts

@@ -7,6 +7,7 @@ export declare class TypeUtils {
     getByRootAndPath(options: TypeClientOptions): Promise<import("@contrail/types").Type>;
     static getFlexPLMTypePath(entity: any): any;
     getEventObjectClass(entityType: string, newData: any): string;
+    getEntityTypeClientOptionsUsingMapping(transformMapFile: any, mapFileUtil: any, data: any): Promise<TypeClientOptions>;
     getEntityTypeClientOptions(objectClass: string, data: any): TypeClientOptions;
     filterTypeProperties(type: any, newData: any): TypeProperty[];
 }

package/lib/util/type-utils.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeUtils = void 0;
 const app_framework_1 = require("@contrail/app-framework");
 const sdk_1 = require("@contrail/sdk");
+const type_conversion_utils_1 = require("./type-conversion-utils");
 class TypeUtils {
     constructor() {
         this.typesObj = new sdk_1.Types();
@@ -47,6 +48,15 @@ class TypeUtils {
         }
         return objectClass;
     }
+    async getEntityTypeClientOptionsUsingMapping(transformMapFile, mapFileUtil, data) {
+        const root = await type_conversion_utils_1.TypeConversionUtils.getEntityClassFromObject(transformMapFile, mapFileUtil, data);
+        const path = await type_conversion_utils_1.TypeConversionUtils.getEntityTypePathFromOjbect(transformMapFile, mapFileUtil, data);
+        let tco = {
+            root,
+            path
+        };
+        return tco;
+    }
     getEntityTypeClientOptions(objectClass, data) {
         let tco;
         if (['LCSProduct', 'LCSSKU'].includes(objectClass)) {

package/package.json

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

package/src/entity-processor/base-entity-processor.ts

@@ -35,7 +35,7 @@ export abstract class BaseEntityProcessor {
 
     switch (eventType) {
     case 'PERSIST':
-      return await this.handleIncomingUpdate(event);
+      return await this.handleIncomingUpsert(event);
     case 'DELETE':
       return await this.handleIncomingDelete(event);
     default:
@@ -47,7 +47,7 @@ export abstract class BaseEntityProcessor {
     }
   }
 
-  async handleIncomingUpdate (event: EntityPayloadType) {
+  async handleIncomingUpsert (event: EntityPayloadType) {
     const inboundData = await this.getTransformedData(event);
     const incomingEntityResponse = await this.getIncomingEntity(event, inboundData);
     // This case means there was an early return in the getIncomingEntity method
@@ -56,13 +56,13 @@ export abstract class BaseEntityProcessor {
     }
 
     const entity = incomingEntityResponse.entity;
-    if(!entity){
-      const message = 'No entity found';
-      console.debug(message);
-      return {
-        status: 404,
-        data: {message}
-      };
+    if (!entity) {
+      const createEntityResponse = await this.getCreateEntity(inboundData);
+      if (createEntityResponse.earlyReturn) {
+          return createEntityResponse.earlyReturn;
+      }
+
+      return this.createEntity(this.baseType, createEntityResponse.entity);
     }
 
     const diffs = await this.getUpdatesForEntity(entity, inboundData);
@@ -86,9 +86,12 @@ export abstract class BaseEntityProcessor {
     let inboundData = event.data;
     console.debug('inboundData: ' + JSON.stringify(inboundData));
 
-    const objectClass = event.objectClass;
-    inboundData = await MapUtil.applyTransformMap(this.transformMapFile, this.mapFileUtil, inboundData, objectClass, 'flex2vibe');
+    const mapKey = await TypeConversionUtils.getMapKeyFromObject(this.transformMapFile, this.mapFileUtil, inboundData, TypeConversionUtils.FLEX2VIBE_DIRECTION);
+    inboundData = await MapUtil.applyTransformMap(this.transformMapFile, this.mapFileUtil, inboundData, mapKey, TypeConversionUtils.FLEX2VIBE_DIRECTION);
     console.debug('Transformed-inboundData: ' + JSON.stringify(inboundData));
+
+    
+
     return inboundData;
   }
 
@@ -110,7 +113,7 @@ export abstract class BaseEntityProcessor {
 
   async getVibeOwningKeys(entity) {
     let vibeOwningKeys = [];
-    if (this.transformMapFile) {
+    if (this.transformMapFile && entity) {
       //Technically the transform is flex->vibe.  But the vibe entity being updated was passed in,
       // so we use VIBE2FLEX_DIRECTION to get the mapKey
       const mapKey = await TypeConversionUtils.getMapKey(this.transformMapFile, this.mapFileUtil, entity, TypeConversionUtils.VIBE2FLEX_DIRECTION);
@@ -122,6 +125,16 @@ export abstract class BaseEntityProcessor {
     return vibeOwningKeys;
   }
 
+  async createEntity(entityName, changes) {
+    const options = {
+      entityName: entityName,
+      object: changes,
+    };
+    console.log("options: " + JSON.stringify(options));
+
+    return await new Entities().create(options);
+  }
+
   async updateEntity(entityName, entity, diffs) {
     const options = {
       entityName: entityName,
@@ -135,6 +148,7 @@ export abstract class BaseEntityProcessor {
 
   // This method must be implemented by derived classes
   protected abstract getIncomingEntity(event, inboundData): Promise<IncomingEntityResponse>;
+  protected abstract getCreateEntity(inboundData): Promise<IncomingEntityResponse>;
 
   // outbound
 

package/src/util/data-converter.ts

@@ -228,7 +228,7 @@ export class DataConverter {
     // this.logger.log('setEntityValues: ' + JSON.stringify(entity));
     // this.logger.log('data: ' + JSON.stringify(data));
     const type = await this.typeUtils.getTypeById(entity.typeId);
-    keysToSkip = keysToSkip.concat(['updatedOn', 'updatedById', 'createdOn', 'createdById', 'modifiedAt', 'orgId', 'createdAt', 'id', 'typeId', 'workspaceId']);
+    keysToSkip = keysToSkip.concat(['updatedOn', 'updatedById', 'createdOn', 'createdById', 'modifiedAt', 'orgId', 'createdAt', 'id', 'typeId', 'typePath', 'workspaceId']);
     let typeProps = this.typeUtils.filterTypeProperties(type, entity);
     typeProps = typeProps.filter( prop => !keysToSkip.includes(prop['slug']));
     //Only process properties that had a value sent; to not accidentally clear out values
@@ -260,7 +260,7 @@ export class DataConverter {
    */
   async getEntityValues(objectClass: string, data: any, keysToSkip: string[] = []){
     const entityValues = {};
-    const tco: TypeClientOptions = this.typeUtils.getEntityTypeClientOptions(objectClass,data);
+    const tco: TypeClientOptions = await this.typeUtils.getEntityTypeClientOptionsUsingMapping(this.transformMapFile, this.mapFileUtil, data);
     const type = await this.typeUtils.getByRootAndPath(tco);
     const typePath = type['typePath'];
     if(typePath && (typePath.startsWith('item') || typePath.startsWith('project-item'))){
@@ -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
+  }
+
 }

package/src/util/type-conversion-utils.spec.ts

@@ -320,7 +320,7 @@ describe('conversion-utils', () => {
     it('uses mapping-catName', async () =>{
       const expectedClass = 'custom-entity';
       const object = {
-        objectClass: 'LCSLast',
+        flexPLMObjectClass: 'LCSLast',
         flexPLMTypePath: 'Last\\catName'
       };
       const spy = jest.spyOn(mapFileUtil, 'getMapFile')
@@ -339,7 +339,7 @@ describe('conversion-utils', () => {
     it('uses default-noMap', async () =>{
       const expectedClass = 'color';
       const entity = {
-        objectClass: 'LCSColor',
+        flexPLMObjectClass: 'LCSColor',
         flexPLMTypePath: 'Color'
       };
       const spy = jest.spyOn(mapFileUtil, 'getMapFile')
@@ -376,7 +376,7 @@ describe('conversion-utils', () => {
     it('uses mapping-catName', async () =>{
       const expectedTypePath = 'custom-entity:catName';
       const entity = {
-        objectClass: 'LCSLast',
+        flexPLMObjectClass: 'LCSLast',
         flexPLMTypePath: 'Last\\catName'
       };
       const spy = jest.spyOn(mapFileUtil, 'getMapFile')
@@ -395,7 +395,7 @@ describe('conversion-utils', () => {
     it('uses default-noMap', async () =>{
       const expectedTypePath = 'color';
       const entity = {
-        objectClass: 'LCSColor',
+        flexPLMObjectClass: 'LCSColor',
         flexPLMTypePath: 'Color'
       };
       const spy = jest.spyOn(mapFileUtil, 'getMapFile')
@@ -433,7 +433,7 @@ describe('conversion-utils', () => {
     it('uses mapping-catName', async () =>{
       const properties = ['catName', 'catNumber'];
       const object = {
-        objectClass: 'LCSLast',
+        flexPLMObjectClass: 'LCSLast',
         flexPLMTypePath: 'Last\\catName'
       };
       const spy = jest.spyOn(mapFileUtil, 'getMapFile')
@@ -453,7 +453,7 @@ describe('conversion-utils', () => {
     it('uses default-noMap', async () =>{
       const properties = ['itemNumber'];
       const object = {
-        objectClass: 'LCSProduct',
+        flexPLMObjectClass: 'LCSProduct',
         flexPLMTypePath: 'Product'
       };
       const spy = jest.spyOn(mapFileUtil, 'getMapFile')
@@ -492,7 +492,7 @@ describe('conversion-utils', () => {
     it('uses mapping-catName', async () =>{
       const properties = ['longName'];
       const object = {
-        objectClass: 'LCSLast',
+        flexPLMObjectClass: 'LCSLast',
         flexPLMTypePath: 'Last\\catName'
       };
       const spy = jest.spyOn(mapFileUtil, 'getMapFile')
@@ -512,7 +512,7 @@ describe('conversion-utils', () => {
     it('uses default-noMap', async () =>{
       const properties = ['optionName', 'description'];
       const object = {
-        objectClass: 'LCSSKU',
+        flexPLMObjectClass: 'LCSSKU',
         typePath: 'Product'
       };
       const spy = jest.spyOn(mapFileUtil, 'getMapFile')
@@ -543,7 +543,7 @@ describe('conversion-utils', () => {
           return mapping;
         });
       const object = {
-        objectClass: 'LCSRevisableEntity',
+        flexPLMObjectClass: 'LCSRevisableEntity',
         flexPLMTypePath: 'Revisable Entity\\packaging'
       }
       const expectedMapKey = 'packaging';
@@ -563,7 +563,7 @@ describe('conversion-utils', () => {
           return mapping;
         });
         const object = {
-          objectClass: 'LCSRevisableEntity',
+          flexPLMObjectClass: 'LCSRevisableEntity',
           flexPLMTypePath: 'Revisable Entity\\prefix'
         }
         const expectedMapKey = 'prefix';
@@ -583,7 +583,7 @@ describe('conversion-utils', () => {
           return mapping;
         });
       const object = {
-        objectClass: 'LCSColor',
+        flexPLMObjectClass: 'LCSColor',
         flexPLMTypePath: 'Color'
       }
       const expectedMapKey = 'LCSColor';

package/src/util/type-conversion-utils.ts

@@ -337,7 +337,7 @@ export class TypeConversionUtils {
   }
 
   static getObjectType(object:any) {
-    let objectType = object['objectClass'];
+    let objectType = object['flexPLMObjectClass'];
     return objectType;
   }
 

package/src/util/type-defaults.spec.ts

@@ -392,12 +392,12 @@ describe('Type Defaults', () =>{
 
     });
 
-  });
+  });//getEntityType
 
   describe('getDefaultEntityClass', () =>{
     it('item - LCSProduct', () =>{
       const object = {
-        objectClass: 'LCSProduct'
+        flexPLMObjectClass: 'LCSProduct'
       };
 
       const entityClass = TypeDefaults.getDefaultEntityClass(object);
@@ -407,7 +407,7 @@ describe('Type Defaults', () =>{
 
     it('item - LCSSKU', () =>{
       const object = {
-        objectClass: 'LCSSKU'
+        flexPLMObjectClass: 'LCSSKU'
       };
 
       const entityClass = TypeDefaults.getDefaultEntityClass(object);
@@ -417,7 +417,7 @@ describe('Type Defaults', () =>{
 
     it('color - LCSColor', () =>{
       const object = {
-        objectClass: 'LCSColor'
+        flexPLMObjectClass: 'LCSColor'
       };
 
       const entityClass = TypeDefaults.getDefaultEntityClass(object);
@@ -425,12 +425,52 @@ describe('Type Defaults', () =>{
       expect(entityClass).toBe('color');
     });
 
+    it('assortment - LCSSeason', () =>{
+      const object = {
+        flexPLMObjectClass: 'LCSSeason'
+      };
+
+      const entityClass = TypeDefaults.getDefaultEntityClass(object);
+
+      expect(entityClass).toBe('assortment');
+    });
+
+    it('assortment - SeasonGroup', () =>{
+      const object = {
+        flexPLMObjectClass: 'SeasonGroup'
+      };
+
+      const entityClass = TypeDefaults.getDefaultEntityClass(object);
+
+      expect(entityClass).toBe('assortment');
+    });
+
+    it('custom-entity - LCSRevisableEntity', () =>{
+      const object = {
+        flexPLMObjectClass: 'LCSRevisableEntity'
+      };
+
+      const entityClass = TypeDefaults.getDefaultEntityClass(object);
+
+      expect(entityClass).toBe('custom-entity');
+    });
+
+    it('custom-entity - LCSLifecycleManaged', () =>{
+      const object = {
+        flexPLMObjectClass: 'LCSLifecycleManaged'
+      };
+
+      const entityClass = TypeDefaults.getDefaultEntityClass(object);
+
+      expect(entityClass).toBe('custom-entity');
+    });
+
   });//getDefaultEntityClass
 
   describe('getDefaultEntityTypePath', () =>{
     it('LCSProduct', () =>{
       const object = {
-        objectClass: 'LCSProduct'
+        flexPLMObjectClass: 'LCSProduct'
       };
 
       const typePath = TypeDefaults.getDefaultEntityTypePath(object);
@@ -439,7 +479,7 @@ describe('Type Defaults', () =>{
 
     it('LCSSKU', () =>{
       const object = {
-        objectClass: 'LCSSKU'
+        flexPLMObjectClass: 'LCSSKU'
       };
 
       const typePath = TypeDefaults.getDefaultEntityTypePath(object);
@@ -447,7 +487,7 @@ describe('Type Defaults', () =>{
     });
     it('LCSProductSeasonLink', () =>{
       const object = {
-        objectClass: 'LCSProductSeasonLink'
+        flexPLMObjectClass: 'LCSProductSeasonLink'
       };
 
       const typePath = TypeDefaults.getDefaultEntityTypePath(object);
@@ -456,7 +496,7 @@ describe('Type Defaults', () =>{
 
     it('LCSSKUSeasonLink', () =>{
       const object = {
-        objectClass: 'LCSSKUSeasonLink'
+        flexPLMObjectClass: 'LCSSKUSeasonLink'
       };
 
       const typePath = TypeDefaults.getDefaultEntityTypePath(object);
@@ -465,7 +505,7 @@ describe('Type Defaults', () =>{
 
     it('LCSColor', () =>{
       const object = {
-        objectClass: 'LCSColor'
+        flexPLMObjectClass: 'LCSColor'
       };
 
       const typePath = TypeDefaults.getDefaultEntityTypePath(object);
@@ -477,7 +517,7 @@ describe('Type Defaults', () =>{
   describe('getDefaultIdentifierPropertiesFromObject', () =>{
     it('LCSProduct', () =>{
       const object = {
-        objectClass: 'LCSProduct'
+        flexPLMObjectClass: 'LCSProduct'
       };
       const defaultIdentifiers = TypeDefaults.getDefaultIdentifierPropertiesFromObject(object);
 
@@ -487,7 +527,7 @@ describe('Type Defaults', () =>{
 
     it('LCSSKU', () =>{
       const object = {
-        objectClass: 'LCSSKU'
+        flexPLMObjectClass: 'LCSSKU'
       };
       const defaultIdentifiers = TypeDefaults.getDefaultIdentifierPropertiesFromObject(object);
 
@@ -497,7 +537,7 @@ describe('Type Defaults', () =>{
 
     it('LCSSeason', () =>{
       const object = {
-        objectClass: 'LCSSeason'
+        flexPLMObjectClass: 'LCSSeason'
       };
       const defaultIdentifiers = TypeDefaults.getDefaultIdentifierPropertiesFromObject(object);
 
@@ -507,7 +547,7 @@ describe('Type Defaults', () =>{
 
     it('SeasonGroup', () =>{
       const object = {
-        objectClass: 'SeasonGroup'
+        flexPLMObjectClass: 'SeasonGroup'
       };
       const defaultIdentifiers = TypeDefaults.getDefaultIdentifierPropertiesFromObject(object);
 
@@ -517,7 +557,7 @@ describe('Type Defaults', () =>{
 
     it('LCSColor', () =>{
       const object = {
-        objectClass: 'LCSColor'
+        flexPLMObjectClass: 'LCSColor'
       };
       const defaultIdentifiers = TypeDefaults.getDefaultIdentifierPropertiesFromObject(object);
 
@@ -527,7 +567,7 @@ describe('Type Defaults', () =>{
 
     it('LCSRevisableEntity', () =>{
       const object = {
-        objectClass: 'LCSRevisableEntity'
+        flexPLMObjectClass: 'LCSRevisableEntity'
       };
       const defaultIdentifiers = TypeDefaults.getDefaultIdentifierPropertiesFromObject(object);
 
@@ -537,7 +577,7 @@ describe('Type Defaults', () =>{
 
     it('LCSLifecycleManaged', () =>{
       const object = {
-        objectClass: 'LCSLifecycleManaged'
+        flexPLMObjectClass: 'LCSLifecycleManaged'
       };
       const defaultIdentifiers = TypeDefaults.getDefaultIdentifierPropertiesFromObject(object);
 
@@ -550,7 +590,7 @@ describe('Type Defaults', () =>{
   describe('getDefaultInformationalPropertiesFromObject', () =>{
     it('LCSProduct', () =>{
       const object = {
-        objectClass: 'LCSProduct'
+        flexPLMObjectClass: 'LCSProduct'
       };
 
       const defaultIdentifiers = TypeDefaults.getDefaultInformationalPropertiesFromObject(object);
@@ -560,7 +600,7 @@ describe('Type Defaults', () =>{
 
     it('LCSSKU', () =>{
       const object = {
-        objectClass: 'LCSSKU'
+        flexPLMObjectClass: 'LCSSKU'
       };
 
       const defaultIdentifiers = TypeDefaults.getDefaultInformationalPropertiesFromObject(object);
@@ -570,7 +610,7 @@ describe('Type Defaults', () =>{
 
     it('LCSSeason', () =>{
       const object = {
-        objectClass: 'LCSSeason'
+        flexPLMObjectClass: 'LCSSeason'
       };
 
       const defaultIdentifiers = TypeDefaults.getDefaultInformationalPropertiesFromObject(object);
@@ -580,7 +620,7 @@ describe('Type Defaults', () =>{
 
     it('SeasonGroup', () =>{
       const object = {
-        objectClass: 'SeasonGroup'
+        flexPLMObjectClass: 'SeasonGroup'
       };
 
       const defaultIdentifiers = TypeDefaults.getDefaultInformationalPropertiesFromObject(object);

package/src/util/type-defaults.ts

@@ -173,6 +173,10 @@ export class TypeDefaults {
       entityClass = 'item';
     } else if('LCSColor' === objectClass){
       entityClass = 'color';
+    } else if(['LCSSeason', 'SeasonGroup'].includes(objectClass)) {
+      entityClass = 'assortment';
+    } else if(['LCSRevisableEntity', 'LCSLifecycleManaged'].includes(objectClass)) {
+      entityClass = 'custom-entity';
     }
 
     return entityClass;
@@ -256,6 +260,6 @@ export class TypeDefaults {
     }
 
     static getObjectClass(object: any): string {
-      return (object)? object['objectClass']: '';
+      return (object)? object['flexPLMObjectClass']: '';
     }
 }

package/src/util/type-utils.ts

@@ -1,6 +1,7 @@
 import { Logger } from '@contrail/app-framework';
 import { TypeClientOptions, Types } from '@contrail/sdk';
 import { TypeProperty } from '@contrail/types';
+import { TypeConversionUtils } from './type-conversion-utils';
 
 export class TypeUtils {
   private typesObj: Types;
@@ -55,6 +56,23 @@ export class TypeUtils {
     return objectClass;
   }
 
+  /** Gets the VibeIQ entity type for the object data
+   * @param data: object data
+   */
+  async getEntityTypeClientOptionsUsingMapping(transformMapFile, mapFileUtil, data): Promise<TypeClientOptions> {
+    const root = await TypeConversionUtils.getEntityClassFromObject(transformMapFile, mapFileUtil, data);
+    const path = await TypeConversionUtils.getEntityTypePathFromOjbect(transformMapFile, mapFileUtil, data);
+
+    let tco: TypeClientOptions = {
+      root,
+      path
+    };
+
+
+
+    return tco;
+  }
+
   /** Gets the VibeIQ entity type for the object data
    * @param objectClass: string object class
    * @param data: object data