legalgonews/legalgo-BE-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: legalgonews:3311b809430e85b94df4b5c7a424107aeb5580cf
Branches Tags
legalgonews:main
legalgonews:dev
legalgonews:feature-test
..
compare: legalgonews:24f0fe6efa6fe127841fdc1ce12180444429fdc8
Branches Tags
legalgonews:dev
legalgonews:main
legalgonews:feature-test

No commits in common. "3311b809430e85b94df4b5c7a424107aeb5580cf" and "24f0fe6efa6fe127841fdc1ce12180444429fdc8" have entirely different histories.
3311b80943 ... 24f0fe6efa

11 changed files with 31 additions and 135 deletions
Show Stats Expand all files Collapse all files

12
internal/accessor/news/get_all.go
View File

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

17
internal/accessor/news/get_by_id.go
View File

@ -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
}

3
internal/accessor/news/impl.go
View File

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

4
internal/api/http/news/get_all.go
View File

@ -15,7 +15,7 @@ func GetAll(
) {
router.Get("/news", func(w http.ResponseWriter, r *http.Request) {
var (
news []newsdomain.NewsResponse
news []newsdomain.News
err error
)
ctx := r.Context()
@ -24,13 +24,11 @@ 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 {

77
internal/api/http/news/get_by_id.go
View File

@ -1,77 +0,0 @@
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)
})
}

1
internal/api/http/news/module.go
View File

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

24
internal/api/http/staff/register.go
View File

@ -3,6 +3,7 @@ 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"
@ -48,7 +49,7 @@ func Register(
return
}
_, err := authSvc.Register(spec)
token, err := authSvc.Register(spec)
if err != nil {
response.ResponseWithErrorCode(
ctx,
@ -61,10 +62,21 @@ func Register(
return
}
response.RespondJsonSuccess(ctx, w, struct {
Message string
}{
Message: "staff created successfully.",
})
if err := utils.StoreTokenRedis(ctx, rdb, token, spec.Email); err != nil {
response.ResponseWithErrorCode(
ctx,
w,
err,
response.ErrBadRequest.Code,
response.ErrBadRequest.HttpCode,
err.Error(),
)
return
}
responsePayload := &responsedomain.Auth{
Token: token,
}
response.RespondJsonSuccess(ctx, w, responsePayload)
})
}

13
internal/domain/news/spec.go
View File

@ -27,23 +27,19 @@ type News struct {
Title string `json:"title"`
Content string `json:"content"`
FeaturedImage string `json:"featured_image"`
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;foreignKey:ID;joinForeignKey:news_id;References:ID;joinReferences:category_id" json:"categories"`
Tags []tagdomain.Tag `gorm:"many2many:news_tags" json:"tags"`
Categories []categorydomain.Category `gorm:"many2many:news_categories" 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"`
@ -56,12 +52,11 @@ type NewsUpdate struct {
}
type Filter struct {
Category, Tags, Active, Search string
Category, Tags, Active string
}
type NewsFilter struct {
Tags []string
Category []string
Active string
Search string
}

5
internal/services/news/get_all.go
View File

@ -5,12 +5,12 @@ import (
"strings"
)
func (i *impl) GetAll(filter newsdomain.Filter) ([]newsdomain.NewsResponse, error) {
func (i *impl) GetAll(filter newsdomain.Filter) ([]newsdomain.News, error) {
var err error
categories := []string{}
tags := []string{}
news := []newsdomain.NewsResponse{}
news := []newsdomain.News{}
tagCodeArr := strings.Split(filter.Tags, " ")
categoryCodeArr := strings.Split(filter.Category, " ")
@ -41,7 +41,6 @@ func (i *impl) GetAll(filter newsdomain.Filter) ([]newsdomain.NewsResponse, erro
Tags: tags,
Category: categories,
Active: filter.Active,
Search: filter.Search,
}
return i.newsRepo.GetAll(filterSpec)
}

7
internal/services/news/get_by_id.go
View File

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

3
internal/services/news/impl.go
View File

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