[FSSDK-11529] Impression event logic adjustment for holdouts (#1076)

Author: junaed-optimizely

lib/core/decision_service/index.spec.ts

@@ -137,8 +137,8 @@ const getHoldoutTestDatafile = () => {
       id: 'holdout_running_id',
       key: 'holdout_running',
       status: 'Running',
-      includeFlags: [],
-      excludeFlags: [],
+      includedFlags: [],
+      excludedFlags: [],
       audienceIds: ['4001'], // age_22 audience
       audienceConditions: ['or', '4001'],
       variations: [
@@ -159,8 +159,8 @@ const getHoldoutTestDatafile = () => {
       id: "holdout_not_bucketed_id",
       key: "holdout_not_bucketed",
       status: "Running",
-      includeFlags: [],
-      excludeFlags: [],
+      includedFlags: [],
+      excludedFlags: [],
       audienceIds: ['4002'],
       audienceConditions: ['or', '4002'],
       variations: [
@@ -1940,8 +1940,8 @@ describe('DecisionService', () => {
           id: 'holdout_included_id',
           key: 'holdout_included',
           status: 'Running',
-          includeFlags: ['flag_1'],
-          excludeFlags: [],
+          includedFlags: ['1001'],
+          excludedFlags: [],
           audienceIds: ['4002'], // age_40 audience
           audienceConditions: ['or', '4002'],
           variations: [
@@ -1989,8 +1989,8 @@ describe('DecisionService', () => {
           id: 'holdout_included_specific_id',
           key: 'holdout_included_specific',
           status: 'Running',
-          includeFlags: ['flag_1'], 
-          excludeFlags: [], 
+          includedFlags: ['1001'],
+          excludedFlags: [], 
           audienceIds: ['4002'], // age_60 audience (age <= 60)
           audienceConditions: ['or', '4002'],
           variations: [
@@ -2176,7 +2176,7 @@ describe('DecisionService', () => {
           if(holdout.id === 'holdout_running_id') {
             return {
               ...holdout,
-              excludeFlags: ['flag_1']
+              excludedFlags: ['1001']
             }
           }
           return holdout;
@@ -2212,8 +2212,8 @@ describe('DecisionService', () => {
           id: 'holdout_second_id',
           key: 'holdout_second',
           status: 'Running',
-          includeFlags: [],
-          excludeFlags: [],
+          includedFlags: [],
+          excludedFlags: [],
           audienceIds: [], // no audience requirements
           audienceConditions: [],
           variations: [

lib/event_processor/event_builder/user_event.ts

@@ -28,6 +28,7 @@ import {
 
 import { EventTags, UserAttributes } from '../../shared_types';
 import { LoggerFacade } from '../../logging/logger';
+import { DECISION_SOURCES } from '../../common_exports';
 
 export type VisitorAttribute = {
   entityId: string
@@ -184,8 +185,8 @@ export const buildImpressionEvent = function({
   const variationKey = decision.getVariationKey(decisionObj);
   const variationId = decision.getVariationId(decisionObj);
   const cmabUuid = decisionObj.cmabUuid;
-
-  const layerId = experimentId !== null ? getLayerId(configObj, experimentId) : null;
+  const layerId =
+    experimentId !== null ? (ruleType === DECISION_SOURCES.HOLDOUT ? '' : getLayerId(configObj, experimentId)) : null;
 
   return {
     ...buildBaseEvent({

lib/feature_toggle.ts

@@ -31,4 +31,4 @@
  * flag and all associated checks can be removed from the codebase.
  */
 
-export const holdout = () => false;
+export const holdout = () => true;