♻️ refactor: updated codebase #2

internal/core/handlers.go

@@ -1,24 +1,24 @@
 package core
 
 import (
+	"github.com/sivaosorg/gocell/internal/handlers"
 	"github.com/sivaosorg/gocell/internal/middlewares"
+	"github.com/sivaosorg/gocell/internal/repository"
+	"github.com/sivaosorg/gocell/internal/service"
 	syncconf "github.com/sivaosorg/gocell/internal/syncConf"
 )
 
 type coreHandler struct {
-	middlewares *middlewares.MiddlewareManager
-}
-
-func NewCoreHandler() *coreHandler {
-	return &coreHandler{}
-}
-
-func (c *coreHandler) setMiddlewares(value *middlewares.MiddlewareManager) *coreHandler {
-	c.middlewares = value
-	return c
+	middlewares   *middlewares.MiddlewareManager
+	commonHandler *handlers.CommonHandler
 }
 
 func (c *CoreCommand) handler() {
+	commonRepository := repository.NewCommonRepository(c.psql, c.psqlStatus)
+	commonSvc := service.NewCommonService(commonRepository)
+	commonHandler := handlers.NewCommonHandler(commonSvc)
+
 	c.handlers = NewCoreHandler().
-		setMiddlewares(middlewares.NewMiddlewareManager(syncconf.Conf))
+		setMiddlewares(middlewares.NewMiddlewareManager(syncconf.Conf)).
+		setCommonHandler(commonHandler)
 }

internal/core/init.go

@@ -0,0 +1,20 @@
+package core
+
+import (
+	"github.com/sivaosorg/gocell/internal/handlers"
+	"github.com/sivaosorg/gocell/internal/middlewares"
+)
+
+func NewCoreHandler() *coreHandler {
+	return &coreHandler{}
+}
+
+func (c *coreHandler) setMiddlewares(value *middlewares.MiddlewareManager) *coreHandler {
+	c.middlewares = value
+	return c
+}
+
+func (c *coreHandler) setCommonHandler(value *handlers.CommonHandler) *coreHandler {
+	c.commonHandler = value
+	return c
+}

internal/core/routes.go

@@ -7,9 +7,15 @@ import (
 )
 
 func (c *CoreCommand) routes(core *gin.Engine) {
-
 	core.GET("/api/v1/swagger/index.html", ginSwagger.WrapHandler(
 		swaggerFiles.Handler,
 		ginSwagger.DefaultModelsExpandDepth(-1),
 	))
+	v1 := core.Group("/api/v1")
+	{
+		v1.GET("/common/psql-status",
+			c.handlers.middlewares.RequestMiddleWare(),
+			c.handlers.middlewares.NoopMiddleWare(),
+			c.handlers.commonHandler.OnPsqlStatus)
+	}
 }

internal/handlers/common_handler.go

@@ -0,0 +1,26 @@
+package handlers
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/sivaosorg/gocell/internal/service"
+	"github.com/sivaosorg/govm/entity"
+)
+
+type CommonHandler struct {
+	commonSvc service.CommonService
+}
+
+func NewCommonHandler(commonSvc service.CommonService) *CommonHandler {
+	h := &CommonHandler{
+		commonSvc: commonSvc,
+	}
+	return h
+}
+
+func (h *CommonHandler) OnPsqlStatus(ctx *gin.Context) {
+	response := entity.NewResponseEntity().SetStatusCode(http.StatusOK).SetData(h.commonSvc.GetPsqlStatus())
+	ctx.JSON(response.StatusCode, response)
+	return
+}

internal/middlewares/interceptor_middleware.go

@@ -40,15 +40,7 @@ func (m *MiddlewareManager) RequestMiddleWare() gin.HandlerFunc {
 			bodyBuffer:     bytes.NewBufferString(""),
 		}
 		c.Writer = wrappedWriter
-		// Make the request handling asynchronous
-		go func() {
-			defer func() {
-				if r := recover(); r != nil {
-					logger.Debugf("Asynchronous request recover handling: %v", r)
-				}
-			}()
-			c.Next()
-		}()
+		c.Next()
 		m.async(c, wrappedWriter)
 	}
 }

internal/models/common_model.go

@@ -0,0 +1,10 @@
+package models
+
+type Common struct {
+}
+
+type CommonRequest struct {
+}
+
+type CommonResponse struct {
+}

internal/repository/common_repository.go

@@ -0,0 +1,26 @@
+package repository
+
+import (
+	"github.com/sivaosorg/govm/dbx"
+	"github.com/sivaosorg/postgresconn/postgresconn"
+)
+
+type CommonRepository interface {
+	GetPsqlStatus() dbx.Dbx
+}
+
+type commonRepositoryImpl struct {
+	psql       *postgresconn.Postgres
+	psqlStatus dbx.Dbx
+}
+
+func NewCommonRepository(psql *postgresconn.Postgres, psqlStatus dbx.Dbx) CommonRepository {
+	return &commonRepositoryImpl{
+		psql:       psql,
+		psqlStatus: psqlStatus,
+	}
+}
+
+func (repo *commonRepositoryImpl) GetPsqlStatus() dbx.Dbx {
+	return repo.psqlStatus
+}

internal/service/common_service.go

@@ -0,0 +1,24 @@
+package service
+
+import (
+	"github.com/sivaosorg/gocell/internal/repository"
+	"github.com/sivaosorg/govm/dbx"
+)
+
+type CommonService interface {
+	GetPsqlStatus() dbx.Dbx
+}
+
+type commonServiceImpl struct {
+	commonRepository repository.CommonRepository
+}
+
+func NewCommonService(commonRepository repository.CommonRepository) CommonService {
+	return &commonServiceImpl{
+		commonRepository: commonRepository,
+	}
+}
+
+func (s *commonServiceImpl) GetPsqlStatus() dbx.Dbx {
+	return s.commonRepository.GetPsqlStatus()
+}