@contrail/flexplm 1.7.0-alpha.c295a1e → 1.7.1-alpha.a1f78e7

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

@@ -183,7 +183,15 @@ class BaseEntityProcessor {
             return undefined;
         }
         const entityReference = identityEntity.entityReference;
-        const [entityName, id] = entityReference.split(':');
+        if (typeof entityReference !== 'string' || !entityReference.includes(':')) {
+            throw new Error(`Invalid identity entityReference: ${String(entityReference)}`);
+        }
+        const firstColonIndex = entityReference.indexOf(':');
+        if (firstColonIndex === 0 || firstColonIndex === entityReference.length - 1) {
+            throw new Error('Invalid identity entityReference: ' + entityReference);
+        }
+        const entityName = entityReference.slice(0, firstColonIndex);
+        const id = entityReference.slice(firstColonIndex + 1);
         const entity = await this.entities.get({
             entityName,
             id

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

@@ -585,5 +585,82 @@ describe('BaseEntityProcessor', () => {
                 id: '5'
             });
         });
+        it('should split entityReference on the first colon only when the id itself contains colons (project-item)', async () => {
+            const mockEntity = { id: 'e5g8ugusNWOuCvdw:nju12Jw2jGFvcQSf', name: 'Test Project Item' };
+            mockEntitiesGet
+                .mockResolvedValueOnce([{ entityReference: 'project-item:e5g8ugusNWOuCvdw:nju12Jw2jGFvcQSf' }])
+                .mockResolvedValueOnce(mockEntity);
+            const result = await btep.getEntityUsingIdentityService({
+                poolKey: 'project-item',
+                propertyName: 'itemNumber',
+                propertyValue: '12345'
+            });
+            expect(result).toEqual(mockEntity);
+            expect(mockEntitiesGet).toHaveBeenNthCalledWith(2, {
+                entityName: 'project-item',
+                id: 'e5g8ugusNWOuCvdw:nju12Jw2jGFvcQSf'
+            });
+        });
+        it('should split entityReference on the first colon only when identity result is a single object with a composite id', async () => {
+            const mockEntity = { id: 'e5g8ugusNWOuCvdw:nju12Jw2jGFvcQSf' };
+            mockEntitiesGet
+                .mockResolvedValueOnce({ entityReference: 'project-item:e5g8ugusNWOuCvdw:nju12Jw2jGFvcQSf' })
+                .mockResolvedValueOnce(mockEntity);
+            const result = await btep.getEntityUsingIdentityService({
+                poolKey: 'project-item',
+                propertyName: 'itemNumber',
+                propertyValue: '12345'
+            });
+            expect(result).toEqual(mockEntity);
+            expect(mockEntitiesGet).toHaveBeenNthCalledWith(2, {
+                entityName: 'project-item',
+                id: 'e5g8ugusNWOuCvdw:nju12Jw2jGFvcQSf'
+            });
+        });
+        it('should throw error when entityReference has no colon', async () => {
+            mockEntitiesGet.mockResolvedValue([{ entityReference: 'item1' }]);
+            await expect(btep.getEntityUsingIdentityService({
+                poolKey: 'item',
+                propertyName: 'itemNumber',
+                propertyValue: '12345'
+            })).rejects.toThrow('Invalid identity entityReference: item1');
+            expect(mockEntitiesGet).toHaveBeenCalledTimes(1);
+        });
+        it('should throw error when entityReference is not a string', async () => {
+            mockEntitiesGet.mockResolvedValue([{ entityReference: 12345 }]);
+            await expect(btep.getEntityUsingIdentityService({
+                poolKey: 'item',
+                propertyName: 'itemNumber',
+                propertyValue: '12345'
+            })).rejects.toThrow('Invalid identity entityReference: 12345');
+            expect(mockEntitiesGet).toHaveBeenCalledTimes(1);
+        });
+        it('should throw error when entityReference is undefined', async () => {
+            mockEntitiesGet.mockResolvedValue([{}]);
+            await expect(btep.getEntityUsingIdentityService({
+                poolKey: 'item',
+                propertyName: 'itemNumber',
+                propertyValue: '12345'
+            })).rejects.toThrow('Invalid identity entityReference: undefined');
+            expect(mockEntitiesGet).toHaveBeenCalledTimes(1);
+        });
+        it('should throw error when entityReference starts with a colon (missing entityName)', async () => {
+            mockEntitiesGet.mockResolvedValue([{ entityReference: ':1' }]);
+            await expect(btep.getEntityUsingIdentityService({
+                poolKey: 'item',
+                propertyName: 'itemNumber',
+                propertyValue: '12345'
+            })).rejects.toThrow('Invalid identity entityReference: :1');
+            expect(mockEntitiesGet).toHaveBeenCalledTimes(1);
+        });
+        it('should throw error when entityReference ends with a colon (missing id)', async () => {
+            mockEntitiesGet.mockResolvedValue([{ entityReference: 'item:' }]);
+            await expect(btep.getEntityUsingIdentityService({
+                poolKey: 'item',
+                propertyName: 'itemNumber',
+                propertyValue: '12345'
+            })).rejects.toThrow('Invalid identity entityReference: item:');
+            expect(mockEntitiesGet).toHaveBeenCalledTimes(1);
+        });
     });
 });

package/package.json

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