fix: drop ErrorBadRequest, use Error

things-go · Feb 1, 2024 · 0456eca · 0456eca
1 parent bdcbbd9
commit 0456eca
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/cmd/protoc-gen-dyn-gin/main.go b/cmd/protoc-gen-dyn-gin/main.go
@@ -7,7 +7,7 @@ import (
 	"google.golang.org/protobuf/compiler/protogen"
 )
 
-const version = "v0.0.2"
+const version = "v0.1.0"
 
 var args = struct {
 	ShowVersion         bool

diff --git a/cmd/protoc-gen-dyn-gin/service.go b/cmd/protoc-gen-dyn-gin/service.go
@@ -138,7 +138,7 @@ func executeServiceDesc(g *protogen.GeneratedFile, s *serviceDesc) error {
 				g.P("var reply *", m.Reply)
 				g.P()
 				g.P("if err = shouldBind(&req); err != nil {")
-				g.P("carrier.ErrorBadRequest(c, err)")
+				g.P("carrier.Error(c, err)")
 				g.P("return")
 				g.P("}")
 				g.P("reply, err = srv.", m.Name, "(c.Request.Context(), &req)")

diff --git a/example/hello/hello.gin.pb.go b/example/hello/hello.gin.pb.go
diff --git a/ginp/gin.go b/ginp/gin.go
@@ -2,6 +2,7 @@ package ginp
 
 import (
 	"context"
+	stdErrors "errors"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -46,13 +47,13 @@ func (*GinCarry) BindQuery(cg *gin.Context, v any) error {
 func (*GinCarry) BindUri(cg *gin.Context, v any) error {
 	return cg.ShouldBindUri(v)
 }
-func (*GinCarry) ErrorBadRequest(cg *gin.Context, err error) {
-	Abort(cg, errors.ErrBadRequest(err.Error()))
-}
 func (cy *GinCarry) Error(cg *gin.Context, err error) {
 	if cy.translate != nil {
 		err = cy.translate.Translate(err)
 	}
+	if e := new(validator.ValidationErrors); stdErrors.As(err, e) {
+		err = errors.ErrBadRequest(err.Error())
+	}
 	Abort(cg, err)
 }
 func (*GinCarry) Render(cg *gin.Context, v any) {

diff --git a/ginp/ginp.go b/ginp/ginp.go
@@ -2,6 +2,7 @@ package ginp
 
 import (
 	"context"
+	stdErrors "errors"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -67,13 +68,14 @@ func (cy *Carry) BindQuery(c *gin.Context, v any) error {
 func (cy *Carry) BindUri(c *gin.Context, v any) error {
 	return cy.encoding.BindUri(c.Request, v)
 }
-func (*Carry) ErrorBadRequest(c *gin.Context, err error) {
-	Abort(c, errors.ErrBadRequest(err.Error()))
-}
+
 func (cy *Carry) Error(c *gin.Context, err error) {
 	if cy.translate != nil {
 		err = cy.translate.Translate(err)
 	}
+	if e := new(validator.ValidationErrors); stdErrors.As(err, e) {
+		err = errors.ErrBadRequest(err.Error())
+	}
 	Abort(c, err)
 }
 func (cy *Carry) Render(c *gin.Context, v any) {

diff --git a/transport/http/carrier.go b/transport/http/carrier.go
@@ -21,8 +21,6 @@ type Carrier interface {
 	// BindUri binds the passed struct pointer using the uri codec.Marshaler.
 	// NOTE: before use this, you should set uri params in the request context with RequestWithUri.
 	BindUri(*gin.Context, any) error
-	// ErrorBadRequest encode error response.
-	ErrorBadRequest(*gin.Context, error)
 	// Error encode error response.
 	Error(c *gin.Context, err error)
 	// Render encode response.