add flag tags to models Result

Author: temirlan

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

@@ -71,23 +71,25 @@ 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,
+				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,
+				FlagTagsOperator: flagTagsOperator,
 			}
 
 			evalResult := EvalFlag(evalContext)
@@ -105,10 +107,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 +127,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

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

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