Update backend
This commit is contained in:
@@ -42,9 +42,8 @@ func (h *Handler) Inquiry(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
validate := validator.New()
|
||||
if err := validate.Struct(req); err != nil {
|
||||
response.ErrorWrapper(c, err)
|
||||
if err := request.ValidateAndHandleError(req); err != nil {
|
||||
response.ErrorWrapper(c, errors.NewErrorMessage(errors.ErrorBadRequest, err.Error()))
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@@ -15,9 +15,9 @@ type Order struct {
|
||||
|
||||
type CustomerOrder struct {
|
||||
PartnerID int64 `json:"partner_id" validate:"required"`
|
||||
PaymentMethod transaction.PaymentMethod `json:"payment_method" validate:"required"`
|
||||
OrderItems []OrderItem `json:"order_items" validate:"required"`
|
||||
VisitDate string `json:"visit_date"`
|
||||
PaymentMethod transaction.PaymentMethod `json:"payment_method" validate:"required,oneof=ONLINE"`
|
||||
OrderItems []OrderItem `json:"order_items" validate:"required,min=1"`
|
||||
VisitDate string `json:"visit_date" validate:"required"`
|
||||
}
|
||||
|
||||
func (o *CustomerOrder) ToEntity(createdBy int64) *entity.OrderRequest {
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
|
||||
type User struct {
|
||||
Name string `json:"name" validate:"required"`
|
||||
Email string `json:"email" validate:"required"`
|
||||
Email string `json:"email" validate:"required,email"`
|
||||
Password string `json:"password" validate:"required"`
|
||||
PartnerID *int64 `json:"partner_id"`
|
||||
SiteID *int64 `json:"site_id"`
|
||||
@@ -72,6 +72,7 @@ func (p *UserParam) ToEntity(ctx mycontext.Context) entity.UserSearch {
|
||||
Offset: p.Offset,
|
||||
}
|
||||
}
|
||||
|
||||
type CustomerParam struct {
|
||||
Search string `form:"search" json:"search" example:"admin,branch1"`
|
||||
Name string `form:"name" json:"name" example:"Admin 1"`
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
package request
|
||||
|
||||
import (
|
||||
errors2 "errors"
|
||||
"github.com/go-playground/validator/v10"
|
||||
"reflect"
|
||||
)
|
||||
|
||||
var validate *validator.Validate
|
||||
|
||||
func ValidateAndHandleError(req interface{}) error {
|
||||
validate = validator.New()
|
||||
|
||||
if err := validate.Struct(req); err != nil {
|
||||
formattedError := formatValidationError(err)
|
||||
return errors2.New(formattedError)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func formatValidationError(err error) string {
|
||||
if _, ok := err.(*validator.InvalidValidationError); ok {
|
||||
return err.Error()
|
||||
}
|
||||
|
||||
var errorMessage string
|
||||
for _, err := range err.(validator.ValidationErrors) {
|
||||
switch err.Tag() {
|
||||
case "required":
|
||||
errorMessage += "The field '" + err.Field() + "' is required."
|
||||
case "min":
|
||||
if err.Kind() == reflect.Slice {
|
||||
errorMessage += "The field '" + err.Field() + "' must contain at least " + err.Param() + " items."
|
||||
} else {
|
||||
errorMessage += "The field '" + err.Field() + "' must be at least " + err.Param() + "."
|
||||
}
|
||||
case "oneof":
|
||||
errorMessage += "The field '" + err.Field() + "' must be one of [" + err.Param() + "]."
|
||||
case "email":
|
||||
errorMessage += "The field '" + err.Field() + "' must be a valid email address."
|
||||
case "len":
|
||||
errorMessage += "The field '" + err.Field() + "' must be exactly " + err.Param() + " characters long."
|
||||
default:
|
||||
errorMessage += "The field '" + err.Field() + "' is invalid."
|
||||
}
|
||||
errorMessage += " "
|
||||
}
|
||||
|
||||
return errorMessage
|
||||
}
|
||||
Reference in New Issue
Block a user