add eval context to model Results

Author: temirlan

integration_tests/test.sh

@@ -269,13 +269,20 @@ step_7_test_evaluation() {
     matches "\"variantID\":1"
     matches "\"flagID\":1"
     matches "\"segmentID\":1"
+    matches "\"evalContext\""
+    matches "\"entityID\":\"abc1234\""
+    matches "\"entityType\":\"candidate\""
+    contains "\"entityContext\":{\"property_1\":\"value_2\"}"
 
     shakedown POST "$flagr_url"/evaluation -H 'Content-Type:application/json' -d '{"entityID": "abc1234", "entityType": "candidate", "flagID": 1}'
     status 200
     matches "\"variantKey\":\"key_2\""
     matches "\"variantID\":2"
     matches "\"flagID\":1"
     matches "\"segmentID\":2"
+    matches "\"evalContext\""
+    matches "\"entityID\":\"abc1234\""
+    matches "\"entityType\":\"candidate\""
 }
 
 step_8_test_preload() {
@@ -349,6 +356,10 @@ step_11_test_tag_batch_evaluation() {
     matches "\"flagID\":1"
     matches "\"variantKey\":\"key_1\""
     matches "\"variantID\":1"
+    matches "\"evalContext\""
+    matches "\"entityType\":\"externalalert\""
+    contains "\"entityContext\":{\"property_1\":\"value_2\"}"
+    contains "\"flagTags\":\[\"value_1\"\]"
 
 }
 
@@ -361,12 +372,22 @@ step_12_test_tag_operator_batch_evaluation() {
     matches "\"flagID\":1"
     matches "\"variantKey\":\"key_1\""
     matches "\"variantID\":1"
+    matches "\"evalContext\""
+    matches "\"entityType\":\"externalalert\""
+    contains "\"entityContext\":{\"property_1\":\"value_2\"}"
+    contains "\"flagTags\":\[\"value_1\",\"value_2\"\]"
+    matches "\"flagTagsOperator\":\"ALL\""
 
     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\""
+    matches "\"entityType\":\"externalalert\""
+    contains "\"entityContext\":{\"property_1\":\"value_2\"}"
+    contains "\"flagTags\":\[\"value_1\",\"value_3\"\]"
+    matches "\"flagTagsOperator\":\"ANY\""
 
 }
 

pkg/handler/eval.go

@@ -195,6 +195,8 @@ var EvalFlagWithContext = func(flag *entity.Flag, evalContext models.EvalContext
 	evalResult.EvalDebugLog.SegmentDebugLogs = logs
 	evalResult.SegmentID = sID
 	evalResult.VariantID = vID
+	evalResult.EvalContext = &evalContext
+
 	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)