feat: [#243] Optimize the return of controller

goravel · Sep 3, 2023 · 4dd5ee8 · 4dd5ee8
1 parent 8c9c2ea
commit 4dd5ee8
Show file tree

Hide file tree

Showing 12 changed files with 410 additions and 256 deletions.
diff --git a/auth/auth_test.go b/auth/auth_test.go
@@ -30,8 +30,8 @@ type User struct {
 
 type Context struct {
 	ctx      context.Context
-	request  http.Request
-	response http.Response
+	request  http.ContextRequest
+	response http.ContextResponse
 	values   map[string]any
 	mu       sync.RWMutex
 }
@@ -72,11 +72,11 @@ func (mc *Context) WithValue(key string, value any) {
 	mc.mu.Unlock()
 }
 
-func (mc *Context) Request() http.Request {
+func (mc *Context) Request() http.ContextRequest {
 	return mc.request
 }
 
-func (mc *Context) Response() http.Response {
+func (mc *Context) Response() http.ContextResponse {
 	return mc.response
 }
 

diff --git a/contracts/http/context.go b/contracts/http/context.go
@@ -5,20 +5,20 @@ import (
 )
 
 type Middleware func(Context)
-type HandlerFunc func(Context)
+type HandlerFunc func(Context) Response
 type ResourceController interface {
-	Index(Context)
-	Show(Context)
-	Store(Context)
-	Update(Context)
-	Destroy(Context)
+	Index(Context) Response
+	Show(Context) Response
+	Store(Context) Response
+	Update(Context) Response
+	Destroy(Context) Response
 }
 
 //go:generate mockery --name=Context
 type Context interface {
 	context.Context
 	Context() context.Context
 	WithValue(key string, value any)
-	Request() Request
-	Response() Response
+	Request() ContextRequest
+	Response() ContextResponse
 }
diff --git a/contracts/http/mocks/Context.go b/contracts/http/mocks/Context.go