Skip to content

Commit 982523c

Browse files
fixing field errors
1 parent cbf46d0 commit 982523c

File tree

5 files changed

+7
-37
lines changed

5 files changed

+7
-37
lines changed

app/domain/homeapp/homeapp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (a *app) query(ctx context.Context, r *http.Request) web.Encoder {
9090

9191
filter, err := parseFilter(qp)
9292
if err != nil {
93-
return err.(errs.FieldErrors)
93+
return err.(*errs.Error)
9494
}
9595

9696
orderBy, err := order.Parse(orderByFields, qp.OrderBy, homebus.DefaultOrderBy)

app/domain/productapp/productapp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (a *app) query(ctx context.Context, r *http.Request) web.Encoder {
9090

9191
filter, err := parseFilter(qp)
9292
if err != nil {
93-
return err.(errs.FieldErrors)
93+
return err.(*errs.Error)
9494
}
9595

9696
orderBy, err := order.Parse(orderByFields, qp.OrderBy, productbus.DefaultOrderBy)

app/domain/userapp/userapp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func (a *app) query(ctx context.Context, r *http.Request) web.Encoder {
121121

122122
filter, err := parseFilter(qp)
123123
if err != nil {
124-
return err.(errs.FieldErrors)
124+
return err.(*errs.Error)
125125
}
126126

127127
orderBy, err := order.Parse(orderByFields, qp.OrderBy, userbus.DefaultOrderBy)

app/domain/vproductapp/vproductapp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func (a *app) query(ctx context.Context, r *http.Request) web.Encoder {
3333

3434
filter, err := parseFilter(qp)
3535
if err != nil {
36-
return err.(errs.FieldErrors)
36+
return err.(*errs.Error)
3737
}
3838

3939
orderBy, err := order.Parse(orderByFields, qp.OrderBy, vproductbus.DefaultOrderBy)

app/sdk/errs/errs.go

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,13 @@ type FieldError struct {
126126
type FieldErrors []FieldError
127127

128128
// NewFieldsError creates an fields error.
129-
func NewFieldsError(field string, err error) FieldErrors {
130-
return FieldErrors{
129+
func NewFieldsError(field string, err error) *Error {
130+
return New(InvalidArgument, FieldErrors{
131131
{
132132
Field: field,
133133
Err: err.Error(),
134134
},
135-
}
135+
})
136136
}
137137

138138
// Error implements the error interface.
@@ -143,33 +143,3 @@ func (fe FieldErrors) Error() string {
143143
}
144144
return string(d)
145145
}
146-
147-
// Encode implements the encoder interface.
148-
func (fe FieldErrors) Encode() ([]byte, string, error) {
149-
d, err := json.Marshal(fe)
150-
return d, "application/json", err
151-
}
152-
153-
// Fields returns the fields that failed validation
154-
func (fe FieldErrors) Fields() map[string]string {
155-
m := make(map[string]string, len(fe))
156-
for _, fld := range fe {
157-
m[fld.Field] = fld.Err
158-
}
159-
return m
160-
}
161-
162-
// IsFieldErrors checks if an error of type FieldErrors exists.
163-
func IsFieldErrors(err error) bool {
164-
var fe FieldErrors
165-
return errors.As(err, &fe)
166-
}
167-
168-
// GetFieldErrors returns a copy of the FieldErrors pointer.
169-
func GetFieldErrors(err error) FieldErrors {
170-
var fe FieldErrors
171-
if !errors.As(err, &fe) {
172-
return nil
173-
}
174-
return fe
175-
}

0 commit comments

Comments
 (0)