Evaluator

rpc/validation.go

@@ -11,6 +11,20 @@ type Validator interface {
 	Validate() error
 }
 
+// Evaluate
+
+func (req *EvaluationRequest) Validate() error {
+	if req.FlagKey == "" {
+		return errors.EmptyFieldError("flagKey")
+	}
+
+	if req.EntityId == "" {
+		return errors.EmptyFieldError("entityId")
+	}
+
+	return nil
+}
+
 // Flags
 
 func (req *GetFlagRequest) Validate() error {

rpc/validation_test.go

@@ -7,6 +7,37 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func TestValidate_EvaluationRequest(t *testing.T) {
+	tests := []struct {
+		name    string
+		req     *EvaluationRequest
+		wantErr error
+	}{
+		{
+			name:    "emptyFlagKey",
+			req:     &EvaluationRequest{FlagKey: "", EntityId: "entityID"},
+			wantErr: errors.EmptyFieldError("flagKey"),
+		},
+		{
+			name:    "emptyEntityId",
+			req:     &EvaluationRequest{FlagKey: "flagKey", EntityId: ""},
+			wantErr: errors.EmptyFieldError("entityId"),
+		},
+	}
+
+	for _, tt := range tests {
+		var (
+			req     = tt.req
+			wantErr = tt.wantErr
+		)
+
+		t.Run(tt.name, func(t *testing.T) {
+			err := req.Validate()
+			assert.Equal(t, wantErr, err)
+		})
+	}
+}
+
 func TestValidate_GetFlagRequest(t *testing.T) {
 	tests := []struct {
 		name    string

server/evaluator.go

@@ -5,20 +5,11 @@ import (
 	"time"
 
 	"github.com/gofrs/uuid"
-	"github.com/markphelps/flipt/errors"
 	flipt "github.com/markphelps/flipt/rpc"
 )
 
 // Evaluate evaluates a request for a given flag and entity
 func (s *Server) Evaluate(ctx context.Context, req *flipt.EvaluationRequest) (*flipt.EvaluationResponse, error) {
-	if req.FlagKey == "" {
-		return nil, errors.EmptyFieldError("flagKey")
-	}
-
-	if req.EntityId == "" {
-		return nil, errors.EmptyFieldError("entityId")
-	}
-
 	startTime := time.Now()
 
 	// set request ID if not present

server/evaluator_test.go

@@ -48,37 +48,7 @@ func TestEvaluate(t *testing.T) {
 			},
 		},
 		{
-			name: "emptyFlagKey",
-			req:  &flipt.EvaluationRequest{FlagKey: "", EntityId: "entityID"},
-			f: func(_ context.Context, r *flipt.EvaluationRequest) (*flipt.EvaluationResponse, error) {
-				assert.NotNil(t, r)
-				assert.Equal(t, "", r.FlagKey)
-				assert.Equal(t, "entityID", r.EntityId)
-
-				return &flipt.EvaluationResponse{
-					FlagKey:  "",
-					EntityId: r.EntityId,
-				}, nil
-			},
-			wantErr: errors.EmptyFieldError("flagKey"),
-		},
-		{
-			name: "emptyEntityId",
-			req:  &flipt.EvaluationRequest{FlagKey: "flagKey", EntityId: ""},
-			f: func(_ context.Context, r *flipt.EvaluationRequest) (*flipt.EvaluationResponse, error) {
-				assert.NotNil(t, r)
-				assert.Equal(t, "flagKey", r.FlagKey)
-				assert.Equal(t, "", r.EntityId)
-
-				return &flipt.EvaluationResponse{
-					FlagKey:  r.FlagKey,
-					EntityId: "",
-				}, nil
-			},
-			wantErr: errors.EmptyFieldError("entityId"),
-		},
-		{
-			name: "error test",
+			name: "error",
 			req:  &flipt.EvaluationRequest{FlagKey: "flagKey", EntityId: "entityID"},
 			f: func(_ context.Context, r *flipt.EvaluationRequest) (*flipt.EvaluationResponse, error) {
 				assert.NotNil(t, r)