Isset purchase update fix

src/anonymousUserTracking/criteriaCompletionChecker.ts

@@ -8,7 +8,8 @@
   UPDATE_USER,
   KEY_EVENT_NAME,
   UPDATECART_ITEM_PREFIX,
-  PURCHASE_ITEM_PREFIX
+  PURCHASE_ITEM_PREFIX,
+  PURCHASE_ITEM
 } from '../constants';
 
 interface SearchQuery {
@@ -33,7 +34,7 @@
 }
 
 class CriteriaCompletionChecker {
   private localStoredEventList: any[];
 
   constructor(localStoredEventList: string) {
     this.localStoredEventList = JSON.parse(localStoredEventList);
@@ -69,7 +70,7 @@
     return matchingCriteria ? matchingCriteria.criteriaId : null;
   }
 
   private prepareEventsToProcess(): any[] {
     const eventsToProcess: any[] = this.getEventsWithCartItems();
     const nonPurchaseEvents: any[] = this.getNonCartEvents();
 
@@ -99,7 +100,7 @@
             });
             return updatItem;
           });
-          updatedItem[KEY_ITEMS] = items;
+          updatedItem[PURCHASE_ITEM] = items;
         }
 
         if (localEventData.dataFields) {
@@ -277,9 +278,16 @@
   private evaluateFieldLogic(searchQueries: any[], eventData: any): boolean {
     const localDataKeys = Object.keys(eventData);
     let itemMatchedResult = false;
+    let key_item = null;
     if (localDataKeys.includes(KEY_ITEMS)) {
+      key_item = KEY_ITEMS;
+    } else if (localDataKeys.includes(PURCHASE_ITEM)) {
+      key_item = PURCHASE_ITEM;
+    }
+
+    if (key_item !== null) {
       // scenario of items inside purchase and updateCart Events
-      const items = eventData[KEY_ITEMS];
+      const items = eventData[key_item];
       const result = items.some((item: any) => {
         return this.doesItemMatchQueries(item, searchQueries);
       });
@@ -307,6 +315,19 @@
     }
     const matchResult = filteredSearchQueries.every((query: any) => {
       const field = query.field;
+      if (
+        query.dataType === TRACK_EVENT &&
+        query.fieldType === 'object' &&
+        query.comparatorType === 'IsSet'
+      ) {
+        const eventName = eventData[KEY_EVENT_NAME];
+        if (eventName === UPDATE_CART && field === eventName) {
+          return true;
+        }
+        if (field === eventName) {
+          return true;
+        }
+      }
       const eventKeyItems = filteredLocalDataKeys.filter(
         (keyItem) => keyItem === field
       );
@@ -323,10 +344,21 @@
   }
 
   private doesItemMatchQueries(item: any, searchQueries: any[]): boolean {
-    const filteredSearchQueries = searchQueries.filter((searchQuery) =>
-      Object.keys(item).includes(searchQuery.field)
-    );
-    if (filteredSearchQueries.length === 0) {
+    let shouldReturn = false;
+    const filteredSearchQueries = searchQueries.filter((searchQuery) => {
+      if (
+        searchQuery.field.startsWith(UPDATECART_ITEM_PREFIX) ||
+        searchQuery.field.startsWith(PURCHASE_ITEM_PREFIX)
+      ) {
+        if (!Object.keys(item).includes(searchQuery.field)) {
+          shouldReturn = true;
+          return false;
+        }
+        return true;
+      }
+      return false;
+    });
+    if (filteredSearchQueries.length === 0 || shouldReturn) {
       return false;
     }
     return filteredSearchQueries.every((query: any) => {
@@ -356,7 +388,7 @@
       case 'DoesNotEquals':
         return !this.compareValueEquality(matchObj, valueToCompare);
       case 'IsSet':
-        return matchObj !== '';
+        return this.issetCheck(matchObj);
       case 'GreaterThan':
       case 'LessThan':
       case 'GreaterThanOrEqualTo':
@@ -439,6 +471,16 @@
     }
   }
 
+  private issetCheck(matchObj: string | object | any[]): boolean {
+    if (Array.isArray(matchObj)) {
+      return matchObj.length > 0;
+    } else if (typeof matchObj === 'object' && matchObj !== null) {
+      return Object.keys(matchObj).length > 0;
+    } else {
+      return matchObj !== '';
+    }
+  }
+
   private handleException(e: any) {
     console.error('Exception occurred', e.toString());
   }