From 7c0a62c48e00d806591eeb30f7ebd5fc99573fcc Mon Sep 17 00:00:00 2001 From: Alexis Gousseau Date: Fri, 18 Jul 2025 15:30:41 +0200 Subject: [PATCH] feat: :sparkles: add filters on model relations --- config/sitemap-generator.php | 12 ++++++----- .../Commands/GenerateSitemapCommand.php | 20 ++++++++++++++++--- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/config/sitemap-generator.php b/config/sitemap-generator.php index 77ea348..44eb7ae 100644 --- a/config/sitemap-generator.php +++ b/config/sitemap-generator.php @@ -16,17 +16,19 @@ return [ /** * Model namespaces with filters * - * Ex: + * Ex: (modelFilters & relationFilters are not necessaries) * 'cruds' => [ * [ - * 'model' => 'App\Models\Product', - * 'filters' => [ + * 'model' => 'App\Models\Product', + * 'modelFilters' => [ * ['published', '=', true] - * ] + * ], + * 'relationFilters' => [ + * 'range' => fn(Builder $q) => $q->where('status', true), + * ], * ], * [ * 'model' => 'App\Models\Article', - * 'filters' => [] * ] * ], */ diff --git a/src/Console/Commands/GenerateSitemapCommand.php b/src/Console/Commands/GenerateSitemapCommand.php index 3809e16..c7b5232 100644 --- a/src/Console/Commands/GenerateSitemapCommand.php +++ b/src/Console/Commands/GenerateSitemapCommand.php @@ -4,11 +4,12 @@ namespace Uwil\SitemapGenerator\Console\Commands; use Carbon\Carbon; use Illuminate\Console\Command; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Facades\File; use Illuminate\Support\Str; -use Uwil\SitemapGenerator\Exceptions\SitemapException; -use Symfony\Component\Console\Helper\Table; use Spatie\Sitemap\Sitemap; +use Symfony\Component\Console\Helper\Table; +use Uwil\SitemapGenerator\Exceptions\SitemapException; use Uwil\SitemapGenerator\Lib\SitemapHelper; class GenerateSitemapCommand extends Command @@ -42,7 +43,20 @@ class GenerateSitemapCommand extends Command $sitemap->add(SitemapHelper::generateUrl($page)); } foreach (config('sitemap-generator.cruds') as $crud) { - $sitemap->add($crud['model']::where($crud['filters'])->get()); + $modelFilters = $crud['filters'] ?? []; + $relationsFilters = $crud['relationFilters'] ?? []; + $sitemap->add( + $crud['model']::query() + ->when($modelFilters, function (Builder $q) use ($modelFilters) { + $q->where($modelFilters); + }) + ->when($relationsFilters, function (Builder $q) use ($relationsFilters) { + foreach ($relationsFilters as $key => $filter) { + $q->whereHas($key, $filter); + } + }) + ->get() + ); } try {