Skip to content

Commit

Permalink
FFM-11656 Sort Group Serving Rules rules when saving to cache (#117)
Browse files Browse the repository at this point in the history
* FFM-11656 Sort serving rules in cache code

* FFM-11656 Sort serving rules in cache code

* FFM-11656 1.8.2 bump
  • Loading branch information
erdirowlands authored Jun 28, 2024
1 parent 31a6e23 commit 370918e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@harnessio/ff-nodejs-server-sdk",
"version": "1.8.1",
"version": "1.8.2",
"description": "Feature flags SDK for NodeJS environments",
"main": "dist/cjs/index.js",
"module": "dist/esm/index.mjs",
Expand Down
2 changes: 0 additions & 2 deletions src/evaluator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,6 @@ export class Evaluator {

if (segment?.servingRules?.length) {
// Use enhanced rules first if they're available
segment.servingRules.sort((r1, r2) => r1.priority - r2.priority);

for (const servingRule of segment.servingRules) {
if (await this.evaluateClauses_v2(servingRule.clauses, target)) {
return true;
Expand Down
12 changes: 10 additions & 2 deletions src/repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ export class StorageRepository implements Repository {
if (await this.isSegmentOutdated(identifier, segment)) {
return;
}

// Sort the serving rules before storing the segment
this.sortSegmentServingRules(segment);

const segmentKey = this.formatSegmentKey(identifier);
if (this.store) {
await this.store.set(segmentKey, segment);
Expand Down Expand Up @@ -165,13 +169,17 @@ export class StorageRepository implements Repository {
return oldSegment?.version && oldSegment.version >= segment?.version;
}

private sortSegmentServingRules(segment: Segment): void {
if (segment.servingRules && segment.servingRules.length > 1) {
segment.servingRules.sort((r1, r2) => r1.priority - r2.priority);
}
}

private formatFlagKey(key: string): string {
return `flags/${key}`;
}

private formatSegmentKey(key: string): string {
return `segments/${key}`;
}


}

0 comments on commit 370918e

Please sign in to comment.