feat: fixed-rebase-from-get-context-key

Author: Zaimwa9

lib/flagsmith/engine/core.rb

@@ -13,7 +13,6 @@
 require_relative 'segments/models'
 require_relative 'utils/hash_func'
 require_relative 'mappers'
-require_relative 'evaluation/core'
 
 module Flagsmith
   # Core evaluation logic for feature flags
@@ -29,6 +28,7 @@ module Engine
     # @return [Hash] Evaluation result with flags and segments
     # returns EvaluationResultWithMetadata
     def get_evaluation_result(evaluation_context)
+      evaluation_context = get_enriched_context(evaluation_context)
       segments, segment_overrides = evaluate_segments(evaluation_context)
       flags = evaluate_features(evaluation_context, segment_overrides)
       {
@@ -141,7 +141,11 @@ def get_multivariate_feature_value(feature, identity_key)
     # returns boolean
     def should_apply_override(override, existing_overrides)
       current_override = existing_overrides[override[:name]]
-      !current_override || is_stronger_priority?(override[:priority], current_override[:feature][:priority])
+      !current_override || stronger_priority?(override[:priority], current_override[:feature][:priority])
+    end
+
+    def stronger_priority?(priority_a, priority_b)
+      (priority_a || WEAKEST_PRIORITY) < (priority_b || WEAKEST_PRIORITY)
     end
 
     private
@@ -153,13 +157,7 @@ def should_apply_override(override, existing_overrides)
     def get_identity_key(evaluation_context)
       return nil unless evaluation_context[:identity]
 
-      evaluation_context[:identity][:key] ||
-        "#{evaluation_context[:environment][:key]}_#{evaluation_context[:identity][:identifier]}"
-    end
-
-    # returns boolean
-    def is_stronger_priority?(priority_a, priority_b)
-      (priority_a || WEAKEST_PRIORITY) < (priority_b || WEAKEST_PRIORITY)
+      evaluation_context[:identity][:key]
     end
   end
 end

lib/flagsmith/engine/evaluation/core.rb

@@ -16,7 +16,19 @@ module Evaluator # rubocop:disable Metrics/ModuleLength
 
         module_function
 
-        # Context-based segment evaluation (new approach)
+        def get_enriched_context(context)
+          identity_context = context[:identity]
+          return context unless identity_context
+          return context if identity_context[:key]
+
+          enriched_context = context.dup
+          enriched_context[:identity] = identity_context.merge(
+            key: "#{context[:environment][:key]}_#{identity_context[:identifier]}"
+          )
+          enriched_context
+        end
+
+        # Context-based segment evaluation
         # Returns all segments that the identity belongs to based on segment rules evaluation
         #
         # @param context [Hash] Evaluation context containing identity and segment definitions
@@ -85,7 +97,7 @@ def traits_match_segment_rule(identity_traits, rule, segment_id, identity_id)
         end
         # rubocop:enable Metrics/MethodLength
 
-        # Context-based helper functions (new approach)
+        # Context-based helper functions
 
         # Evaluates whether a segment rule matches using context
         #
@@ -217,8 +229,7 @@ def get_context_value(json_path, context)
         def get_identity_key_from_context(context)
           return nil unless context[:identity]
 
-          context[:identity][:key] ||
-            "#{context[:environment][:key]}_#{context[:identity][:identifier]}"
+          context[:identity][:key]
         end
 
         # Check if value is primitive (not an object or array)