From 6c96b349aba8507c1a721f24b985f20c285e6181 Mon Sep 17 00:00:00 2001 From: mahsa-fox Date: Sun, 19 Apr 2026 02:33:30 +0330 Subject: [PATCH] Changed struct --- cmd/payment/command/serve.go | 2 +- domain/payment/delivery/http/handler.go | 20 -------------- domain/payment/delivery/http/server.go | 34 ------------------------ {domain/payment => paymentapp}/app.go | 10 +++---- {domain/payment => paymentapp}/config.go | 9 ------- 5 files changed, 4 insertions(+), 71 deletions(-) delete mode 100644 domain/payment/delivery/http/handler.go delete mode 100644 domain/payment/delivery/http/server.go rename {domain/payment => paymentapp}/app.go (60%) rename {domain/payment => paymentapp}/config.go (68%) diff --git a/cmd/payment/command/serve.go b/cmd/payment/command/serve.go index 1ac7e884..29d81b52 100644 --- a/cmd/payment/command/serve.go +++ b/cmd/payment/command/serve.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v3" - paymentapp "git.gocasts.ir/ebhomengo/niki/domain/payment" + paymentapp "git.gocasts.ir/ebhomengo/niki/paymentapp" "git.gocasts.ir/ebhomengo/niki/pkg/database" ) diff --git a/domain/payment/delivery/http/handler.go b/domain/payment/delivery/http/handler.go deleted file mode 100644 index b8c9ae72..00000000 --- a/domain/payment/delivery/http/handler.go +++ /dev/null @@ -1,20 +0,0 @@ -package http - -import ( - "git.gocasts.ir/ebhomengo/niki/domain/payment/service" - "github.com/labstack/echo/v4" -) - -type Handler struct { - service *service.PaymentService -} - -func NewHandler(service *service.PaymentService) *Handler { - return &Handler{ - service: service, - } -} - -func (h *Handler) HealthCheck(c echo.Context) error { - return c.String(200, "HealthCheck is ok") -} diff --git a/domain/payment/delivery/http/server.go b/domain/payment/delivery/http/server.go deleted file mode 100644 index e03a27a0..00000000 --- a/domain/payment/delivery/http/server.go +++ /dev/null @@ -1,34 +0,0 @@ -package http - -import ( - "context" - - httpserver "git.gocasts.ir/ebhomengo/niki/pkg/http_server" -) - -type Server struct { - httpServer httpserver.Server - handler *Handler -} - -func NewServer(httpServer httpserver.Server, handler *Handler) *Server { - return &Server{ - httpServer: httpServer, - handler: handler, - } -} - -func (s *Server) Serve() error { - s.registerRoutes() - return s.httpServer.Start() -} - -func (s *Server) Stop(ctx context.Context) error { - return s.httpServer.Stop(ctx) -} - -func (s *Server) registerRoutes() { - paymentGroup := s.httpServer.Router.Group("/payment") - - paymentGroup.GET("/health", s.handler.HealthCheck) -} diff --git a/domain/payment/app.go b/paymentapp/app.go similarity index 60% rename from domain/payment/app.go rename to paymentapp/app.go index 5f80cc0c..9316e126 100644 --- a/domain/payment/app.go +++ b/paymentapp/app.go @@ -3,27 +3,23 @@ package paymentapp import ( "context" - paymenthttp "git.gocasts.ir/ebhomengo/niki/domain/payment/delivery/http" "git.gocasts.ir/ebhomengo/niki/pkg/database" ) type App struct { - server *paymenthttp.Server } func Setup(ctx context.Context, cfg Config, conn *database.Database) (*App, error) { //TODO Setup - return &App{ - server: nil, - }, nil + return &App{}, nil } func (a *App) Start() error { - return a.server.Serve() + return nil } func (a *App) Stop(ctx context.Context) error { - return a.server.Stop(ctx) + return nil } diff --git a/domain/payment/config.go b/paymentapp/config.go similarity index 68% rename from domain/payment/config.go rename to paymentapp/config.go index b4df44bc..b68cb5cc 100644 --- a/domain/payment/config.go +++ b/paymentapp/config.go @@ -1,13 +1,5 @@ package paymentapp -type HTTPConfig struct { - Addr string `yaml:"addr" json:"addr"` - Port int - ReadTimeout int `yaml:"read_timeout" json:"read_timeout"` - WriteTimeout int `yaml:"write_timeout" json:"write_timeout"` - IdleTimeout int `yaml:"idle_timeout" json:"idle_timeout"` - AllowOrigins []string -} type PostgresConfig struct { Host string `yaml:"host"` Port int `yaml:"port"` @@ -27,7 +19,6 @@ type LoggerConfig struct { } type Config struct { - HTTP HTTPConfig `yaml:"http" json:"http"` Postgres PostgresConfig `yaml:"postgres" json:"postgres"` Logger LoggerConfig `yaml:"logger" json:"logger"` }