feat: enrich-context-with-identity-key

Author: Zaimwa9

lib/flagsmith/engine/evaluation/core.rb

@@ -19,6 +19,7 @@ module Core
         # @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)
           {

lib/flagsmith/engine/segments/evaluator.rb

@@ -14,7 +14,7 @@ module Evaluator # rubocop:disable Metrics/ModuleLength
         include Flagsmith::Engine::Segments::Constants
         include Flagsmith::Engine::Utils::HashFunc
 
-        # Model-based segment evaluation (existing approach)
+        # Model-based segment evaluation
         def get_identity_segments(environment, identity, override_traits = nil)
           environment.project.segments.select do |s|
             evaluate_identity_in_segment(identity, s, override_traits)
@@ -39,7 +39,19 @@ def traits_match_segment_condition(identity_traits, condition, segment_id, ident
 
         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
@@ -92,7 +104,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
         #
@@ -224,8 +236,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)