add flag disabled handling and improve log message for invalid targeting rule

Signed-off-by: Kavindu Dodanduwa <kavindudodanduwa@gmail.com>

Author: Kavindu-Dodan

core/pkg/evaluator/json.go

@@ -376,7 +376,7 @@ func (je *Resolver) evaluateVariant(ctx context.Context, reqID string, flagKey s
 		// evaluate JsonLogic rules to determine the variant
 		err = jsonlogic.Apply(bytes.NewReader(targetingBytes), bytes.NewReader(b), &result)
 		if err != nil {
-			je.Logger.ErrorWithID(reqID, fmt.Sprintf("error applying rules: %s", err))
+			je.Logger.ErrorWithID(reqID, fmt.Sprintf("error applying targeting rules: %s", err))
 			return "", flag.Variants, model.ErrorReason, metadata, errors.New(model.ParseErrorCode)
 		}
 

core/pkg/service/ofrep/models.go

@@ -95,6 +95,9 @@ func EvaluationErrorResponseFrom(result evaluator.AnyValue) (int, EvaluationErro
 	case model.ParseErrorCode:
 		payload.ErrorCode = model.ParseErrorCode
 		payload.ErrorDetails = fmt.Sprintf("error parsing the flag `%s`", result.FlagKey)
+	case model.FlagDisabledErrorCode:
+		payload.ErrorCode = model.FlagDisabledErrorCode
+		payload.ErrorDetails = fmt.Sprintf("flag `%s` is disabled", result.FlagKey)
 	case model.GeneralErrorCode:
 		fallthrough
 	default:

core/pkg/service/ofrep/models_test.go

@@ -90,7 +90,7 @@ func TestErrorStatus(t *testing.T) {
 			name:           "flag disabled",
 			modelError:     model.FlagDisabledErrorCode,
 			expectedStatus: 400,
-			expectedCode:   model.GeneralErrorCode,
+			expectedCode:   model.FlagDisabledErrorCode,
 		},
 		{
 			name:           "general error",