Merge pull request #347 from matematikk-mooc/aj/DIT-35

DIT-35: Remove daily user deletion job
matematikk-mooc · Jul 19, 2024 · 0b309aa · 0b309aa
2 parents c00e81d + 1e64211
commit 0b309aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/app/Console/Commands/UserDeletion.php b/app/Console/Commands/UserDeletion.php
@@ -73,7 +73,8 @@ public function handle()
                             "ID" => $tokenId,
                             "CanvasID" => $canvasUserData->id,
                             "Email" => $canvasUserData->email,
-                            "ConfirmedAt" => $confirmedDeleteTokensItem->confirmed_at
+                            "CanceledAt" => $confirmedDeleteTokensItem->canceled_at,
+                            "ConfirmedAt" => $confirmedDeleteTokensItem->confirmed_at,
                         ]
                     );
                 }
@@ -82,7 +83,7 @@ public function handle()
             }
         }
 
-        $headers = ["ID", "CanvasID", "Email", "ConfirmedAt"];
+        $headers = ["ID", "CanvasID", "Email", "CanceledAt", "ConfirmedAt"];
         $this->table($headers, $usersToDelete);
 
         $paramPrompts = $this->option("prompts") == "true";

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -14,8 +14,7 @@ class Kernel extends ConsoleKernel
      */
     protected $commands = [
         Commands\StorageLinkCommand::class,
-        Commands\FetchNsrData::class,
-        Commands\UserDeletion::class,
+        Commands\FetchNsrData::class
     ];
 
     /**
@@ -32,8 +31,6 @@ protected function schedule(Schedule $schedule)
         // be triggered more often than once every hour, or you
         // want it to be triggered at another minute than :00,
         // you'll need to update the file /docker-prod/laravel-cron
-        $schedule->command('kpas:user_deletion --prompts=false')
-            ->dailyAt('01:00')->runInBackground();
         $schedule->command('fetch_from:nsr')
             ->dailyAt('02:00')->runInBackground();
         $schedule->command('fetch_from:canvas')