add test for createFlags

Author: thomaspoignant

dao/inmemory_impl_mock.go

@@ -33,6 +33,12 @@ func (m *InMemoryMockDao) GetFlags(ctx context.Context) ([]model.FeatureFlag, da
 
 // GetFlagByID return a flag by its ID
 func (m *InMemoryMockDao) GetFlagByID(ctx context.Context, id string) (model.FeatureFlag, daoErr.DaoError) {
+	if ctx.Value("error") != nil {
+		if err, ok := ctx.Value("error").(daoErr.DaoErrorCode); ok {
+			return model.FeatureFlag{}, daoErr.NewDaoError(err, fmt.Errorf("error on get flag by id"))
+		}
+		return model.FeatureFlag{}, daoErr.NewDaoError(daoErr.UnknownError, fmt.Errorf("error on get flag by id"))
+	}
 	for _, flag := range m.flags {
 		if flag.ID == id {
 			return flag, nil
@@ -43,6 +49,12 @@ func (m *InMemoryMockDao) GetFlagByID(ctx context.Context, id string) (model.Fea
 
 // GetFlagByName return a flag by its name
 func (m *InMemoryMockDao) GetFlagByName(ctx context.Context, name string) (model.FeatureFlag, daoErr.DaoError) {
+	if ctx.Value("error") != nil {
+		if err, ok := ctx.Value("error").(daoErr.DaoErrorCode); ok {
+			return model.FeatureFlag{}, daoErr.NewDaoError(err, fmt.Errorf("error on get flag by name"))
+		}
+		return model.FeatureFlag{}, daoErr.NewDaoError(daoErr.UnknownError, fmt.Errorf("error on get flag by name"))
+	}
 	for _, flag := range m.flags {
 		if flag.Name == name {
 			return flag, nil
@@ -53,6 +65,13 @@ func (m *InMemoryMockDao) GetFlagByName(ctx context.Context, name string) (model
 
 // CreateFlag create a new flag, return the id of the flag
 func (m *InMemoryMockDao) CreateFlag(ctx context.Context, flag model.FeatureFlag) (string, daoErr.DaoError) {
+	if ctx.Value("error_create") != nil {
+		if err, ok := ctx.Value("error_create").(daoErr.DaoErrorCode); ok {
+			return "", daoErr.NewDaoError(err, fmt.Errorf("error creating flag"))
+		}
+		return "", daoErr.NewDaoError(daoErr.UnknownError, fmt.Errorf("error creating flag"))
+	}
+
 	m.flags = append(m.flags, flag)
 	return flag.ID, nil
 }

handler/flags.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	daoErr "github.com/go-feature-flag/app-api/dao/err"
+	"github.com/go-feature-flag/app-api/util"
 	"github.com/labstack/echo/v4"
 	"net/http"
 	"time"
@@ -15,14 +16,25 @@ import (
 	"github.com/lib/pq"
 )
 
+type FlagAPIHandlerOptions struct {
+	Clock util.Clock
+}
+
 type FlagAPIHandler struct {
-	dao dao.Flags
+	dao     dao.Flags
+	options *FlagAPIHandlerOptions
 }
 
 // NewFlagAPIHandler creates a new instance of the FlagAPIHandler handler
 // It is a controller class to handle the feature flag configuration logic
-func NewFlagAPIHandler(dao dao.Flags) FlagAPIHandler {
-	return FlagAPIHandler{dao: dao}
+func NewFlagAPIHandler(dao dao.Flags, options *FlagAPIHandlerOptions) FlagAPIHandler {
+	if options == nil {
+		options = &FlagAPIHandlerOptions{}
+	}
+	if options.Clock == nil {
+		options.Clock = util.DefaultClock{}
+	}
+	return FlagAPIHandler{dao: dao, options: options}
 }
 
 // GetAllFeatureFlags is returning the list of all the flags
@@ -87,8 +99,8 @@ func (f FlagAPIHandler) CreateNewFlag(c echo.Context) error {
 	if flag.ID == "" {
 		flag.ID = uuid.NewString()
 	}
-	flag.CreatedDate = time.Now()
-	flag.LastUpdatedDate = time.Now()
+	flag.CreatedDate = f.options.Clock.Now()
+	flag.LastUpdatedDate = f.options.Clock.Now()
 	// TODO: remove this line and extract the information from the token
 	flag.LastModifiedBy = "toto"
 
@@ -105,6 +117,9 @@ func (f FlagAPIHandler) CreateNewFlag(c echo.Context) error {
 
 	id, err := f.dao.CreateFlag(c.Request().Context(), flag)
 	if err != nil {
+		if err.Code() == daoErr.ConversionError {
+			return c.JSON(model.NewHTTPError(http.StatusBadRequest, err))
+		}
 		return c.JSON(model.NewHTTPError(http.StatusInternalServerError, err))
 	}
 	flag.ID = id
@@ -123,8 +138,17 @@ func validateFlag(flag model.FeatureFlag) (int, error) {
 		return status, err
 	}
 
-	if flag.VariationType == "" {
+	switch flag.VariationType {
+	case model.FlagTypeBoolean,
+		model.FlagTypeDouble,
+		model.FlagTypeInteger,
+		model.FlagTypeString,
+		model.FlagTypeJSON:
+		break
+	case "":
 		return http.StatusBadRequest, errors.New("flag type is required")
+	default:
+		return http.StatusBadRequest, fmt.Errorf("flag type %s not supported", flag.VariationType)
 	}
 
 	for _, rule := range flag.GetRules() {
@@ -137,10 +161,15 @@ func validateFlag(flag model.FeatureFlag) (int, error) {
 }
 
 func validateRule(rule *model.Rule, isDefault bool) (int, error) {
-	if rule == nil ||
-		(rule.ProgressiveRollout == nil &&
-			rule.Percentages == nil &&
-			(rule.VariationResult == nil || *rule.VariationResult == "")) {
+	if rule == nil || *rule == (model.Rule{}) {
+		if isDefault {
+			return http.StatusBadRequest, errors.New("flag default rule is required")
+		}
+		return http.StatusBadRequest, errors.New("targeting rule is nil")
+	}
+	if rule.ProgressiveRollout == nil &&
+		rule.Percentages == nil &&
+		(rule.VariationResult == nil || *rule.VariationResult == "") {
 		err := fmt.Errorf("invalid rule %s", rule.Name)
 		if isDefault {
 			err = errors.New("flag default rule is invalid")
@@ -150,7 +179,7 @@ func validateRule(rule *model.Rule, isDefault bool) (int, error) {
 
 	if !isDefault {
 		if rule.Query == "" {
-			return http.StatusBadRequest, errors.New("rule query is required")
+			return http.StatusBadRequest, errors.New("query is required for targeting rules")
 		}
 	}
 	return http.StatusOK, nil
@@ -263,7 +292,7 @@ func (f FlagAPIHandler) UpdateFeatureFlagStatus(c echo.Context) error {
 func (f FlagAPIHandler) handleDaoError(c echo.Context, err daoErr.DaoError) error {
 	switch err.Code() {
 	case daoErr.NotFound:
-		return c.JSON(model.NewHTTPError(http.StatusNotFound, fmt.Errorf("flag with id %s not found", c.Param("id"))))
+		return c.JSON(model.NewHTTPError(http.StatusNotFound, fmt.Errorf("flag not found")))
 	case daoErr.InvalidUUID:
 		return c.JSON(model.NewHTTPError(http.StatusBadRequest, fmt.Errorf("invalid UUID format")))
 	default: