fix: technical debts left by the Sites, Authors and SEO slices, plus backend support for the new Sites and Authors pagination
This commit is contained in:
1 parent
9f4ce426a8
commit
daf3594316
86 files changed
+4223
-1485
No files matched your search
@@ -3,13 +3,15 @@ package database
|
||||
import (
|
||||
"RenewCMS/internal/domain/article"
|
||||
entity "RenewCMS/internal/infrastructure/persistence/models"
|
||||
"slices"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
const (
|
||||
articleSlugIndexName = "idx_articles_site_slug"
|
||||
articleSlugIndexStatement = "CREATE UNIQUE INDEX " + articleSlugIndexName + " ON articles (site_id, slug)"
|
||||
articleSlugIndexName = "idx_articles_site_slug"
|
||||
articleSlugBackfillBatchSize = 500
|
||||
articleSlugIndexStatement = "CREATE UNIQUE INDEX idx_articles_site_slug ON articles (site_id, slug)"
|
||||
)
|
||||
|
||||
type slugOwner struct {
|
||||
@@ -23,13 +25,22 @@ type slugAssignment struct {
|
||||
}
|
||||
|
||||
func BackfillArticleSlugs(db *gorm.DB) error {
|
||||
return db.Transaction(func(tx *gorm.DB) error {
|
||||
var rows []entity.Article
|
||||
if err := tx.Unscoped().Select("id", "site_id", "title", "slug", "deleted_at").Order("id ASC").Find(&rows).Error; err != nil {
|
||||
var rows []entity.Article
|
||||
if err := db.Unscoped().Select("id", "site_id", "title", "slug", "deleted_at").Order("id ASC").Find(&rows).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
assignments := planSlugAssignments(rows)
|
||||
for batch := range slices.Chunk(assignments, articleSlugBackfillBatchSize) {
|
||||
if err := writeSlugAssignments(db, batch); err != nil {
|
||||
return err
|
||||
}
|
||||
assignments := planSlugAssignments(rows)
|
||||
for _, assignment := range assignments {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func writeSlugAssignments(db *gorm.DB, batch []slugAssignment) error {
|
||||
return db.Transaction(func(tx *gorm.DB) error {
|
||||
for _, assignment := range batch {
|
||||
if err := tx.Unscoped().Model(&entity.Article{}).Where("id = ?", assignment.id).UpdateColumn("slug", assignment.slug).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
domain "RenewCMS/internal/domain/site"
|
||||
"RenewCMS/internal/infrastructure/persistence/mappers"
|
||||
entity "RenewCMS/internal/infrastructure/persistence/models"
|
||||
"strings"
|
||||
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/clause"
|
||||
@@ -59,6 +60,40 @@ func (s *SiteRepository) List() ([]domain.Site, error) {
|
||||
return sites, nil
|
||||
}
|
||||
|
||||
func (s *SiteRepository) Find(query domain.ListQuery) (domain.Page, error) {
|
||||
all, err := s.List()
|
||||
if err != nil {
|
||||
return domain.Page{}, err
|
||||
}
|
||||
matching := all
|
||||
if needle := foldForSearch(strings.TrimSpace(query.Q)); needle != "" {
|
||||
matching = make([]domain.Site, 0, len(all))
|
||||
for _, candidate := range all {
|
||||
if siteMatches(candidate, needle) {
|
||||
matching = append(matching, candidate)
|
||||
}
|
||||
}
|
||||
}
|
||||
page := domain.Page{Items: []domain.Site{}, Total: len(matching)}
|
||||
if query.Size <= 0 {
|
||||
page.Items = matching
|
||||
return page, nil
|
||||
}
|
||||
start := pageStart(max(query.Page, 1), query.Size, len(matching))
|
||||
end := min(start+query.Size, len(matching))
|
||||
page.Items = matching[start:end]
|
||||
return page, nil
|
||||
}
|
||||
|
||||
func siteMatches(candidate domain.Site, needle string) bool {
|
||||
for _, field := range []string{candidate.Name, candidate.Key, candidate.BaseURL} {
|
||||
if strings.Contains(foldForSearch(field), needle) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func (s *SiteRepository) load(db *gorm.DB, model entity.Site) (domain.Site, error) {
|
||||
total, err := s.articleCount(db, model.ID)
|
||||
if err != nil {
|
||||
|
||||
Reference in new issue
Block a user