include flagTags in postEvaluation and postEvaluationBatch (#623)

* add flag tags to models Result

* reset eval_test

* add correct flagTags checking to eval_test

---------

Co-authored-by: temirlan <timtursunov@temirlans-MacBook-Pro.local>

Author: su5kk

docs/api_docs/bundle.yaml

@@ -1353,6 +1353,12 @@ definitions:
       flagSnapshotID:
         type: integer
         format: int64
+      flagTags:
+        description: flagTags. flagTags looks up flags by tag. Either works.
+        type: array
+        x-omitempty: true
+        items:
+          type: string
       segmentID:
         type: integer
         format: int64

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,7 @@ step_11_test_tag_batch_evaluation() {
     matches "\"flagID\":1"
     matches "\"variantKey\":\"key_1\""
     matches "\"variantID\":1"
+    contains "flagTags"
 
 }
 
@@ -361,12 +362,14 @@ step_12_test_tag_operator_batch_evaluation() {
     matches "\"flagID\":1"
     matches "\"variantKey\":\"key_1\""
     matches "\"variantID\":1"
+    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"
+    contains "flagTags"
 
 }
 

pkg/handler/eval.go

@@ -105,10 +105,16 @@ func BlankResult(f *entity.Flag, evalContext models.EvalContext, msg string) *mo
 	flagID := uint(0)
 	flagKey := ""
 	flagSnapshotID := uint(0)
+	flagTags := []string{}
 	if f != nil {
 		flagID = f.ID
 		flagSnapshotID = f.SnapshotID
 		flagKey = f.Key
+		if len(f.Tags) > 0 {
+			for _, tag := range f.Tags {
+				flagTags = append(flagTags, tag.Value)
+			}
+		}
 	}
 	return &models.EvalResult{
 		EvalContext: &evalContext,
@@ -119,6 +125,7 @@ func BlankResult(f *entity.Flag, evalContext models.EvalContext, msg string) *mo
 		FlagID:         int64(flagID),
 		FlagKey:        flagKey,
 		FlagSnapshotID: int64(flagSnapshotID),
+		FlagTags:       flagTags,
 		Timestamp:      util.TimeNow(),
 	}
 }

pkg/handler/eval_test.go

@@ -167,6 +167,10 @@ func TestEvalFlag(t *testing.T) {
 		})
 		assert.NotNil(t, result)
 		assert.NotZero(t, result.VariantID)
+		assert.NotEmpty(t, result.FlagTags)
+		assert.Len(t, result.FlagTags, 2)
+		assert.Contains(t, result.FlagTags, "tag1")
+		assert.Contains(t, result.FlagTags, "tag2")
 	})
 
 	t.Run("test happy code path with flagKey", func(t *testing.T) {
@@ -467,6 +471,10 @@ func TestEvalFlagsByTags(t *testing.T) {
 		})
 		assert.NotZero(t, len(results))
 		assert.NotZero(t, results[0].VariantID)
+		assert.NotEmpty(t, results[0].FlagTags)
+		assert.Len(t, results[0].FlagTags, 2)
+		assert.Contains(t, results[0].FlagTags, "tag1")
+		assert.Contains(t, results[0].FlagTags, "tag2")
 	})
 }
 
@@ -515,6 +523,7 @@ func TestPostEvaluationBatch(t *testing.T) {
 		assert.NotNil(t, resp)
 	})
 }
+
 func TestTagsPostEvaluationBatch(t *testing.T) {
 	t.Run("test happy code path", func(t *testing.T) {
 		defer gostub.StubFunc(&EvalFlag, &models.EvalResult{}).Reset()

swagger/index.yaml

@@ -481,6 +481,12 @@ definitions:
       flagSnapshotID:
         type: integer
         format: int64
+      flagTags:
+        description: flagTags. flagTags looks up flags by tag. Either works.
+        type: array
+        x-omitempty: true
+        items:
+          type: string
       segmentID:
         type: integer
         format: int64