add eval context to model Results

Author: temirlan

integration_tests/docker-compose.yml

@@ -7,6 +7,7 @@ networks:
 
 services:
   mysql:
+    platform: linux/x86_64
     image: mysql:5.6
     container_name: flagr-mysql
     environment:

integration_tests/test.sh

@@ -349,6 +349,8 @@ step_11_test_tag_batch_evaluation() {
     matches "\"flagID\":1"
     matches "\"variantKey\":\"key_1\""
     matches "\"variantID\":1"
+    matches "\"evalContext\""
+    contains "flagTags"
 
 }
 
@@ -361,12 +363,16 @@ step_12_test_tag_operator_batch_evaluation() {
     matches "\"flagID\":1"
     matches "\"variantKey\":\"key_1\""
     matches "\"variantID\":1"
+    matches "\"evalContext\""
+    contains "flagTags"
 
     shakedown POST "$flagr_url"/evaluation/batch -H 'Content-Type:application/json' -d '{"entities":[{ "entityType": "externalalert", "entityContext": {"property_1": "value_2"} }],"flagTags": ["value_1", "value_3"], "flagTagsOperator": "ANY", "enableDebug": false }'
     status 200
     matches "\"flagID\":1"
     matches "\"variantKey\":\"key_1\""
     matches "\"variantID\":1"
+    matches "\"evalContext\""
+    contains "flagTags"
 
 }
 

pkg/handler/eval.go

@@ -71,23 +71,27 @@ func (e *eval) PostEvaluationBatch(params evaluation.PostEvaluationBatchParams)
 		}
 		for _, flagID := range flagIDs {
 			evalContext := models.EvalContext{
-				EnableDebug:   params.Body.EnableDebug,
-				EntityContext: entity.EntityContext,
-				EntityID:      entity.EntityID,
-				EntityType:    entity.EntityType,
-				FlagID:        flagID,
+				EnableDebug:      params.Body.EnableDebug,
+				EntityContext:    entity.EntityContext,
+				EntityID:         entity.EntityID,
+				EntityType:       entity.EntityType,
+				FlagID:           flagID,
+				FlagTags:         flagTags,
+				FlagTagsOperator: flagTagsOperator,
 			}
 
 			evalResult := EvalFlag(evalContext)
 			results.EvaluationResults = append(results.EvaluationResults, evalResult)
 		}
 		for _, flagKey := range flagKeys {
 			evalContext := models.EvalContext{
-				EnableDebug:   params.Body.EnableDebug,
-				EntityContext: entity.EntityContext,
-				EntityID:      entity.EntityID,
-				EntityType:    entity.EntityType,
-				FlagKey:       flagKey,
+				EnableDebug:      params.Body.EnableDebug,
+				EntityContext:    entity.EntityContext,
+				EntityID:         entity.EntityID,
+				EntityType:       entity.EntityType,
+				FlagKey:          flagKey,
+				FlagTags:         flagTags,
+				FlagTagsOperator: flagTagsOperator,
 			}
 
 			evalResult := EvalFlag(evalContext)
@@ -195,6 +199,7 @@ var EvalFlagWithContext = func(flag *entity.Flag, evalContext models.EvalContext
 	evalResult.EvalDebugLog.SegmentDebugLogs = logs
 	evalResult.SegmentID = sID
 	evalResult.VariantID = vID
+
 	v := flag.FlagEvaluation.VariantsMap[util.SafeUint(vID)]
 	if v != nil {
 		evalResult.VariantAttachment = v.Attachment

pkg/handler/eval_test.go

@@ -488,6 +488,7 @@ func TestPostEvaluation(t *testing.T) {
 				EntityID:      "entityID1",
 				EntityType:    "entityType1",
 				FlagID:        int64(100),
+				FlagTags:      []string{"tag1", "tag2"},
 			},
 		})
 		assert.NotNil(t, resp)