.env.example

@@ -14,4 +14,3 @@ REDIS_PORT=
 REDIS_PASSWORD=
 REDIS_TTL=
 REDIS_DB=
-REDIS_TIMEOUT=

.gitignore

@@ -1,6 +1,2 @@
 bin
 .env
-.DS_Store
-/cmd/legalgo/env
-
-__debug*

README.md

@@ -148,12 +148,6 @@ make run
 
 This command will compile and execute your Go application.
 
-Or you can execute the compiled binary at `bin/legalgo` by:
-
-```bash
-./bin/legalgo
-```
-
 ---
 
 **Note:** Ensure that your `Makefile` is correctly set up to handle these commands. If not, you may need to create

cmd/gorm/main.go

@@ -6,7 +6,6 @@ import (
 
 	"legalgo-BE-go/config"
 	"legalgo-BE-go/database"
-	categorydomain "legalgo-BE-go/internal/domain/category"
 	subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan"
 
 	"github.com/google/uuid"
@@ -37,29 +36,14 @@ func main() {
 		log.Fatal("Migration failed: ", err)
 	}
 
-	var tempSP subscribeplandomain.SubscribePlan
+	var temp subscribeplandomain.SubscribePlan
-	var tempCtg categorydomain.Category
 
-	if err := db.Where("code = ?", "basic").First(&tempSP).Error; err != nil {
+	if err := db.Where("code = ?", "basic").First(&temp).Error; err != nil {
 		log.Print("seeding basic subscribe plan")
 		db.Create(&subscribeplandomain.SubscribePlan{
-			ID:     uuid.NewString(),
+			ID:   uuid.NewString(),
-			Code:   "basic",
+			Code: "basic",
-			Name:   "Basic",
+			Name: "Basic",
-			Length: 0,
-			Price:  0,
-			Status: 1,
-		})
-	}
-
-	if err := db.Where("code = ?", "spotlight").First(&tempCtg).Error; err != nil {
-		log.Print("seeding basic subscribe plan")
-		seq := 0
-		db.Create(&categorydomain.Category{
-			ID:       uuid.NewString(),
-			Code:     "spotlight",
-			Name:     "Spotlight",
-			Sequence: &seq,
 		})
 	}
 

cmd/legalgo/main.go

@@ -15,7 +15,6 @@ import (
 
 	"github.com/go-chi/chi/v5"
 	"github.com/joho/godotenv"
-	"github.com/redis/go-redis/v9"
 	"go.uber.org/fx"
 )
 
@@ -33,26 +32,16 @@ func init() {
 	config.InitEnv()
 }
 
-func run(
+func run(lc fx.Lifecycle, db *database.DB, apiRouter chi.Router) {
-	lc fx.Lifecycle,
-	db *database.DB,
-	apiRouter chi.Router,
-	rdb *redis.Client,
-) {
 	lc.Append(fx.Hook{
 		OnStart: func(ctx context.Context) error {
 			fmt.Println("Application has started...")
-			_, err := rdb.Ping(ctx).Result()
-			if err != nil {
-				log.Fatalf("Could not connect to Redis: %v", err)
-			}
 			pkgconfig.Router(apiRouter)
 
 			return nil
 		},
 		OnStop: func(ctx context.Context) error {
 			fmt.Println("Shutting down...")
-			rdb.Close()
 			return nil
 		},
 	})

config/conf.go

@@ -1,11 +1,7 @@
 package config
 
-import "fmt"
-
 var (
-	APP_PORT,
+	APP_PORT          int
-	REDIS_DB,
-	REDIS_TIMEOUT,
 	GRACEFULL_TIMEOUT int
 
 	// DB
@@ -14,9 +10,6 @@ var (
 	DB_PASSWORD,
 	DB_NAME,
 	DB_PORT,
-	REDIS_PASSWORD,
-	REDIS_ADDR,
-	REDIS_USERNAME,
 	SALT_SECURITY string
 )
 
@@ -31,10 +24,4 @@ func InitEnv() {
 
 	APP_PORT = GetOrDefault("APP_PORT", 3000)
 	GRACEFULL_TIMEOUT = GetOrDefault("GRACEFULL_TIMEOUT", 10)
-
-	REDIS_DB = GetOrDefault("REDIS_DB", 0)
-	REDIS_PASSWORD = GetOrDefault("REDIS_PASSWORD", "")
-	REDIS_ADDR = fmt.Sprintf("%s:%s", GetOrDefault("REDIS_HOST", "localhost"), GetOrDefault("REDIS_PORT", "6379"))
-	REDIS_USERNAME = GetOrDefault("REDIS_USERNAME", "")
-	REDIS_TIMEOUT = GetOrDefault("REDIS_TIMEOUT", 60)
 }

config/configs.go

@@ -12,15 +12,14 @@ import (
 const (
 	YAML_PATH        = "env/%s"
 	ENV_MODE         = "ENV_MODE"
-	DEFAULT_ENV_MODE = "local"
+	DEFAULT_ENV_MODE = "development"
 )
 
 var (
 	validEnvMode = map[string]struct{}{
-		"local":      {},
+		"local":       {},
-		"staging":    {},
+		"development": {},
-		"production": {},
+		"production":  {},
-		"debug":      {},
 	}
 )
 
@@ -29,7 +28,6 @@ type Config struct {
 	Database  Database  `mapstructure:"postgresql"`
 	Jwt       Jwt       `mapstructure:"jwt"`
 	OSSConfig OSSConfig `mapstructure:"oss"`
-	Redis     Redis     `mapstructure:"redis"`
 }
 
 var (

config/redis.go

@@ -1,14 +0,0 @@
-package config
-
-type Redis struct {
-	Host                          string `mapstructure:"host"`
-	Port                          string `mapstructure:"port"`
-	DB                            int    `mapstructure:"db"`
-	Username                      string `mapstructure:"username"`
-	Password                      string `mapstructure:"password"`
-	SSL                           bool   `mapstructure:"ssl"`
-	Debug                         bool   `mapstructure:"debug"`
-	MaxIdleConnectionsInSecond    int    `mapstructure:"max-idle-connections-in-second"`
-	MaxOpenConnectionsInSecond    int    `mapstructure:"max-open-connections-in-second"`
-	ConnectionMaxLifetimeInSecond int64  `mapstructure:"connection-max-life-time-in-second"`
-}

database/ads_model.go

@@ -1,13 +0,0 @@
-package database
-
-import "time"
-
-type Ads struct {
-	ID        string     `gorm:"primaryKey;not null" json:"id"`
-	ImageUrl  string     `gorm:"not null" json:"image_url"`
-	Url       string     `gorm:"not null" json:"url"`
-	StartDate *time.Time `gorm:"default:null" json:"start_date"`
-	EndDate   *time.Time `gorm:"default:null" json:"end_date"`
-	CreatedAt time.Time  `gorm:"default:CURRENT_TIMESTAMP" json:"created_at"`
-	UpdatedAt time.Time  `gorm:"default:CURRENT_TIMESTAMP" json:"updated_at"`
-}

database/category_model.go

@@ -5,14 +5,17 @@ import (
 )
 
 type Category struct {
-	ID          string    `gorm:"primaryKey" json:"id"`
+	ID        string    `gorm:"primaryKey" json:"id"`
-	Name        string    `gorm:"not null" json:"name"`
+	Code      string    `gorm:"not null;unique" json:"code"`
-	Code        string    `gorm:"not null;unique" json:"code"`
+	Name      string    `gorm:"not null" json:"name"`
-	Description string    `gorm:"default:null" json:"description"`
+	CreatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"created_at"`
-	Sequence    int       `gorm:"default:null" json:"sequence"`
+	UpdatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"updated_at"`
-	CreatedAt   time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"created_at"`
+}
-	UpdatedAt   time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"updated_at"`
+
-	DeletedAt   time.Time `gorm:"default:null" json:"deleted_at"`
+type CategoryModel struct {
-
+	ID        string    `gorm:"primaryKey" json:"id"`
-	News []News `gorm:"many2many:news_categories" json:"news"`
+	Name      string    `gorm:"not null;unique" json:"name"`
+	Code      string    `gorm:"not null" json:"code"`
+	CreatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"created_at"`
+	UpdatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"updated_at"`
 }

database/log_model.go

@@ -1,14 +0,0 @@
-package database
-
-import "time"
-
-type ContentLog struct {
-	ID        string    `gorm:"primaryKey;not null" json:"id"`
-	ContentID string    `gorm:"not null" json:"content_id"`
-	UserID    string    `gorm:"default:null" json:"user_id"`
-	IP        string    `gorm:"default:null" json:"ip"`
-	UserAgent string    `gorm:"default:null" json:"user_agent"`
-	Category  string    `gorm:"not null" json:"category"`
-	CreatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"created_at"`
-	UpdatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"updated_at"`
-}

database/new_db.go

@@ -15,13 +15,12 @@ type DB struct {
 
 func NewDB(cfg *config.Config) (*DB, error) {
 	dsn := fmt.Sprintf(
-		"host=%s user=%s password=%s dbname=%s port=%v sslmode=%s",
+		"host=%s user=%s password=%s dbname=%s port=%v sslmode=disable",
 		cfg.Database.Host,
 		cfg.Database.Username,
 		cfg.Database.Password,
 		cfg.Database.DB,
 		cfg.Database.Port,
-		cfg.Database.SslMode,
 	)
 
 	if dsn == "" {
@@ -40,6 +39,10 @@ func NewDB(cfg *config.Config) (*DB, error) {
 func (db *DB) DropTables() error {
 	// Auto Migrate the User model
 	return db.Migrator().DropTable(
+		// &Staff{},
+		// &SubscribePlan{},
+		// &Subscribe{},
+		// &User{},
 		&Tag{},
 		&Category{},
 		&News{},
@@ -52,10 +55,11 @@ func (db *DB) Migrate() error {
 		&SubscribePlan{},
 		&Subscribe{},
 		&User{},
-		&News{},
+		// &Tag{},
-		&Tag{},
+		// &Category{},
-		&Category{},
+		// &News{},
-		&Ads{},
+		&NewsModel{},
-		&ContentLog{},
+		&TagModel{},
+		&CategoryModel{},
 	)
 }

database/news_model.go

@@ -6,18 +6,30 @@ import (
 
 type News struct {
 	ID            string     `gorm:"primaryKey" json:"id"`
-	Title         string     `json:"title"`
+	Title         string     `gorm:"default:null" json:"title"`
-	Content       string     `json:"content"`
-	Categories    []Category `gorm:"many2many:news_categories" json:"categories"`
 	Tags          []Tag      `gorm:"many2many:news_tags" json:"tags"`
+	Categories    []Category `gorm:"many2many:news_categories" json:"categories"`
+	Content       string     `gorm:"default:null" json:"content"`
+	LiveAt        time.Time  `gorm:"not null" json:"live_at"`
+	AuthorID      string     `gorm:"not null" json:"author_id"`
 	IsPremium     bool       `gorm:"default:false" json:"is_premium"`
 	Slug          string     `gorm:"default:null" json:"slug"`
 	FeaturedImage string     `gorm:"default:null" json:"featured_image"`
-	AuthorID      string     `gorm:"not null" json:"author_id"`
-	LiveAt        time.Time  `gorm:"not null" json:"live_at"`
 	CreatedAt     time.Time  `gorm:"default:CURRENT_TIMESTAMP" json:"created_at"`
 	UpdatedAt     time.Time  `gorm:"default:CURRENT_TIMESTAMP" json:"updated_at"`
-	DeletedAt     time.Time  `gorm:"default:null" json:"deleted_at"`
+}
-
+
-	Author Staff `gorm:"foreignKey:AuthorID" json:"author"`
+type NewsModel struct {
+	ID            string          `gorm:"primaryKey" json:"id"`
+	Title         string          `json:"title"`
+	Content       string          `json:"content"`
+	Categories    []CategoryModel `gorm:"many2many:news_categories" json:"categories"`
+	Tags          []TagModel      `gorm:"many2many:news_tags" json:"tags"`
+	IsPremium     bool            `gorm:"default:false" json:"is_premium"`
+	Slug          string          `gorm:"default:null" json:"slug"`
+	FeaturedImage string          `gorm:"default:null" json:"featured_image"`
+	AuthorID      string          `gorm:"not null" json:"author_id"`
+	LiveAt        time.Time       `gorm:"not null" json:"live_at"`
+	CreatedAt     time.Time       `gorm:"default:CURRENT_TIMESTAMP" json:"created_at"`
+	UpdatedAt     time.Time       `gorm:"default:CURRENT_TIMESTAMP" json:"updated_at"`
 }

database/staff_model.go

@@ -5,12 +5,10 @@ import (
 )
 
 type Staff struct {
-	ID             string    `gorm:"primaryKey" json:"id"`
+	ID        string    `gorm:"primaryKey" json:"id"`
-	Name           string    `gorm:"default:null" json:"name"`
+	Username  string    `gorm:"default:null;unique" json:"username"`
-	ProfilePicture string    `gorm:"default:null" json:"profile_picture"`
+	Email     string    `gorm:"unique;not null" json:"email"`
-	Email          string    `gorm:"unique;not null" json:"email"`
+	Password  string    `gorm:"not null" json:"password"`
-	Password       string    `gorm:"not null" json:"password"`
+	CreatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"created_at"`
-	CreatedAt      time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"created_at"`
+	UpdatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"updated_at"`
-	UpdatedAt      time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"updated_at"`
-	DeletedAt      time.Time `gorm:"default:null" json:"deleted_at"`
 }

database/subscribe_model.go

@@ -9,22 +9,18 @@ type Subscribe struct {
 	SubscribePlanID string    `gorm:"not null" json:"subscribe_plan_id"`
 	StartDate       time.Time `gorm:"default:CURRENT_TIMESTAMP"`
 	EndDate         time.Time `gorm:"default:null"`
-	Status          int8      `gorm:"default:0"`
+	Status          string    `gorm:"default:'inactive'"`
 	AutoRenew       bool      `gorm:"default:true"`
 	CreatedAt       time.Time `gorm:"default:CURRENT_TIMESTAMP"`
 	UpdatedAt       time.Time `gorm:"default:CURRENT_TIMESTAMP"`
-	DeletedAt       time.Time `gorm:"default:null" json:"deleted_at"`
 
-	SubscribePlan SubscribePlan `gorm:"foreignKey:SubscribePlanID;constraint:OnDelete:CASCADE" json:"subscribe_plan"`
+	SubscribePlan SubscribePlan `gorm:"foreignKey:SubscribePlanID;constraint:OnDelete:CASCADE"`
 }
 
 type SubscribePlan struct {
 	ID        string    `gorm:"primaryKey" json:"id"`
 	Code      string    `gorm:"not null;unique" json:"code"`
 	Name      string    `gorm:"not null" json:"name"`
-	Length    int       `gorm:"default:0" json:"length"`
-	Price     float32   `gorm:"default:0" json:"price"`
-	Status    int8      `gorm:"default:1" json:"status"`
 	CreatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP"`
 	UpdatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP"`
 }

database/tag_module.go

@@ -6,11 +6,16 @@ import (
 
 type Tag struct {
 	ID        string    `gorm:"primaryKey" json:"id"`
-	Name      string    `gorm:"not null" json:"name"`
 	Code      string    `gorm:"not null;unique" json:"code"`
+	Name      string    `gorm:"not null" json:"name"`
+	CreatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"created_at"`
+	UpdatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"updated_at"`
+}
+
+type TagModel struct {
+	ID        string    `gorm:"primaryKey" json:"id"`
+	Name      string    `gorm:"not null;unique" json:"name"`
+	Code      string    `gorm:"not null" json:"code"`
 	CreatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"created_at"`
 	UpdatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"updated_at"`
-	DeletedAt time.Time `gorm:"default:null" json:"deleted_at"`
-
-	News []News `gorm:"many2many:news_tags" json:"news"`
 }

database/user_model.go

@@ -12,7 +12,6 @@ type User struct {
 	Phone       string    `gorm:"default:not null;unique" json:"phone"`
 	CreatedAt   time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"created_at"`
 	UpdatedAt   time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"updated_at"`
-	DeletedAt   time.Time `gorm:"default:null" json:"deleted_at"`
 
-	Subscribe Subscribe `gorm:"foreignKey:SubscribeID;constraint:OnDelete:CASCADE" json:"subscribe"`
+	Subscribe Subscribe `gorm:"foreignKey:SubscribeID;constraint:OnDelete:CASCADE"`
 }

env/debug.yaml

@@ -1,43 +0,0 @@
-server:
-  base-url: https://api.legalgo.id/core
-  local-url: http://localhost:3300
-  port: 3300
-
-jwt:
-  token:
-    expires-ttl: 1440
-    secret: "5Lm25V3Qd7aut8dr4QUxm5PZUrSFs"
-
-postgresql:
-  host: dpg-d046h549c44c739arfv0-a.singapore-postgres.render.com
-  port: 5432
-  driver: postgres
-  db: legalgonews_prod
-  username: legalgo_admin
-  password: "656ogwc0JlLEVQyHnT5RrrYa7762iBQQ"
-  ssl-mode: require
-  max-idle-connections-in-second: 600
-  max-open-connections-in-second: 600
-  connection-max-life-time-in-second: 600
-  debug: false
-
-oss:
-  access_key_id: GTK7i3SVy9llQeGH0Htv
-  access_key_secret: 2psmKXZFpevA9n5ntSDRMqFBpZuSz32dvtXjYclf
-  endpoint: news-cdn.legalgo.id
-  bucket_name: uploads
-  log_level: Error
-  host_url: https://news-cdn.legalgo.id
-  public_url: https://news-cdn.legalgo.id
-
-redis:
-  host: singapore-keyvalue.render.com
-  port: 6379
-  username: red-d046l42dbo4c73ea9iag
-  password: 7cZvu08JKuO9MPNxBb97tZCVNj0ZGNp2
-  db: 5
-  ssl: true
-  max-idle-connections-in-second: 600
-  max-open-connections-in-second: 600
-  connection-max-life-time-in-second: 600
-  debug: false

env/development.yaml

@@ -0,0 +1,31 @@
+server:
+  base-url: https://api.legalgo.id/core
+  local-url: http://localhost:3300
+  port: 3300
+
+jwt:
+  token:
+    expires-ttl: 1440
+    secret: "5Lm25V3Qd7aut8dr4QUxm5PZUrSFs"
+
+postgresql:
+  host: 62.72.45.250
+  port: 20826
+  driver: postgres
+  db: legalgonews-dev
+  username: legalgo_admin
+  password: 'K4K!2Kg7c@KW6H&4A2aBy2dFCRY3Sh'
+  ssl-mode: disable
+  max-idle-connections-in-second: 600
+  max-open-connections-in-second: 600
+  connection-max-life-time-in-second: 600
+  debug: false
+
+oss:
+  access_key_id: cf9a475e18bc7626cbdbf09709d82a64
+  access_key_secret: 91f3321294d3e23035427a0ecb893ada
+  endpoint: sin1.contabostorage.com
+  bucket_name: legalgonews-dev
+  log_level: Error
+  host_url: https://sin1.contabostorage.com
+  public_url: https://sin1.contabostorage.com/fda98c2228f246f29a7e466b86b3b9e7

env/local.yaml

@@ -1,43 +0,0 @@
-server:
-  base-url: https://api.legalgo.id/core
-  local-url: http://localhost:3300
-  port: 3300
-
-jwt:
-  token:
-    expires-ttl: 1440
-    secret: "5Lm25V3Qd7aut8dr4QUxm5PZUrSFs"
-
-postgresql:
-  host: dpg-d04bi9juibrs73augcc0-a.singapore-postgres.render.com
-  port: 5432
-  driver: postgres
-  db: legalgonews_dev
-  username: legalgo_admin
-  password: "5h7DCBR1T8pug6AlbrHXqIDAr9o2vnky"
-  ssl-mode: require
-  max-idle-connections-in-second: 600
-  max-open-connections-in-second: 600
-  connection-max-life-time-in-second: 600
-  debug: false
-
-oss:
-  access_key_id: GTK7i3SVy9llQeGH0Htv
-  access_key_secret: 2psmKXZFpevA9n5ntSDRMqFBpZuSz32dvtXjYclf
-  endpoint: news-cdn.legalgo.id
-  bucket_name: uploads-staging
-  log_level: Error
-  host_url: https://news-cdn.legalgo.id
-  public_url: https://news-cdn.legalgo.id
-
-redis:
-  host: singapore-keyvalue.render.com
-  port: 6379
-  username: red-d04c8k49c44c739ga8dg
-  password: ItPzniHv94yr8vY4HTrhCfKoibqBh61T
-  db: 5
-  ssl: true
-  max-idle-connections-in-second: 600
-  max-open-connections-in-second: 600
-  connection-max-life-time-in-second: 600
-  debug: false

env/production.yaml

@@ -1,42 +0,0 @@
-server:
-  base-url: https://api.legalgo.id/core
-  local-url: http://localhost:3300
-  port: 3300
-
-jwt:
-  token:
-    expires-ttl: 1440
-    secret: "5Lm25V3Qd7aut8dr4QUxm5PZUrSFs"
-
-postgresql:
-  host: dpg-d046h549c44c739arfv0-a
-  port: 5432
-  driver: postgres
-  db: legalgonews_prod
-  username: legalgo_admin
-  password: "656ogwc0JlLEVQyHnT5RrrYa7762iBQQ"
-  ssl-mode: disable
-  max-idle-connections-in-second: 600
-  max-open-connections-in-second: 600
-  connection-max-life-time-in-second: 600
-  debug: false
-
-oss:
-  access_key_id: GTK7i3SVy9llQeGH0Htv
-  access_key_secret: 2psmKXZFpevA9n5ntSDRMqFBpZuSz32dvtXjYclf
-  endpoint: news-cdn.legalgo.id
-  bucket_name: uploads
-  log_level: Error
-  host_url: https://news-cdn.legalgo.id
-  public_url: https://news-cdn.legalgo.id
-
-redis:
-  host: red-d046l42dbo4c73ea9iag
-  port: 6379
-  password: 7cZvu08JKuO9MPNxBb97tZCVNj0ZGNp2
-  db: 5
-  ssl: false
-  max-idle-connections-in-second: 600
-  max-open-connections-in-second: 600
-  connection-max-life-time-in-second: 600
-  debug: false

env/staging.yaml

@@ -1,42 +0,0 @@
-server:
-  base-url: https://api.legalgo.id/core
-  local-url: http://localhost:3300
-  port: 3300
-
-jwt:
-  token:
-    expires-ttl: 1440
-    secret: "5Lm25V3Qd7aut8dr4QUxm5PZUrSFs"
-
-postgresql:
-  host: dpg-d04bi9juibrs73augcc0-a
-  port: 5432
-  driver: postgres
-  db: legalgonews_dev
-  username: legalgo_admin
-  password: "5h7DCBR1T8pug6AlbrHXqIDAr9o2vnky"
-  ssl-mode: disable
-  max-idle-connections-in-second: 600
-  max-open-connections-in-second: 600
-  connection-max-life-time-in-second: 600
-  debug: false
-
-oss:
-  access_key_id: GTK7i3SVy9llQeGH0Htv
-  access_key_secret: 2psmKXZFpevA9n5ntSDRMqFBpZuSz32dvtXjYclf
-  endpoint: news-cdn.legalgo.id
-  bucket_name: uploads-staging
-  log_level: Error
-  host_url: https://news-cdn.legalgo.id
-  public_url: https://news-cdn.legalgo.id
-
-redis:
-  host: red-d04c8k49c44c739ga8dg
-  port: 6379
-  password: ItPzniHv94yr8vY4HTrhCfKoibqBh61T
-  db: 5
-  ssl: false
-  max-idle-connections-in-second: 600
-  max-open-connections-in-second: 600
-  connection-max-life-time-in-second: 600
-  debug: false

go.mod

@@ -9,7 +9,7 @@ require (
 	go.uber.org/fx v1.23.0
 	golang.org/x/crypto v0.34.0
 	gopkg.in/yaml.v3 v3.0.1
-	gorm.io/driver/postgres v1.5.7
+	gorm.io/driver/postgres v1.4.7
 )
 
 require (
@@ -20,7 +20,7 @@ require (
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
-	github.com/jackc/pgx/v5 v5.4.3 // indirect
+	github.com/jackc/pgx/v5 v5.2.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect

go.sum

@@ -6,6 +6,7 @@ github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
 github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -40,12 +41,16 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.4.3 h1:cxFyXhxlvAifxnkKKdlxv8XqUf59tDlYjnV5YYfsJJY=
+github.com/jackc/pgx/v5 v5.2.0 h1:NdPpngX0Y6z6XDFKqmFQaE+bCtkqzvQIOt1wvBlAqs8=
-github.com/jackc/pgx/v5 v5.4.3/go.mod h1:Ig06C2Vu0t5qXC60W8sqIthScaEnFvojjj9dSljmHRA=
+github.com/jackc/pgx/v5 v5.2.0/go.mod h1:Ptn7zmohNsWEsdxRawMzk3gaKma2obW+NWTnKa0S4nk=
+github.com/jackc/puddle/v2 v2.1.2/go.mod h1:2lpufsF5mRHO6SuZkm0fNYxM6SWHfvyFj62KwNzgels=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
@@ -54,8 +59,13 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
@@ -71,6 +81,7 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/redis/go-redis/v9 v9.7.1 h1:4LhKRCIduqXqtvCUlaq9c8bdHOkICjDMrr1+Zb3osAc=
 github.com/redis/go-redis/v9 v9.7.1/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
@@ -94,6 +105,7 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
@@ -102,6 +114,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/dig v1.18.0 h1:imUL1UiY0Mg4bqbFfsRQO5G4CGRBec/ZujWTvSVp3pw=
 go.uber.org/dig v1.18.0/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE=
 go.uber.org/fx v1.23.0 h1:lIr/gYWQGfTwGcSXWXu4vP5Ws6iqnNEIY+F/aFzCKTg=
@@ -112,30 +126,67 @@ go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
 go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
 go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
 golang.org/x/crypto v0.34.0 h1:+/C6tk6rf/+t5DhUketUbD1aNGqiSX3j15Z6xuIDlBA=
 golang.org/x/crypto v0.34.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
 golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
 golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
 golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
 golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
 golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/postgres v1.5.7 h1:8ptbNJTDbEmhdr62uReG5BGkdQyeasu/FZHxI0IMGnM=
+gorm.io/driver/postgres v1.4.7 h1:J06jXZCNq7Pdf7LIPn8tZn9LsWjd81BRSKveKNr0ZfA=
-gorm.io/driver/postgres v1.5.7/go.mod h1:3e019WlBaYI5o5LIdNV+LyxCMNtLOQETBXL2h4chKpA=
+gorm.io/driver/postgres v1.4.7/go.mod h1:UJChCNLFKeBqQRE+HrkFUbKbq9idPXmTOk2u4Wok8S4=
+gorm.io/gorm v1.24.2/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
 gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
 gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=

internal/accessor/ads/create.go

@@ -1,14 +0,0 @@
-package adsrepository
-
-import (
-	"fmt"
-	adsdomain "legalgo-BE-go/internal/domain/ads"
-)
-
-func (a *accessor) Create(spec adsdomain.Ads) error {
-	if err := a.db.Create(&spec).Error; err != nil {
-		return fmt.Errorf("failed to create ads: %v", err)
-	}
-
-	return nil
-}

internal/accessor/ads/delete.go

@@ -1,26 +0,0 @@
-package adsrepository
-
-import (
-	"errors"
-	"fmt"
-	adsdomain "legalgo-BE-go/internal/domain/ads"
-
-	"gorm.io/gorm"
-)
-
-func (a *accessor) Delete(id string) error {
-	var ads adsdomain.Ads
-	if err := a.db.First(&ads, "id = ?", id).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return fmt.Errorf("ads with id %s is not found", id)
-
-		}
-		return fmt.Errorf("failed to g ads %s : %v", id, err)
-	}
-
-	if err := a.db.Delete(&ads).Error; err != nil {
-		return fmt.Errorf("failed to delete ads %s : %v", id, err)
-	}
-
-	return nil
-}

internal/accessor/ads/get-all.go

@@ -1,20 +0,0 @@
-package adsrepository
-
-import (
-	"fmt"
-	adsdomain "legalgo-BE-go/internal/domain/ads"
-)
-
-func (a *accessor) GetAll() ([]adsdomain.AdsResponse, error) {
-	var ads []adsdomain.AdsResponse
-
-	if err := a.db.Table("ads").
-		Select("ads.*, COUNT(content_logs.content_id) as clicked").
-		Joins("LEFT JOIN content_logs ON content_logs.content_id = ads.id").
-		Group("ads.id").
-		Scan(&ads).Error; err != nil {
-		return ads, fmt.Errorf("failed to get all ads: %v", err)
-	}
-
-	return ads, nil
-}

internal/accessor/ads/impl.go

@@ -1,23 +0,0 @@
-package adsrepository
-
-import (
-	"legalgo-BE-go/database"
-	adsdomain "legalgo-BE-go/internal/domain/ads"
-)
-
-type accessor struct {
-	db *database.DB
-}
-
-type Ads interface {
-	Create(adsdomain.Ads) error
-	GetAll() ([]adsdomain.AdsResponse, error)
-	Update(adsdomain.Ads) error
-	Delete(string) error
-}
-
-func New(
-	db *database.DB,
-) Ads {
-	return &accessor{db}
-}

internal/accessor/ads/update.go

@@ -1,31 +0,0 @@
-package adsrepository
-
-import (
-	"fmt"
-	adsdomain "legalgo-BE-go/internal/domain/ads"
-
-	"gorm.io/gorm/clause"
-)
-
-func (a *accessor) Update(spec adsdomain.Ads) error {
-	if err := a.db.Clauses(clause.OnConflict{
-		Columns: []clause.Column{{Name: "id"}},
-		DoUpdates: clause.AssignmentColumns([]string{
-			"image_url",
-			"url",
-			"updated_at",
-			"start_date",
-			"end_date",
-		}),
-	}).Select(
-		"image_url",
-		"url",
-		"updated_at",
-		"start_date",
-		"end_date",
-	).Save(&spec).Error; err != nil {
-		return fmt.Errorf("failed to update tag: %v", err)
-	}
-
-	return nil
-}

internal/accessor/category/create.go

@@ -1,22 +1,19 @@
 package categoryrepository
 
 import (
-	"legalgo-BE-go/database"
 	categorydomain "legalgo-BE-go/internal/domain/category"
 
 	"github.com/google/uuid"
 )
 
-func (a *accessor) CreateModel(spec categorydomain.CategoryReq) error {
+func (a *accessor) Create(spec categorydomain.CategoryReq) error {
-	data := database.Category{
+	data := categorydomain.Category{
-		ID:          uuid.NewString(),
+		ID:   uuid.NewString(),
-		Name:        spec.Name,
+		Name: spec.Name,
-		Code:        spec.Code,
+		Code: spec.Code,
-		Description: *spec.Description,
-		Sequence:    *spec.Sequence,
 	}
 
-	if err := a.db.Create(&data).Error; err != nil {
+	if err := a.DB.Create(&data).Error; err != nil {
 		return err
 	}
 

internal/accessor/category/create_model.go

@@ -0,0 +1,22 @@
+package categoryrepository
+
+import (
+	"legalgo-BE-go/database"
+	categorydomain "legalgo-BE-go/internal/domain/category"
+
+	"github.com/google/uuid"
+)
+
+func (a *accessor) CreateModel(spec categorydomain.CategoryReq) error {
+	data := database.CategoryModel{
+		ID:   uuid.NewString(),
+		Name: spec.Name,
+		Code: spec.Code,
+	}
+
+	if err := a.DB.Create(&data).Error; err != nil {
+		return err
+	}
+
+	return nil
+}

internal/accessor/category/delete.go

@@ -1,24 +0,0 @@
-package categoryrepository
-
-import (
-	"fmt"
-	"legalgo-BE-go/database"
-)
-
-func (a *accessor) Delete(id string) error {
-	var category database.Category
-
-	if err := a.db.First(&category, "id = ?", id).Error; err != nil {
-		return fmt.Errorf("failed to find category: %v", err)
-	}
-
-	if err := a.db.Model(&category).Association("News").Clear(); err != nil {
-		return fmt.Errorf("failed to remove categories association: %v", err)
-	}
-
-	if err := a.db.Delete(&category).Error; err != nil {
-		return fmt.Errorf("failed to delete category %s : %v", id, err)
-	}
-
-	return nil
-}

internal/accessor/category/get_all.go

@@ -1,13 +1,11 @@
 package categoryrepository
 
-import (
+import categorydomain "legalgo-BE-go/internal/domain/category"
-	categorydomain "legalgo-BE-go/internal/domain/category"
-)
 
-func (a *accessor) GetAllModel() ([]categorydomain.Category, error) {
+func (a *accessor) GetAll() ([]categorydomain.Category, error) {
 	var categories []categorydomain.Category
 
-	if err := a.db.Find(&categories).Error; err != nil {
+	if err := a.DB.Find(&categories).Error; err != nil {
 		return nil, err
 	}
 

internal/accessor/category/get_all_model.go

@@ -0,0 +1,15 @@
+package categoryrepository
+
+import (
+	"legalgo-BE-go/database"
+)
+
+func (a *accessor) GetAllModel() ([]database.CategoryModel, error) {
+	var categories []database.CategoryModel
+
+	if err := a.DB.Find(&categories).Error; err != nil {
+		return nil, err
+	}
+
+	return categories, nil
+}

internal/accessor/category/get_bulk.go

@@ -7,7 +7,7 @@ import (
 func (a *accessor) GetByIDs(ids []string) ([]categorydomain.Category, error) {
 	var categories []categorydomain.Category
 
-	if err := a.db.Find(&categories, "id IN ?", ids).Error; err != nil {
+	if err := a.DB.Find(&categories, "id IN ?", ids).Error; err != nil {
 		return nil, err
 	}
 

internal/accessor/category/get_bulk_model.go

@@ -0,0 +1,15 @@
+package categoryrepository
+
+import (
+	"legalgo-BE-go/database"
+)
+
+func (a *accessor) GetBulks(ids []string) ([]database.CategoryModel, error) {
+	var categories []database.CategoryModel
+
+	if err := a.DB.Find(&categories, "id IN ?", ids).Error; err != nil {
+		return nil, err
+	}
+
+	return categories, nil
+}

internal/accessor/category/get_by_codes.go

@@ -1,19 +0,0 @@
-package categoryrepository
-
-import (
-	categorydomain "legalgo-BE-go/internal/domain/category"
-)
-
-func (a *accessor) GetIDByCode(codes []string) ([]string, error) {
-	var categories []string
-
-	if err := a.db.
-		Model(&categorydomain.Category{}).
-		Select("id").Where("code IN ?", codes).
-		Pluck("id", &categories).
-		Error; err != nil {
-		return nil, err
-	}
-
-	return categories, nil
-}

internal/accessor/category/impl.go

@@ -6,16 +6,18 @@ import (
 )
 
 type accessor struct {
-	db *database.DB
+	DB *database.DB
 }
 
 type Category interface {
-	GetAllModel() ([]categorydomain.Category, error)
+	Create(categorydomain.CategoryReq) error
-	GetByIDs([]string) ([]categorydomain.Category, error)
-	GetIDByCode([]string) ([]string, error)
 	CreateModel(categorydomain.CategoryReq) error
-	Update(categorydomain.Category) error
+
-	Delete(string) error
+	GetAll() ([]categorydomain.Category, error)
+	GetAllModel() ([]database.CategoryModel, error)
+
+	GetByIDs([]string) ([]categorydomain.Category, error)
+	GetBulks([]string) ([]database.CategoryModel, error)
 }
 
 func New(

internal/accessor/category/update.go

@@ -1,19 +0,0 @@
-package categoryrepository
-
-import (
-	"fmt"
-	categorydomain "legalgo-BE-go/internal/domain/category"
-
-	"gorm.io/gorm/clause"
-)
-
-func (a *accessor) Update(spec categorydomain.Category) error {
-	if err := a.db.Clauses(clause.OnConflict{
-		Columns:   []clause.Column{{Name: "id"}},
-		DoUpdates: clause.AssignmentColumns([]string{"name", "code", "sequence", "description", "updated_at"}),
-	}).Select("name", "code", "sequence", "description", "updated_at").Save(&spec).Error; err != nil {
-		return fmt.Errorf("failed to update category: %v", err)
-	}
-
-	return nil
-}

internal/accessor/log/create_log_ads.go

@@ -1,33 +0,0 @@
-package logrepository
-
-import (
-	"legalgo-BE-go/database"
-	logsdomain "legalgo-BE-go/internal/domain/logs"
-
-	"github.com/google/uuid"
-)
-
-func (a *accessor) CreateLog(spec logsdomain.LogsSpec) error {
-	newSpec := database.ContentLog{
-		ID:        uuid.NewString(),
-		ContentID: spec.ContentID,
-		Category:  spec.Category,
-	}
-
-	if spec.UserID != nil {
-		newSpec.UserID = *spec.UserID
-	}
-
-	if spec.IP != nil {
-		newSpec.IP = *spec.IP
-	}
-
-	if spec.UserAgent != nil {
-		newSpec.UserAgent = *spec.UserAgent
-	}
-	if err := a.db.Create(&newSpec).Error; err != nil {
-		return err
-	}
-
-	return nil
-}

internal/accessor/log/get_all_logs_ads.go

@@ -1,21 +0,0 @@
-package logrepository
-
-import (
-	adsdomain "legalgo-BE-go/internal/domain/ads"
-)
-
-func (a *accessor) GetAllLogAds(userID string) ([]adsdomain.Ads, error) {
-	var ads []adsdomain.Ads
-
-	// if err := a.db.Find(&ads, "user_id = ?", userID).Error; err != nil {
-	// 	return ads, err
-	// }
-
-	if err := a.db.
-		Joins("JOIN log_ads ON ads.id = log_ads.ads_id").
-		Find(&ads, "log_ads.user_id = ?", userID).Error; err != nil {
-		return ads, err
-	}
-
-	return ads, nil
-}

internal/accessor/log/impl.go

@@ -1,20 +0,0 @@
-package logrepository
-
-import (
-	"legalgo-BE-go/database"
-	adsdomain "legalgo-BE-go/internal/domain/ads"
-	logsdomain "legalgo-BE-go/internal/domain/logs"
-)
-
-type accessor struct {
-	db *database.DB
-}
-
-type Log interface {
-	CreateLog(logsdomain.LogsSpec) error
-	GetAllLogAds(string) ([]adsdomain.Ads, error)
-}
-
-func New(db *database.DB) Log {
-	return &accessor{db}
-}

internal/accessor/module.go

@@ -1,17 +1,15 @@
 package repository
 
 import (
-	adsrepository "legalgo-BE-go/internal/accessor/ads"
 	categoryrepository "legalgo-BE-go/internal/accessor/category"
-	logrepository "legalgo-BE-go/internal/accessor/log"
 	newsrepository "legalgo-BE-go/internal/accessor/news"
 	"legalgo-BE-go/internal/accessor/oss"
 	redisaccessor "legalgo-BE-go/internal/accessor/redis"
 	staffrepository "legalgo-BE-go/internal/accessor/staff"
 	subscriberepository "legalgo-BE-go/internal/accessor/subscribe"
-	subscribeplanrepository "legalgo-BE-go/internal/accessor/subscribe_plan"
+	subscribeplanrepository "legalgo-BE-go/internal/accessor/subscribeplan"
 	tagrepository "legalgo-BE-go/internal/accessor/tag"
-	userrepository "legalgo-BE-go/internal/accessor/user"
+	userrepository "legalgo-BE-go/internal/accessor/user_repository"
 
 	"go.uber.org/fx"
 )
@@ -26,6 +24,4 @@ var Module = fx.Module("repository", fx.Provide(
 	categoryrepository.New,
 	newsrepository.New,
 	oss.New,
-	adsrepository.New,
-	logrepository.New,
 ))

internal/accessor/news/create.go

@@ -5,7 +5,7 @@ import (
 	newsdomain "legalgo-BE-go/internal/domain/news"
 )
 
-func (a *accessor) Create(spec newsdomain.News) error {
+func (a *accessor) Create(spec *newsdomain.News) error {
 	if err := a.db.Create(&spec).Error; err != nil {
 		return fmt.Errorf("failed to create news: %w", err)
 	}

internal/accessor/news/create_model.go

@@ -0,0 +1,13 @@
+package newsrepository
+
+import (
+	"fmt"
+	"legalgo-BE-go/database"
+)
+
+func (a *accessor) CreateModel(spec database.NewsModel) error {
+	if err := a.db.Create(&spec).Error; err != nil {
+		return fmt.Errorf("failed to create news: %w", err)
+	}
+	return nil
+}

internal/accessor/news/delete.go

@@ -1,28 +0,0 @@
-package newsrepository
-
-import (
-	"fmt"
-	newsdomain "legalgo-BE-go/internal/domain/news"
-)
-
-func (a *accessor) Delete(id string) error {
-	var news newsdomain.News
-
-	if err := a.db.Preload("Categories").Preload("Tags").First(&news, "id = ?", id).Error; err != nil {
-		return fmt.Errorf("failed to find news: %v", err)
-	}
-
-	if err := a.db.Model(&news).Association("Categories").Clear(); err != nil {
-		return fmt.Errorf("failed to remove categories association: %v", err)
-	}
-
-	if err := a.db.Model(&news).Association("Tags").Clear(); err != nil {
-		return fmt.Errorf("failed to remove tags association: %v", err)
-	}
-
-	if err := a.db.Delete(&news, "id = ?", id).Error; err != nil {
-		return fmt.Errorf("failed to delete news %s : %v", id, err)
-	}
-
-	return nil
-}

internal/accessor/news/get_all.go

@@ -1,50 +1,11 @@
 package newsrepository
 
-import (
+import newsdomain "legalgo-BE-go/internal/domain/news"
-	newsdomain "legalgo-BE-go/internal/domain/news"
-	timeutils "legalgo-BE-go/internal/utilities/time_utils"
-)
 
-type is_active string
+func (a *accessor) GetAll() ([]newsdomain.News, error) {
+	var news []newsdomain.News
 
-const (
+	if err := a.db.Preload("Tags").Preload("Categories").Find(&news).Error; err != nil {
-	active    is_active = "true"
-	notActive is_active = "false"
-)
-
-func (a *accessor) GetAll(filter newsdomain.NewsFilter) ([]newsdomain.NewsResponse, error) {
-	var news []newsdomain.NewsResponse
-	query := a.db.Table("news").
-		Preload("Tags").
-		Preload("Categories").
-		Preload("Author").
-		Joins("LEFT JOIN content_logs ON content_logs.content_id = news.id")
-
-	if len(filter.Category) > 0 {
-		query = query.Joins("JOIN news_categories nc ON nc.news_id = news.id").
-			Where("nc.category_id IN (?)", filter.Category)
-	}
-
-	if len(filter.Tags) > 0 {
-		query = query.Joins("JOIN news_tags nt ON nt.news_id = news.id").
-			Where("nt.tag_id IN (?)", filter.Tags)
-	}
-
-	if filter.Active == string(active) {
-		query = query.Where("news.live_at <= ?", timeutils.Now())
-	}
-
-	if filter.Search != "" {
-		query = query.Where("news.title ILIKE ?", "%"+filter.Search+"%")
-	}
-
-	query.
-		Select("news.*, COUNT(content_logs.content_id) as views").
-		Group("news.id").
-		Order("news.created_at DESC")
-
-	if err := query.
-		Find(&news).Error; err != nil {
 		return nil, err
 	}
 

internal/accessor/news/get_all_model.go

@@ -0,0 +1,13 @@
+package newsrepository
+
+import "legalgo-BE-go/database"
+
+func (a *accessor) GetAllModel() ([]database.NewsModel, error) {
+	var news []database.NewsModel
+
+	if err := a.db.Preload("Tags").Preload("Categories").Find(&news).Error; err != nil {
+		return nil, err
+	}
+
+	return news, nil
+}

internal/accessor/news/get_by_id.go

@@ -1,17 +0,0 @@
-package newsrepository
-
-import newsdomain "legalgo-BE-go/internal/domain/news"
-
-func (a *accessor) GetByID(id string) (*newsdomain.News, error) {
-	var news newsdomain.News
-
-	if err := a.db.
-		Preload("Tags").
-		Preload("Categories").
-		Preload("Author").
-		First(&news, "id = ?", id).Error; err != nil {
-		return nil, err
-	}
-
-	return &news, nil
-}

internal/accessor/news/get_by_slug.go

@@ -1,17 +0,0 @@
-package newsrepository
-
-import newsdomain "legalgo-BE-go/internal/domain/news"
-
-func (a *accessor) GetBySlug(slug string) (*newsdomain.News, error) {
-	var news newsdomain.News
-
-	if err := a.db.
-		Preload("Tags").
-		Preload("Categories").
-		Preload("Author").
-		First(&news, "slug = ?", slug).Error; err != nil {
-		return nil, err
-	}
-
-	return &news, nil
-}

internal/accessor/news/impl.go

@@ -10,12 +10,10 @@ type accessor struct {
 }
 
 type News interface {
-	GetAll(filter newsdomain.NewsFilter) ([]newsdomain.NewsResponse, error)
+	GetAll() ([]newsdomain.News, error)
-	GetBySlug(string) (*newsdomain.News, error)
+	GetAllModel() ([]database.NewsModel, error)
-	GetByID(string) (*newsdomain.News, error)
+	Create(*newsdomain.News) error
-	Create(newsdomain.News) error
+	CreateModel(database.NewsModel) error
-	Update(newsdomain.News) error
-	Delete(string) error
 }
 
 func New(db *database.DB) News {

internal/accessor/news/update.go

@@ -1,69 +0,0 @@
-package newsrepository
-
-import (
-	"fmt"
-	categorydomain "legalgo-BE-go/internal/domain/category"
-	newsdomain "legalgo-BE-go/internal/domain/news"
-	tagdomain "legalgo-BE-go/internal/domain/tag"
-
-	"gorm.io/gorm/clause"
-)
-
-func (a *accessor) Update(spec newsdomain.News) error {
-	tx := a.db.Begin()
-	if err := tx.Clauses(clause.OnConflict{
-		Columns: []clause.Column{{Name: "id"}},
-		DoUpdates: clause.AssignmentColumns([]string{
-			"title",
-			"content",
-			"featured_image",
-			"is_premium",
-			"slug",
-			"author_id",
-			"live_at",
-			"updated_at",
-		}),
-	}).Select(
-		"title",
-		"content",
-		"featured_image",
-		"is_premium",
-		"slug",
-		"author_id",
-		"live_at",
-		"updated_at",
-	).Save(&spec).Error; err != nil {
-		tx.Rollback()
-		return fmt.Errorf("failed to update news: %v", err)
-	}
-
-	tagsDeleted := make([]tagdomain.Tag, len(spec.Tags))
-	copy(tagsDeleted, spec.Tags)
-	if err := tx.Model(&spec).Association("Tags").Clear(); err != nil {
-		tx.Rollback()
-		return fmt.Errorf("failed to remove previous tags: %v", err)
-	}
-
-	if err := tx.Model(&spec).Association("Tags").Append(tagsDeleted); err != nil {
-		tx.Rollback()
-		return fmt.Errorf("failed to add tags: %v", err)
-	}
-
-	categoriesDeleted := make([]categorydomain.Category, len(spec.Categories))
-	copy(categoriesDeleted, spec.Categories)
-	if err := tx.Model(&spec).Association("Categories").Clear(); err != nil {
-		tx.Rollback()
-		return fmt.Errorf("failed to remove previous categories: %v", err)
-	}
-
-	if err := tx.Model(&spec).Association("Categories").Append(categoriesDeleted); err != nil {
-		tx.Rollback()
-		return fmt.Errorf("failed to add categories: %v", err)
-	}
-
-	if err := tx.Commit().Error; err != nil {
-		return fmt.Errorf("failed to commit transaction: %v", err)
-	}
-
-	return nil
-}

internal/accessor/oss/oss.go

@@ -66,21 +66,5 @@ func (r *OssRepositoryImpl) GetPublicURL(fileName string) string {
 	if fileName == "" {
 		return ""
 	}
-	return fmt.Sprintf("%s/%s%s", r.cfg.GetPublicURL(), r.cfg.GetBucketName(), fileName)
+	return fmt.Sprintf("%s:%s%s", r.cfg.GetPublicURL(), r.cfg.GetBucketName(), fileName)
-}
-
-func (r *OssRepositoryImpl) DeleteObject(ctx context.Context, fileName string) error {
-	if fileName == "" {
-		return fmt.Errorf("file name is not provided")
-	}
-
-	_, err := r.s3.DeleteObject(&s3.DeleteObjectInput{
-		Key: aws.String(fileName),
-	})
-
-	if err != nil {
-		return fmt.Errorf("failed to delete object %s from bucket: %v", fileName, err)
-	}
-
-	return nil
 }

internal/accessor/oss/upload.go

@@ -7,5 +7,4 @@ import (
 type OSSRepository interface {
 	UploadFile(ctx context.Context, fileName string, fileContent []byte) (fileUrl string, err error)
 	GetPublicURL(fileName string) string
-	DeleteObject(ctx context.Context, fileName string) error
 }

internal/accessor/redis/impl.go

@@ -1,9 +1,8 @@
 package redisaccessor
 
 import (
-	"crypto/tls"
 	"fmt"
-	"legalgo-BE-go/config"
+	"os"
 
 	"github.com/redis/go-redis/v9"
 )
@@ -14,22 +13,20 @@ func Get() *redis.Client {
 	return redisClient
 }
 
-func New(cfg *config.Config) *redis.Client {
+func New() *redis.Client {
-	addr := fmt.Sprintf("%s:%s", cfg.Redis.Host, cfg.Redis.Port)
+	var (
+		username = os.Getenv("REDIS_USERNAME")
+		addr     = fmt.Sprintf("%s:%s", os.Getenv("REDIS_HOST"), os.Getenv("REDIS_PORT"))
+		password = os.Getenv("REDIS_PASSWORD")
+		db       = 2 // TODO: change later
+	)
 
-	options := &redis.Options{
+	redisClient = redis.NewClient(&redis.Options{
+		Username: username,
 		Addr:     addr,
-		Password: cfg.Redis.Password,
+		Password: password,
-		DB:       cfg.Redis.DB,
+		DB:       db,
-	}
+	})
 
-	if cfg.Redis.Username != "" {
-		options.Username = cfg.Redis.Username
-	}
-	if cfg.Redis.SSL {
-		options.TLSConfig = &tls.Config{}
-	}
-
-	redisClient = redis.NewClient(options)
 	return redisClient
 }

internal/accessor/staff/create.go

@@ -1,13 +1,11 @@
 package staffrepository
 
-import (
+import authdomain "legalgo-BE-go/internal/domain/auth"
-	staffdomain "legalgo-BE-go/internal/domain/staff"
-)
 
-func (ur *accessor) Create(spec staffdomain.Staff) error {
+func (ur *StaffRepository) Create(spec *authdomain.Staff) (*authdomain.Staff, error) {
-	if err := ur.db.Create(&spec).Error; err != nil {
+	if err := ur.DB.Create(&spec).Error; err != nil {
-		return err
+		return nil, err
 	}
 
-	return nil
+	return spec, nil
 }

internal/accessor/staff/get_by_email.go

@@ -2,23 +2,22 @@ package staffrepository
 
 import (
 	"errors"
-	"fmt"
 
-	staffdomain "legalgo-BE-go/internal/domain/staff"
+	authdomain "legalgo-BE-go/internal/domain/auth"
 
 	"gorm.io/gorm"
 )
 
-func (sr *accessor) GetStaffByEmail(email string) (*staffdomain.Staff, error) {
+func (sr *StaffRepository) GetStaffByEmail(email string) (*authdomain.Staff, error) {
-	var staff staffdomain.Staff
+	var staff authdomain.Staff
 
 	if email == "" {
-		return nil, fmt.Errorf("email is required")
+		return nil, errors.New("email is required")
 	}
 
-	if err := sr.db.First(&staff, "email = ?", email).Error; err != nil {
+	if err := sr.DB.First(&staff, "email = ?", email).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, fmt.Errorf("staff not found")
+			return nil, errors.New("staff not found")
 		}
 		return nil, err
 	}

internal/accessor/staff/get_by_id.go

@@ -2,22 +2,21 @@ package staffrepository
 
 import (
 	"errors"
-	"fmt"
+	authdomain "legalgo-BE-go/internal/domain/auth"
-	staffdomain "legalgo-BE-go/internal/domain/staff"
 
 	"gorm.io/gorm"
 )
 
-func (sr *accessor) GetStaffByID(ID string) (*staffdomain.Staff, error) {
+func (sr *StaffRepository) GetStaffByID(ID string) (*authdomain.Staff, error) {
-	var staff staffdomain.Staff
+	var staff authdomain.Staff
 
 	if ID == "" {
-		return nil, fmt.Errorf("id is required")
+		return nil, errors.New("id is required")
 	}
 
-	if err := sr.db.First(&staff, "id = ? ", ID).Error; err != nil {
+	if err := sr.DB.First(&staff, "id = ? ", ID).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, fmt.Errorf("staff not found")
+			return nil, errors.New("staff not found")
 		}
 		return nil, err
 	}

internal/accessor/staff/get_staff.go

@@ -1,13 +0,0 @@
-package staffrepository
-
-import staffdomain "legalgo-BE-go/internal/domain/staff"
-
-func (a *accessor) GetStaffs() ([]staffdomain.StaffProfile, error) {
-	var staffs []staffdomain.StaffProfile
-
-	if err := a.db.Table("staffs").Find(&staffs).Error; err != nil {
-		return staffs, err
-	}
-
-	return staffs, nil
-}

internal/accessor/staff/get_users.go

@@ -1,28 +0,0 @@
-package staffrepository
-
-import userdomain "legalgo-BE-go/internal/domain/user"
-
-func (a *accessor) GetUsers() ([]userdomain.UserProfile, error) {
-	var usersRaw []userdomain.User
-	if err := a.db.
-		Preload("Subscribe").
-		Preload("Subscribe.SubscribePlan").
-		Find(&usersRaw).
-		Error; err != nil {
-		return nil, err
-	}
-
-	users := []userdomain.UserProfile{}
-
-	for _, user := range usersRaw {
-		users = append(users, userdomain.UserProfile{
-			ID:        user.ID,
-			Email:     user.Email,
-			Phone:     user.Phone,
-			Subscribe: user.Subscribe,
-			CreatedAt: user.CreatedAt,
-		})
-	}
-
-	return users, nil
-}

internal/accessor/staff/impl.go

@@ -2,23 +2,20 @@ package staffrepository
 
 import (
 	"legalgo-BE-go/database"
-	staffdomain "legalgo-BE-go/internal/domain/staff"
+	authdomain "legalgo-BE-go/internal/domain/auth"
-	userdomain "legalgo-BE-go/internal/domain/user"
 )
 
-type accessor struct {
+type StaffRepository struct {
-	db *database.DB
+	DB *database.DB
 }
 
-type Staff interface {
+type StaffIntf interface {
-	GetStaffByEmail(string) (*staffdomain.Staff, error)
+	GetStaffByEmail(string) (*authdomain.Staff, error)
-	GetStaffByID(string) (*staffdomain.Staff, error)
+	GetStaffByID(string) (*authdomain.Staff, error)
-	GetUsers() ([]userdomain.UserProfile, error)
+	Create(*authdomain.Staff) (*authdomain.Staff, error)
-	GetStaffs() ([]staffdomain.StaffProfile, error)
+	Update(authdomain.Staff) error
-	Create(staffdomain.Staff) error
-	Update(staffdomain.Staff) error
 }
 
-func New(db *database.DB) Staff {
+func New(db *database.DB) StaffIntf {
-	return &accessor{db}
+	return &StaffRepository{db}
 }

internal/accessor/staff/update.go

@@ -1,16 +1,17 @@
 package staffrepository
 
 import (
-	staffdomain "legalgo-BE-go/internal/domain/staff"
+	authdomain "legalgo-BE-go/internal/domain/auth"
+	"legalgo-BE-go/internal/utilities/utils"
 )
 
-func (ur *accessor) Update(spec staffdomain.Staff) error {
+func (ur *StaffRepository) Update(spec authdomain.Staff) error {
-	// val, err := utils.StructToMap(spec)
+	val, err := utils.StructToMap(spec)
-	// if err != nil {
+	if err != nil {
-	// 	return err
+		return err
-	// }
+	}
 
-	if err := ur.db.Model(&staffdomain.Staff{}).Where("id = ?", spec.ID).Updates(spec).Error; err != nil {
+	if err := ur.DB.Model(&authdomain.Staff{}).Where("id = ?", spec.ID).Updates(val).Error; err != nil {
 		return err
 	}
 

internal/accessor/subscribe/create.go

@@ -6,13 +6,13 @@ import (
 	"github.com/google/uuid"
 )
 
-func (s *accessor) Create(subsPlanId string) (string, error) {
+func (s *SubsAccs) Create(subsPlanId string) (string, error) {
 	spec := &subscribedomain.Subscribe{
 		ID:              uuid.NewString(),
 		SubscribePlanID: subsPlanId,
 	}
 
-	if err := s.db.Create(&spec).Error; err != nil {
+	if err := s.DB.Create(&spec).Error; err != nil {
 		return "", err
 	}
 

internal/accessor/subscribe/get_by_id.go

@@ -1,23 +0,0 @@
-package subscriberepository
-
-import (
-	"errors"
-	"fmt"
-	subscribedomain "legalgo-BE-go/internal/domain/subscribe"
-
-	"gorm.io/gorm"
-)
-
-func (s *accessor) GetByID(id string) (subscribedomain.Subscribe, error) {
-	var subscribe subscribedomain.Subscribe
-
-	if err := s.db.First(&subscribe, "id = ?", id).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return subscribe, fmt.Errorf("subscribe data not found: %v", err)
-		}
-
-		return subscribe, err
-	}
-
-	return subscribe, nil
-}

internal/accessor/subscribe/impl.go

@@ -1,20 +1,15 @@
 package subscriberepository
 
-import (
+import "legalgo-BE-go/database"
-	"legalgo-BE-go/database"
-	subscribedomain "legalgo-BE-go/internal/domain/subscribe"
-)
 
-type accessor struct {
+type SubsAccs struct {
-	db *database.DB
+	DB *database.DB
 }
 
-type Subscribe interface {
+type SubsIntf interface {
 	Create(string) (string, error)
-	GetByID(string) (subscribedomain.Subscribe, error)
-	Update(subscribedomain.Subscribe) error
 }
 
-func New(db *database.DB) Subscribe {
+func New(db *database.DB) SubsIntf {
-	return &accessor{db}
+	return &SubsAccs{db}
 }

internal/accessor/subscribe/update.go

@@ -1,19 +0,0 @@
-package subscriberepository
-
-import (
-	"fmt"
-	subscribedomain "legalgo-BE-go/internal/domain/subscribe"
-
-	"gorm.io/gorm/clause"
-)
-
-func (a *accessor) Update(spec subscribedomain.Subscribe) error {
-	if err := a.db.Clauses(clause.OnConflict{
-		Columns:   []clause.Column{{Name: "id"}},
-		DoUpdates: clause.AssignmentColumns([]string{"status", "subscribe_plan_id", "start_date"}),
-	}).Create(&spec).Error; err != nil {
-		return fmt.Errorf("failed to update status: %v", err)
-	}
-
-	return nil
-}

internal/accessor/subscribe_plan/create.go

@@ -1,13 +0,0 @@
-package subscribeplanrepository
-
-import (
-	subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan"
-)
-
-func (s *accessor) Create(spec subscribeplandomain.SubscribePlan) error {
-	if err := s.db.Create(&spec).Error; err != nil {
-		return err
-	}
-
-	return nil
-}

internal/accessor/subscribe_plan/delete.go

@@ -1,30 +0,0 @@
-package subscribeplanrepository
-
-import (
-	"fmt"
-	"legalgo-BE-go/database"
-	subscribedomain "legalgo-BE-go/internal/domain/subscribe"
-	subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan"
-)
-
-func (a *accessor) Delete(id string) error {
-	var subsPlan database.SubscribePlan
-	var basicPlan subscribeplandomain.SubscribePlan
-
-	if err := a.db.First(&basicPlan, "code = ?", "basic").Error; err != nil {
-		return fmt.Errorf("failed to find basic plan: %v", err)
-	}
-
-	if err := a.db.
-		Model(&subscribedomain.Subscribe{}).
-		Where("subscribe_plan_id = ?", id).
-		Update("subscribe_plan_id", basicPlan.ID).Error; err != nil {
-		return fmt.Errorf("failed to change subscribe plan: %v", err)
-	}
-
-	if err := a.db.Delete(&subsPlan, "id = ?", id).Error; err != nil {
-		return fmt.Errorf("failed to delete subscribe plan %s : %v", id, err)
-	}
-
-	return nil
-}

internal/accessor/subscribe_plan/get_by_id.go

@@ -1,22 +0,0 @@
-package subscribeplanrepository
-
-import (
-	"errors"
-	"fmt"
-	subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan"
-
-	"gorm.io/gorm"
-)
-
-func (s *accessor) GetByID(id string) (*subscribeplandomain.SubscribePlan, error) {
-	var subscribePlan *subscribeplandomain.SubscribePlan
-
-	if err := s.db.First(&subscribePlan, "id = ? ", id).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return subscribePlan, fmt.Errorf("subscribe plan not found")
-		}
-		return subscribePlan, err
-	}
-
-	return subscribePlan, nil
-}

internal/accessor/subscribe_plan/get_default.go

@@ -1,22 +0,0 @@
-package subscribeplanrepository
-
-import (
-	"legalgo-BE-go/database"
-	subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan"
-
-	"github.com/google/uuid"
-)
-
-func (s *accessor) GetDefault() (*subscribeplandomain.SubscribePlan, error) {
-	var subscribePlan *subscribeplandomain.SubscribePlan
-
-	if err := s.db.First(&subscribePlan, "code = ?", "basic").Error; err != nil {
-		s.db.Create(&database.SubscribePlan{
-			ID:   uuid.NewString(),
-			Code: "basic",
-			Name: "Basic",
-		})
-	}
-
-	return subscribePlan, nil
-}

internal/accessor/subscribe_plan/impl.go

@@ -1,25 +0,0 @@
-package subscribeplanrepository
-
-import (
-	"legalgo-BE-go/database"
-	subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan"
-)
-
-type accessor struct {
-	db *database.DB
-}
-
-type SubscribePlan interface {
-	Create(subscribeplandomain.SubscribePlan) error
-	GetAll() ([]subscribeplandomain.SubscribePlan, error)
-	GetByID(string) (*subscribeplandomain.SubscribePlan, error)
-	GetDefault() (*subscribeplandomain.SubscribePlan, error)
-	Update(subscribeplandomain.SubscribePlan) error
-	Delete(string) error
-}
-
-func New(
-	db *database.DB,
-) SubscribePlan {
-	return &accessor{db}
-}

internal/accessor/subscribe_plan/update.go

@@ -1,33 +0,0 @@
-package subscribeplanrepository
-
-import (
-	"fmt"
-	subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan"
-
-	"gorm.io/gorm/clause"
-)
-
-func (a *accessor) Update(spec subscribeplandomain.SubscribePlan) error {
-	if err := a.db.Clauses(clause.OnConflict{
-		Columns: []clause.Column{{Name: "id"}},
-		DoUpdates: clause.AssignmentColumns([]string{
-			"name",
-			"code",
-			"length",
-			"price",
-			"status",
-			"updated_at",
-		}),
-	}).Select(
-		"name",
-		"code",
-		"length",
-		"price",
-		"status",
-		"updated_at",
-	).Save(&spec).Error; err != nil {
-		return fmt.Errorf("failed to update tag: %v", err)
-	}
-
-	return nil
-}

internal/accessor/subscribeplan/create.go

@@ -0,0 +1,21 @@
+package subscribeplanrepository
+
+import (
+	subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan"
+
+	"github.com/google/uuid"
+)
+
+func (s *SubsPlan) Create(spec subscribeplandomain.SubscribePlanReq) error {
+	data := &subscribeplandomain.SubscribePlan{
+		ID:   uuid.NewString(),
+		Code: spec.Code,
+		Name: spec.Name,
+	}
+
+	if err := s.DB.Create(&data).Error; err != nil {
+		return err
+	}
+
+	return nil
+}

internal/accessor/subscribeplan/get_all.go

@@ -4,10 +4,10 @@ import (
 	subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan"
 )
 
-func (s *accessor) GetAll() ([]subscribeplandomain.SubscribePlan, error) {
+func (s *SubsPlan) GetAll() ([]subscribeplandomain.SubscribePlan, error) {
 	var subscribePlans []subscribeplandomain.SubscribePlan
 
-	if err := s.db.Find(&subscribePlans).Error; err != nil {
+	if err := s.DB.Find(&subscribePlans).Error; err != nil {
 		return nil, err
 	}
 

internal/accessor/subscribeplan/get_by_id.go

@@ -0,0 +1,21 @@
+package subscribeplanrepository
+
+import (
+	"errors"
+	subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan"
+
+	"gorm.io/gorm"
+)
+
+func (s *SubsPlan) GetByID(id string) (subscribeplandomain.SubscribePlan, error) {
+	var subscribePlan subscribeplandomain.SubscribePlan
+
+	if err := s.DB.First(&subscribePlan, "id = ? ", id).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return subscribePlan, errors.New("subscribe plan not found")
+		}
+		return subscribePlan, err
+	}
+
+	return subscribePlan, nil
+}

internal/accessor/subscribeplan/get_default.go

@@ -0,0 +1,21 @@
+package subscribeplanrepository
+
+import (
+	subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan"
+
+	"github.com/google/uuid"
+)
+
+func (s *SubsPlan) GetDefault() (subscribeplandomain.SubscribePlan, error) {
+	var subscribePlan subscribeplandomain.SubscribePlan
+
+	if err := s.DB.First(&subscribePlan, "code = ?", "basic").Error; err != nil {
+		s.DB.Create(&subscribeplandomain.SubscribePlan{
+			ID:   uuid.NewString(),
+			Code: "basic",
+			Name: "Basic",
+		})
+	}
+
+	return subscribePlan, nil
+}

internal/accessor/subscribeplan/impl.go

@@ -0,0 +1,23 @@
+package subscribeplanrepository
+
+import (
+	"legalgo-BE-go/database"
+	subscribeplandomain "legalgo-BE-go/internal/domain/subscribe_plan"
+)
+
+type SubsPlan struct {
+	DB *database.DB
+}
+
+type SubsPlanIntf interface {
+	Create(subscribeplandomain.SubscribePlanReq) error
+	GetAll() ([]subscribeplandomain.SubscribePlan, error)
+	GetByID(string) (subscribeplandomain.SubscribePlan, error)
+	GetDefault() (subscribeplandomain.SubscribePlan, error)
+}
+
+func New(
+	db *database.DB,
+) SubsPlanIntf {
+	return &SubsPlan{db}
+}

internal/accessor/tag/create.go

@@ -13,7 +13,7 @@ func (acc *accessor) Create(spec tagdomain.TagReq) error {
 		Name: spec.Name,
 	}
 
-	if err := acc.db.Create(&data).Error; err != nil {
+	if err := acc.DB.Create(&data).Error; err != nil {
 		return err
 	}
 

internal/accessor/tag/create_model.go

@@ -0,0 +1,22 @@
+package tagrepository
+
+import (
+	"legalgo-BE-go/database"
+	tagdomain "legalgo-BE-go/internal/domain/tag"
+
+	"github.com/google/uuid"
+)
+
+func (acc *accessor) CreateModel(spec tagdomain.TagReq) error {
+	data := &database.TagModel{
+		ID:   uuid.NewString(),
+		Code: spec.Code,
+		Name: spec.Name,
+	}
+
+	if err := acc.DB.Create(&data).Error; err != nil {
+		return err
+	}
+
+	return nil
+}

internal/accessor/tag/delete.go

@@ -1,24 +0,0 @@
-package tagrepository
-
-import (
-	"fmt"
-	"legalgo-BE-go/database"
-)
-
-func (a *accessor) Delete(id string) error {
-	var tag database.Tag
-
-	if err := a.db.First(&tag, "id = ?", id).Error; err != nil {
-		return fmt.Errorf("failed to find tag: %v", err)
-	}
-
-	if err := a.db.Model(&tag).Association("News").Clear(); err != nil {
-		return fmt.Errorf("failed to remove tag association: %v", err)
-	}
-
-	if err := a.db.Delete(&tag).Error; err != nil {
-		return fmt.Errorf("failed to delete tag %s : %v", id, err)
-	}
-
-	return nil
-}

internal/accessor/tag/get_all.go

@@ -7,7 +7,7 @@ import (
 func (acc *accessor) GetAll() ([]tagdomain.Tag, error) {
 	var tags []tagdomain.Tag
 
-	if err := acc.db.Find(&tags).Error; err != nil {
+	if err := acc.DB.Find(&tags).Error; err != nil {
 		return nil, err
 	}
 

internal/accessor/tag/get_all_model.go

@@ -0,0 +1,13 @@
+package tagrepository
+
+import "legalgo-BE-go/database"
+
+func (acc *accessor) GetAllModel() ([]database.TagModel, error) {
+	var tags []database.TagModel
+
+	if err := acc.DB.Find(&tags).Error; err != nil {
+		return nil, err
+	}
+
+	return tags, nil
+}

internal/accessor/tag/get_bulk.go

@@ -5,7 +5,7 @@ import tagdomain "legalgo-BE-go/internal/domain/tag"
 func (a *accessor) GetByIDs(ids []string) ([]tagdomain.Tag, error) {
 	var tags []tagdomain.Tag
 
-	if err := a.db.Find(&tags, "id IN ?", ids).Error; err != nil {
+	if err := a.DB.Find(&tags, "id IN ?", ids).Error; err != nil {
 		return nil, err
 	}
 

internal/accessor/tag/get_bulk_model.go

@@ -0,0 +1,13 @@
+package tagrepository
+
+import "legalgo-BE-go/database"
+
+func (a *accessor) GetBulks(ids []string) ([]database.TagModel, error) {
+	var tags []database.TagModel
+
+	if err := a.DB.Find(&tags, "id IN ?", ids).Error; err != nil {
+		return nil, err
+	}
+
+	return tags, nil
+}

internal/accessor/tag/get_by_codes.go

@@ -1,17 +0,0 @@
-package tagrepository
-
-import tagdomain "legalgo-BE-go/internal/domain/tag"
-
-func (a *accessor) GetIDsByCodes(codes []string) ([]string, error) {
-	var tags []string
-
-	if err := a.db.
-		Model(&tagdomain.Tag{}).
-		Select("id").Where("code IN ?", codes).
-		Pluck("id", &tags).
-		Error; err != nil {
-		return nil, err
-	}
-
-	return tags, nil
-}

internal/accessor/tag/impl.go

@@ -6,16 +6,16 @@ import (
 )
 
 type accessor struct {
-	db *database.DB
+	DB *database.DB
 }
 
 type TagAccessor interface {
 	Create(tagdomain.TagReq) error
+	CreateModel(tagdomain.TagReq) error
 	GetAll() ([]tagdomain.Tag, error)
+	GetAllModel() ([]database.TagModel, error)
 	GetByIDs([]string) ([]tagdomain.Tag, error)
-	GetIDsByCodes([]string) ([]string, error)
+	GetBulks(ids []string) ([]database.TagModel, error)
-	Update(tagdomain.Tag) error
-	Delete(string) error
 }
 
 func New(

internal/accessor/tag/update.go

@@ -1,23 +0,0 @@
-package tagrepository
-
-import (
-	"fmt"
-	tagdomain "legalgo-BE-go/internal/domain/tag"
-
-	"gorm.io/gorm/clause"
-)
-
-func (a *accessor) Update(spec tagdomain.Tag) error {
-	if err := a.db.Clauses(clause.OnConflict{
-		Columns: []clause.Column{{Name: "id"}},
-		DoUpdates: clause.AssignmentColumns([]string{
-			"name",
-			"code",
-			"updated_at",
-		}),
-	}).Select("name", "code", "updated_at").Save(&spec).Error; err != nil {
-		return fmt.Errorf("failed to update tag: %v", err)
-	}
-
-	return nil
-}

internal/accessor/user/create_user.go

@@ -1,13 +0,0 @@
-package userrepository
-
-import (
-	userdomain "legalgo-BE-go/internal/domain/user"
-)
-
-func (ur *accessor) CreateUser(spec userdomain.User) error {
-	if err := ur.db.Create(&spec).Error; err != nil {
-		return err
-	}
-
-	return nil
-}

internal/accessor/user/get_user_by_email.go

@@ -1,26 +0,0 @@
-package userrepository
-
-import (
-	"errors"
-	"fmt"
-	userdomain "legalgo-BE-go/internal/domain/user"
-
-	"gorm.io/gorm"
-)
-
-func (ur *accessor) GetUserByEmail(email string) (*userdomain.User, error) {
-	var user *userdomain.User
-
-	if email == "" {
-		return nil, fmt.Errorf("email is empty")
-	}
-
-	if err := ur.db.First(&user, "email = ?", email).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, fmt.Errorf("user not found")
-		}
-		return nil, err
-	}
-
-	return user, nil
-}

internal/accessor/user/get_user_by_id.go

@@ -1,23 +0,0 @@
-package userrepository
-
-import (
-	"fmt"
-	userdomain "legalgo-BE-go/internal/domain/user"
-)
-
-func (ur *accessor) GetUserByID(id string) (*userdomain.User, error) {
-	var user userdomain.User
-
-	if id == "" {
-		return nil, fmt.Errorf("id is empty")
-	}
-
-	if err := ur.db.
-		Preload("Subscribe").
-		Preload("Subscribe.SubscribePlan").
-		First(&user, "id = ?", id).Error; err != nil {
-		return nil, err
-	}
-
-	return &user, nil
-}

internal/accessor/user/get_user_profile.go

@@ -1,32 +0,0 @@
-package userrepository
-
-import (
-	"fmt"
-	userdomain "legalgo-BE-go/internal/domain/user"
-)
-
-func (ur *accessor) GetUserProfile(id string) (*userdomain.UserProfile, error) {
-	var user *userdomain.User
-
-	if id == "" {
-		return nil, fmt.Errorf("email is empty")
-	}
-
-	if err := ur.db.
-		Preload("Subscribe").
-		Preload("Subscribe.SubscribePlan").
-		First(&user, "id = ?", id).
-		Error; err != nil {
-		return nil, err
-	}
-
-	userProfile := &userdomain.UserProfile{
-		ID:        user.ID,
-		Email:     user.Email,
-		Phone:     user.Phone,
-		Subscribe: user.Subscribe,
-		CreatedAt: user.CreatedAt,
-	}
-
-	return userProfile, nil
-}

internal/accessor/user/impl.go

@@ -1,23 +0,0 @@
-package userrepository
-
-import (
-	"legalgo-BE-go/database"
-	userdomain "legalgo-BE-go/internal/domain/user"
-)
-
-type accessor struct {
-	db *database.DB
-}
-
-type User interface {
-	GetUserByEmail(string) (*userdomain.User, error)
-	GetUserByID(string) (*userdomain.User, error)
-	GetUserProfile(string) (*userdomain.UserProfile, error)
-	CreateUser(userdomain.User) error
-}
-
-func New(
-	db *database.DB,
-) User {
-	return &accessor{db}
-}

internal/accessor/user_repository/create_user.go

@@ -0,0 +1,13 @@
+package userrepository
+
+import (
+	authdomain "legalgo-BE-go/internal/domain/auth"
+)
+
+func (ur *UserRepository) CreateUser(spec *authdomain.User) (*authdomain.User, error) {
+	if err := ur.DB.Create(&spec).Error; err != nil {
+		return nil, err
+	}
+
+	return spec, nil
+}

internal/accessor/user_repository/get_user_by_email.go

@@ -0,0 +1,26 @@
+package userrepository
+
+import (
+	"errors"
+
+	authdomain "legalgo-BE-go/internal/domain/auth"
+
+	"gorm.io/gorm"
+)
+
+func (ur *UserRepository) GetUserByEmail(email string) (*authdomain.User, error) {
+	var user authdomain.User
+
+	if email == "" {
+		return nil, errors.New("email is empty")
+	}
+
+	if err := ur.DB.First(&user, "email = ?", email).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, errors.New("user not found")
+		}
+		return nil, err
+	}
+
+	return &user, nil
+}

internal/accessor/user_repository/get_user_by_id.go

@@ -0,0 +1,30 @@
+package userrepository
+
+import (
+	"errors"
+
+	authdomain "legalgo-BE-go/internal/domain/auth"
+
+	"gorm.io/gorm"
+)
+
+func (ur *UserRepository) GetUserByID(email string) (*authdomain.UserProfile, error) {
+	var users []authdomain.UserProfile
+
+	if email == "" {
+		return nil, errors.New("email is empty")
+	}
+
+	if err := ur.DB.Table("users u").
+		Select("u.email, u.id, s.status as subscribe_status, sp.code as subscribe_plan_code, sp.name as subscribe_plan_name").
+		Joins("join subscribes s on s.id = u.subscribe_id").
+		Joins("join subscribe_plans sp on s.subscribe_plan_id = sp.id").
+		Scan(&users).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, errors.New("user not found")
+		}
+		return nil, err
+	}
+
+	return &users[0], nil
+}

internal/accessor/user_repository/get_user_profile.go

@@ -0,0 +1,30 @@
+package userrepository
+
+import (
+	"errors"
+	authdomain "legalgo-BE-go/internal/domain/auth"
+
+	"gorm.io/gorm"
+)
+
+func (ur *UserRepository) GetUserProfile(email string) (*authdomain.UserProfile, error) {
+	var users []authdomain.UserProfile
+
+	if email == "" {
+		return nil, errors.New("email is empty")
+	}
+
+	if err := ur.DB.Table("users u").
+		Where("email = ?", email).
+		Select("u.email, u.id, s.status as subscribe_status, sp.code as subscribe_plan_code, sp.name as subscribe_plan_name").
+		Joins("join subscribes s on s.id = u.subscribe_id").
+		Joins("join subscribe_plans sp on s.subscribe_plan_id = sp.id").
+		Scan(&users).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, errors.New("user not found")
+		}
+		return nil, err
+	}
+
+	return &users[0], nil
+}

internal/accessor/user_repository/impl.go

@@ -0,0 +1,23 @@
+package userrepository
+
+import (
+	"legalgo-BE-go/database"
+	authdomain "legalgo-BE-go/internal/domain/auth"
+)
+
+type UserRepository struct {
+	DB *database.DB
+}
+
+type UserIntf interface {
+	GetUserByEmail(string) (*authdomain.User, error)
+	GetUserByID(string) (*authdomain.UserProfile, error)
+	GetUserProfile(string) (*authdomain.UserProfile, error)
+	CreateUser(*authdomain.User) (*authdomain.User, error)
+}
+
+func New(
+	db *database.DB,
+) UserIntf {
+	return &UserRepository{db}
+}

internal/api/http/ads/create.go

@@ -1,68 +0,0 @@
-package adshttp
-
-import (
-	authmiddleware "legalgo-BE-go/internal/api/http/middleware/auth"
-	adsdomain "legalgo-BE-go/internal/domain/ads"
-	adssvc "legalgo-BE-go/internal/services/ads"
-	"legalgo-BE-go/internal/utilities/response"
-	"legalgo-BE-go/internal/utilities/utils"
-	"net/http"
-
-	"github.com/go-chi/chi/v5"
-	"github.com/go-playground/validator/v10"
-)
-
-func Create(
-	router chi.Router,
-	adsSvc adssvc.Ads,
-	validate *validator.Validate,
-) {
-	router.
-		With(authmiddleware.Authorize()).
-		Post("/ads/create", func(w http.ResponseWriter, r *http.Request) {
-			ctx := r.Context()
-			var spec adsdomain.AdsReq
-
-			if err := utils.UnmarshalBody(r, &spec); err != nil {
-				response.RespondJsonErrorWithCode(
-					ctx,
-					w,
-					err,
-					response.ErrBadRequest.Code,
-					response.ErrBadRequest.HttpCode,
-					"failed to unmarshal body",
-				)
-				return
-			}
-
-			if err := validate.Struct(spec); err != nil {
-				response.ResponseWithErrorCode(
-					ctx,
-					w,
-					err,
-					response.ErrBadRequest.Code,
-					response.ErrBadRequest.HttpCode,
-					err.(validator.ValidationErrors).Error(),
-				)
-				return
-			}
-
-			if err := adsSvc.Create(spec); err != nil {
-				response.RespondJsonErrorWithCode(
-					ctx,
-					w,
-					err,
-					response.ErrBadRequest.Code,
-					response.ErrBadRequest.HttpCode,
-					err.Error(),
-				)
-				return
-			}
-
-			response.RespondJsonSuccess(ctx, w, struct {
-				Message string
-			}{
-				Message: "ads created successfully",
-			})
-		})
-}

internal/api/http/ads/delete.go

@@ -1,53 +0,0 @@
-package adshttp
-
-import (
-	"fmt"
-	authmiddleware "legalgo-BE-go/internal/api/http/middleware/auth"
-	adssvc "legalgo-BE-go/internal/services/ads"
-	"legalgo-BE-go/internal/utilities/response"
-	"net/http"
-
-	"github.com/go-chi/chi/v5"
-)
-
-func Delete(
-	router chi.Router,
-	adsSvc adssvc.Ads,
-) {
-	router.
-		With(authmiddleware.Authorize()).
-		Delete("/ads/{ads_id}/delete", func(w http.ResponseWriter, r *http.Request) {
-			ctx := r.Context()
-			adsID := chi.URLParam(r, "ads_id")
-
-			if adsID == "" {
-				response.RespondJsonErrorWithCode(
-					ctx,
-					w,
-					fmt.Errorf("ads id is not provided"),
-					response.ErrBadRequest.Code,
-					response.ErrBadRequest.HttpCode,
-					"ads id is not provided",
-				)
-				return
-			}
-
-			if err := adsSvc.Delete(adsID); err != nil {
-				response.RespondJsonErrorWithCode(
-					ctx,
-					w,
-					err,
-					response.ErrBadRequest.Code,
-					response.ErrBadRequest.HttpCode,
-					err.Error(),
-				)
-				return
-			}
-
-			response.RespondJsonSuccess(ctx, w, struct {
-				Message string
-			}{
-				Message: "ads has been deleted",
-			})
-		})
-}

internal/api/http/ads/get_all.go

@@ -1,32 +0,0 @@
-package adshttp
-
-import (
-	adssvc "legalgo-BE-go/internal/services/ads"
-	"legalgo-BE-go/internal/utilities/response"
-	"net/http"
-
-	"github.com/go-chi/chi/v5"
-)
-
-func GetAll(
-	router chi.Router,
-	adsSvc adssvc.Ads,
-) {
-	router.Get("/ads", func(w http.ResponseWriter, r *http.Request) {
-		ctx := r.Context()
-		subsPlan, err := adsSvc.GetAll()
-		if err != nil {
-			response.ResponseWithErrorCode(
-				ctx,
-				w,
-				err,
-				response.ErrBadRequest.Code,
-				response.ErrBadRequest.HttpCode,
-				err.Error(),
-			)
-			return
-		}
-
-		response.RespondJsonSuccess(ctx, w, subsPlan)
-	})
-}