From edf030bb18ffb1c9a463f76a7e934796724bfd65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= <jeremy.munsch@ldc.fr>
Date: Fri, 15 Dec 2023 16:59:41 +0100
Subject: [PATCH] Jobs refactor

---
 app/Jobs/GamesStatusUpdate.php | 17 +++++++++--------
 app/Jobs/NewsStatusUpdate.php  |  8 ++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/Jobs/GamesStatusUpdate.php b/app/Jobs/GamesStatusUpdate.php
index c724c34..63f6d08 100644
--- a/app/Jobs/GamesStatusUpdate.php
+++ b/app/Jobs/GamesStatusUpdate.php
@@ -19,9 +19,9 @@ class GamesStatusUpdate
      */
     public function handle()
     {
-        /** @var \Illuminate\Database\Eloquent\Collection<array-key, \App\Models\News> */
+        /** @var \Illuminate\Database\Eloquent\Collection<array-key,\App\Models\News> */
         $gamesListToUnPublish = Game::query()
-            ->where('unpublish_at', '<=', Carbon::now()->toDateTime())
+            ->where('unpublish_at', '<=', Carbon::now())
             ->whereNotNull('unpublish_at')
             ->where('published', true)->get();
         Log::debug(__CLASS__ . " games to unpublish " . $gamesListToUnPublish->count());
@@ -31,18 +31,19 @@ class GamesStatusUpdate
             $game->published    = false;
             $game->saveOrFail();
         }
-        /** @var \Illuminate\Database\Eloquent\Collection<array-key, \App\Models\> */
+        /** @var \Illuminate\Database\Eloquent\Collection<array-key,\App\Models\Game> */
         $gamesListToPublish = Game::query()
-            ->where('publish_at', '<=', Carbon::now()->toDateTime())
+            ->where('publish_at', '<=', Carbon::now())
             ->whereNotNull('publish_at')
             ->where('published', false)->get();
         Log::debug(__CLASS__ . " games to publish " . $gamesListToPublish->count());
         // Unpublish all game with no date because only 1 game can be published.
         if ($gamesListToPublish->count()) {
-            Game::query()->where('published', true)->each(function (Game $game) {
-                $game->published = false;
-                $game->saveOrFail();
-            });
+            Game::query()->where('published', true)
+                ->each(function (Game $game) {
+                    $game->published = false;
+                    $game->saveOrFail();
+                });
         }
         foreach ($gamesListToPublish as $game) {
             $game->publish_at = null;
diff --git a/app/Jobs/NewsStatusUpdate.php b/app/Jobs/NewsStatusUpdate.php
index 5e13fe4..aa2d221 100644
--- a/app/Jobs/NewsStatusUpdate.php
+++ b/app/Jobs/NewsStatusUpdate.php
@@ -19,9 +19,9 @@ class NewsStatusUpdate
      */
     public function handle()
     {
-        /** @var \Illuminate\Database\Eloquent\Collection<array-key, \App\Models\News> */
+        /** @var \Illuminate\Database\Eloquent\Collection<array-key,\App\Models\News> */
         $newsListToPublish = News::query()
-            ->where('publish_at', '<=', Carbon::now()->toDateTime())
+            ->where('publish_at', '<=', Carbon::now())
             ->whereNotNull('publish_at')
             ->where('published', false)->get();
         Log::debug(__CLASS__ . " news to publish " . $newsListToPublish->count());
@@ -30,9 +30,9 @@ class NewsStatusUpdate
             $news->published  = true;
             $news->saveOrFail();
         }
-        /** @var \Illuminate\Database\Eloquent\Collection<array-key, \App\Models\News> */
+        /** @var \Illuminate\Database\Eloquent\Collection<array-key,\App\Models\News> */
         $newsListToUnPublish = News::query()
-            ->where('unpublish_at', '<=', Carbon::now()->toDateTime())
+            ->where('unpublish_at', '<=', Carbon::now())
             ->whereNotNull('unpublish_at')
             ->where('published', true)->get();
         Log::debug(__CLASS__ . " news to unpublish " . $newsListToPublish->count());