Merge pull request #35 from MariaInsyt/arthur

Expiring passwords command, order of billboards

app/Console/Commands/CheckForExpiredOneTimePasswords.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\OneTimePassword;
+use Illuminate\Console\Command;
+
+class CheckForExpiredOneTimePasswords extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:check-for-expired-one-time-passwords';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Check for expired one-time passwords and change status to expired.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        //
+        $this->info('Checking for expired one-time passwords...');
+        $expiredOneTimePasswords = OneTimePassword::where('expires_at', '<', now())
+            ->where('status', 'pending')
+            ->get();
+        $expiredOneTimePasswords->each(function ($otp) {
+            $otp->update(['status' => 'expired']);
+        });
+        $this->info('Expired one-time passwords checked and updated.');
+    }
+}

app/Console/Kernel.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use Illuminate\Support\Facades\Log;
 
 class Kernel extends ConsoleKernel
 {
@@ -12,9 +13,14 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule): void
     {
-        // $schedule->command('inspire')->hourly();
         $schedule->command('sanctum:prune-expired --hours=24')->daily();
-        //delete expired otps
+        $schedule->command('app:check-for-expired-one-time-passwords')->everyMinute()
+            ->onSuccess(function () {
+                Log::info('Expired one-time passwords checked and updated.');
+            })
+            ->onFailure(function () {
+                Log::error('Expired one-time passwords check failed.');
+            });
     }
 
     /**

app/Http/Controllers/BillboardController.php

@@ -32,6 +32,7 @@ public function agentBillboards(Request $request)
             return response()->json([
                 'billboards' => $agent->billboards()
                     ->active()
+                    ->orderBy('updated_at', 'desc')
                     ->with('district:id,name')
                     ->get()
 

app/Models/Billboard.php

@@ -38,14 +38,24 @@ public static function boot()
     protected $hidden = [
         'created_at',
         'deleted_at',
+        'created_by',
+        'updated_at',
+        'district_id',
     ];
 
     protected $casts = [
         'is_active' => 'boolean',
     ];
 
+    protected $appends = [
+        'updated_at_human',
+    ];
+
+    public function getUpdatedAtHumanAttribute()
+    {
+        return $this->updated_at->diffForHumans();
+    }
 
-    //Scope Active
     public function scopeActive($query)
     {
         return $query->where('is_active', true);