Refactor scheduled tasks to use command calls with configurable notif… (#420)

* Refactor scheduled tasks to use command calls with configurable notification periods and add task names.

* fix: update project expiration notification logic to use settings for days before expiration and reminder

* Refactor: clean up unused imports and remove redundant whitespace in Console Kernel

* wip

---------

Co-authored-by: Andrei Ioniță <hi@andrei.io>

Author: gheorghelupu17

app/Console/Commands/EndProjectPeriod.php

@@ -5,8 +5,11 @@
 namespace App\Console\Commands;
 
 use App\Models\Project;
+use App\Models\Setting;
 use App\Notifications\Ngo\ProjectEndingNotification;
 use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Notification;
 
 class EndProjectPeriod extends Command
 {
@@ -15,7 +18,7 @@ class EndProjectPeriod extends Command
      *
      * @var string
      */
-    protected $signature = 'app:notification-end-project-period {--days=7}';
+    protected $signature = 'app:notification-end-project-period';
 
     /**
      * The console command description.
@@ -29,20 +32,28 @@ class EndProjectPeriod extends Command
      */
     public function handle(): void
     {
-        $this->info('Ending project period...');
-        $daysBeforeEnding = (int) $this->option('days') ?? 7;
-        $this->info("Ending period {$daysBeforeEnding}...");
-        $projects = Project::withoutEagerLoads()->with(['organization'])
+        $this->projectsEndingNotification('project_expiration_notification_days_before', 7);
+        $this->projectsEndingNotification('project_expiration_notification_days_before_reminder', 2);
+    }
+
+    private function projectsEndingNotification(string $setting, int $fallbackDays)
+    {
+        $days = (int) (Setting::value($setting) ?? $fallbackDays);
+
+        $this->info('Notifying projects ending in ' . $days . ' days');
+
+        $projects = Project::withoutEagerLoads()
+            ->with([
+                'organization.users' => function (Builder $query) {
+                    $query->whereNotNull('email_verified_at');
+                },
+            ])
             ->whereIsApproved()
-            ->whereDate('end', now()->addDays($daysBeforeEnding))
+            ->whereDate('end', now()->addDays($days))
             ->get();
-        $projects->each(function (Project $project) use ($daysBeforeEnding) {
-
-           $users =  $project->organization->load('users')->users->filter(function ($user) {
-                return $user->hasVerifiedEmail();
-            });
-           \Notification::send($users, new ProjectEndingNotification($project, $daysBeforeEnding));
 
+        $projects->each(function (Project $project) use ($days) {
+            Notification::send($project->organization->users, new ProjectEndingNotification($project, $days));
         });
     }
 }

app/Console/Kernel.php

@@ -5,10 +5,8 @@
 namespace App\Console;
 
 use App\Jobs\ProcessAuthorizedTransactionsJob;
-use App\Models\Setting;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
-use Illuminate\Support\Facades\Artisan;
 
 class Kernel extends ConsoleKernel
 {
@@ -19,29 +17,21 @@ protected function schedule(Schedule $schedule): void
     {
         $schedule->command('model:prune')
             ->daily()
+            ->name('model-prune')
             ->onOneServer()
             ->sentryMonitor('model-prune');
 
         $schedule->job(ProcessAuthorizedTransactionsJob::class)
             ->everyFourHours()
+            ->name('transactions-process-authorized')
             ->onOneServer()
             ->sentryMonitor('process-authorized-transactions-job');
 
-        $schedule->call(function () {
-            $days = (int) (Setting::value('project_expiration_notification_days_before') ?? 10);
-            Artisan::call('app:notification-end-project-period', ['--days' => $days]);
-        })
+        $schedule->command('app:notification-end-project-period', ['--days' => $daysBeforeProjectExpiration])
             ->dailyAt('09:00')
+            ->name('notification-end-project-period')
             ->onOneServer()
             ->sentryMonitor('notification-end-project-period');
-
-        $schedule->call(function () {
-            $days = (int) (Setting::value('project_expiration_notification_days_before_reminder') ?? 2);
-            Artisan::call('app:notification-end-project-period', ['--days' => $days]);
-        })
-            ->dailyAt('10:00')
-            ->onOneServer()
-            ->sentryMonitor('notification-end-project-period-reminder');
     }
 
     /**