From af516537bdc0ffa4304ef0ad7ddee8b9da92be03 Mon Sep 17 00:00:00 2001
From: Fredrik Strand Oseberg <fredrik.no@gmail.com>
Date: Fri, 7 Feb 2025 14:39:43 +0100
Subject: [PATCH] fix: return if empty array (#9254)

Fixes an issue where segment-updated event would be added to cache even
though there were no correlated events. Tests needs to be added in
Enterprise.
---
 .../delta/client-feature-toggle-delta.ts                    | 5 +++--
 src/lib/features/segment/fake-segment-read-model.ts         | 2 +-
 src/lib/features/segment/segment-read-model-type.ts         | 2 +-
 src/lib/features/segment/segment-read-model.ts              | 6 +++++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/lib/features/client-feature-toggles/delta/client-feature-toggle-delta.ts b/src/lib/features/client-feature-toggles/delta/client-feature-toggle-delta.ts
index 9858b77697..b3e9389054 100644
--- a/src/lib/features/client-feature-toggles/delta/client-feature-toggle-delta.ts
+++ b/src/lib/features/client-feature-toggles/delta/client-feature-toggle-delta.ts
@@ -171,6 +171,7 @@ export class ClientFeatureToggleDelta extends EventEmitter {
         if (!hasDelta) {
             await this.initEnvironmentDelta(environment);
         }
+
         if (requiredRevisionId >= this.currentRevisionId) {
             return undefined;
         }
@@ -272,7 +273,7 @@ export class ClientFeatureToggleDelta extends EventEmitter {
             .map((event) => event.preData.id);
 
         const segments =
-            await this.segmentReadModel.getAllForClient(segmentsUpdated);
+            await this.segmentReadModel.getAllForClientIds(segmentsUpdated);
 
         const segmentsUpdatedEvents: DeltaEvent[] = segments.map((segment) => ({
             eventId: latestRevision,
@@ -328,7 +329,7 @@ export class ClientFeatureToggleDelta extends EventEmitter {
         const baseFeatures = await this.getClientFeatures({
             environment,
         });
-        const baseSegments = await this.segmentReadModel.getAllForClient();
+        const baseSegments = await this.segmentReadModel.getAllForClientIds();
 
         this.currentRevisionId =
             await this.configurationRevisionService.getMaxRevisionId();
diff --git a/src/lib/features/segment/fake-segment-read-model.ts b/src/lib/features/segment/fake-segment-read-model.ts
index c5c034a51b..b2d984db0b 100644
--- a/src/lib/features/segment/fake-segment-read-model.ts
+++ b/src/lib/features/segment/fake-segment-read-model.ts
@@ -23,7 +23,7 @@ export class FakeSegmentReadModel implements ISegmentReadModel {
         return [];
     }
 
-    async getAllForClient(ids?: number[]): Promise<IClientSegment[]> {
+    async getAllForClientIds(ids?: number[]): Promise<IClientSegment[]> {
         return [];
     }
 }
diff --git a/src/lib/features/segment/segment-read-model-type.ts b/src/lib/features/segment/segment-read-model-type.ts
index 261ea6769f..4e992d2912 100644
--- a/src/lib/features/segment/segment-read-model-type.ts
+++ b/src/lib/features/segment/segment-read-model-type.ts
@@ -9,5 +9,5 @@ export interface ISegmentReadModel {
     getAllFeatureStrategySegments(): Promise<IFeatureStrategySegment[]>;
     getActive(): Promise<ISegment[]>;
     getActiveForClient(): Promise<IClientSegment[]>;
-    getAllForClient(ids?: number[]): Promise<IClientSegment[]>;
+    getAllForClientIds(ids?: number[]): Promise<IClientSegment[]>;
 }
diff --git a/src/lib/features/segment/segment-read-model.ts b/src/lib/features/segment/segment-read-model.ts
index 3d8174580a..b55ccec783 100644
--- a/src/lib/features/segment/segment-read-model.ts
+++ b/src/lib/features/segment/segment-read-model.ts
@@ -110,7 +110,11 @@ export class SegmentReadModel implements ISegmentReadModel {
         }));
     }
 
-    async getAllForClient(ids?: number[]): Promise<IClientSegment[]> {
+    async getAllForClientIds(ids?: number[]): Promise<IClientSegment[]> {
+        if (!ids || ids.length === 0) {
+            return [];
+        }
+
         const fullSegments = await this.getAll(ids);
 
         return fullSegments.map((segments) => ({