fix: update default environment mode to local and adjust database configurations

* 'main' of https://github.com/ardeman/project-legalgo-go:
  fix: search news title by query

.gitignore

@@ -2,3 +2,5 @@ bin
 .env
 .DS_Store
 /cmd/legalgo/env
+
+__debug*

cmd/gorm/main.go

@@ -6,6 +6,7 @@ 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"
@@ -36,9 +37,10 @@ func main() {
 		log.Fatal("Migration failed: ", err)
 	}
 
-	var temp subscribeplandomain.SubscribePlan
+	var tempSP subscribeplandomain.SubscribePlan
+	var tempCtg categorydomain.Category
 
-	if err := db.Where("code = ?", "basic").First(&temp).Error; err != nil {
+	if err := db.Where("code = ?", "basic").First(&tempSP).Error; err != nil {
 		log.Print("seeding basic subscribe plan")
 		db.Create(&subscribeplandomain.SubscribePlan{
 			ID:     uuid.NewString(),
@@ -50,5 +52,16 @@ func main() {
 		})
 	}
 
+	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,
+		})
+	}
+
 	log.Print("migrate success")
 }

config/configs.go

@@ -12,14 +12,15 @@ import (
 const (
 	YAML_PATH        = "env/%s"
 	ENV_MODE         = "ENV_MODE"
-	DEFAULT_ENV_MODE = "development"
+	DEFAULT_ENV_MODE = "local"
 )
 
 var (
 	validEnvMode = map[string]struct{}{
 		"local":      {},
-		"development": {},
+		"staging":    {},
 		"production": {},
+		"debug":      {},
 	}
 )
 

config/redis.go

@@ -6,7 +6,7 @@ type Redis struct {
 	DB                            int    `mapstructure:"db"`
 	Username                      string `mapstructure:"username"`
 	Password                      string `mapstructure:"password"`
-	SslMode                       string `mapstructure:"ssl-mode"`
+	SSL                           bool   `mapstructure:"ssl"`
 	Debug                         bool   `mapstructure:"debug"`
 	MaxIdleConnectionsInSecond    int    `mapstructure:"max-idle-connections-in-second"`
 	MaxOpenConnectionsInSecond    int    `mapstructure:"max-open-connections-in-second"`

database/log_model.go

@@ -0,0 +1,14 @@
+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,12 +15,13 @@ type DB struct {
 
 func NewDB(cfg *config.Config) (*DB, error) {
 	dsn := fmt.Sprintf(
-		"host=%s user=%s password=%s dbname=%s port=%v sslmode=disable",
+		"host=%s user=%s password=%s dbname=%s port=%v sslmode=%s",
 		cfg.Database.Host,
 		cfg.Database.Username,
 		cfg.Database.Password,
 		cfg.Database.DB,
 		cfg.Database.Port,
+		cfg.Database.SslMode,
 	)
 
 	if dsn == "" {
@@ -55,5 +56,6 @@ func (db *DB) Migrate() error {
 		&Tag{},
 		&Category{},
 		&Ads{},
+		&ContentLog{},
 	)
 }

env/debug.yaml

@@ -0,0 +1,43 @@
+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/local.yaml

@@ -0,0 +1,43 @@
+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

@@ -9,12 +9,12 @@ jwt:
     secret: "5Lm25V3Qd7aut8dr4QUxm5PZUrSFs"
 
 postgresql:
-  host: 62.72.45.250
+  host: dpg-d046h549c44c739arfv0-a
-  port: 20826
+  port: 5432
   driver: postgres
-  db: legalgonews-dev
+  db: legalgonews_prod
   username: legalgo_admin
-  password: "K4K!2Kg7c@KW6H&4A2aBy2dFCRY3Sh"
+  password: "656ogwc0JlLEVQyHnT5RrrYa7762iBQQ"
   ssl-mode: disable
   max-idle-connections-in-second: 600
   max-open-connections-in-second: 600
@@ -22,18 +22,18 @@ postgresql:
   debug: false
 
 oss:
-  access_key_id: cf9a475e18bc7626cbdbf09709d82a64
+  access_key_id: GTK7i3SVy9llQeGH0Htv
-  access_key_secret: 91f3321294d3e23035427a0ecb893ada
+  access_key_secret: 2psmKXZFpevA9n5ntSDRMqFBpZuSz32dvtXjYclf
-  endpoint: sin1.contabostorage.com
+  endpoint: news-cdn.legalgo.id
-  bucket_name: legalgonews-dev
+  bucket_name: uploads
   log_level: Error
-  host_url: https://sin1.contabostorage.com
+  host_url: https://news-cdn.legalgo.id
-  public_url: https://sin1.contabostorage.com/fda98c2228f246f29a7e466b86b3b9e7
+  public_url: https://news-cdn.legalgo.id
 
 redis:
-  host: 62.72.45.250
+  host: red-d046l42dbo4c73ea9iag
-  port: 26379
+  port: 6379
-  password: mDtpsyEW8W26vwLhglpO
+  password: 7cZvu08JKuO9MPNxBb97tZCVNj0ZGNp2
   db: 5
   ssl: false
   max-idle-connections-in-second: 600

env/staging.yaml

@@ -0,0 +1,42 @@
+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

internal/accessor/ads/get-all.go

@@ -5,9 +5,14 @@ import (
 	adsdomain "legalgo-BE-go/internal/domain/ads"
 )
 
-func (a *accessor) GetAll() ([]adsdomain.Ads, error) {
+func (a *accessor) GetAll() ([]adsdomain.AdsResponse, error) {
-	var ads []adsdomain.Ads
+	var ads []adsdomain.AdsResponse
-	if err := a.db.Find(&ads).Error; err != nil {
+
+	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)
 	}
 

internal/accessor/ads/impl.go

@@ -11,7 +11,7 @@ type accessor struct {
 
 type Ads interface {
 	Create(adsdomain.Ads) error
-	GetAll() ([]adsdomain.Ads, error)
+	GetAll() ([]adsdomain.AdsResponse, error)
 	Update(adsdomain.Ads) error
 	Delete(string) error
 }

internal/accessor/log/create_log_ads.go

@@ -0,0 +1,33 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -3,6 +3,7 @@ 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"
@@ -26,4 +27,5 @@ var Module = fx.Module("repository", fx.Provide(
 	newsrepository.New,
 	oss.New,
 	adsrepository.New,
+	logrepository.New,
 ))

internal/accessor/news/get_all.go

@@ -1,13 +1,24 @@
 package newsrepository
 
-import newsdomain "legalgo-BE-go/internal/domain/news"
+import (
+	newsdomain "legalgo-BE-go/internal/domain/news"
+	timeutils "legalgo-BE-go/internal/utilities/time_utils"
+)
 
-func (a *accessor) GetAll(filter newsdomain.NewsFilter) ([]newsdomain.News, error) {
+type is_active string
-	var news []newsdomain.News
+
-	query := a.db.
+const (
+	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")
+		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").
@@ -19,6 +30,19 @@ func (a *accessor) GetAll(filter newsdomain.NewsFilter) ([]newsdomain.News, erro
 			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_by_id.go

@@ -0,0 +1,17 @@
+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/impl.go

@@ -10,8 +10,9 @@ type accessor struct {
 }
 
 type News interface {
-	GetAll(filter newsdomain.NewsFilter) ([]newsdomain.News, error)
+	GetAll(filter newsdomain.NewsFilter) ([]newsdomain.NewsResponse, error)
 	GetBySlug(string) (*newsdomain.News, error)
+	GetByID(string) (*newsdomain.News, error)
 	Create(newsdomain.News) error
 	Update(newsdomain.News) error
 	Delete(string) error

internal/accessor/oss/oss.go

@@ -66,7 +66,7 @@ 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 {

internal/accessor/redis/impl.go

@@ -1,6 +1,7 @@
 package redisaccessor
 
 import (
+	"crypto/tls"
 	"fmt"
 	"legalgo-BE-go/config"
 
@@ -16,11 +17,19 @@ func Get() *redis.Client {
 func New(cfg *config.Config) *redis.Client {
 	addr := fmt.Sprintf("%s:%s", cfg.Redis.Host, cfg.Redis.Port)
 
-	redisClient = redis.NewClient(&redis.Options{
+	options := &redis.Options{
 		Addr:     addr,
 		Password: cfg.Redis.Password,
 		DB:       cfg.Redis.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/get_staff.go

@@ -0,0 +1,13 @@
+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

@@ -20,6 +20,7 @@ func (a *accessor) GetUsers() ([]userdomain.UserProfile, error) {
 			Email:     user.Email,
 			Phone:     user.Phone,
 			Subscribe: user.Subscribe,
+			CreatedAt: user.CreatedAt,
 		})
 	}
 

internal/accessor/staff/impl.go

@@ -14,6 +14,7 @@ type Staff interface {
 	GetStaffByEmail(string) (*staffdomain.Staff, error)
 	GetStaffByID(string) (*staffdomain.Staff, error)
 	GetUsers() ([]userdomain.UserProfile, error)
+	GetStaffs() ([]staffdomain.StaffProfile, error)
 	Create(staffdomain.Staff) error
 	Update(staffdomain.Staff) error
 }

internal/accessor/user/get_user_profile.go

@@ -25,6 +25,7 @@ func (ur *accessor) GetUserProfile(id string) (*userdomain.UserProfile, error) {
 		Email:     user.Email,
 		Phone:     user.Phone,
 		Subscribe: user.Subscribe,
+		CreatedAt: user.CreatedAt,
 	}
 
 	return userProfile, nil

internal/api/http/logs/create_log_ads.go

@@ -0,0 +1,86 @@
+package logshttp
+
+import (
+	logsdomain "legalgo-BE-go/internal/domain/logs"
+	logssvc "legalgo-BE-go/internal/services/logs"
+	usersvc "legalgo-BE-go/internal/services/user"
+	"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 CreateLogAds(
+	router chi.Router,
+	userSvc usersvc.User,
+	logsSvc logssvc.Log,
+	validate *validator.Validate,
+) {
+	router.Post("/logs/ads", func(w http.ResponseWriter, r *http.Request) {
+		ctx := r.Context()
+
+		var specReq logsdomain.LogsSpec
+
+		var spec logsdomain.LogsRequest
+
+		if err := utils.UnmarshalBody(r, &spec); err != nil {
+			response.RespondJsonErrorWithCode(
+				ctx,
+				w,
+				err,
+				response.ErrBadRequest.Code,
+				response.ErrBadRequest.HttpCode,
+				"failed unmarshal body",
+			)
+			return
+		}
+
+		if err := validate.Struct(spec); err != nil {
+			response.RespondJsonErrorWithCode(
+				ctx,
+				w,
+				err,
+				response.ErrBadRequest.Code,
+				response.ErrBadRequest.HttpCode,
+				err.(validator.ValidationErrors).Error(),
+			)
+			return
+		}
+
+		specReq.ContentID = spec.AdsID
+
+		userDetail, _ := utils.GetTokenDetail(r)
+
+		if userDetail.ID != "" {
+			specReq.UserID = &userDetail.ID
+		}
+
+		if ip := r.Header.Get("X-Ip-Address"); ip != "" {
+			specReq.IP = &ip
+		}
+
+		if userAgent := r.Header.Get("X-User-Agent"); userAgent != "" {
+			specReq.UserAgent = &userAgent
+		}
+
+		if err := logsSvc.CreateLogAds(specReq); err != nil {
+			response.RespondJsonErrorWithCode(
+				ctx,
+				w,
+				err,
+				response.ErrBadRequest.Code,
+				response.ErrBadRequest.HttpCode,
+				err.Error(),
+			)
+			return
+		}
+
+		response.RespondJsonSuccess(ctx, w, struct {
+			Message string
+		}{
+			Message: "logs ads recorded successfully",
+		})
+	})
+}

internal/api/http/logs/get_all_log_ads.go

@@ -0,0 +1,37 @@
+package logshttp
+
+import (
+	authmiddleware "legalgo-BE-go/internal/api/http/middleware/auth"
+	logssvc "legalgo-BE-go/internal/services/logs"
+	"legalgo-BE-go/internal/utilities/response"
+	"legalgo-BE-go/internal/utilities/utils"
+	"net/http"
+
+	"github.com/go-chi/chi/v5"
+)
+
+func GetUserAds(
+	router chi.Router,
+	logSvc logssvc.Log,
+) {
+	router.With(authmiddleware.Authorize()).Get("/logs/ads", func(w http.ResponseWriter, r *http.Request) {
+		ctx := r.Context()
+
+		userDetail, err := utils.GetTokenDetail(r)
+
+		subsPlan, err := logSvc.GetAllLogAds(userDetail.ID)
+		if err != nil {
+			response.ResponseWithErrorCode(
+				ctx,
+				w,
+				err,
+				response.ErrBadRequest.Code,
+				response.ErrBadRequest.HttpCode,
+				err.Error(),
+			)
+			return
+		}
+
+		response.RespondJsonSuccess(ctx, w, subsPlan)
+	})
+}

internal/api/http/logs/module.go

@@ -0,0 +1,8 @@
+package logshttp
+
+import "go.uber.org/fx"
+
+var Module = fx.Module("logs-http", fx.Invoke(
+	CreateLogAds,
+	GetUserAds,
+))

internal/api/http/news/get_all.go

@@ -15,7 +15,7 @@ func GetAll(
 ) {
 	router.Get("/news", func(w http.ResponseWriter, r *http.Request) {
 		var (
-			news []newsdomain.News
+			news []newsdomain.NewsResponse
 			err  error
 		)
 		ctx := r.Context()
@@ -23,8 +23,15 @@ func GetAll(
 
 		category := query.Get("categories")
 		tags := query.Get("tags")
+		activeOnly := query.Get("active")
+		search := query.Get("q")
 
-		news, err = newsSvc.GetAll(category, tags)
+		news, err = newsSvc.GetAll(newsdomain.Filter{
+			Category: category,
+			Tags:     tags,
+			Active:   activeOnly,
+			Search:   search,
+		})
 
 		if err != nil {
 			response.ResponseWithErrorCode(

internal/api/http/news/get_by_id.go

@@ -0,0 +1,77 @@
+package newshttp
+
+import (
+	authmiddleware "legalgo-BE-go/internal/api/http/middleware/auth"
+	logssvc "legalgo-BE-go/internal/services/logs"
+	newssvc "legalgo-BE-go/internal/services/news"
+	"legalgo-BE-go/internal/utilities/response"
+	"legalgo-BE-go/internal/utilities/utils"
+	"net/http"
+
+	"github.com/go-chi/chi/v5"
+)
+
+func GetByID(
+	router chi.Router,
+	newsSvc newssvc.News,
+	logSvc logssvc.Log,
+) {
+	router.With(authmiddleware.Authorize()).Get("/staff/news/{id}", func(w http.ResponseWriter, r *http.Request) {
+		ctx := r.Context()
+		id := chi.URLParam(r, "id")
+
+		token, err := utils.GetToken(r)
+		if err != nil {
+			response.ResponseWithErrorCode(
+				ctx,
+				w,
+				err,
+				response.ErrBadRequest.Code,
+				response.ErrBadRequest.HttpCode,
+				err.Error(),
+			)
+			return
+		}
+
+		staffDetail, err := utils.DestructToken(token)
+
+		if err != nil {
+			response.ResponseWithErrorCode(
+				ctx,
+				w,
+				err,
+				response.ErrBadRequest.Code,
+				response.ErrBadRequest.HttpCode,
+				err.Error(),
+			)
+			return
+		}
+
+		if staffDetail.Role != "staff" {
+			response.ResponseWithErrorCode(
+				ctx,
+				w,
+				err,
+				response.ErrUnauthorized.Code,
+				response.ErrUnauthorized.HttpCode,
+				"unauthorized",
+			)
+			return
+		}
+
+		news, err := newsSvc.GetByID(id)
+		if err != nil {
+			response.ResponseWithErrorCode(
+				ctx,
+				w,
+				err,
+				response.ErrBadRequest.Code,
+				response.ErrBadRequest.HttpCode,
+				err.Error(),
+			)
+			return
+		}
+
+		response.RespondJsonSuccess(ctx, w, news)
+	})
+}

internal/api/http/news/get_by_slug.go

@@ -1,8 +1,11 @@
 package newshttp
 
 import (
+	logsdomain "legalgo-BE-go/internal/domain/logs"
+	logssvc "legalgo-BE-go/internal/services/logs"
 	newssvc "legalgo-BE-go/internal/services/news"
 	"legalgo-BE-go/internal/utilities/response"
+	"legalgo-BE-go/internal/utilities/utils"
 	"net/http"
 
 	"github.com/go-chi/chi/v5"
@@ -11,6 +14,7 @@ import (
 func GetBySlug(
 	router chi.Router,
 	newsSvc newssvc.News,
+	logSvc logssvc.Log,
 ) {
 	router.Get("/news/{slug}", func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
@@ -29,6 +33,38 @@ func GetBySlug(
 			return
 		}
 
+		userDetail, _ := utils.GetTokenDetail(r)
+
+		if userDetail.Role != "staff" {
+			var specReq logsdomain.LogsSpec
+
+			specReq.ContentID = news.ID
+
+			if userDetail.ID != "" {
+				specReq.UserID = &userDetail.ID
+			}
+
+			if ip := r.Header.Get("X-Ip-Address"); ip != "" {
+				specReq.IP = &ip
+			}
+
+			if userAgent := r.Header.Get("X-User-Agent"); userAgent != "" {
+				specReq.UserAgent = &userAgent
+			}
+
+			if err := logSvc.CreateLogNews(specReq); err != nil {
+				response.RespondJsonErrorWithCode(
+					ctx,
+					w,
+					err,
+					response.ErrBadRequest.Code,
+					response.ErrBadRequest.HttpCode,
+					err.Error(),
+				)
+				return
+			}
+		}
+
 		response.RespondJsonSuccess(ctx, w, news)
 	})
 }

internal/api/http/news/module.go

@@ -5,6 +5,7 @@ import "go.uber.org/fx"
 var Module = fx.Module("news", fx.Invoke(
 	GetAll,
 	GetBySlug,
+	GetByID,
 	Create,
 	Update,
 	Delete,

internal/api/http/news/update.go

@@ -5,7 +5,7 @@ import (
 	authmiddleware "legalgo-BE-go/internal/api/http/middleware/auth"
 	newsdomain "legalgo-BE-go/internal/domain/news"
 	newssvc "legalgo-BE-go/internal/services/news"
-	staffsvc "legalgo-BE-go/internal/services/staffsvc"
+	staffsvc "legalgo-BE-go/internal/services/staff"
 	"legalgo-BE-go/internal/utilities/response"
 	"legalgo-BE-go/internal/utilities/utils"
 	"net/http"

internal/api/http/router.go

@@ -3,6 +3,7 @@ package internalhttp
 import (
 	adshttp "legalgo-BE-go/internal/api/http/ads"
 	categoryhttp "legalgo-BE-go/internal/api/http/category"
+	logshttp "legalgo-BE-go/internal/api/http/logs"
 	newshttp "legalgo-BE-go/internal/api/http/news"
 	osshttp "legalgo-BE-go/internal/api/http/oss"
 	staffhttp "legalgo-BE-go/internal/api/http/staff"
@@ -33,6 +34,7 @@ var Module = fx.Module("router",
 	userhttp.Module,
 	subscribehttp.Module,
 	adshttp.Module,
+	logshttp.Module,
 )
 
 func initRouter() chi.Router {

internal/api/http/staff/get_staffs.go

@@ -0,0 +1,59 @@
+package staffhttp
+
+import (
+	authmiddleware "legalgo-BE-go/internal/api/http/middleware/auth"
+	staffsvc "legalgo-BE-go/internal/services/staff"
+	"legalgo-BE-go/internal/utilities/response"
+	"legalgo-BE-go/internal/utilities/utils"
+	"net/http"
+
+	"github.com/go-chi/chi/v5"
+)
+
+func GetStaffs(
+	router chi.Router,
+	staffSvc staffsvc.Auth,
+) {
+	router.With(authmiddleware.Authorize()).Get("/staff/get-all", func(w http.ResponseWriter, r *http.Request) {
+		ctx := r.Context()
+		staffDetail, err := utils.GetTokenDetail(r)
+		if err != nil {
+			response.RespondJsonErrorWithCode(
+				ctx,
+				w,
+				err,
+				response.ErrBadRequest.Code,
+				response.ErrBadRequest.HttpCode,
+				"failed to get staff token",
+			)
+			return
+		}
+
+		if staffDetail.Role != "staff" {
+			response.RespondJsonErrorWithCode(
+				ctx,
+				w,
+				err,
+				response.ErrUnauthorized.Code,
+				response.ErrUnauthorized.HttpCode,
+				"unauthorized",
+			)
+			return
+		}
+
+		staffs, err := staffSvc.GetStaffs()
+		if err != nil {
+			response.RespondJsonErrorWithCode(
+				ctx,
+				w,
+				err,
+				response.ErrBadRequest.Code,
+				response.ErrBadRequest.HttpCode,
+				err.Error(),
+			)
+			return
+		}
+
+		response.RespondJsonSuccess(ctx, w, staffs)
+	})
+}

internal/api/http/staff/get_users.go

@@ -2,7 +2,7 @@ package staffhttp
 
 import (
 	authmiddleware "legalgo-BE-go/internal/api/http/middleware/auth"
-	staffsvc "legalgo-BE-go/internal/services/staffsvc"
+	staffsvc "legalgo-BE-go/internal/services/staff"
 	"legalgo-BE-go/internal/utilities/response"
 	"legalgo-BE-go/internal/utilities/utils"
 	"net/http"

internal/api/http/staff/login.go

@@ -5,7 +5,7 @@ import (
 
 	responsedomain "legalgo-BE-go/internal/domain/reponse"
 	staffdomain "legalgo-BE-go/internal/domain/staff"
-	staffsvc "legalgo-BE-go/internal/services/staffsvc"
+	staffsvc "legalgo-BE-go/internal/services/staff"
 	"legalgo-BE-go/internal/utilities/response"
 	"legalgo-BE-go/internal/utilities/utils"
 

internal/api/http/staff/module.go

@@ -9,5 +9,6 @@ var Module = fx.Module("auth-api",
 		Update,
 		GetProfile,
 		GetUsers,
+		GetStaffs,
 	),
 )

internal/api/http/staff/profile.go

@@ -1,7 +1,7 @@
 package staffhttp
 
 import (
-	staffsvc "legalgo-BE-go/internal/services/staffsvc"
+	staffsvc "legalgo-BE-go/internal/services/staff"
 	"legalgo-BE-go/internal/utilities/response"
 	"legalgo-BE-go/internal/utilities/utils"
 	"net/http"

internal/api/http/staff/register.go

@@ -3,9 +3,8 @@ package staffhttp
 import (
 	"net/http"
 
-	responsedomain "legalgo-BE-go/internal/domain/reponse"
 	staffdomain "legalgo-BE-go/internal/domain/staff"
-	staffsvc "legalgo-BE-go/internal/services/staffsvc"
+	staffsvc "legalgo-BE-go/internal/services/staff"
 	"legalgo-BE-go/internal/utilities/response"
 	"legalgo-BE-go/internal/utilities/utils"
 
@@ -49,7 +48,7 @@ func Register(
 			return
 		}
 
-		token, err := authSvc.Register(spec)
+		_, err := authSvc.Register(spec)
 		if err != nil {
 			response.ResponseWithErrorCode(
 				ctx,
@@ -62,21 +61,10 @@ func Register(
 			return
 		}
 
-		if err := utils.StoreTokenRedis(ctx, rdb, token, spec.Email); err != nil {
+		response.RespondJsonSuccess(ctx, w, struct {
-			response.ResponseWithErrorCode(
+			Message string
-				ctx,
+		}{
-				w,
+			Message: "staff created successfully.",
-				err,
+		})
-				response.ErrBadRequest.Code,
-				response.ErrBadRequest.HttpCode,
-				err.Error(),
-			)
-			return
-		}
-
-		responsePayload := &responsedomain.Auth{
-			Token: token,
-		}
-		response.RespondJsonSuccess(ctx, w, responsePayload)
 	})
 }

internal/api/http/staff/update.go

@@ -2,7 +2,7 @@ package staffhttp
 
 import (
 	staffdomain "legalgo-BE-go/internal/domain/staff"
-	staffsvc "legalgo-BE-go/internal/services/staffsvc"
+	staffsvc "legalgo-BE-go/internal/services/staff"
 	"legalgo-BE-go/internal/utilities/response"
 	"legalgo-BE-go/internal/utilities/utils"
 	"net/http"

internal/domain/ads/spec.go

@@ -14,6 +14,11 @@ type Ads struct {
 	UpdatedAt time.Time  `json:"updated_at"`
 }
 
+type AdsResponse struct {
+	Ads
+	Clicked int64 `json:"clicked"`
+}
+
 type AdsReq struct {
 	Image     string     `json:"image" validate:"required"`
 	URL       string     `json:"url" validate:"required"`

internal/domain/logs/spec.go

@@ -0,0 +1,22 @@
+package logsdomain
+
+import (
+	adsdomain "legalgo-BE-go/internal/domain/ads"
+)
+
+type LogsRequest struct {
+	AdsID string `json:"ads_id" validate:"required"`
+}
+
+type LogsSpec struct {
+	ContentID string `json:"content_id" validate:"required"`
+	IP        *string
+	UserID    *string
+	UserAgent *string
+	Category  string
+}
+
+type LogResponse struct {
+	ID   string          `json:"id"`
+	News []adsdomain.Ads `json:"news"`
+}

internal/domain/news/spec.go

@@ -27,8 +27,8 @@ type News struct {
 	Title         string                    `json:"title"`
 	Content       string                    `json:"content"`
 	FeaturedImage string                    `json:"featured_image"`
-	Tags          []tagdomain.Tag           `gorm:"many2many:news_tags" json:"tags"`
+	Tags          []tagdomain.Tag           `gorm:"many2many:news_tags;foreignKey:ID;joinForeignKey:news_id;References:ID;joinReferences:tag_id" json:"tags"`
-	Categories    []categorydomain.Category `gorm:"many2many:news_categories" json:"categories"`
+	Categories    []categorydomain.Category `gorm:"many2many:news_categories;foreignKey:ID;joinForeignKey:news_id;References:ID;joinReferences:category_id" json:"categories"`
 	IsPremium     bool                      `json:"is_premium"`
 	Slug          string                    `json:"slug"`
 	AuthorID      string                    `json:"author_id"`
@@ -39,6 +39,11 @@ type News struct {
 	Author Staff `json:"author"`
 }
 
+type NewsResponse struct {
+	News
+	Views int64 `json:"views"`
+}
+
 type NewsUpdate struct {
 	ID            string    `json:"id"`
 	Title         string    `json:"title"`
@@ -50,7 +55,13 @@ type NewsUpdate struct {
 	LiveAt        time.Time `json:"live_at"`
 }
 
+type Filter struct {
+	Category, Tags, Active, Search string
+}
+
 type NewsFilter struct {
 	Tags     []string
 	Category []string
+	Active   string
+	Search   string
 }

internal/domain/user/spec.go

@@ -11,6 +11,7 @@ type User struct {
 	Password    string    `json:"password"`
 	Email       string    `json:"email"`
 	Phone       string    `json:"phone"`
+	CreatedAt   time.Time `json:"created_at"`
 
 	Subscribe subscribe.Subscribe `gorm:"foreignKey:SubscribeID" json:"subscribe"`
 }
@@ -26,6 +27,7 @@ type UserProfile struct {
 	ID        string    `json:"id"`
 	Email     string    `json:"email"`
 	Phone     string    `json:"phone"`
+	CreatedAt time.Time `json:"created_at"`
 
 	Subscribe subscribe.Subscribe `gorm:"foreignKey:SubscribeID" json:"subscribe"`
 }

internal/services/ads/get_all.go

@@ -2,6 +2,6 @@ package adssvc
 
 import adsdomain "legalgo-BE-go/internal/domain/ads"
 
-func (i *impl) GetAll() ([]adsdomain.Ads, error) {
+func (i *impl) GetAll() ([]adsdomain.AdsResponse, error) {
 	return i.adsRepo.GetAll()
 }

internal/services/ads/impl.go

@@ -11,7 +11,7 @@ type impl struct {
 
 type Ads interface {
 	Create(adsdomain.AdsReq) error
-	GetAll() ([]adsdomain.Ads, error)
+	GetAll() ([]adsdomain.AdsResponse, error)
 	Update(string, adsdomain.AdsReq) error
 	Delete(string) error
 }

internal/services/logs/create_logs_ads.go

@@ -0,0 +1,15 @@
+package logssvc
+
+import (
+	"fmt"
+	logsdomain "legalgo-BE-go/internal/domain/logs"
+)
+
+func (i *impl) CreateLogAds(spec logsdomain.LogsSpec) error {
+	spec.Category = "ads"
+	if err := i.logsRepo.CreateLog(spec); err != nil {
+		return fmt.Errorf("failed to create ads log: %v", err)
+	}
+
+	return nil
+}

internal/services/logs/create_logs_news.go

@@ -0,0 +1,15 @@
+package logssvc
+
+import (
+	"fmt"
+	logsdomain "legalgo-BE-go/internal/domain/logs"
+)
+
+func (i *impl) CreateLogNews(spec logsdomain.LogsSpec) error {
+	spec.Category = "news"
+	if err := i.logsRepo.CreateLog(spec); err != nil {
+		return fmt.Errorf("failed to create news log: %v", err)
+	}
+
+	return nil
+}

internal/services/logs/get_all_logs_ads.go

@@ -0,0 +1,20 @@
+package logssvc
+
+import (
+	"fmt"
+	adsdomain "legalgo-BE-go/internal/domain/ads"
+)
+
+func (i *impl) GetAllLogAds(userID string) ([]adsdomain.Ads, error) {
+	var (
+		logs []adsdomain.Ads
+		err  error
+	)
+
+	logs, err = i.logsRepo.GetAllLogAds(userID)
+	if err != nil {
+		return logs, fmt.Errorf("failed to get user logs ads: %v", err)
+	}
+
+	return logs, nil
+}

internal/services/logs/impl.go

@@ -0,0 +1,25 @@
+package logssvc
+
+import (
+	logrepository "legalgo-BE-go/internal/accessor/log"
+	adsdomain "legalgo-BE-go/internal/domain/ads"
+	logsdomain "legalgo-BE-go/internal/domain/logs"
+)
+
+type impl struct {
+	logsRepo logrepository.Log
+}
+
+type Log interface {
+	CreateLogAds(logsdomain.LogsSpec) error
+	CreateLogNews(logsdomain.LogsSpec) error
+	GetAllLogAds(string) ([]adsdomain.Ads, error)
+}
+
+func New(
+	logsRepo logrepository.Log,
+) Log {
+	return &impl{
+		logsRepo,
+	}
+}

internal/services/module.go

@@ -3,9 +3,10 @@ package services
 import (
 	adssvc "legalgo-BE-go/internal/services/ads"
 	categorysvc "legalgo-BE-go/internal/services/category"
+	logssvc "legalgo-BE-go/internal/services/logs"
 	newssvc "legalgo-BE-go/internal/services/news"
 	"legalgo-BE-go/internal/services/oss"
-	staffsvc "legalgo-BE-go/internal/services/staffsvc"
+	staffsvc "legalgo-BE-go/internal/services/staff"
 	subscribesvc "legalgo-BE-go/internal/services/subscribe"
 	subscribeplansvc "legalgo-BE-go/internal/services/subscribe_plan"
 	tagsvc "legalgo-BE-go/internal/services/tag"
@@ -25,5 +26,6 @@ var Module = fx.Module("services",
 		oss.NewOSSService,
 		usersvc.New,
 		adssvc.New,
+		logssvc.New,
 	),
 )

internal/services/news/get_all.go

@@ -5,15 +5,15 @@ import (
 	"strings"
 )
 
-func (i *impl) GetAll(categoriesCode, tagCodes string) ([]newsdomain.News, error) {
+func (i *impl) GetAll(filter newsdomain.Filter) ([]newsdomain.NewsResponse, error) {
 	var err error
 
 	categories := []string{}
 	tags := []string{}
-	news := []newsdomain.News{}
+	news := []newsdomain.NewsResponse{}
 
-	tagCodeArr := strings.Split(tagCodes, " ")
+	tagCodeArr := strings.Split(filter.Tags, " ")
-	categoryCodeArr := strings.Split(categoriesCode, " ")
+	categoryCodeArr := strings.Split(filter.Category, " ")
 
 	if len(tagCodeArr) > 0 && tagCodeArr[0] != "" {
 		tags, err = i.tagRepo.GetIDsByCodes(tagCodeArr)
@@ -37,9 +37,11 @@ func (i *impl) GetAll(categoriesCode, tagCodes string) ([]newsdomain.News, error
 		}
 	}
 
-	filter := newsdomain.NewsFilter{
+	filterSpec := newsdomain.NewsFilter{
 		Tags:     tags,
 		Category: categories,
+		Active:   filter.Active,
+		Search:   filter.Search,
 	}
-	return i.newsRepo.GetAll(filter)
+	return i.newsRepo.GetAll(filterSpec)
 }

internal/services/news/get_by_id.go

@@ -0,0 +1,7 @@
+package newssvc
+
+import newsdomain "legalgo-BE-go/internal/domain/news"
+
+func (i *impl) GetByID(id string) (*newsdomain.News, error) {
+	return i.newsRepo.GetByID(id)
+}

internal/services/news/impl.go

@@ -16,8 +16,9 @@ type impl struct {
 }
 
 type News interface {
-	GetAll(string, string) ([]newsdomain.News, error)
+	GetAll(filter newsdomain.Filter) ([]newsdomain.NewsResponse, error)
 	GetBySlug(string) (*newsdomain.News, error)
+	GetByID(string) (*newsdomain.News, error)
 	Create(newsdomain.NewsReq, string) error
 	Update(string, newsdomain.NewsUpdate) error
 	Delete(string) error

internal/services/staff/get_staffs.go

@@ -0,0 +1,7 @@
+package staffsvc
+
+import staffdomain "legalgo-BE-go/internal/domain/staff"
+
+func (i *impl) GetStaffs() ([]staffdomain.StaffProfile, error) {
+	return i.staffRepo.GetStaffs()
+}

internal/services/staff/impl.go

@@ -20,6 +20,7 @@ type Auth interface {
 	Login(staffdomain.StaffLogin) (string, error)
 	Register(staffdomain.StaffRegister) (string, error)
 	GetProfile(string) (*staffdomain.StaffProfile, error)
+	GetStaffs() ([]staffdomain.StaffProfile, error)
 	GetUsers() ([]userdomain.UserProfile, error)
 	Update(string, staffdomain.StaffUpdate) error
 }

internal/services/user/get_user.go

@@ -4,8 +4,8 @@ import (
 	userdomain "legalgo-BE-go/internal/domain/user"
 )
 
-func (i *impl) GetUserProfile(email string) (*userdomain.UserProfile, error) {
+func (i *impl) GetUserProfile(id string) (*userdomain.UserProfile, error) {
-	user, err := i.userRepo.GetUserProfile(email)
+	user, err := i.userRepo.GetUserProfile(id)
 	if err != nil {
 		return nil, err
 	}

internal/services/user/register.go

@@ -50,7 +50,7 @@ func (i *impl) RegisterUser(spec userdomain.UserRegister) (string, error) {
 
 	err = i.userRepo.CreateUser(user)
 	if err != nil {
-		return "", fmt.Errorf(err.Error())
+		return "", fmt.Errorf("create user failed: %v", err)
 	}
 
 	authToken := authdomain.AuthToken{
@@ -62,7 +62,7 @@ func (i *impl) RegisterUser(spec userdomain.UserRegister) (string, error) {
 
 	token, err := utils.GenerateToken(authToken)
 	if err != nil {
-		return "", fmt.Errorf(err.Error())
+		return "", fmt.Errorf("generate token failed: %v", err)
 	}
 	return token, nil
 }

internal/utilities/response/error_code.go

@@ -18,6 +18,7 @@ var (
 	ErrUnauthorized = &ErrorCode{Code: "UNAUTHORIZED", Message: "UNAUTHORIZED", HttpCode: http.StatusUnauthorized}
 	ErrDBRequest    = &ErrorCode{Code: "BAD_DB_REQUEST", Message: "DB_ERROR", HttpCode: http.StatusBadRequest}
 	ErrExpiryToken  = &ErrorCode{Code: "EXPIRED_TOKEN", Message: "EXPIRED_TOKEN", HttpCode: http.StatusUnauthorized}
+	ErrNotFound     = &ErrorCode{Code: "NOT_FOUND", Message: "NOT_FOUND", HttpCode: http.StatusNotFound}
 
 	// 5xx
 	ErrMarshal      = &ErrorCode{Code: "FAILED_MARSHAL", Message: "FAILED_MARSHAL_BODY", HttpCode: http.StatusInternalServerError}