fix is fire only

FogosPT · May 27, 2024 · cb48332 · cb48332
1 parent cc006b2
commit cb48332
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 23 deletions.
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -57,8 +57,6 @@ protected function schedule(Schedule $schedule)
             $schedule->job(new UpdateICNFData(4))->cron('0 3 * * 1,5'); // twice a week, monday and thursday
             $schedule->job(new UpdateICNFData(5))->cron('0 3 * * 1,5'); // twice a week, monday and thursday
             $schedule->job(new UpdateICNFData(6))->cron('0 3 * * 3'); // once a week, wednesday
-            $schedule->job(new UpdateICNFData(7))->monthly();
-            $schedule->job(new UpdateICNFData(8))->cron('0 0 1 */2 *'); // every two months
 
 
             $schedule->job(new UpdateWeatherStations())->daily()->at('03:21');

diff --git a/app/Jobs/UpdateICNFData.php b/app/Jobs/UpdateICNFData.php
@@ -54,31 +54,12 @@ public function handle()
             [
                 'before' => Carbon::now()->subDays(90),
                 'after' => Carbon::now()->subDays(180),
-            ],
-            [
-                'before' => Carbon::now()->subDays(180),
-                'after' => Carbon::now()->subDays(360),
-            ],
-            [
-                'before' => Carbon::now()->subDays(360),
-                'after' => Carbon::now()->subDays(540),
-            ],
-            [
-                'before' => Carbon::now()->subDays(540),
-                'after' => Carbon::now()->subDays(720),
-            ],
-            [
-                'before' => Carbon::now()->subDays(720),
-                'after' => Carbon::now()->subDays(900),
-            ],
-            [
-                'before' => Carbon::now()->subDays(900),
-                'after' => Carbon::now()->subDays(1080),
-            ],
+            ]
         ];
 
         $incidents = Incident::where('created', '>=', $intervals[$this->interval]['after'])
             ->where('created', '<=', $intervals[$this->interval]['before'])
+            ->whereq('isFire', true)
             ->get();
 
         foreach ($incidents as $incident) {