Enhance FindSliderBySlugTask to filter slides based on current time, ensuring only active slides within the valid time range are retrieved; update SlidesRelationManager to set default and minimum dates for start and end times. Improve Slider component styling for better visibility during loading state.
This commit is contained in:
@@ -4,6 +4,7 @@ namespace App\Containers\Widget\Tasks;
|
||||
|
||||
use App\Containers\Widget\Models\Slider;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use Illuminate\Support\Carbon;
|
||||
|
||||
class FindSliderBySlugTask
|
||||
{
|
||||
@@ -12,15 +13,19 @@ class FindSliderBySlugTask
|
||||
$cacheKey = 'slider_' . $slug;
|
||||
|
||||
return Cache::remember($cacheKey, now()->addHour(), function () use ($slug) {
|
||||
$now = Carbon::now(); // Получаем текущее время один раз
|
||||
|
||||
$slider = Slider::query()
|
||||
->where('slug', $slug)
|
||||
->where('is_active', true)
|
||||
->with(['slides' => function($query) {
|
||||
$query->where('is_active', true);
|
||||
->with(['slides' => function($query) use ($now) {
|
||||
$query->where('is_active', true)
|
||||
->where('start_time', '<=', $now)
|
||||
->where('end_time', '>=', $now);
|
||||
}])
|
||||
->firstOrFail();
|
||||
|
||||
return $slider ?: null;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user