bindioc.Handle use only Invoker as parameter

noobj · Feb 7, 2023 · 588809e · 588809e
1 parent e50b42c
commit 588809e
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 16 deletions.
diff --git a/cmd/ahorro/fetchentries/main.go b/cmd/ahorro/fetchentries/main.go
@@ -50,7 +50,7 @@ type Invoker struct {
 	entryRepository EntryRepository.EntryRepository `container:"type"`
 }
 
-func (this *Invoker) Invoke(ctx context.Context, request events.APIGatewayV2HTTPRequest) (events.APIGatewayProxyResponse, error) {
+func (this Invoker) Invoke(ctx context.Context, request events.APIGatewayV2HTTPRequest) (events.APIGatewayProxyResponse, error) {
 	user, ok := helper.GetUserFromContext(ctx)
 	if !ok {
 		return events.APIGatewayProxyResponse{Body: "please login in", StatusCode: 401}, nil
@@ -173,7 +173,6 @@ func (this *Invoker) Invoke(ctx context.Context, request events.APIGatewayV2HTTP
 
 func main() {
 	defer mongodb.Disconnect()()
-	invoker := Invoker{}
 
-	lambda.Start(jwtMiddleWare.Handle(bindioc.Handle(invoker.Invoke, &invoker)))
+	lambda.Start(jwtMiddleWare.Handle(bindioc.Handle[events.APIGatewayV2HTTPRequest, events.APIGatewayProxyResponse](&Invoker{})))
 }
diff --git a/cmd/ahorro/login/main.go b/cmd/ahorro/login/main.go
@@ -25,7 +25,7 @@ type LoginDto struct {
 	Password string
 }
 
-func (this *Invoker) insertNewRefreshTokenIntoLoginInfo(userId primitive.ObjectID, refreshToken string) {
+func (this Invoker) insertNewRefreshTokenIntoLoginInfo(userId primitive.ObjectID, refreshToken string) {
 	loginInfo := LoginInfoRepository.LoginInfo{
 		User:         userId,
 		RefreshToken: refreshToken,
@@ -39,7 +39,7 @@ type Invoker struct {
 	loginInfoRepository LoginInfoRepository.LoginInfoRepository `container:"type"`
 }
 
-func (this *Invoker) Invoke(ctx context.Context, request events.APIGatewayProxyRequest) (events.APIGatewayV2HTTPResponse, error) {
+func (this Invoker) Invoke(ctx context.Context, request events.APIGatewayProxyRequest) (events.APIGatewayV2HTTPResponse, error) {
 	var requestBody LoginDto
 
 	formData, err := helper.ParseMultipartForm(request.Headers["content-type"], strings.NewReader(request.Body), request.IsBase64Encoded)
@@ -118,7 +118,6 @@ func (this *Invoker) Invoke(ctx context.Context, request events.APIGatewayProxyR
 
 func main() {
 	defer mongodb.Disconnect()()
-	invoker := Invoker{}
 
-	lambda.Start(bindioc.Handle(invoker.Invoke, &invoker))
+	lambda.Start(bindioc.Handle[events.APIGatewayProxyRequest, events.APIGatewayV2HTTPResponse](&Invoker{}))
 }
diff --git a/cmd/ahorro/refresh/main.go b/cmd/ahorro/refresh/main.go
@@ -87,7 +87,6 @@ func (this *Invoker) Invoke(ctx context.Context, request events.APIGatewayV2HTTP
 
 func main() {
 	defer mongodb.Disconnect()()
-	invoker := Invoker{}
 
-	lambda.Start(bindioc.Handle(invoker.Invoke, &invoker))
+	lambda.Start(bindioc.Handle[events.APIGatewayV2HTTPRequest, events.APIGatewayV2HTTPResponse](&Invoker{}))
 }
diff --git a/cmd/ahorro/sync/callback/main.go b/cmd/ahorro/sync/callback/main.go
@@ -93,7 +93,6 @@ func (this *Invoker) Invoke(ctx context.Context, request events.APIGatewayV2HTTP
 
 func main() {
 	defer mongodb.Disconnect()()
-	invoker := Invoker{}
 
-	lambda.Start(jwtMiddleWare.Handle(bindioc.Handle(invoker.Invoke, &invoker)))
+	lambda.Start(jwtMiddleWare.Handle(bindioc.Handle[events.APIGatewayV2HTTPRequest, events.APIGatewayProxyResponse](&Invoker{})))
 }
diff --git a/cmd/ahorro/sync/handler/main.go b/cmd/ahorro/sync/handler/main.go
@@ -237,7 +237,6 @@ func collateEntryItems(entryItems []EntryItem, cateIdMap map[string]primitive.Ob
 
 func main() {
 	defer mongodb.Disconnect()()
-	invoker := Invoker{}
 
-	lambda.Start(jwtMiddleWare.Handle(bindioc.Handle(invoker.Invoke, &invoker)))
+	lambda.Start(jwtMiddleWare.Handle(bindioc.Handle[events.SQSEvent, events.APIGatewayProxyResponse](&Invoker{})))
 }
diff --git a/internal/middleware/bind-ioc/bind-ioc.middleware.go b/internal/middleware/bind-ioc/bind-ioc.middleware.go
@@ -8,6 +8,7 @@ import (
 	"github.com/golobby/container/v3"
 
 	// TODO: use internal types instead
+	typesInternal "github.com/noobj/go-serverless-services/internal/types"
 	"github.com/noobj/jwtmiddleware/types"
 
 	"github.com/noobj/go-serverless-services/internal/helpers/helper"
@@ -17,10 +18,10 @@ import (
 	UserRepository "github.com/noobj/go-serverless-services/internal/repositories/ahorro/user"
 )
 
-func Handle[T types.ApiRequest, R types.ApiResponse](next types.HandlerFunc[T, R], invoker interface{}) types.HandlerFunc[T, R] {
+func Handle[T types.ApiRequest, R types.ApiResponse](invoker typesInternal.IIvoker[T, R]) types.HandlerFunc[T, R] {
 	return func(ctx context.Context, request T) (R, error) {
 		receiverType := reflect.TypeOf(invoker)
-		if receiverType == nil || receiverType.Kind() == reflect.Ptr {
+		if receiverType == nil || receiverType.Kind() != reflect.Ptr {
 			log.Println("container: invalid invoker type")
 			return helper.GenerateErrorResponse[R](500)
 		}
@@ -47,6 +48,6 @@ func Handle[T types.ApiRequest, R types.ApiResponse](next types.HandlerFunc[T, R
 			return helper.GenerateErrorResponse[R](500)
 		}
 
-		return next(ctx, request)
+		return invoker.Invoke(ctx, request)
 	}
 }
diff --git a/internal/middleware/middleswares-loader.go b/internal/middleware/middleswares-loader.go
@@ -0,0 +1,35 @@
+package middleware
+
+import (
+	"context"
+	"fmt"
+
+	typesInternal "github.com/noobj/go-serverless-services/internal/types"
+	"github.com/noobj/jwtmiddleware/types"
+)
+
+type middlewaresFunc[T types.ApiRequest, R types.ApiResponse] func(invoker typesInternal.IIvoker[T, R]) types.HandlerFunc[T, R]
+
+func fakeMiddlewareFunc[T types.ApiRequest, R types.ApiResponse](invoker typesInternal.IIvoker[T, R]) types.HandlerFunc[T, R] {
+	return func(ctx context.Context, request T) (R, error) {
+		fmt.Println("Fake middleware")
+		return invoker.Invoke(ctx, request)
+	}
+}
+
+func Bootstrap[T types.ApiRequest, R types.ApiResponse](invoker typesInternal.IIvoker[T, R], middlewareFuncs ...middlewaresFunc[T, R]) types.HandlerFunc[T, R] {
+	result := func(mFunc middlewaresFunc[T, R]) middlewaresFunc[T, R] {
+		return func(invoker typesInternal.IIvoker[T, R]) types.HandlerFunc[T, R] {
+			return mFunc(invoker)
+		}
+	}
+
+	for _, middlewareFunc := range middlewareFuncs {
+		oldResult := result
+		result = func(mFunc middlewaresFunc[T, R]) middlewaresFunc[T, R] {
+			return oldResult(middlewareFunc)
+		}
+	}
+
+	return result(fakeMiddlewareFunc[T, R])(invoker)
+}
diff --git a/internal/types/middleware.type.go b/internal/types/middleware.type.go
@@ -2,7 +2,13 @@ package types
 
 import (
 	"context"
+
+	"github.com/noobj/jwtmiddleware/types"
 )
 
 // HandlerFunc is a generic JSON Lambda handler used to chain middleware.
 type HandlerFunc[T ApiRequest, R ApiResponse] func(context.Context, T) (R, error)
+
+type IIvoker[T types.ApiRequest, R types.ApiResponse] interface {
+	Invoke(context.Context, T) (R, error)
+}