[FSSDK-11529] project config issue fix

Author: junaed-optimizely

lib/core/decision_service/index.spec.ts

@@ -1940,7 +1940,7 @@ describe('DecisionService', () => {
           id: 'holdout_included_id',
           key: 'holdout_included',
           status: 'Running',
-          includedFlags: ['flag_1'],
+          includedFlags: ['1001'],
           excludedFlags: [],
           audienceIds: ['4002'], // age_40 audience
           audienceConditions: ['or', '4002'],
@@ -1989,7 +1989,7 @@ describe('DecisionService', () => {
           id: 'holdout_included_specific_id',
           key: 'holdout_included_specific',
           status: 'Running',
-          includedFlags: ['flag_1'], 
+          includedFlags: ['1001'],
           excludedFlags: [], 
           audienceIds: ['4002'], // age_60 audience (age <= 60)
           audienceConditions: ['or', '4002'],
@@ -2176,7 +2176,7 @@ describe('DecisionService', () => {
           if(holdout.id === 'holdout_running_id') {
             return {
               ...holdout,
-              excludedFlags: ['flag_1']
+              excludedFlags: ['1001']
             }
           }
           return holdout;

lib/project_config/project_config.spec.ts

@@ -339,7 +339,7 @@ const getHoldoutDatafile = () => {
       key: 'holdout_2',
       status: 'Running',
       includedFlags: [],
-      excludedFlags: ['feature_3'],
+      excludedFlags: ['44829230000'],
       audienceIds: [],
       audienceConditions: [],
       variations: [
@@ -360,7 +360,7 @@ const getHoldoutDatafile = () => {
       id: 'holdout_id_3',
       key: 'holdout_3',
       status: 'Draft',
-      includedFlags: ['feature_1'],
+      includedFlags: ['4482920077'],
       excludedFlags: [],
       audienceIds: [],
       audienceConditions: [],
@@ -420,11 +420,11 @@ describe('createProjectConfig - holdouts, feature toggle is on', () => {
     ]);
 
     expect(configObj.includedHoldouts).toEqual({
-      feature_1: [configObj.holdouts[2]], // holdout_3 includes feature_1
+      feature_1: [configObj.holdouts[2]], // holdout_3 includes feature_1 (ID: 4482920077)
     });
 
     expect(configObj.excludedHoldouts).toEqual({
-      feature_3: [configObj.holdouts[1]]  // holdout_2 excludes feature_3
+      feature_3: [configObj.holdouts[1]]  // holdout_2 excludes feature_3 (ID: 44829230000)
     });
 
     expect(configObj.flagHoldoutsMap).toEqual({});

lib/project_config/project_config.ts

@@ -360,6 +360,8 @@ const parseHoldoutsConfig = (projectConfig: ProjectConfig): void => {
   projectConfig.excludedHoldouts = {};
   projectConfig.flagHoldoutsMap = {};
 
+  const featureFlagIdMap = keyBy(projectConfig.featureFlags, 'id');
+
   projectConfig.holdouts.forEach((holdout) => {
     if (!holdout.includedFlags) {
       holdout.includedFlags = [];
@@ -379,19 +381,27 @@ const parseHoldoutsConfig = (projectConfig: ProjectConfig): void => {
     if (holdout.includedFlags.length === 0) {
       projectConfig.globalHoldouts.push(holdout);
 
-      holdout.excludedFlags.forEach((flagKey: string) => {
-        if (!projectConfig.excludedHoldouts[flagKey]) {
-          projectConfig.excludedHoldouts[flagKey] = [];
+      holdout.excludedFlags.forEach((flagId: string) => {
+        const flag = featureFlagIdMap[flagId];
+        if (flag) {
+          const flagKey = flag.key;
+          if (!projectConfig.excludedHoldouts[flagKey]) {
+            projectConfig.excludedHoldouts[flagKey] = [];
+          }
+          projectConfig.excludedHoldouts[flagKey].push(holdout);
         }
-        projectConfig.excludedHoldouts[flagKey].push(holdout);
       });
     } else {
-      holdout.includedFlags.forEach((flagKey: string) => {
-        if (!projectConfig.includedHoldouts[flagKey]) {
-          projectConfig.includedHoldouts[flagKey] = [];
+      holdout.includedFlags.forEach((flagId: string) => {
+        const flag = featureFlagIdMap[flagId];
+        if (flag) {
+          const flagKey = flag.key;
+          if (!projectConfig.includedHoldouts[flagKey]) {
+            projectConfig.includedHoldouts[flagKey] = [];
+          }
+          projectConfig.includedHoldouts[flagKey].push(holdout);
         }
-        projectConfig.includedHoldouts[flagKey].push(holdout);
-      });
+      })
     }
   });
 }