Filter segments by type when parsing split and RBS definitions

Author: EmilianoSanchez

src/sync/polling/updaters/__tests__/splitChangesUpdater.spec.ts

@@ -14,6 +14,7 @@ import { telemetryTrackerFactory } from '../../../../trackers/telemetryTracker';
 import { splitNotifications } from '../../../streaming/__tests__/dataMocks';
 import { RBSegmentsCacheInMemory } from '../../../../storages/inMemory/RBSegmentsCacheInMemory';
 import { RB_SEGMENT_UPDATE, SPLIT_UPDATE } from '../../../streaming/constants';
+import { IN_RULE_BASED_SEGMENT } from '../../../../utils/constants';
 
 const ARCHIVED_FF = 'ARCHIVED';
 
@@ -84,13 +85,31 @@ const testFFEmptySet: ISplit =
   conditions: [],
   sets: []
 };
+// @ts-ignore
+const rbsWithExcludedSegment: IRBSegment = {
+  name: 'rbs',
+  status: 'ACTIVE',
+  conditions: [],
+  excluded: {
+    segments: [{
+      type: 'standard',
+      name: 'C'
+    }, {
+      type: 'rule-based',
+      name: 'D'
+    }]
+  }
+};
 
 test('splitChangesUpdater / segments parser', () => {
+  let segments = parseSegments(activeSplitWithSegments as ISplit);
+  expect(segments).toEqual(new Set(['A', 'B']));
 
-  const segments = parseSegments(activeSplitWithSegments as ISplit);
+  segments = parseSegments(rbsWithExcludedSegment);
+  expect(segments).toEqual(new Set(['C']));
 
-  expect(segments.has('A')).toBe(true);
-  expect(segments.has('B')).toBe(true);
+  segments = parseSegments(rbsWithExcludedSegment, IN_RULE_BASED_SEGMENT);
+  expect(segments).toEqual(new Set(['D']));
 });
 
 test('splitChangesUpdater / compute splits mutation', () => {

src/sync/polling/updaters/splitChangesUpdater.ts

@@ -26,15 +26,20 @@ function checkAllSegmentsExist(segments: ISegmentsCacheBase): Promise<boolean> {
 }
 
 /**
- * Collect segments from a raw split definition.
+ * Collect segments from a raw FF or RBS definition.
  * Exported for testing purposes.
  */
 export function parseSegments(ruleEntity: ISplit | IRBSegment, matcherType: typeof IN_SEGMENT | typeof IN_RULE_BASED_SEGMENT = IN_SEGMENT): Set<string> {
   const { conditions = [], excluded } = ruleEntity as IRBSegment;
 
-  const segments = new Set<string>(
-    excluded && excluded.segments ? excluded.segments.map(segment => segment.name) : []
-  );
+  const segments = new Set<string>();
+  if (excluded && excluded.segments) {
+    excluded.segments.forEach(({ type, name }) => {
+      if ((type === 'standard' && matcherType === IN_SEGMENT) || (type === 'rule-based' && matcherType === IN_RULE_BASED_SEGMENT)) {
+        segments.add(name);
+      }
+    });
+  }
 
   for (let i = 0; i < conditions.length; i++) {
     const matchers = conditions[i].matcherGroup.matchers;