Skip to content

Commit

Permalink
fix: return if empty array (#9254)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
FredrikOseberg authored Feb 7, 2025
1 parent aa5c70f commit af51653
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ export class ClientFeatureToggleDelta extends EventEmitter {
if (!hasDelta) {
await this.initEnvironmentDelta(environment);
}

if (requiredRevisionId >= this.currentRevisionId) {
return undefined;
}
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/lib/features/segment/fake-segment-read-model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class FakeSegmentReadModel implements ISegmentReadModel {
return [];
}

async getAllForClient(ids?: number[]): Promise<IClientSegment[]> {
async getAllForClientIds(ids?: number[]): Promise<IClientSegment[]> {
return [];
}
}
2 changes: 1 addition & 1 deletion src/lib/features/segment/segment-read-model-type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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[]>;
}
6 changes: 5 additions & 1 deletion src/lib/features/segment/segment-read-model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) => ({
Expand Down

0 comments on commit af51653

Please sign in to comment.