database/log_ads_model.go

@@ -2,13 +2,12 @@ package database
 
 import "time"
 
-type ContentLog struct {
+type LogAds 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/log_news_model.go

@@ -0,0 +1,11 @@
+package database
+
+import "time"
+
+type LogNews struct {
+	ID        string    `gorm:"primaryKey;not null" json:"id"`
+	NewsID    string    `gorm:"not null" json:"news_id"`
+	UserID    string    `gorm:"not null" json:"user_id"`
+	CreatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"created_at"`
+	UpdatedAt time.Time `gorm:"default:CURRENT_TIMESTAMP" json:"updated_at"`
+}

database/new_db.go

@@ -55,6 +55,7 @@ func (db *DB) Migrate() error {
 		&Tag{},
 		&Category{},
 		&Ads{},
-		&ContentLog{},
+		&LogAds{},
+		&LogNews{},
 	)
 }

internal/accessor/ads/get-all.go

@@ -9,8 +9,8 @@ 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").
+		Select("ads.*, COUNT(log_ads.content_id) as clicked").
-		Joins("LEFT JOIN content_logs ON content_logs.content_id = ads.id").
+		Joins("LEFT JOIN log_ads ON log_ads.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/log/create_log_ads.go

@@ -7,11 +7,10 @@ import (
 	"github.com/google/uuid"
 )
 
-func (a *accessor) CreateLog(spec logsdomain.LogsSpec) error {
+func (a *accessor) CreateLogAds(spec logsdomain.LogsSpec) error {
-	newSpec := database.ContentLog{
+	newSpec := database.LogAds{
 		ID:        uuid.NewString(),
 		ContentID: spec.ContentID,
-		Category:  spec.Category,
 	}
 
 	if spec.UserID != nil {

internal/accessor/log/impl.go

@@ -11,7 +11,7 @@ type accessor struct {
 }
 
 type Log interface {
-	CreateLog(logsdomain.LogsSpec) error
+	CreateLogAds(logsdomain.LogsSpec) error
 	GetAllLogAds(string) ([]adsdomain.Ads, error)
 }
 

internal/accessor/news/get_all.go

@@ -1,24 +1,13 @@
 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
-
-const (
-	active    is_active = "true"
-	notActive is_active = "false"
-)
 
 func (a *accessor) GetAll(filter newsdomain.NewsFilter) ([]newsdomain.News, error) {
 	var news []newsdomain.News
 	query := a.db.
 		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").
@@ -30,15 +19,6 @@ 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())
-	}
-
-	query.
-		Select("news.*, COUNT(content_logs.content_id) as clicked").
-		Group("news.id").
-		Order("news.created_at DESC")
-
 	if err := query.
 		Find(&news).Error; err != nil {
 		return nil, err

internal/api/http/logs/create_log_ads.go

@@ -7,6 +7,7 @@ import (
 	"legalgo-BE-go/internal/utilities/response"
 	"legalgo-BE-go/internal/utilities/utils"
 	"net/http"
+	"strings"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/go-playground/validator/v10"
@@ -57,11 +58,17 @@ func CreateLogAds(
 			specReq.UserID = &userDetail.ID
 		}
 
-		if ip := r.Header.Get("X-Ip-Address"); ip != "" {
+		ip := r.RemoteAddr
+
+		if forwarded := r.Header.Get("X-Forwarded-For"); forwarded != "" {
+			ip = strings.Split(forwarded, ",")[0]
+		}
+
+		if ip != "" {
 			specReq.IP = &ip
 		}
 
-		if userAgent := r.Header.Get("X-User-Agent"); userAgent != "" {
+		if userAgent := r.UserAgent(); userAgent != "" {
 			specReq.UserAgent = &userAgent
 		}
 

internal/api/http/news/get_all.go

@@ -23,13 +23,8 @@ func GetAll(
 
 		category := query.Get("categories")
 		tags := query.Get("tags")
-		activeOnly := query.Get("active")
 
-		news, err = newsSvc.GetAll(newsdomain.Filter{
+		news, err = newsSvc.GetAll(category, tags)
-			Category: category,
-			Tags:     tags,
-			Active:   activeOnly,
-		})
 
 		if err != nil {
 			response.ResponseWithErrorCode(

internal/api/http/news/get_by_slug.go

@@ -1,11 +1,8 @@
 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"
@@ -14,7 +11,6 @@ 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()
@@ -33,38 +29,6 @@ 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/domain/logs/spec.go

@@ -10,10 +10,9 @@ type LogsRequest struct {
 
 type LogsSpec struct {
 	ContentID string  `json:"content_id" validate:"required"`
-	IP        *string
+	IP        *string `json:"ip"`
-	UserID    *string
+	UserID    *string `json:"user_id"`
-	UserAgent *string
+	UserAgent *string `json:"user_agent"`
-	Category  string
 }
 
 type LogResponse struct {

internal/domain/news/spec.go

@@ -35,7 +35,6 @@ type News struct {
 	LiveAt        time.Time                 `json:"live_at"`
 	CreatedAt     time.Time                 `json:"created_at"`
 	UpdatedAt     time.Time                 `json:"updated_at"`
-	Clicked       int64                     `json:"clicked"`
 
 	Author Staff `json:"author"`
 }
@@ -51,12 +50,7 @@ type NewsUpdate struct {
 	LiveAt        time.Time `json:"live_at"`
 }
 
-type Filter struct {
-	Category, Tags, Active string
-}
-
 type NewsFilter struct {
 	Tags     []string
 	Category []string
-	Active   string
 }

internal/services/logs/create_logs_ads.go

@@ -6,8 +6,7 @@ import (
 )
 
 func (i *impl) CreateLogAds(spec logsdomain.LogsSpec) error {
-	spec.Category = "ads"
+	if err := i.logsRepo.CreateLogAds(spec); err != nil {
-	if err := i.logsRepo.CreateLog(spec); err != nil {
 		return fmt.Errorf("failed to create ads log: %v", err)
 	}
 

internal/services/logs/create_logs_news.go

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

@@ -12,7 +12,6 @@ type impl struct {
 
 type Log interface {
 	CreateLogAds(logsdomain.LogsSpec) error
-	CreateLogNews(logsdomain.LogsSpec) error
 	GetAllLogAds(string) ([]adsdomain.Ads, error)
 }
 

internal/services/news/get_all.go

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

internal/services/news/impl.go

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