Compare commits

..

No commits in common. "c48a4b944bb3138468fd315a415fd4436c12b7ed" and "51b50a31328f1393beb2ad43802ae80d7389e947" have entirely different histories.

7 changed files with 34 additions and 36 deletions

View File

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

View File

@ -12,7 +12,7 @@ type accessor struct {
type Category interface {
GetAllModel() ([]categorydomain.Category, error)
GetByIDs([]string) ([]categorydomain.Category, error)
GetIDByCode([]string) ([]string, error)
GetIDByCode(string) (string, error)
CreateModel(categorydomain.CategoryReq) error
Update(categorydomain.Category) error
Delete(string) error

View File

@ -9,9 +9,9 @@ func (a *accessor) GetAll(filter newsdomain.NewsFilter) ([]newsdomain.News, erro
Preload("Categories").
Preload("Author")
if len(filter.Category) > 0 {
if filter.Category != "" {
query = query.Joins("JOIN news_categories nc ON nc.news_id = news.id").
Where("nc.category_id IN (?)", filter.Category)
Where("nc.category_id = ?", filter.Category)
}
if len(filter.Tags) > 0 {

View File

@ -2,9 +2,7 @@ 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"
)
@ -36,27 +34,26 @@ func (a *accessor) Update(spec newsdomain.News) error {
tx.Rollback()
return fmt.Errorf("failed to update news: %v", err)
}
tagsDeleted := make([]tagdomain.Tag, len(spec.Tags))
copy(tagsDeleted, spec.Tags)
if len(spec.Tags) < 1 {
if err := tx.Model(&spec).Association("Tags").Clear(); err != nil {
tx.Rollback()
return fmt.Errorf("failed to remove previous tags: %v", err)
return fmt.Errorf("failed to clear tags: %v", err)
}
}
if err := tx.Model(&spec).Association("Tags").Append(tagsDeleted); err != nil {
if len(spec.Categories) < 1 {
if err := tx.Model(&spec).Association("Categories").Clear(); err != nil {
tx.Rollback()
return fmt.Errorf("failed to clear categories: %v", err)
}
}
if err := tx.Model(&spec).Association("Tags").Append(spec.Tags); 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 {
if err := tx.Model(&spec).Association("Categories").Append(spec.Categories); err != nil {
tx.Rollback()
return fmt.Errorf("failed to add categories: %v", err)
}

View File

@ -21,7 +21,7 @@ func GetAll(
ctx := r.Context()
query := r.URL.Query()
category := query.Get("categories")
category := query.Get("category")
tags := query.Get("tags")
news, err = newsSvc.GetAll(category, tags)

View File

@ -52,5 +52,5 @@ type NewsUpdate struct {
type NewsFilter struct {
Tags []string
Category []string
Category string
}

View File

@ -5,15 +5,16 @@ import (
"strings"
)
func (i *impl) GetAll(categoriesCode, tagCodes string) ([]newsdomain.News, error) {
var err error
func (i *impl) GetAll(categoryCode, tagCodes string) ([]newsdomain.News, error) {
var (
category string
err error
)
categories := []string{}
tags := []string{}
news := []newsdomain.News{}
tagCodeArr := strings.Split(tagCodes, " ")
categoryCodeArr := strings.Split(categoriesCode, " ")
if len(tagCodeArr) > 0 && tagCodeArr[0] != "" {
tags, err = i.tagRepo.GetIDsByCodes(tagCodeArr)
@ -26,20 +27,20 @@ func (i *impl) GetAll(categoriesCode, tagCodes string) ([]newsdomain.News, error
}
}
if len(categoryCodeArr) > 0 && categoryCodeArr[0] != "" {
categories, err = i.categoryRepo.GetIDByCode(categoryCodeArr)
if categoryCode != "" {
category, err = i.categoryRepo.GetIDByCode(categoryCode)
if err != nil {
return news, err
}
if len(categories) < 1 {
if category == "" {
return news, nil
}
}
filter := newsdomain.NewsFilter{
Tags: tags,
Category: categories,
Category: category,
}
return i.newsRepo.GetAll(filter)
}