fixing field errors

ardanlabs · Dec 10, 2024 · 982523c · 982523c
1 parent cbf46d0
commit 982523c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 37 deletions.
diff --git a/app/domain/homeapp/homeapp.go b/app/domain/homeapp/homeapp.go
@@ -90,7 +90,7 @@ func (a *app) query(ctx context.Context, r *http.Request) web.Encoder {
 
 	filter, err := parseFilter(qp)
 	if err != nil {
-		return err.(errs.FieldErrors)
+		return err.(*errs.Error)
 	}
 
 	orderBy, err := order.Parse(orderByFields, qp.OrderBy, homebus.DefaultOrderBy)

diff --git a/app/domain/productapp/productapp.go b/app/domain/productapp/productapp.go
@@ -90,7 +90,7 @@ func (a *app) query(ctx context.Context, r *http.Request) web.Encoder {
 
 	filter, err := parseFilter(qp)
 	if err != nil {
-		return err.(errs.FieldErrors)
+		return err.(*errs.Error)
 	}
 
 	orderBy, err := order.Parse(orderByFields, qp.OrderBy, productbus.DefaultOrderBy)

diff --git a/app/domain/userapp/userapp.go b/app/domain/userapp/userapp.go
@@ -121,7 +121,7 @@ func (a *app) query(ctx context.Context, r *http.Request) web.Encoder {
 
 	filter, err := parseFilter(qp)
 	if err != nil {
-		return err.(errs.FieldErrors)
+		return err.(*errs.Error)
 	}
 
 	orderBy, err := order.Parse(orderByFields, qp.OrderBy, userbus.DefaultOrderBy)

diff --git a/app/domain/vproductapp/vproductapp.go b/app/domain/vproductapp/vproductapp.go
@@ -33,7 +33,7 @@ func (a *app) query(ctx context.Context, r *http.Request) web.Encoder {
 
 	filter, err := parseFilter(qp)
 	if err != nil {
-		return err.(errs.FieldErrors)
+		return err.(*errs.Error)
 	}
 
 	orderBy, err := order.Parse(orderByFields, qp.OrderBy, vproductbus.DefaultOrderBy)

diff --git a/app/sdk/errs/errs.go b/app/sdk/errs/errs.go
@@ -126,13 +126,13 @@ type FieldError struct {
 type FieldErrors []FieldError
 
 // NewFieldsError creates an fields error.
-func NewFieldsError(field string, err error) FieldErrors {
-	return FieldErrors{
+func NewFieldsError(field string, err error) *Error {
+	return New(InvalidArgument, FieldErrors{
 		{
 			Field: field,
 			Err:   err.Error(),
 		},
-	}
+	})
 }
 
 // Error implements the error interface.
@@ -143,33 +143,3 @@ func (fe FieldErrors) Error() string {
 	}
 	return string(d)
 }
-
-// Encode implements the encoder interface.
-func (fe FieldErrors) Encode() ([]byte, string, error) {
-	d, err := json.Marshal(fe)
-	return d, "application/json", err
-}
-
-// Fields returns the fields that failed validation
-func (fe FieldErrors) Fields() map[string]string {
-	m := make(map[string]string, len(fe))
-	for _, fld := range fe {
-		m[fld.Field] = fld.Err
-	}
-	return m
-}
-
-// IsFieldErrors checks if an error of type FieldErrors exists.
-func IsFieldErrors(err error) bool {
-	var fe FieldErrors
-	return errors.As(err, &fe)
-}
-
-// GetFieldErrors returns a copy of the FieldErrors pointer.
-func GetFieldErrors(err error) FieldErrors {
-	var fe FieldErrors
-	if !errors.As(err, &fe) {
-		return nil
-	}
-	return fe
-}