feat: Add fx-di to test base

meysamhadeli · meysamhadeli · commit aba183405b0e · 2023-01-06T16:53:59.000+03:30
diff --git a/internal/pkg/http/echo/server/echo-server.go b/internal/pkg/http/echo/server/echo-server.go
@@ -15,58 +15,45 @@ const (
 	WriteTimeout   = 15 * time.Second
 )
 
-type EchoServer struct {
-	Log  logger.ILogger
-	Cfg  *config.EchoConfig
-	Echo *echo.Echo
-}
-
-func NewEchoServer(log logger.ILogger, cfg *config.EchoConfig) *EchoServer {
+func NewEchoServer() *echo.Echo {
 	e := echo.New()
-	return &EchoServer{Log: log, Cfg: cfg, Echo: e}
+	return e
 }
 
-func (s *EchoServer) RunHttpServer(ctx context.Context, configEcho ...func(echoServer *echo.Echo)) error {
-	s.Echo.Server.ReadTimeout = ReadTimeout
-	s.Echo.Server.WriteTimeout = WriteTimeout
-	s.Echo.Server.MaxHeaderBytes = MaxHeaderBytes
-
-	if len(configEcho) > 0 {
-		httpFunc := configEcho[0]
-		if httpFunc != nil {
-			httpFunc(s.Echo)
-		}
-	}
+func RunHttpServer(ctx context.Context, echo *echo.Echo, log logger.ILogger, cfg *config.EchoConfig) error {
+	echo.Server.ReadTimeout = ReadTimeout
+	echo.Server.WriteTimeout = WriteTimeout
+	echo.Server.MaxHeaderBytes = MaxHeaderBytes
 
 	go func() {
 		for {
 			select {
 			case <-ctx.Done():
-				s.Log.Infof("shutting down Http PORT: {%s}", s.Cfg.Port)
-				err := s.Echo.Shutdown(ctx)
+				log.Infof("shutting down Http PORT: {%s}", cfg.Port)
+				err := echo.Shutdown(ctx)
 				if err != nil {
-					s.Log.Errorf("(Shutdown) err: {%v}", err)
+					log.Errorf("(Shutdown) err: {%v}", err)
 					return
 				}
-				s.Log.Info("server exited properly")
+				log.Info("server exited properly")
 				return
 			}
 		}
 	}()
 
-	err := s.Echo.Start(s.Cfg.Port)
+	err := echo.Start(cfg.Port)
 
 	return err
 }
 
-func (s *EchoServer) ApplyVersioningFromHeader() {
-	s.Echo.Pre(apiVersion)
+func ApplyVersioningFromHeader(echo *echo.Echo) {
+	echo.Pre(apiVersion)
 }
 
-func (s *EchoServer) RegisterGroupFunc(groupName string, builder func(g *echo.Group)) *EchoServer {
-	builder(s.Echo.Group(groupName))
+func RegisterGroupFunc(groupName string, echo *echo.Echo, builder func(g *echo.Group)) *echo.Echo {
+	builder(echo.Group(groupName))
 
-	return s
+	return echo
 }
 
 // APIVersion Header Based Versioning
diff --git a/internal/pkg/oauth2/password_credentials.go b/internal/pkg/oauth2/password_credentials.go
@@ -11,7 +11,6 @@ import (
 	"github.com/go-oauth2/oauth2/v4/store"
 	"github.com/golang-jwt/jwt"
 	"github.com/labstack/echo/v4"
-	echo_server "github.com/meysamhadeli/shop-golang-microservices/internal/pkg/http/echo/server"
 	"log"
 	"net/http"
 	"sync"
@@ -53,7 +52,7 @@ func clientStore(clients ...*models.Client) oauth2.ClientStore {
 }
 
 // ref: https://github.com/go-oauth2/oauth2
-func RunOauthServer(e *echo_server.EchoServer) {
+func RunOauthServer(e *echo.Echo) {
 
 	manager.MapClientStorage(clientStore(clients...))
 
@@ -83,8 +82,8 @@ func RunOauthServer(e *echo_server.EchoServer) {
 		log.Println("Response Error:", re.Error.Error())
 	})
 
-	e.Echo.GET("connect/token", token)
-	e.Echo.GET("validate-token", validateBearerToken)
+	e.GET("connect/token", token)
+	e.GET("validate-token", validateBearerToken)
 }
 
 func validateBearerToken(c echo.Context) error {
diff --git a/internal/services/identity-service/identity/configurations/infrastructures_configurator.go b/internal/services/identity-service/identity/configurations/infrastructures_configurator.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"github.com/go-playground/validator"
 	"github.com/go-resty/resty/v2"
+	"github.com/labstack/echo/v4"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/pkg/grpc"
-	echo_server "github.com/meysamhadeli/shop-golang-microservices/internal/pkg/http/echo/server"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/pkg/logger"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/pkg/rabbitmq"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/services/identity-service/config"
@@ -16,14 +16,14 @@ import (
 	"gorm.io/gorm"
 )
 
-func InitialInfrastructures(echoServer *echo_server.EchoServer, log logger.ILogger, ctx context.Context, grpcServer *grpc.GrpcServer,
+func InitialInfrastructures(echo *echo.Echo, log logger.ILogger, ctx context.Context, grpcServer *grpc.GrpcServer,
 	userRepository contracts2.UserRepository, config *config.Config, rabbitmqPublisher *rabbitmq.Publisher, conn *amqp.Connection,
 	gorm *gorm.DB, tracer trace.Tracer, httpClient *resty.Client) *contracts.InfrastructureConfiguration {
 
 	infar := &contracts.InfrastructureConfiguration{
 		Log:               log,
 		Context:           ctx,
-		Echo:              echoServer.Echo,
+		Echo:              echo,
 		GrpcServer:        grpcServer,
 		UserRepository:    userRepository,
 		Cfg:               config,
diff --git a/internal/services/identity-service/identity/configurations/middleware_configurations.go b/internal/services/identity-service/identity/configurations/middleware_configurations.go
@@ -4,30 +4,29 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	echo_middleware "github.com/meysamhadeli/shop-golang-microservices/internal/pkg/http/echo/middleware"
-	echo_server "github.com/meysamhadeli/shop-golang-microservices/internal/pkg/http/echo/server"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/pkg/open-telemetry"
 	otel_middleware "github.com/meysamhadeli/shop-golang-microservices/internal/pkg/open-telemetry/middleware"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/services/identity-service/identity/constants"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/services/identity-service/identity/middlewares"
 	"strings"
 )
 
-func ConfigMiddlewares(e *echo_server.EchoServer, jaegerCfg *open_telemetry.JaegerConfig) {
+func ConfigMiddlewares(e *echo.Echo, jaegerCfg *open_telemetry.JaegerConfig) {
 
-	e.Echo.HideBanner = false
+	e.HideBanner = false
 
-	e.Echo.Use(middleware.Logger())
-	e.Echo.HTTPErrorHandler = middlewares.ProblemDetailsHandler
-	e.Echo.Use(otel_middleware.EchoTracerMiddleware(jaegerCfg.ServiceName))
+	e.Use(middleware.Logger())
+	e.HTTPErrorHandler = middlewares.ProblemDetailsHandler
+	e.Use(otel_middleware.EchoTracerMiddleware(jaegerCfg.ServiceName))
 
-	e.Echo.Use(echo_middleware.CorrelationIdMiddleware)
-	e.Echo.Use(middleware.RequestID())
-	e.Echo.Use(middleware.GzipWithConfig(middleware.GzipConfig{
+	e.Use(echo_middleware.CorrelationIdMiddleware)
+	e.Use(middleware.RequestID())
+	e.Use(middleware.GzipWithConfig(middleware.GzipConfig{
 		Level: constants.GzipLevel,
 		Skipper: func(c echo.Context) bool {
 			return strings.Contains(c.Request().URL.Path, "swagger")
 		},
 	}))
 
-	e.Echo.Use(middleware.BodyLimit(constants.BodyLimit))
+	e.Use(middleware.BodyLimit(constants.BodyLimit))
 }
diff --git a/internal/services/identity-service/identity/configurations/swagger_configurations.go b/internal/services/identity-service/identity/configurations/swagger_configurations.go
@@ -1,15 +1,15 @@
 package configurations
 
 import (
-	echo_server "github.com/meysamhadeli/shop-golang-microservices/internal/pkg/http/echo/server"
+	"github.com/labstack/echo/v4"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/services/identity-service/docs"
 	echoSwagger "github.com/swaggo/echo-swagger"
 )
 
-func ConfigSwagger(e *echo_server.EchoServer) {
+func ConfigSwagger(e *echo.Echo) {
 
 	docs.SwaggerInfo.Version = "1.0"
 	docs.SwaggerInfo.Title = "Identities Service Api"
 	docs.SwaggerInfo.Description = "Identities Service Api"
-	e.Echo.GET("/swagger/*", echoSwagger.WrapHandler)
+	e.GET("/swagger/*", echoSwagger.WrapHandler)
 }
diff --git a/internal/services/identity-service/identity/server/server.go b/internal/services/identity-service/identity/server/server.go
@@ -2,20 +2,22 @@ package server
 
 import (
 	"context"
+	"github.com/labstack/echo/v4"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/pkg/grpc"
+	"github.com/meysamhadeli/shop-golang-microservices/internal/pkg/http/echo/config"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/pkg/http/echo/server"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/pkg/logger"
 	"github.com/pkg/errors"
 	"go.uber.org/fx"
 	"net/http"
 )
 
-func RunServers(lc fx.Lifecycle, log logger.ILogger, echoServer *server.EchoServer, grpcServer *grpc.GrpcServer, ctx context.Context) error {
+func RunServers(lc fx.Lifecycle, log logger.ILogger, echo *echo.Echo, grpcServer *grpc.GrpcServer, ctx context.Context, echoConfig *config.EchoConfig) error {
 
 	lc.Append(fx.Hook{
 		OnStart: func(_ context.Context) error {
 			go func() {
-				if err := echoServer.RunHttpServer(ctx); !errors.Is(err, http.ErrServerClosed) {
+				if err := server.RunHttpServer(ctx, echo, log, echoConfig); !errors.Is(err, http.ErrServerClosed) {
 					log.Fatalf("error running http server: %v", err)
 				}
 			}()
diff --git a/internal/services/product-service/product/configurations/infrastructures_configurator.go b/internal/services/product-service/product/configurations/infrastructures_configurator.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"github.com/go-playground/validator"
 	"github.com/go-resty/resty/v2"
+	"github.com/labstack/echo/v4"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/pkg/grpc"
-	echo_server "github.com/meysamhadeli/shop-golang-microservices/internal/pkg/http/echo/server"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/pkg/logger"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/pkg/rabbitmq"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/services/product-service/config"
@@ -16,14 +16,14 @@ import (
 	"gorm.io/gorm"
 )
 
-func InitialInfrastructures(echoServer *echo_server.EchoServer, log logger.ILogger, ctx context.Context, grpcClient grpc.GrpcClient,
+func InitialInfrastructures(echo *echo.Echo, log logger.ILogger, ctx context.Context, grpcClient grpc.GrpcClient,
 	productRepository data.ProductRepository, config *config.Config, rabbitmqPublisher *rabbitmq.Publisher, conn *amqp.Connection,
 	gorm *gorm.DB, tracer trace.Tracer, httpClient *resty.Client) *contracts.InfrastructureConfiguration {
 
 	infar := &contracts.InfrastructureConfiguration{
 		Log:               log,
 		Context:           ctx,
-		Echo:              echoServer.Echo,
+		Echo:              echo,
 		GrpcClient:        grpcClient,
 		ProductRepository: productRepository,
 		Cfg:               config,
diff --git a/internal/services/product-service/product/configurations/middleware_configurations.go b/internal/services/product-service/product/configurations/middleware_configurations.go
@@ -4,31 +4,30 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	echo_middleware "github.com/meysamhadeli/shop-golang-microservices/internal/pkg/http/echo/middleware"
-	echo_server "github.com/meysamhadeli/shop-golang-microservices/internal/pkg/http/echo/server"
 	open_telemetry "github.com/meysamhadeli/shop-golang-microservices/internal/pkg/open-telemetry"
 	otel_middleware "github.com/meysamhadeli/shop-golang-microservices/internal/pkg/open-telemetry/middleware"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/services/product-service/product/constants"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/services/product-service/product/middlewares"
 	"strings"
 )
 
-func ConfigMiddlewares(e *echo_server.EchoServer, jaegerCfg *open_telemetry.JaegerConfig) {
+func ConfigMiddlewares(e *echo.Echo, jaegerCfg *open_telemetry.JaegerConfig) {
 
-	e.Echo.HideBanner = false
+	e.HideBanner = false
 
-	e.Echo.Use(middleware.Logger())
+	e.Use(middleware.Logger())
 
-	e.Echo.HTTPErrorHandler = middlewares.ProblemDetailsHandler
-	e.Echo.Use(otel_middleware.EchoTracerMiddleware(jaegerCfg.ServiceName))
+	e.HTTPErrorHandler = middlewares.ProblemDetailsHandler
+	e.Use(otel_middleware.EchoTracerMiddleware(jaegerCfg.ServiceName))
 
-	e.Echo.Use(echo_middleware.CorrelationIdMiddleware)
-	e.Echo.Use(middleware.RequestID())
-	e.Echo.Use(middleware.GzipWithConfig(middleware.GzipConfig{
+	e.Use(echo_middleware.CorrelationIdMiddleware)
+	e.Use(middleware.RequestID())
+	e.Use(middleware.GzipWithConfig(middleware.GzipConfig{
 		Level: constants.GzipLevel,
 		Skipper: func(c echo.Context) bool {
 			return strings.Contains(c.Request().URL.Path, "swagger")
 		},
 	}))
 
-	e.Echo.Use(middleware.BodyLimit(constants.BodyLimit))
+	e.Use(middleware.BodyLimit(constants.BodyLimit))
 }
diff --git a/internal/services/product-service/product/configurations/swagger_configurations.go b/internal/services/product-service/product/configurations/swagger_configurations.go
@@ -1,15 +1,15 @@
 package configurations
 
 import (
-	echo_server "github.com/meysamhadeli/shop-golang-microservices/internal/pkg/http/echo/server"
+	"github.com/labstack/echo/v4"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/services/product-service/docs"
 	echoSwagger "github.com/swaggo/echo-swagger"
 )
 
-func ConfigSwagger(e *echo_server.EchoServer) {
+func ConfigSwagger(e *echo.Echo) {
 
 	docs.SwaggerInfo.Version = "1.0"
 	docs.SwaggerInfo.Title = "Products Service Api"
 	docs.SwaggerInfo.Description = "Products Service Api"
-	e.Echo.GET("/swagger/*", echoSwagger.WrapHandler)
+	e.GET("/swagger/*", echoSwagger.WrapHandler)
 }
diff --git a/internal/services/product-service/server/server.go b/internal/services/product-service/server/server.go
@@ -2,19 +2,21 @@ package server
 
 import (
 	"context"
+	"github.com/labstack/echo/v4"
+	"github.com/meysamhadeli/shop-golang-microservices/internal/pkg/http/echo/config"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/pkg/http/echo/server"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/pkg/logger"
 	"github.com/pkg/errors"
 	"go.uber.org/fx"
 	"net/http"
 )
 
-func RunServers(lc fx.Lifecycle, log logger.ILogger, echoServer *server.EchoServer, ctx context.Context) error {
+func RunServers(lc fx.Lifecycle, log logger.ILogger, echo *echo.Echo, ctx context.Context, echoConfig *config.EchoConfig) error {
 
 	lc.Append(fx.Hook{
 		OnStart: func(_ context.Context) error {
 			go func() {
-				if err := echoServer.RunHttpServer(ctx); !errors.Is(err, http.ErrServerClosed) {
+				if err := server.RunHttpServer(ctx, echo, log, echoConfig); !errors.Is(err, http.ErrServerClosed) {
 					log.Fatalf("error running http server: %v", err)
 				}
 			}()
diff --git a/internal/services/product-service/shared/test_fixture/integration/integration_test_fixture.go b/internal/services/product-service/shared/test_fixture/integration/integration_test_fixture.go
@@ -116,7 +116,7 @@ func NewIntegrationTestFixture(t *testing.T, option fx.Option) *IntegrationTestF
 	defer app.RequireStart().RequireStop()
 	require.NoError(t, app.Err())
 
-	configurations.ConfigMiddlewares(&ech_server.EchoServer{Echo: integrationTestFixture.Echo}, integrationTestFixture.Cfg.Jaeger)
+	configurations.ConfigMiddlewares(integrationTestFixture.Echo, integrationTestFixture.Cfg.Jaeger)
 
 	return integrationTestFixture
 }
diff --git a/internal/services/product-service/tests/integration_tests/features/creating_product/create_product_integration_test.go b/internal/services/product-service/tests/integration_tests/features/creating_product/create_product_integration_test.go
@@ -1,11 +1,11 @@
-package v1
+package creating_product
 
 import (
 	"github.com/brianvoe/gofakeit/v6"
 	"github.com/mehdihadeli/go-mediatr"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/pkg/rabbitmq"
 	consumers2 "github.com/meysamhadeli/shop-golang-microservices/internal/services/product-service/product/consumers"
-	v1 "github.com/meysamhadeli/shop-golang-microservices/internal/services/product-service/product/features/creating_product/commands/v1"
+	"github.com/meysamhadeli/shop-golang-microservices/internal/services/product-service/product/features/creating_product/commands/v1"
 	v1_dtos "github.com/meysamhadeli/shop-golang-microservices/internal/services/product-service/product/features/creating_product/dtos/v1"
 	v1_event "github.com/meysamhadeli/shop-golang-microservices/internal/services/product-service/product/features/creating_product/events/v1"
 	"github.com/meysamhadeli/shop-golang-microservices/internal/services/product-service/shared/contracts"
