truncate player punishment and more UX fixes for queue

MineTrax · Oct 26, 2024 · 2f994d9 · 2f994d9
1 parent e89697b
commit 2f994d9
Show file tree

Hide file tree

Showing 12 changed files with 229 additions and 3 deletions.
diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php
@@ -12,6 +12,7 @@
 use DB;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
+use Cache;
 
 class DashboardController extends Controller
 {
@@ -65,6 +66,8 @@ public function index(Request $request)
                 'kpiPostCreatedForInterval' => $kpiPostCreatedForInterval,
                 'kpiTotalPostsPercent' => $kpiTotalPostsPercent,
                 'kpiTotalComments' => $kpiTotalComments,
+
+                'queueLastProcessed' => Cache::get('queue_last_processed'),
             ];
         }
 

diff --git a/app/Http/Controllers/Admin/Settings/DangerSettingController.php b/app/Http/Controllers/Admin/Settings/DangerSettingController.php
@@ -2,8 +2,10 @@
 
 namespace App\Http\Controllers\Admin\Settings;
 
+use Illuminate\Support\Facades\Cache;
 use App\Http\Controllers\Controller;
 use App\Jobs\TruncatePlayerIntelJob;
+use App\Jobs\TruncatePlayerPunishmentJob;
 use App\Jobs\TruncateServerChatlogsJob;
 use App\Jobs\TruncateServerConsolelogsJob;
 use App\Jobs\TruncateServerIntelJob;
@@ -23,14 +25,25 @@ public function __construct()
 
     public function show(): \Inertia\Response
     {
-        return Inertia::render('Admin/Setting/DangerSetting');
+        return Inertia::render('Admin/Setting/DangerSetting', [
+            'inProgressList' => [
+                'truncateShouts' => Cache::get('dangerzone::truncate_shouts'),
+                'truncateConsolelogs' => Cache::get('dangerzone::truncate_consolelogs'),
+                'truncateChatlogs' => Cache::get('dangerzone::truncate_chatlogs'),
+                'truncatePlayerIntelData' => Cache::get('dangerzone::truncate_player_intel_data'),
+                'truncateServerIntelData' => Cache::get('dangerzone::truncate_server_intel_data'),
+                'truncatePlayerPunishments' => Cache::get('dangerzone::truncate_player_punishments'),
+            ]
+        ]);
     }
 
     public function truncateShouts(Request $request): \Illuminate\Http\RedirectResponse
     {
         Log::alert('TRUNCATE_SHOUTS', [
             'causer' => $request->user()->username,
         ]);
+
+        Cache::put('dangerzone::truncate_shouts', now(), 3600 * 24);
         TruncateShoutsJob::dispatch();
 
         return redirect()->back()
@@ -42,6 +55,8 @@ public function truncateConsolelogs(Request $request): \Illuminate\Http\Redirect
         Log::alert('TRUNCATE_CONSOLELOGS', [
             'causer' => $request->user()->username,
         ]);
+
+        Cache::put('dangerzone::truncate_consolelogs', now(), 3600 * 24);
         TruncateServerConsolelogsJob::dispatch();
 
         return redirect()->back()
@@ -53,6 +68,8 @@ public function truncateChatlogs(Request $request): \Illuminate\Http\RedirectRes
         Log::alert('TRUNCATE_CHATLOGS', [
             'causer' => $request->user()->username,
         ]);
+
+        Cache::put('dangerzone::truncate_chatlogs', now(), 3600 * 24);
         TruncateServerChatlogsJob::dispatch();
 
         return redirect()->back()
@@ -64,6 +81,8 @@ public function truncatePlayerIntelData(Request $request): \Illuminate\Http\Redi
         Log::alert('TRUNCATE_PLAYER_INTEL', [
             'causer' => $request->user()->username,
         ]);
+
+        Cache::put('dangerzone::truncate_player_intel_data', now(), 3600 * 24);
         TruncatePlayerIntelJob::dispatch();
 
         return redirect()->back()
@@ -75,9 +94,24 @@ public function truncateServerIntelData(Request $request): \Illuminate\Http\Redi
         Log::alert('TRUNCATE_SERVER_INTEL', [
             'causer' => $request->user()->username,
         ]);
+
+        Cache::put('dangerzone::truncate_server_intel_data', now(), 3600 * 24);
         TruncateServerIntelJob::dispatch();
 
         return redirect()->back()
             ->with(['toast' => ['type' => 'success', 'milliseconds' => 10000, 'title' => __('Queued Successfully! Server Analytics data will be deleted shortly. It may take upto 1 minute to complete.')]]);
     }
+
+    public function truncatePlayerPunishments(Request $request): \Illuminate\Http\RedirectResponse
+    {
+        Log::alert('TRUNCATE_PLAYER_PUNISHMENTS', [
+            'causer' => $request->user()->username,
+        ]);
+
+        Cache::put('dangerzone::truncate_player_punishments', now(), 3600 * 24);
+        TruncatePlayerPunishmentJob::dispatch();
+
+        return redirect()->back()
+            ->with(['toast' => ['type' => 'success', 'milliseconds' => 10000, 'title' => __('Queued Successfully! Player Punishments data will be deleted shortly. It may take upto few minute to complete.')]]);
+    }
 }
diff --git a/app/Jobs/TruncatePlayerIntelJob.php b/app/Jobs/TruncatePlayerIntelJob.php
@@ -16,6 +16,7 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Cache;
 
 class TruncatePlayerIntelJob implements ShouldQueue
 {
@@ -34,6 +35,8 @@ public function __construct()
      */
     public function handle(): void
     {
+        Cache::put('dangerzone::truncate_player_intel_data', now(), 3600 * 24);
+
         DB::transaction(function () {
             // Delete player intel.
             MinecraftPlayerDeath::query()->delete();
@@ -45,5 +48,7 @@ public function handle(): void
             MinecraftPlayer::query()->delete();
             Player::query()->delete();
         }, 3);
+
+        Cache::forget('dangerzone::truncate_player_intel_data');
     }
 }
