Merge pull request #49 from Flagsmith/release/4.2.0

Release 4.2.0

Author: matthewelwell

Flagsmith.Engine/Segment/Constants.cs

@@ -20,5 +20,8 @@ public static class Constants
         public const string NotEqual = "NOT_EQUAL";
         public const string Regex = "REGEX";
         public const string PercentageSplit = "PERCENTAGE_SPLIT";
+        public const string IsSet = "IS_SET";
+        public const string IsNotSet = "IS_NOT_SET";
+        public const string Modulo = "MODULO";
     }
 }

Flagsmith.Engine/Segment/Evaluator.cs

@@ -36,15 +36,24 @@ static bool TraitsMatchSegmentCondition(List<TraitModel> identityTraits, Segment
                 return Hashing.GetHashedPercentageForObjectIds(new List<string>() { segemntId, identityId }) <= float.Parse(condition.Value);
 
             var trait = identityTraits?.FirstOrDefault(t => t.TraitKey == condition.Property);
-            if (trait != null)
-                return MatchesTraitValue(trait.TraitValue, condition);
-            return false;
+
+            if (condition.Operator == Constants.IsSet)
+            {
+                return trait != null;
+            }
+            else if (condition.Operator == Constants.IsNotSet)
+            {
+                return trait == null;
+            }
+
+            return trait != null && MatchesTraitValue(trait.TraitValue, condition);
         }
         public static bool MatchesTraitValue(object traitValue, SegmentConditionModel condition)
         {
             var exceptionOperatorMethods = new Dictionary<string, string>(){
                 {Constants.NotContains, "EvaluateNotContains"},
                 {Constants.Regex, "EvaluateRegex"},
+                {Constants.Modulo, "EvaluateModulo"},
             };
             if (exceptionOperatorMethods.ContainsKey(condition.Operator))
                 return (bool)typeof(SegmentConditionModel).GetMethod(exceptionOperatorMethods[condition.Operator]).Invoke(condition, new object[] { traitValue });

Flagsmith.Engine/Segment/Models/SegmentConditionModel.cs

@@ -1,4 +1,5 @@
 using System.Text.RegularExpressions;
+using System;
 using Newtonsoft.Json;
 namespace FlagsmithEngine.Segment.Models
 {
@@ -13,6 +14,23 @@ public class SegmentConditionModel
 
         public bool EvaluateNotContains(string traitValue) => !traitValue.Contains(Value);
         public bool EvaluateRegex(string traitValue) => Regex.Match(traitValue, Value).Success;
+        public bool EvaluateModulo(object traitValue)
+        {
+            try
+            {
+                string[] parts = this.Value.Split('|');
+                if (parts.Length != 2) { return false; }
+
+                double divisor = Convert.ToDouble(parts[0]);
+                double remainder = Convert.ToDouble(parts[1]);
+
+                return Convert.ToDouble(traitValue) % divisor == remainder;
+            }
+            catch (FormatException)
+            {
+                return false;
+            }
+        }
 
     }
 }

Flagsmith.EngineTest/Unit/Segments/SegmentEvaluatorTest.cs

@@ -93,6 +93,12 @@ public static IEnumerable<object[]> TestCasesSegmentCondition() =>
                 new object[]{Constants.LessThanInclusive, "1.0.0", "1.0.1:semver", true},
                 new object[]{Constants.LessThanInclusive, "1.0.0", "1.0.0:semver", true},
                 new object[]{Constants.LessThanInclusive, "1.0.1", "1.0.0:semver", false},
+                new object[]{Constants.Modulo, 2, "2|0", true},
+                new object[]{Constants.Modulo, 3, "2|0", false},
+                new object[]{Constants.Modulo, 2.0, "2|0", true},
+                new object[]{Constants.Modulo, 2.0, "2.0|0", true},
+                new object[]{Constants.Modulo, "foo", "2|0", false},
+                new object[]{Constants.Modulo, "foo", "foo|bar", false},
             };
         [Theory]
         [MemberData(nameof(TestCasesIdentityInSegment))]
@@ -142,6 +148,10 @@ public static IEnumerable<object[]> TestCasesIdentityInSegment() =>
                                     new TraitModel { TraitKey = Fixtures.TraitKey3, TraitValue = Fixtures.TraitValue3 }
                                     }, true
                 },
+                new object[] { Fixtures.SegmentToCheckIfTrait1IsSet, new List<TraitModel>(), false },
+                new object[] { Fixtures.SegmentToCheckIfTrait1IsSet, new List<TraitModel>() { new TraitModel {TraitKey = Fixtures.TraitKey1, TraitValue = "foo"}}, true },
+                new object[] { Fixtures.SegmentToCheckIfTrait1IsNotSet, new List<TraitModel>() { new TraitModel {TraitKey = Fixtures.TraitKey1, TraitValue = "foo"}}, false },
+                new object[] { Fixtures.SegmentToCheckIfTrait1IsNotSet, new List<TraitModel>(), true },
             };
         [Theory]
         [InlineData(10, 1, true)]
@@ -164,6 +174,5 @@ public void TestIdentityInSegmentPercentageSplit(int segmentSplitValue, int iden
             var result = Evaluator.EvaluateIdentityInSegment(Unit.Fixtures.Identity(), segment, null);
             Assert.Equal(expectedResult, result);
         }
-
     }
 }

Flagsmith.EngineTest/Unit/Segments/fixtures.cs

@@ -122,5 +122,35 @@ public class Fixtures
             }
 
         };
+
+        public static SegmentModel SegmentToCheckIfTrait1IsSet => new SegmentModel()
+        {
+            Id = 7,
+            Name = "segment_to_check_if_foo_is_set",
+            Rules = new List<SegmentRuleModel> {
+                new SegmentRuleModel {
+                    Type = Constants.AllRule,
+                    Conditions = new List<SegmentConditionModel>
+                    {
+                        new SegmentConditionModel { Operator = Constants.IsSet, Property = TraitKey1, Value = null }
+                    }
+                }
+            }
+        };
+
+        public static SegmentModel SegmentToCheckIfTrait1IsNotSet => new SegmentModel()
+        {
+            Id = 8,
+            Name = "segment_to_check_if_foo_is_not_set",
+            Rules = new List<SegmentRuleModel> {
+                new SegmentRuleModel {
+                    Type = Constants.AllRule,
+                    Conditions = new List<SegmentConditionModel>
+                    {
+                        new SegmentConditionModel { Operator = Constants.IsNotSet, Property = TraitKey1, Value = null }
+                    }
+                }
+            }
+        };
     }
 }

Flagsmith.FlagsmithClient/Flagsmith.FlagsmithClient.csproj

@@ -6,8 +6,8 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <PackageId>Flagsmith</PackageId>
     <Title>Flagsmith</Title>
-    <Version>4.1.0</Version>
-    <Authors>ssg-luke</Authors>
+    <Version>4.2.0</Version>
+    <Authors>flagsmith</Authors>
     <Company>Flagsmith</Company>
     <PackageDescription>Client SDK for Flagsmith. Ship features with confidence using feature flags and remote config. Host yourself or use our hosted version at https://flagsmith.com/</PackageDescription>
     <Copyright>Copyright © 2021 Bullet Train Ltd</Copyright>