Merge pull request #118 from Flagsmith/release/3.0.0

Release 3.0.0

Author: matthewelwell

flagsmith-engine/identities/models.ts

@@ -19,14 +19,16 @@ export class IdentityModel {
         identityFeatures: IdentityFeaturesList,
         environmentApiKey: string,
         identifier: string,
-        identityUuid?: string
+        identityUuid?: string,
+        djangoID?: number
     ) {
         this.identityUuid = identityUuid || uuidv4();
         this.createdDate = Date.parse(created_date) || Date.now();
         this.identityTraits = identityTraits;
         this.identityFeatures = new IdentityFeaturesList(...identityFeatures);
         this.environmentApiKey = environmentApiKey;
         this.identifier = identifier;
+        this.djangoID = djangoID;
     }
 
     get compositeKey() {

flagsmith-engine/segments/evaluators.ts

@@ -27,7 +27,7 @@ export function evaluateIdentityInSegment(
                 overrideTraits || identity.identityTraits,
                 rule,
                 segment.id,
-                identity.compositeKey
+                identity.djangoID || identity.compositeKey
             )
         ).length === segment.rules.length
     );
@@ -62,7 +62,8 @@ export function traitsMatchSegmentCondition(
     identityId: number | string
 ): boolean {
     if (condition.operator == PERCENTAGE_SPLIT) {
-        return getHashedPercentateForObjIds([segmentId, identityId]) <= parseFloat(String(condition.value));
+        var hashedPercentage = getHashedPercentateForObjIds([segmentId, identityId]);
+        return hashedPercentage <= parseFloat(String(condition.value));
     }
     const traits = identityTraits.filter(t => t.traitKey === condition.property_);
     const trait = traits.length > 0 ? traits[0] : undefined;
@@ -73,4 +74,4 @@ export function traitsMatchSegmentCondition(
     }
     return trait ? condition.matchesTraitValue(trait.traitValue) : false;
 
-}
+}

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "flagsmith-nodejs",
-  "version": "2.5.2",
+  "version": "3.0.0",
   "description": "Flagsmith lets you manage features flags and remote config across web, mobile and server side applications. Deliver true Continuous Integration. Get builds out faster. Control who has access to new features.",
   "main": "build/index.js",
   "repository": {

package.json

@@ -1,11 +1,21 @@
 import {
+    ALL_RULE,
     CONDITION_OPERATORS,
+    PERCENTAGE_SPLIT,
 } from '../../../../flagsmith-engine/segments/constants';
-import {
-    SegmentConditionModel,
-} from '../../../../flagsmith-engine/segments/models';
-import {traitsMatchSegmentCondition} from "../../../../flagsmith-engine/segments/evaluators";
-import {TraitModel} from "../../../../flagsmith-engine";
+import {SegmentConditionModel} from '../../../../flagsmith-engine/segments/models';
+import {traitsMatchSegmentCondition, evaluateIdentityInSegment} from "../../../../flagsmith-engine/segments/evaluators";
+import {TraitModel, IdentityModel} from "../../../../flagsmith-engine";
+import {environment} from "../utils";
+import { buildSegmentModel } from '../../../../flagsmith-engine/segments/util';
+import { getHashedPercentateForObjIds } from '../../../../flagsmith-engine/utils/hashing';
+
+
+// todo: work out how to implement this in a test function or before hook
+jest.mock('../../../../flagsmith-engine/utils/hashing', () => ({
+    getHashedPercentateForObjIds: jest.fn(() => 1)
+}));
+
 
 let traitExistenceTestCases: [string, string | null | undefined, string | null | undefined, TraitModel [],boolean][] = [
     [CONDITION_OPERATORS.IS_SET,'foo', null,[] , false],
@@ -24,4 +34,34 @@ test('test_traits_match_segment_condition_for_trait_existence_operators', () =>
            traitsMatchSegmentCondition (traits, segmentModel, 'any','any')
         ).toBe(expectedResult);
     }
-});
+});
+
+
+test('evaluateIdentityInSegment uses django ID for hashed percentage when present', () => {
+    var identityModel = new IdentityModel(Date.now().toString(), [], [], environment().apiKey, 'identity_1', undefined, 1);
+    const segmentDefinition = {
+        id: 1,
+        name: 'percentage_split_segment',
+        rules: [
+            {
+                type: ALL_RULE,
+                conditions: [
+                    {
+                        operator: PERCENTAGE_SPLIT,
+                        property_: null,
+                        value: "10"
+                    }
+                ],
+                rules: []
+            }
+        ],
+        feature_states: []
+    };
+    const segmentModel = buildSegmentModel(segmentDefinition);
+
+    var result = evaluateIdentityInSegment(identityModel, segmentModel);
+
+    expect(result).toBe(true);
+    expect(getHashedPercentateForObjIds).toHaveBeenCalledTimes(1)
+    expect(getHashedPercentateForObjIds).toHaveBeenCalledWith([segmentModel.id, identityModel.djangoID])
+});