jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix calculation on indirect articles by tags

Browse Source
This commit is contained in:
ludo
2025-01-03 14:45:23 +01:00
parent df78126b12
commit 2e71f17856
2 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/Models/Shop/Tag.php
View File

@@ -70,19 +70,16 @@ class Tag extends parentTag
return $query->where($this->table.'.tag_group_id', $id); return $query->where($this->table.'.tag_group_id', $id);
} }
public function scopeWithCountArticlesByCategory($query, $categoryId) public function scopeWithCountDirectArticlesByCategory($query, $categoryId)
{ {
return $query->withCount([ return $query->withCount([
'articles as direct_article_count' => function ($query) use ($categoryId) { 'articles as direct_article_count' => function ($query) use ($categoryId) {
$query->byCategoryParent($categoryId)->withAvailableOffers(); $query->byCategoryParent($categoryId)->withAvailableOffers();
}, },
'articles as indirect_article_count' => function ($query) use ($categoryId) { ])->having('direct_article_count', '>', 0);
$query->byCategoryParent($categoryId)->withAvailableOffers()->whereHasMorph('product', [Variety::class], function () {});
},
])->havingRaw('(COALESCE(direct_article_count, 0) + COALESCE(indirect_article_count, 0)) > 0');
} }
public function scopeWithCountArticlesByProductByCategory($query, $categoryId) public function scopeWithCountIndirectArticlesByCategory($query, $categoryId)
{ {
return $query->select(['tags.*']) return $query->select(['tags.*'])
->selectRaw('(SELECT COUNT(*) ->selectRaw('(SELECT COUNT(*)
@@ -124,20 +121,6 @@ class Tag extends parentTag
->having('indirect_article_count', '>', 0); ->having('indirect_article_count', '>', 0);
} }
public function scopeWithIndirectArticleCount($query, $categoryId = null)
{
return $query->withCount([
'articles as indirect_article_count' => function ($articleQuery) use ($categoryId) {
$articleQuery->whereHasMorph('product', [Variety::class], function ($varietyQuery) {
$varietyQuery->whereHas('tags', function ($tagQuery) {
$tagQuery->whereColumn('tags.id', 'taggables.tag_id');
});
})->byCategoryParent($categoryId);
},
])
->having('indirect_article_count', '>', 0); // Garde uniquement les tags ayant au moins un article indirect
}
public function scopeById($query, $id) public function scopeById($query, $id)
{ {
return $query->where($this->table.'.id', $id); return $query->where($this->table.'.id', $id);

21
app/Repositories/Shop/TagGroups.php
View File

@@ -15,14 +15,23 @@ class TagGroups
public static function getWithTagsAndCountOffers($category_id = false) public static function getWithTagsAndCountOffers($category_id = false)
{ {
$data = []; $data = [];
$tags = Tag::withCountArticlesByCategory($category_id)->get()->toArray(); $tagsDirect = Tag::withCountDirectArticlesByCategory($category_id)->get()->toArray();
$tagGroups = TagGroup::pluck('name', 'id')->toArray(); $tagsIndirect = Tag::withCountIndirectArticlesByCategory($category_id)->get()->toArray();
foreach ($tags as $tag) { foreach ($tagsDirect as $tag) {
$data[$tag['tag_group_id']]['name'] = $tagGroups[$tag['tag_group_id']]; $data[$tag['tag_group_id']]['name'] = $tag['group'];
$data[$tag['tag_group_id']]['tags'][] = [ $data[$tag['tag_group_id']]['tags'][$tag['id']] = [
'id' => $tag['id'], 'id' => $tag['id'],
'name' => $tag['name'], 'name' => $tag['name'],
'count' => $tag['direct_article_count'] + $tag['indirect_article_count'], 'count' => $tag['direct_article_count'],
];
}
foreach ($tagsIndirect as $tag) {
$data[$tag['tag_group_id']]['name'] = $tag['group'];
$data[$tag['tag_group_id']]['tags'][$tag['id']] = [
'id' => $tag['id'],
'name' => $tag['name'],
'count' => ($data[$tag['tag_group_id']]['tags'][$tag['id']]['count'] ?? 0) + $tag['indirect_article_count'],
]; ];
} }