httpserver, funk: handle validations and provide methods to box/unbox slice elements;

Author: selm0

pkg/funk/slice.go

@@ -27,6 +27,14 @@ func CastSlice[T any, I ~[]any](sl I) ([]T, error) {
 	return result, nil
 }
 
+func BoxSlice[T any](sl []T) []*T {
+	return Map(sl, mdl.Box)
+}
+
+func UnboxSlice[T any](sl []*T) []T {
+	return Map(sl, mdl.EmptyIfNil)
+}
+
 func Partition[S ~[]T, T any, E comparable, F func(T) E](sl S, keyer F) map[E][]T {
 	result := make(map[E][]T)
 

pkg/funk/slice_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/justtrackio/gosoline/pkg/funk"
+	"github.com/justtrackio/gosoline/pkg/mdl"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -18,6 +19,33 @@ func TestCastSlice(t *testing.T) {
 	assert.Equal(t, expectedSlice, target)
 }
 
+func TestBoxSlice(t *testing.T) {
+	inputSlice := []string{"", ""}
+	expectedSlice := []*string{mdl.Box(""), mdl.Box("")}
+
+	target := funk.BoxSlice(inputSlice)
+
+	assert.Equal(t, expectedSlice, target)
+}
+
+func TestUnboxSlice(t *testing.T) {
+	inputSlice := []*string{mdl.Box(""), mdl.Box("")}
+	expectedSlice := []string{"", ""}
+
+	target := funk.UnboxSlice(inputSlice)
+
+	assert.Equal(t, expectedSlice, target)
+}
+
+func TestUnboxSlice_EmptyValue(t *testing.T) {
+	inputSlice := []*string{nil, nil}
+	expectedSlice := []string{"", ""}
+
+	target := funk.UnboxSlice(inputSlice)
+
+	assert.Equal(t, expectedSlice, target)
+}
+
 func TestContains(t *testing.T) {
 	type test struct {
 		Foo string

pkg/httpserver/crud/errors.go

@@ -11,16 +11,14 @@ import (
 	"github.com/justtrackio/gosoline/pkg/exec"
 	"github.com/justtrackio/gosoline/pkg/httpserver"
 	"github.com/justtrackio/gosoline/pkg/log"
-	"github.com/justtrackio/gosoline/pkg/validation"
 )
 
 var ErrModelNotChanged = fmt.Errorf("nothing has changed on model")
 
-// HandleErrorOnWrite handles errors for read operations.
+// HandleErrorOnRead handles errors for read operations.
 // Covers many default errors and responses like
 //   - context.Canceled, context.DeadlineExceed -> HTTP 499
 //   - dbRepo.RecordNotFoundError | dbRepo.NoQueryResultsError -> HTTP 404
-//   - validation.Error -> HTTP 400
 func HandleErrorOnRead(logger log.Logger, err error) (*httpserver.Response, error) {
 	if exec.IsRequestCanceled(err) {
 		logger.Info("read model(s) aborted: %s", err.Error())
@@ -34,10 +32,6 @@ func HandleErrorOnRead(logger log.Logger, err error) (*httpserver.Response, erro
 		return httpserver.NewStatusResponse(http.StatusNotFound), nil
 	}
 
-	if errors.Is(err, &validation.Error{}) {
-		return httpserver.GetErrorHandler()(http.StatusBadRequest, err), nil
-	}
-
 	// rely on the outside handling of access forbidden and HTTP 500
 	return nil, err
 }
@@ -48,7 +42,6 @@ func HandleErrorOnRead(logger log.Logger, err error) (*httpserver.Response, erro
 //   - dbRepo.RecordNotFoundError | dbRepo.NoQueryResultsError -> HTTP 404
 //   - ErrModelNotChanged -> HTTP 304
 //   - db.IsDuplicateEntryError -> HTTP 409
-//   - validation.Error -> HTTP 400
 func HandleErrorOnWrite(ctx context.Context, logger log.Logger, err error) (*httpserver.Response, error) {
 	logger = logger.WithContext(ctx)
 
@@ -74,10 +67,6 @@ func HandleErrorOnWrite(ctx context.Context, logger log.Logger, err error) (*htt
 		return httpserver.NewStatusResponse(http.StatusConflict), nil
 	}
 
-	if errors.Is(err, &validation.Error{}) {
-		return httpserver.GetErrorHandler()(http.StatusBadRequest, err), nil
-	}
-
 	// rely on the outside handling of access forbidden and HTTP 500
 	return nil, err
 }

pkg/httpserver/handler.go

@@ -14,6 +14,7 @@ import (
 	"github.com/imdario/mergo"
 	"github.com/justtrackio/gosoline/pkg/coffin"
 	"github.com/justtrackio/gosoline/pkg/exec"
+	"github.com/justtrackio/gosoline/pkg/validation"
 	"github.com/pkg/errors"
 	"github.com/spf13/cast"
 )
@@ -375,6 +376,17 @@ func handle(ginCtx *gin.Context, handler HandlerWithoutInput, input any, errHand
 		return
 	}
 
+	validErr := &validation.Error{}
+	if errors.As(err, &validErr) {
+		handleError(ginCtx, errHandler, http.StatusBadRequest, gin.Error{
+			// only pass the validation error in case it is wrapped in something else
+			Err:  validErr,
+			Type: gin.ErrorTypePrivate,
+		})
+
+		return
+	}
+
 	if err != nil {
 		handleError(ginCtx, errHandler, http.StatusInternalServerError, gin.Error{
 			Err:  err,

pkg/httpserver/handler_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/justtrackio/gosoline/pkg/httpserver"
 	"github.com/justtrackio/gosoline/pkg/httpserver/mocks"
 	"github.com/justtrackio/gosoline/pkg/httpserver/testdata"
+	"github.com/justtrackio/gosoline/pkg/validation"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"google.golang.org/protobuf/proto"
@@ -122,6 +123,17 @@ func TestCreateHandler_RequestCanceled(t *testing.T) {
 	assert.Equal(t, `{"err":"context canceled"}`, response.Body.String())
 }
 
+func TestCreateHandler_ValidationError(t *testing.T) {
+	requestHandler := mocks.NewHandlerWithoutInput(t)
+	requestHandler.EXPECT().Handle(mock.AnythingOfType("context.backgroundCtx"), mock.AnythingOfType("*httpserver.Request")).Return(nil, fmt.Errorf("wrap: %w", validation.NewError(fmt.Errorf("error"))))
+
+	handler := httpserver.CreateHandler(requestHandler)
+	response := httpserver.HttpTest("GET", "/action", "/action", `{"text":"foobar"}`, handler)
+
+	assert.Equal(t, 400, response.Code)
+	assert.Equal(t, `{"err":"validation: error"}`, response.Body.String())
+}
+
 func TestCreateIoHandler_InputFailure(t *testing.T) {
 	handler := httpserver.CreateJsonHandler(JsonHandler{})
 	response := httpserver.HttpTest("PUT", "/action", "/action", `{}`, handler)

pkg/validation/error.go

@@ -1,6 +1,7 @@
 package validation
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 )
@@ -33,3 +34,13 @@ func (e *Error) As(target interface{}) bool {
 
 	return ok
 }
+
+func NewError(errs ...error) *Error {
+	return &Error{Errors: errs}
+}
+
+func IsValidationError(err error) bool {
+	validErr := &Error{}
+
+	return errors.As(err, &validErr)
+}