feat: rebased

Author: Zaimwa9

lib/flagsmith/engine/evaluation/mappers.rb

@@ -2,7 +2,7 @@
 
 module Flagsmith
   module Engine
-    module EvaluationContext
+    module Evaluation
       module Mappers
         STRONGEST_PRIORITY = Float::INFINITY
         WEAKEST_PRIORITY = -Float::INFINITY
@@ -55,7 +55,8 @@ def self.map_environment_model_to_evaluation_context(environment)
             }
 
             feature_hash[:variants] = variants if variants
-            feature_hash[:priority] = fs.feature_segment.priority if fs.feature_segment&.priority
+            priority = fs.feature_segment&.priority
+            feature_hash[:priority] = priority unless priority.nil?
             feature_hash[:metadata] = { flagsmith_id: fs.feature.id }
 
             features[fs.feature.name] = feature_hash
@@ -138,17 +139,9 @@ def self.map_segment_rule_model_to_rule(rule)
           }
 
           # Map conditions if present
-          result[:conditions] = if rule.conditions&.any?
-                                  rule.conditions.map do |condition|
-                                    {
-                                      property: condition.property,
-                                      operator: condition.operator,
-                                      value: condition.value
-                                    }
-                                  end
-                                else
-                                  []
-                                end
+          result[:conditions] = (rule.conditions || []).map do |condition|
+            { property: condition.property, operator: condition.operator, value: condition.value }
+          end
 
           result[:rules] = if rule.rules&.any?
                              rule.rules.map { |nested_rule| map_segment_rule_model_to_rule(nested_rule) }
@@ -188,7 +181,7 @@ def self.map_identity_overrides_to_segments(identity_overrides)
             end
 
             # Create hash of the overrides to group identities with same overrides
-            overrides_hash = overrides_key.hash
+            overrides_hash = Digest::SHA1.hexdigest(overrides_key.inspect)
 
             features_to_identifiers[overrides_hash] ||= { identifiers: [], overrides: overrides_key }
             features_to_identifiers[overrides_hash][:identifiers] << identity.identifier

spec/engine/unit/evaluation_context_mappers_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Flagsmith::Engine::EvaluationContext::Mappers do
+RSpec.describe Flagsmith::Engine::Evaluation::Mappers do
   describe '.get_evaluation_context' do
     let(:environment_json) do
       JSON.parse(
@@ -72,7 +72,7 @@
       expect(override[:name]).to eq('some_feature')
       expect(override[:enabled]).to be false
       expect(override[:value]).to eq('some-overridden-value')
-      expect(override[:priority]).to eq(Flagsmith::Engine::EvaluationContext::Mappers::STRONGEST_PRIORITY)
+      expect(override[:priority]).to eq(Flagsmith::Engine::Evaluation::Mappers::STRONGEST_PRIORITY)
       expect(override[:metadata][:flagsmith_id]).to eq(1)
 
       # Verify features