Refactor code

Author: minhduc140583

internal/app/app.go

@@ -4,10 +4,11 @@ import (
 	"context"
 	"github.com/core-go/health"
 	"github.com/gocql/gocql"
-	"go-service/cql"
-	"go-service/internal/handlers"
-	"go-service/internal/services"
 	"time"
+
+	"go-service/internal/handler"
+	"go-service/internal/service"
+	"go-service/pkg/cql"
 )
 
 const (
@@ -27,18 +28,18 @@ const (
 )
 
 type ApplicationContext struct {
-	HealthHandler *health.Handler
-	UserHandler   *handlers.UserHandler
+	Health *health.Handler
+	User   *handler.UserHandler
 }
 
-func NewApp(context context.Context, root Config) (*ApplicationContext, error) {
+func NewApp(ctx context.Context, config Config) (*ApplicationContext, error) {
 	// connect to the cluster
-	cluster := gocql.NewCluster(root.Cql.PublicIp)
+	cluster := gocql.NewCluster(config.Cql.PublicIp)
 	cluster.Consistency = gocql.Quorum
 	cluster.ProtoVersion = 4
 	cluster.Timeout = time.Second * 1000
 	cluster.ConnectTimeout = time.Second * 1000
-	cluster.Authenticator = gocql.PasswordAuthenticator{Username: root.Cql.UserName, Password: root.Cql.Password}
+	cluster.Authenticator = gocql.PasswordAuthenticator{Username: config.Cql.UserName, Password: config.Cql.Password}
 	session, err := cluster.CreateSession()
 	if err != nil {
 		return nil, err
@@ -66,14 +67,14 @@ func NewApp(context context.Context, root Config) (*ApplicationContext, error) {
 		return nil, err
 	}
 
-	userService := services.NewUserService(cluster)
-	userHandler := handlers.NewUserHandler(userService)
+	userService := service.NewUserService(cluster)
+	userHandler := handler.NewUserHandler(userService)
 
 	cqlChecker := cql.NewHealthChecker(cluster)
 	healthHandler := health.NewHandler(cqlChecker)
 
 	return &ApplicationContext{
-		HealthHandler: healthHandler,
-		UserHandler:   userHandler,
+		Health: healthHandler,
+		User:   userHandler,
 	}, nil
 }

internal/app/route.go

@@ -9,7 +9,6 @@ const (
 	GET    = "GET"
 	POST   = "POST"
 	PUT    = "PUT"
-	PATCH  = "PATCH"
 	DELETE = "DELETE"
 )
 
@@ -19,14 +18,14 @@ func Route(r *mux.Router, ctx context.Context, root Config) error {
 		return err
 	}
 
-	r.HandleFunc("/health", app.HealthHandler.Check).Methods(GET)
+	r.HandleFunc("/health", app.Health.Check).Methods(GET)
 
 	userPath := "/users"
-	r.HandleFunc(userPath, app.UserHandler.All).Methods(GET)
-	r.HandleFunc(userPath+"/{id}", app.UserHandler.Load).Methods(GET)
-	r.HandleFunc(userPath, app.UserHandler.Insert).Methods(POST)
-	r.HandleFunc(userPath+"/{id}", app.UserHandler.Update).Methods(PUT)
-	r.HandleFunc(userPath+"/{id}", app.UserHandler.Delete).Methods(DELETE)
+	r.HandleFunc(userPath, app.User.All).Methods(GET)
+	r.HandleFunc(userPath+"/{id}", app.User.Load).Methods(GET)
+	r.HandleFunc(userPath, app.User.Insert).Methods(POST)
+	r.HandleFunc(userPath+"/{id}", app.User.Update).Methods(PUT)
+	r.HandleFunc(userPath+"/{id}", app.User.Delete).Methods(DELETE)
 
 	return nil
 }

internal/handlers/user_handler.go renamed to internal/handler/user_handler.go

@@ -1,12 +1,12 @@
-package handlers
+package handler
 
 import (
 	"encoding/json"
 	"github.com/gorilla/mux"
 	"net/http"
 
-	. "go-service/internal/models"
-	. "go-service/internal/services"
+	. "go-service/internal/model"
+	. "go-service/internal/service"
 )
 
 type UserHandler struct {

internal/models/user.go renamed to internal/model/user.go

@@ -1,4 +1,4 @@
-package models
+package model
 
 import "time"
 

internal/services/cql_user_service.go renamed to internal/service/cql_user_service.go

@@ -1,12 +1,12 @@
-package services
+package service
 
 import (
 	"context"
 	"fmt"
 	"github.com/gocql/gocql"
 	"strings"
 
-	. "go-service/internal/models"
+	. "go-service/internal/model"
 )
 
 type CqlUserService struct {

internal/services/user_service.go renamed to internal/service/user_service.go

@@ -1,9 +1,9 @@
-package services
+package service
 
 import (
 	"context"
 
-	. "go-service/internal/models"
+	. "go-service/internal/model"
 )
 
 type UserService interface {

main.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 	"github.com/core-go/config"
+	"github.com/core-go/core"
 	"github.com/core-go/log"
 	mid "github.com/core-go/log/middleware"
-	sv "github.com/core-go/core"
 	"github.com/gorilla/mux"
 	"net/http"
 
@@ -15,9 +15,9 @@ import (
 
 func main() {
 	var conf app.Config
-	er1 := config.Load(&conf, "configs/config")
-	if er1 != nil {
-		panic(er1)
+	err := config.Load(&conf, "configs/config")
+	if err != nil {
+		panic(err)
 	}
 
 	r := mux.NewRouter()
@@ -30,12 +30,12 @@ func main() {
 	}
 	r.Use(mid.Recover(log.PanicMsg))
 
-	er2 := app.Route(r, context.Background(), conf)
-	if er2 != nil {
-		panic(er2)
+	err = app.Route(r, context.Background(), conf)
+	if err != nil {
+		panic(err)
 	}
-	fmt.Println(sv.ServerInfo(conf.Server))
-	if er3 := http.ListenAndServe(sv.Addr(conf.Server.Port), r); er3 != nil {
-		fmt.Println(er3.Error())
+	fmt.Println(core.ServerInfo(conf.Server))
+	if err = http.ListenAndServe(core.Addr(conf.Server.Port), r); err != nil {
+		fmt.Println(err.Error())
 	}
 }