From 2b51363b8c000d27781daaa18550648301b9ce1d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Thu, 16 Oct 2025 17:23:22 +0200
Subject: [PATCH] Changes auto-committed by Conductor

---
 ...loudDeleteUser.php => AdminDeleteUser.php} |  8 +--
 app/Console/Commands/AdminRemoveUser.php      | 56 -------------------
 2 files changed, 4 insertions(+), 60 deletions(-)
 rename app/Console/Commands/{Cloud/CloudDeleteUser.php => AdminDeleteUser.php} (99%)
 delete mode 100644 app/Console/Commands/AdminRemoveUser.php

diff --git a/app/Console/Commands/Cloud/CloudDeleteUser.php b/app/Console/Commands/AdminDeleteUser.php
similarity index 99%
rename from app/Console/Commands/Cloud/CloudDeleteUser.php
rename to app/Console/Commands/AdminDeleteUser.php
index eb1a27fa8..9b803b1f7 100644
--- a/app/Console/Commands/Cloud/CloudDeleteUser.php
+++ b/app/Console/Commands/AdminDeleteUser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands\Cloud;
+namespace App\Console\Commands;
 
 use App\Actions\Stripe\CancelSubscription;
 use App\Actions\User\DeleteUserResources;
@@ -12,16 +12,16 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 
-class CloudDeleteUser extends Command
+class AdminDeleteUser extends Command
 {
-    protected $signature = 'cloud:delete-user {email}
+    protected $signature = 'admin:delete-user {email}
                             {--dry-run : Preview what will be deleted without actually deleting}
                             {--skip-stripe : Skip Stripe subscription cancellation}
                             {--skip-resources : Skip resource deletion}
                             {--auto-confirm : Skip all confirmation prompts between phases}
                             {--force : Bypass the lock check and force deletion (use with caution)}';
 
-    protected $description = 'Delete a user with phase-by-phase confirmation (works on cloud and self-hosted)';
+    protected $description = 'Delete a user with comprehensive resource cleanup and phase-by-phase confirmation (works on cloud and self-hosted)';
 
     private bool $isDryRun = false;
 
diff --git a/app/Console/Commands/AdminRemoveUser.php b/app/Console/Commands/AdminRemoveUser.php
deleted file mode 100644
index d4534399c..000000000
--- a/app/Console/Commands/AdminRemoveUser.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\User;
-use Illuminate\Console\Command;
-
-class AdminRemoveUser extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'admin:remove-user {email}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Remove User from database';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        try {
-            $email = $this->argument('email');
-            $confirm = $this->confirm('Are you sure you want to remove user with email: '.$email.'?');
-            if (! $confirm) {
-                $this->info('User removal cancelled.');
-
-                return;
-            }
-            $this->info("Removing user with email: $email");
-            $user = User::whereEmail($email)->firstOrFail();
-            $teams = $user->teams;
-            foreach ($teams as $team) {
-                if ($team->members->count() > 1) {
-                    $this->error('User is a member of a team with more than one member. Please remove user from team first.');
-
-                    return;
-                }
-                $team->delete();
-            }
-            $user->delete();
-        } catch (\Exception $e) {
-            $this->error('Failed to remove user.');
-            $this->error($e->getMessage());
-
-            return;
-        }
-    }
-}