diff --git a/app/Jobs/TruncatePlayerPunishmentJob.php b/app/Jobs/TruncatePlayerPunishmentJob.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\PlayerPunishment;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Cache;
+
+class TruncatePlayerPunishmentJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        Cache::put('dangerzone::truncate_player_punishments', now(), 3600 * 24);
+
+        PlayerPunishment::query()->delete();
+
+        Cache::forget('dangerzone::truncate_player_punishments');
+    }
+}
diff --git a/app/Jobs/TruncateServerChatlogsJob.php b/app/Jobs/TruncateServerChatlogsJob.php
@@ -8,6 +8,7 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Cache;
 
 class TruncateServerChatlogsJob implements ShouldQueue
 {
@@ -26,6 +27,10 @@ public function __construct()
      */
     public function handle(): void
     {
+        Cache::put('dangerzone::truncate_chatlogs', now(), 3600 * 24);
+
         ServerChatlog::truncate();
+
+        Cache::forget('dangerzone::truncate_chatlogs');
     }
 }
diff --git a/app/Jobs/TruncateServerConsolelogsJob.php b/app/Jobs/TruncateServerConsolelogsJob.php
@@ -8,6 +8,7 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Cache;
 
 class TruncateServerConsolelogsJob implements ShouldQueue
 {
@@ -26,6 +27,10 @@ public function __construct()
      */
     public function handle(): void
     {
+        Cache::put('dangerzone::truncate_consolelogs', now(), 3600 * 24);
+
         ServerConsolelog::truncate();
+
+        Cache::forget('dangerzone::truncate_consolelogs');
     }
 }
diff --git a/app/Jobs/TruncateServerIntelJob.php b/app/Jobs/TruncateServerIntelJob.php
@@ -11,6 +11,7 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Cache;
 
 class TruncateServerIntelJob implements ShouldQueue
 {
@@ -29,11 +30,15 @@ public function __construct()
      */
     public function handle(): void
     {
+        Cache::put('dangerzone::truncate_server_intel_data', now(), 3600 * 24);
+
         DB::transaction(function () {
             // Delete server intel.
             MinecraftWorldLiveInfo::query()->delete();
             MinecraftServerWorld::query()->delete();
             MinecraftServerLiveInfo::query()->delete();
         }, 3);
+
+        Cache::forget('dangerzone::truncate_server_intel_data');
     }
 }
diff --git a/app/Jobs/TruncateShoutsJob.php b/app/Jobs/TruncateShoutsJob.php
@@ -8,6 +8,7 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Cache;
 
 class TruncateShoutsJob implements ShouldQueue
 {
@@ -26,6 +27,10 @@ public function __construct()
      */
     public function handle(): void
     {
+        Cache::put('dangerzone::truncate_shouts', now(), 3600 * 24);
+
         Shout::truncate();
+
+        Cache::forget('dangerzone::truncate_shouts');
     }
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -3,7 +3,10 @@
 namespace App\Providers;
 
 use App\Models\User;
+use Illuminate\Queue\Events\JobProcessed;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Queue;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\ServiceProvider;
 use Laravel\Pulse\Facades\Pulse;
 
@@ -28,7 +31,7 @@ public function boot()
     {
         //
         Pulse::users(function ($ids) {
-            return User::findMany($ids)->map(fn ($user) => [
+            return User::findMany($ids)->map(fn($user) => [
                 'id' => $user->id,
                 'name' => $user->name,
                 'extra' => $user->email,
@@ -46,5 +49,10 @@ public function boot()
                 return $value;
             });
         });
+
+        // Queue Status
+        Queue::after(function (JobProcessed $event) {
+            Cache::set('queue_last_processed', now());
+        });
     }
 }
diff --git a/resources/default/js/Pages/Admin/Dashboard.vue b/resources/default/js/Pages/Admin/Dashboard.vue
@@ -15,10 +15,12 @@ import PlayersPerServerMetricBox from '@/Shared/PlayersPerServerMetricBox.vue';
 import PlayersPerCountryMetricBox from '@/Shared/PlayersPerCountryMetricBox.vue';
 import NetworkTrendsMetricBox from '@/Shared/NetworkTrendsMetricBox.vue';
 import { useAuthorizable } from '@/Composables/useAuthorizable';
+import { useHelpers } from '@/Composables/useHelpers';
 import PlayersJoinAddressMetricBox from '@/Shared/PlayersJoinAddressMetricBox.vue';
 import PlayersMinecraftVersionMetricBox from '@/Shared/PlayersMinecraftVersionMetricBox.vue';
 
 const {can} = useAuthorizable();
+const {formatTimeAgoToNow} = useHelpers();
 
 defineProps({
     kpiTotalUsers: Number,
@@ -39,6 +41,8 @@ defineProps({
     kpiPostCreatedForInterval: Number,
     kpiTotalPostsPercent: Number,
     kpiTotalComments: Number,
+
+    queueLastProcessed: String,
 });
 </script>
 
@@ -122,7 +126,7 @@ defineProps({
           change-desc="in last 7 days"
           :icon="FireIcon"
           icon-class="text-red-500 bg-red-100 dark:bg-red-500 dark:text-white"
-          description="Jobs failed to run."
+          :description="`Last Run: ${queueLastProcessed ? formatTimeAgoToNow(queueLastProcessed) : __('not yet')}`"
         />
       </div>