Address PR Comments

Author: alexs-mparticle

src/apiClient.ts

@@ -135,6 +135,7 @@ export default function APIClient(
             this.queueEventForBatchUpload(event);
         }
 
+        // https://go.mparticle.com/work/SQDSDKS-6935
         // While Event Name is 'usually' a string, there are some cases where it is a number
         // in that it could be a type of MessageType Enum
         if (event.EventName as unknown as number !== Types.MessageType.AppStateTransition) {

src/types.ts

@@ -1,5 +1,5 @@
 import Constants from './constants';
-import { parseNumber, valueof } from './utils';
+import { isNumber, parseNumber, valueof } from './utils';
 
 interface IdentitiesByType {
     [key: number]: string;
@@ -159,7 +159,9 @@ export const IdentityType = {
         }
     },
 
-    getIdentityType: (identityName: string): valueof<typeof IdentityType> | boolean => {
+    getIdentityType: (
+        identityName: string
+    ): valueof<typeof IdentityType> | boolean => {
         switch (identityName) {
             case 'other':
                 return IdentityType.Other;
@@ -208,7 +210,7 @@ export const IdentityType = {
         }
     },
 
-    getIdentityName: (identityType): string | null => {
+    getIdentityName: (identityType: number): string | null => {
         switch (identityType) {
             case IdentityType.Other:
                 return 'other';
@@ -257,14 +259,25 @@ export const IdentityType = {
         }
     },
 
-    getNewIdentitiesByName: (newIdentitiesByType: IdentitiesByType): IdentitiesByType => {
+    // Strips out functions from Identity Types for easier lookups
+    getValuesAsStrings: (): string[] =>
+        Object.values(IdentityType)
+            .map(value => (isNumber(value) ? value.toString() : undefined))
+            .filter(value => value !== undefined) as string[],
+
+    getNewIdentitiesByName: (
+        newIdentitiesByType: IdentitiesByType
+    ): IdentitiesByType => {
         const newIdentitiesByName: IdentitiesByType = {};
 
         for (const key in newIdentitiesByType) {
-            const identityNameKey = IdentityType.getIdentityName(
-                parseNumber(key)
-            );
-            newIdentitiesByName[identityNameKey] = newIdentitiesByType[key];
+            // IdentityTypes are stored as numbers but are passed in as strings
+            if (IdentityType.getValuesAsStrings().includes(key)) {
+                const identityNameKey = IdentityType.getIdentityName(
+                    parseNumber(key)
+                );
+                newIdentitiesByName[identityNameKey] = newIdentitiesByType[key];
+            }
         }
 
         return newIdentitiesByName;

test/jest/types.spec.ts

@@ -238,6 +238,36 @@ describe('IdentityType', () => {
         expect(PhoneNumber3).toEqual(21);
     });
 
+    describe('#getValuesAsStrings', () => {
+        it('returns an array of identity types values as an array of numbers as strings', () => {
+            const { getValuesAsStrings } = IdentityType;
+
+            expect(getValuesAsStrings()).toEqual([
+                '0',
+                '1',
+                '2',
+                '3',
+                '4',
+                '5',
+                '6',
+                '7',
+                '9',
+                '10',
+                '11',
+                '12',
+                '13',
+                '14',
+                '15',
+                '16',
+                '17',
+                '18',
+                '19',
+                '20',
+                '21',
+            ]);
+        });
+    });
+
     describe('#isValid', () => {
         it('returns true if the identity type is valid', () => {
             const { isValid } = IdentityType;
@@ -288,9 +318,7 @@ describe('IdentityType', () => {
             });
         });
 
-        // FIXME: We have a bug in the implementation
-        // FIXME: parseNumber causes unknown identity type to be returned as 0
-        it.skip('returns an empty object if the identity type is not found', () => {
+        it('returns an empty object if the identity type is not found', () => {
             const { getNewIdentitiesByName } = IdentityType;
 
             const newIdentitiesByType = {