[FSSDK-12444] getQualifiedSegments improvement

Author: junaed-optimizely

src/utils/helpers.spec.ts

@@ -34,14 +34,18 @@ describe('getQualifiedSegments', () => {
   });
 
   const mockFetchResponse = (body: any, ok = true) => {
-    global.fetch = vi.fn().mockResolvedValue({
-      ok,
-      json: () => Promise.resolve(body),
-    });
+    vi.stubGlobal(
+      'fetch',
+      vi.fn().mockResolvedValue({
+        ok,
+        json: () => Promise.resolve(body),
+      })
+    );
   };
 
   afterEach(() => {
     vi.restoreAllMocks();
+    vi.unstubAllGlobals();
   });
 
   it('returns null when datafile is invalid or missing ODP integration', async () => {
@@ -95,7 +99,7 @@ describe('getQualifiedSegments', () => {
 
   it('returns null when fetch fails or response is not ok', async () => {
     // network error
-    global.fetch = vi.fn().mockRejectedValue(new Error('network error'));
+    vi.stubGlobal('fetch', vi.fn().mockRejectedValue(new Error('network error')));
 
     expect(await utils.getQualifiedSegments('user-1', makeDatafile())).toBeNull();
 
@@ -105,6 +109,25 @@ describe('getQualifiedSegments', () => {
     expect(await utils.getQualifiedSegments('user-1', makeDatafile())).toBeNull();
   });
 
+  it('skips audiences with malformed conditions string without throwing', async () => {
+    mockFetchResponse({
+      data: {
+        customer: {
+          audiences: {
+            edges: [{ node: { name: 'seg1', state: 'qualified' } }],
+          },
+        },
+      },
+    });
+
+    const datafile = makeDatafile({
+      typedAudiences: [{ conditions: '{bad json' }, { conditions: ['or', { match: 'qualified', value: 'seg1' }] }],
+    });
+
+    const result = await utils.getQualifiedSegments('user-1', datafile);
+    expect(result).toEqual(['seg1']);
+  });
+
   it('returns null when response contains GraphQL errors or missing edges', async () => {
     // GraphQL errors
     mockFetchResponse({ errors: [{ message: 'something went wrong' }] });

src/utils/helpers.ts

@@ -62,18 +62,13 @@ const QUALIFIED = 'qualified';
  * Looks for conditions with `match: 'qualified'` and collects their values.
  */
 function extractSegmentsFromConditions(condition: any): string[] {
-  if (typeof condition === 'string') {
-    return [];
-  }
-
   if (Array.isArray(condition)) {
-    const segments: string[] = [];
-    condition.forEach((c) => segments.push(...extractSegmentsFromConditions(c)));
-    return segments;
+    return condition.flatMap(extractSegmentsFromConditions);
   }
 
-  if (condition && typeof condition === 'object' && condition['match'] === 'qualified') {
-    return [condition['value']];
+  if (condition && typeof condition === 'object' && condition['match'] === QUALIFIED) {
+    const value = condition['value'];
+    return typeof value === 'string' && value.length > 0 ? [value] : [];
   }
 
   return [];
@@ -83,8 +78,9 @@ function extractSegmentsFromConditions(condition: any): string[] {
  * Builds the GraphQL query payload for fetching audience segments from ODP.
  */
 function buildGraphQLQuery(userId: string, segmentsToCheck: string[]): string {
-  const segmentsList = segmentsToCheck.map((s) => `\\"${s}\\"`).join(',');
-  return `{"query" : "query {customer(fs_user_id : \\"${userId}\\") {audiences(subset: [${segmentsList}]) {edges {node {name state}}}}}"}`;
+  const segmentsList = segmentsToCheck.map((s) => `"${s}"`).join(',');
+  const query = `query {customer(fs_user_id : "${userId}") {audiences(subset: [${segmentsList}]) {edges {node {name state}}}}}`;
+  return JSON.stringify({ query });
 }
 
 /**
@@ -121,29 +117,21 @@ export async function getQualifiedSegments(
     } catch {
       return null;
     }
-  } else if (typeof datafile === 'object') {
+  } else if (typeof datafile === 'object' && datafile !== null) {
     datafileObj = datafile;
   } else {
     return null;
   }
 
   // Extract ODP integration config from datafile
-  let apiKey = '';
-  let apiHost = '';
-  let odpIntegrated = false;
-
-  if (Array.isArray(datafileObj.integrations)) {
-    for (const integration of datafileObj.integrations) {
-      if (integration.key === 'odp') {
-        odpIntegrated = true;
-        apiKey = integration.publicKey || '';
-        apiHost = integration.host || '';
-        break;
-      }
-    }
-  }
+  const odpIntegration = Array.isArray(datafileObj.integrations)
+    ? datafileObj.integrations.find((i: Record<string, unknown>) => i.key === 'odp')
+    : undefined;
 
-  if (!odpIntegrated || !apiKey || !apiHost) {
+  const apiKey = odpIntegration?.publicKey;
+  const apiHost = odpIntegration?.host;
+
+  if (!apiKey || !apiHost) {
     return null;
   }
 
@@ -153,8 +141,14 @@ export async function getQualifiedSegments(
 
   for (const audience of audiences) {
     if (audience.conditions) {
-      const conditions =
-        typeof audience.conditions === 'string' ? JSON.parse(audience.conditions) : audience.conditions;
+      let conditions = audience.conditions;
+      if (typeof conditions === 'string') {
+        try {
+          conditions = JSON.parse(conditions);
+        } catch {
+          continue;
+        }
+      }
       extractSegmentsFromConditions(conditions).forEach((s) => allSegments.add(s));
     }
   }