Merge pull request #16 from DoWithLogic/refactor/config-and-sql-base

chore: update config retrieve mechanism and sql base from sql to sqlx

Author: martinyonatann

cmd/main.go cmd/api/main.go

@@ -1,21 +1,21 @@
-server:
-  name: golang-clean-architecture
-  version: "v0.0.1"
-  rpc_port: 8080
-  rest_port: 9090
-  debug: false
-  env: local
-  read_time_out: 5s
-  write_time_out: 5s
+Server:
+  Name: golang-clean-architecture
+  Version: "v0.0.1"
+  RPCPort: 8080
+  RESTPort: 9090
+  Debug: false
+  Env: local
+  ReadTimeOut: 5s
+  WriteTimeOut: 5s
 
-database:
-  host: localhost
-  port: 3306
-  name: users
-  user: mysql
-  password: pwd
+Database:
+  Host: localhost
+  Port: 3306
+  Name: users
+  User: mysql
+  Password: pwd
 
-authentication:
-  key: DoWithLogic!@#
-  secret_key: s3cr#tK3y!@#v001
-  salt_key: s4ltK3y!@#ddv001
+Authentication:
+  Key: DoWithLogic!@#
+  SecretKey: s3cr#tK3y!@#v001
+  SaltKey: s4ltK3y!@#ddv001

cmd/scheduler/.keep

@@ -15,28 +15,28 @@ type (
 	}
 
 	DatabaseConfig struct {
-		Host     string `mapstructure:"host"`
-		Port     int    `mapstructure:"port"`
-		Name     string `mapstructure:"name"`
-		User     string `mapstructure:"user"`
-		Password string `mapstructure:"password"`
+		Host     string
+		Port     int
+		Name     string
+		User     string
+		Password string
 	}
 
 	ServerConfig struct {
-		Name         string        `mapstructure:"name"`
-		Version      string        `mapstructure:"version"`
-		RPCPort      string        `mapstructure:"rpc_port"`
-		RESTPort     string        `mapstructure:"rest_port"`
-		Debug        bool          `mapstructure:"debug"`
-		Environment  string        `mapstructure:"env"`
-		ReadTimeout  time.Duration `mapstructure:"read_time_out"`
-		WriteTimeout time.Duration `mapstructure:"write_time_out"`
+		Name         string
+		Version      string
+		RPCPort      string
+		RESTPort     string
+		Debug        bool
+		Environment  string
+		ReadTimeout  time.Duration
+		WriteTimeout time.Duration
 	}
 
 	AuthenticationConfig struct {
-		Key       string `mapstructure:"key"`
-		SecretKey string `mapstructure:"secret_key"`
-		SaltKey   string `mapstructure:"salt_key"`
+		Key       string
+		SecretKey string
+		SaltKey   string
 	}
 )
 

config/config-local.yaml.example

@@ -1,17 +1,24 @@
 package dtos
 
-import "github.com/invopop/validation"
+import (
+	"github.com/DoWithLogic/golang-clean-architecture/pkg/apperror"
+	"github.com/DoWithLogic/golang-clean-architecture/pkg/constant"
+	"github.com/invopop/validation"
+)
 
 type UpdateUserStatusRequest struct {
 	UserID   int64  `json:"-"`
-	Status   int    `json:"status"`
+	Status   string `json:"status"`
 	UpdateBy string `json:"-"`
 }
 
 func (ussp UpdateUserStatusRequest) Validate() error {
+	if ussp.Status != constant.UserInactive && ussp.Status != constant.UserActive {
+		return apperror.ErrStatusValue
+	}
+
 	return validation.ValidateStruct(&ussp,
 		validation.Field(&ussp.UserID, validation.NotNil),
 		validation.Field(&ussp.UpdateBy, validation.NotNil),
-		validation.Field(&ussp.Status, validation.Required),
 	)
 }

config/config.go

