Merge pull request #32 from gone-io/feature/1.x

Feature/1.x
gone-io · Jul 13, 2024 · 7c0c739 · 7c0c739
2 parents 65daa2e + ad75c87
commit 7c0c739
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 0 deletions.
diff --git a/goner/gin/interface.go b/goner/gin/interface.go
@@ -106,6 +106,7 @@ type HandleProxyToGin interface {
 type XContext interface {
 	JSON(code int, obj any)
 	String(code int, format string, values ...any)
+	Abort()
 }
 
 type WrappedDataFunc func(code int, msg string, data any) any

diff --git a/goner/gin/mock_test.go b/goner/gin/mock_test.go
diff --git a/goner/gin/responer.go b/goner/gin/responer.go
@@ -120,6 +120,14 @@ func (r *responser) Failed(ctx XContext, oErr error) {
 }
 
 func (r *responser) ProcessResults(context XContext, writer gin.ResponseWriter, last bool, funcName string, results ...any) {
+	for _, result := range results {
+		if err, ok := result.(error); ok {
+			r.Failed(context, err)
+			context.Abort()
+			return
+		}
+	}
+
 	isNotEnd := false
 	for _, result := range results {
 		if result == nil {

diff --git a/goner/gin/responer_test.go b/goner/gin/responer_test.go
@@ -259,6 +259,7 @@ func Test_responser_ProcessResults(t *testing.T) {
 	writer := NewMockResponseWriter(controller)
 
 	ctx.EXPECT().JSON(gomock.Any(), gomock.Any()).AnyTimes()
+	ctx.EXPECT().Abort().AnyTimes()
 
 	t.Run("last=false", func(t *testing.T) {
 		writer.EXPECT().Written().Return(false).AnyTimes()