Merge branch 'main' of github.com:ardeman/project-legalgo-go

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

internal/accessor/news/get_all.go

@@ -12,9 +12,9 @@ const (
 	notActive is_active = "false"
 )
 
-func (a *accessor) GetAll(filter newsdomain.NewsFilter) ([]newsdomain.News, error) {
+func (a *accessor) GetAll(filter newsdomain.NewsFilter) ([]newsdomain.NewsResponse, error) {
-	var news []newsdomain.News
+	var news []newsdomain.NewsResponse
-	query := a.db.
+	query := a.db.Table("news").
 		Preload("Tags").
 		Preload("Categories").
 		Preload("Author").
@@ -34,8 +34,12 @@ func (a *accessor) GetAll(filter newsdomain.NewsFilter) ([]newsdomain.News, erro
 		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 clicked").
+		Select("news.*, COUNT(content_logs.content_id) as views").
 		Group("news.id").
 		Order("news.created_at DESC")
 

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/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()
@@ -24,11 +24,13 @@ func GetAll(
 		category := query.Get("categories")
 		tags := query.Get("tags")
 		activeOnly := query.Get("active")
+		search := query.Get("q")
 
 		news, err = newsSvc.GetAll(newsdomain.Filter{
 			Category: category,
 			Tags:     tags,
 			Active:   activeOnly,
+			Search:   search,
 		})
 
 		if err != nil {

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/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/staff/register.go

@@ -3,7 +3,6 @@ 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"
 	"legalgo-BE-go/internal/utilities/response"
@@ -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/domain/news/spec.go

@@ -27,19 +27,23 @@ 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"`
 	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"`
 }
 
+type NewsResponse struct {
+	News
+	Views int64 `json:"views"`
+}
+
 type NewsUpdate struct {
 	ID            string    `json:"id"`
 	Title         string    `json:"title"`
@@ -52,11 +56,12 @@ type NewsUpdate struct {
 }
 
 type Filter struct {
-	Category, Tags, Active string
+	Category, Tags, Active, Search string
 }
 
 type NewsFilter struct {
 	Tags     []string
 	Category []string
 	Active   string
+	Search   string
 }

internal/services/news/get_all.go

@@ -5,12 +5,12 @@ import (
 	"strings"
 )
 
-func (i *impl) GetAll(filter newsdomain.Filter) ([]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(filter.Tags, " ")
 	categoryCodeArr := strings.Split(filter.Category, " ")
@@ -41,6 +41,7 @@ func (i *impl) GetAll(filter newsdomain.Filter) ([]newsdomain.News, error) {
 		Tags:     tags,
 		Category: categories,
 		Active:   filter.Active,
+		Search:   filter.Search,
 	}
 	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(filter newsdomain.Filter) ([]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