@@ -37,7 +37,7 @@ func NewRepository(c *sqlx.DB, l *zerolog.Logger) Repository {
 
 // Atomic implements vendor.Repository for transaction query
 func (r *repository) Atomic(ctx context.Context, opt *sql.TxOptions, repo func(tx Repository) error) error {
-	txConn, err := r.db.BeginTx(ctx, opt)
+	txConn, err := r.db.BeginTxx(ctx, opt)
 	if err != nil {
 		r.log.Z().Err(err).Msg("[repository]Atomic.BeginTxx")
 
@@ -122,8 +122,8 @@ func (repo *repository) GetUserByID(ctx context.Context, userID int64, options .
 		query += " FOR UPDATE"
 	}
 
-	if err = new(datasource.DataSource).QuerySQL(repo.conn.QueryContext(ctx, query, args...)).Scan(row); err != nil {
-		repo.log.Z().Err(err).Msg("[repository]GetUserByID.QueryContext")
+	if err = new(datasource.DataSource).QuerySQL(repo.conn.QueryxContext(ctx, query, args...)).Scan(row); err != nil {
+		repo.log.Z().Err(err).Msg("[repository]GetUserByID.QueryxContext")
 		return userData, err
 	}
 
@@ -159,9 +159,9 @@ func (repo *repository) IsUserExist(ctx context.Context, email string) bool {
 		}
 	}
 
-	err := new(datasource.DataSource).QuerySQL(repo.conn.QueryContext(ctx, repository_query.IsUserExist, args...)).Scan(row)
+	err := new(datasource.DataSource).QuerySQL(repo.conn.QueryxContext(ctx, repository_query.IsUserExist, args...)).Scan(row)
 	if err != nil {
-		repo.log.Z().Err(err).Msg("[repository]IsUserExist.QueryContext")
+		repo.log.Z().Err(err).Msg("[repository]IsUserExist.QueryxContext")
 
 		return false
 	}
@@ -182,9 +182,9 @@ func (repo *repository) GetUserByEmail(ctx context.Context, email string) (userD
 		}
 	}
 
-	err = new(datasource.DataSource).QuerySQL(repo.conn.QueryContext(ctx, repository_query.GetUserByEmail, args...)).Scan(row)
+	err = new(datasource.DataSource).QuerySQL(repo.conn.QueryxContext(ctx, repository_query.GetUserByEmail, args...)).Scan(row)
 	if err != nil {
-		repo.log.Z().Err(err).Msg("[repository]GetUserByID.QueryContext")
+		repo.log.Z().Err(err).Msg("[repository]GetUserByID.QueryxContext")
 		return entities.Users{}, err
 	}
 

internal/users/delivery/kafka/.keep

@@ -8,4 +8,5 @@ var (
 	ErrInvalidPassword   = errors.New("invalid password")
 	ErrFailedGenerateJWT = errors.New("failed generate access token")
 	ErrInvalidIsActive   = errors.New("invalid is_active")
+	ErrStatusValue       = errors.New("status should be 0 or 1")
 )

internal/users/delivery/kafka/read.txt

@@ -7,11 +7,11 @@ const (
 )
 
 const (
-	UserInactive = iota
-	UserActive
+	UserInactive = "0"
+	UserActive   = "1"
 )
 
-var MapStatus = map[int]bool{
+var MapStatus = map[string]bool{
 	UserInactive: false,
 	UserActive:   true,
 }

internal/users/delivery/rpc/.keep

@@ -10,21 +10,22 @@ import (
 
 	"github.com/DoWithLogic/golang-clean-architecture/pkg/otel/zerolog"
 	"github.com/DoWithLogic/golang-clean-architecture/pkg/utils"
+	"github.com/jmoiron/sqlx"
 )
 
 type (
 	Conn interface {
-		BeginTx(ctx context.Context, opts *sql.TxOptions) (tx *sql.Tx, err error)
+		BeginTxx(ctx context.Context, opts *sql.TxOptions) (*sqlx.Tx, error)
 		PingContext(ctx context.Context) (err error)
 		io.Closer
 		ConnTx
 	}
 
 	ConnTx interface {
-		ExecContext(ctx context.Context, query string, args ...interface{}) (res sql.Result, err error)
-		PrepareContext(ctx context.Context, query string) (stmt *sql.Stmt, err error)
-		QueryContext(ctx context.Context, query string, args ...interface{}) (rows *sql.Rows, err error)
-		QueryRowContext(ctx context.Context, query string, args ...interface{}) (row *sql.Row)
+		ExecContext(ctx context.Context, query string, args ...any) (sql.Result, error)
+		PreparexContext(ctx context.Context, query string) (*sqlx.Stmt, error)
+		QueryxContext(ctx context.Context, query string, args ...interface{}) (*sqlx.Rows, error)
+		QueryRowxContext(ctx context.Context, query string, args ...interface{}) *sqlx.Row
 	}
 
 	Exec interface {
@@ -41,17 +42,17 @@ type (
 	}
 
 	query struct {
-		sqlRows *sql.Rows
+		sqlRows *sqlx.Rows
 		err     error
 	}
 
 	DataSource struct{}
 )
 
 var (
-	_   Conn   = (*sql.Conn)(nil)
-	_   Conn   = (*sql.DB)(nil)
-	_   ConnTx = (*sql.Tx)(nil)
+	_   Conn   = (*sqlx.Conn)(nil)
+	_   Conn   = (*sqlx.DB)(nil)
+	_   ConnTx = (*sqlx.Tx)(nil)
 	log        = zerolog.NewZeroLog(context.Background(), os.Stdout)
 )
 
@@ -174,11 +175,11 @@ func (DataSource) ExecSQL(sqlResult sql.Result, err error) exec {
 	return exec{sqlResult, err}
 }
 
-func (DataSource) QuerySQL(sqlRows *sql.Rows, err error) Query {
+func (DataSource) QuerySQL(sqlRows *sqlx.Rows, err error) Query {
 	return query{sqlRows, err}
 }
 
-func (DataSource) EndTx(tx *sql.Tx, err error) error {
+func (DataSource) EndTx(tx *sqlx.Tx, err error) error {
 	if tx == nil {
 		log.Z().Err(ErrInvalidTransaction).Msg("[database:EndTx]")