From a1b6b96e26a28383e36f92168952dfe9dfbae3e7 Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Mon, 9 Feb 2026 11:59:20 +0100
Subject: [PATCH] Update account area

---
 .../Controllers/Admin/AdminPageController.php |  2 +
 app/Observers/UserActivityObserver.php        | 41 ++++++++-
 ...9_114731_add_deleted_by_to_users_table.php | 28 ++++++
 resources/views/admin/dashboard.blade.php     |  9 +-
 resources/views/admin/users/deleted.blade.php | 18 ++++
 tests/Unit/Admin/DeletedUsersByColumnTest.php | 91 +++++++++++++++++++
 6 files changed, 186 insertions(+), 3 deletions(-)
 create mode 100644 database/migrations/2026_02_09_114731_add_deleted_by_to_users_table.php
 create mode 100644 tests/Unit/Admin/DeletedUsersByColumnTest.php

diff --git a/app/Http/Controllers/Admin/AdminPageController.php b/app/Http/Controllers/Admin/AdminPageController.php
index 61743b620..138873bd9 100644
--- a/app/Http/Controllers/Admin/AdminPageController.php
+++ b/app/Http/Controllers/Admin/AdminPageController.php
@@ -69,6 +69,7 @@ class AdminPageController extends BasePageController
                     'icon_color' => 'text-'.$activity->color_class.'-600 dark:text-'.$activity->color_class.'-400',
                     'created_at' => $activity->created_at,
                     'username' => $activity->username,
+                    'metadata' => $activity->metadata,
                 ];
             })->toArray();
         });
@@ -92,6 +93,7 @@ class AdminPageController extends BasePageController
                     'icon_color' => $activity->icon_color,
                     'created_at' => $activity->created_at->diffForHumans(),
                     'username' => $activity->username,
+                    'metadata' => $activity->metadata,
                 ];
             }, $activities),
         ]);
diff --git a/app/Observers/UserActivityObserver.php b/app/Observers/UserActivityObserver.php
index 20db48180..68411ff49 100644
--- a/app/Observers/UserActivityObserver.php
+++ b/app/Observers/UserActivityObserver.php
@@ -58,6 +58,31 @@ class UserActivityObserver
         }
     }
 
+    /**
+     * Handle the User "deleting" event (before soft delete).
+     * Sets the deleted_by field to track who deleted the account.
+     */
+    public function deleting(User $user): void
+    {
+        $deletedBy = auth()->user()?->username ?? 'System';
+
+        // Check if user is deleting their own account
+        if (auth()->check() && auth()->id() === $user->id) {
+            $deletedBy = 'Self';
+        }
+
+        // Update the deleted_by field directly in the database
+        // We use a direct query to avoid triggering update events
+        User::withoutEvents(function () use ($user, $deletedBy) {
+            User::withTrashed()
+                ->where('id', $user->id)
+                ->update(['deleted_by' => $deletedBy]);
+        });
+
+        // Store the deleted_by value on the model for the deleted event
+        $user->deleted_by = $deletedBy;
+    }
+
     /**
      * Handle the User "deleted" event (soft delete).
      */
@@ -72,7 +97,7 @@ class UserActivityObserver
                 'description' => "User deleted: {$user->username}",
                 'metadata' => [
                     'email' => $user->email,
-                    'deleted_by' => auth()->user()?->username ?? 'System',
+                    'deleted_by' => $user->deleted_by ?? 'System',
                 ],
             ]);
         }
@@ -83,6 +108,11 @@ class UserActivityObserver
      */
     public function restored(User $user): void
     {
+        // Clear the deleted_by field when user is restored
+        User::withoutEvents(function () use ($user) {
+            User::where('id', $user->id)->update(['deleted_by' => null]);
+        });
+
         UserActivity::create([
             'user_id' => $user->id,
             'username' => $user->username,
@@ -99,6 +129,13 @@ class UserActivityObserver
      */
     public function forceDeleted(User $user): void
     {
+        $deletedBy = auth()->user()?->username ?? 'System';
+
+        // Check if user is deleting their own account
+        if (auth()->check() && auth()->id() === $user->id) {
+            $deletedBy = 'Self';
+        }
+
         // Log permanent deletion
         UserActivity::create([
             'user_id' => null, // User no longer exists
@@ -107,7 +144,7 @@ class UserActivityObserver
             'description' => "User permanently deleted: {$user->username}",
             'metadata' => [
                 'email' => $user->email,
-                'deleted_by' => auth()->user()?->username ?? 'System',
+                'deleted_by' => $deletedBy,
                 'permanent' => true,
             ],
         ]);
diff --git a/database/migrations/2026_02_09_114731_add_deleted_by_to_users_table.php b/database/migrations/2026_02_09_114731_add_deleted_by_to_users_table.php
new file mode 100644
index 000000000..b319e2f16
--- /dev/null
+++ b/database/migrations/2026_02_09_114731_add_deleted_by_to_users_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('deleted_by')->nullable()->after('deleted_at');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('deleted_by');
+        });
+    }
+};
diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php
index b87f05f88..70a87730d 100644
--- a/resources/views/admin/dashboard.blade.php
+++ b/resources/views/admin/dashboard.blade.php
@@ -477,7 +477,14 @@
                                 <i class="fas fa-{{ $activity->icon }} {{ $activity->icon_color }} text-sm"></i>
                             </div>
                             <div class="flex-1">
-                                <p class="text-sm text-gray-800 dark:text-gray-200">{{ $activity->message }}</p>
+                                <p class="text-sm text-gray-800 dark:text-gray-200">
+                                    {{ $activity->message }}
+                                    @if($activity->type === 'deleted' && isset($activity->metadata['deleted_by']))
+                                        <span class="text-xs text-gray-500 dark:text-gray-400">
+                                            (by {{ $activity->metadata['deleted_by'] }}{{ isset($activity->metadata['permanent']) ? ', permanent' : '' }})
+                                        </span>
+                                    @endif
+                                </p>
                                 <p class="text-xs text-gray-500 dark:text-gray-400">{{ $activity->created_at->diffForHumans() }}</p>
                             </div>
                         </div>
diff --git a/resources/views/admin/users/deleted.blade.php b/resources/views/admin/users/deleted.blade.php
index e78f84a4b..2b5275423 100644
--- a/resources/views/admin/users/deleted.blade.php
+++ b/resources/views/admin/users/deleted.blade.php
@@ -160,6 +160,7 @@
                                         @endif
                                     </a>
                                 </th>
+                                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">Deleted By</th>
                                 <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">Actions</th>
                             </tr>
                         </thead>
@@ -196,6 +197,23 @@
                                     <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500 dark:text-gray-400">
                                         {{ $user->deleted_at ? $user->deleted_at->format('Y-m-d H:i') : 'N/A' }}
                                     </td>
+                                    <td class="px-6 py-4 whitespace-nowrap">
+                                        @if($user->deleted_by === 'Self')
+                                            <span class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-blue-100 dark:bg-blue-900 text-blue-800 dark:text-blue-200">
+                                                <i class="fa fa-user mr-1"></i>Self
+                                            </span>
+                                        @elseif($user->deleted_by === 'System')
+                                            <span class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 dark:bg-gray-700 text-gray-800 dark:text-gray-200">
+                                                <i class="fa fa-robot mr-1"></i>System
+                                            </span>
+                                        @elseif($user->deleted_by)
+                                            <span class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-yellow-100 dark:bg-yellow-900 text-yellow-800 dark:text-yellow-200" title="Deleted by admin: {{ $user->deleted_by }}">
+                                                <i class="fa fa-user-shield mr-1"></i>{{ $user->deleted_by }}
+                                            </span>
+                                        @else
+                                            <span class="text-gray-400 dark:text-gray-500">N/A</span>
+                                        @endif
+                                    </td>
                                     <td class="px-6 py-4 whitespace-nowrap text-sm font-medium">
                                         <div class="flex gap-2">
                                             <button type="button"
diff --git a/tests/Unit/Admin/DeletedUsersByColumnTest.php b/tests/Unit/Admin/DeletedUsersByColumnTest.php
new file mode 100644
index 000000000..daf851e91
--- /dev/null
+++ b/tests/Unit/Admin/DeletedUsersByColumnTest.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Tests\Unit\Admin;
+
+use PHPUnit\Framework\TestCase;
+
+class DeletedUsersByColumnTest extends TestCase
+{
+    /**
+     * Test that the deleted users view displays the Deleted By column.
+     */
+    public function test_deleted_users_view_contains_deleted_by_column(): void
+    {
+        $bladePath = __DIR__.'/../../../resources/views/admin/users/deleted.blade.php';
+
+        $this->assertFileExists($bladePath);
+
+        $content = file_get_contents($bladePath);
+
+        // Check that the blade file contains the Deleted By column header
+        $this->assertStringContainsString('Deleted By', $content);
+        $this->assertStringContainsString('deleted_by', $content);
+        $this->assertStringContainsString('Self', $content);
+        $this->assertStringContainsString('System', $content);
+    }
+
+    /**
+     * Test that the UserActivityObserver handles deleting event.
+     */
+    public function test_user_activity_observer_has_deleting_method(): void
+    {
+        $observerPath = __DIR__.'/../../../app/Observers/UserActivityObserver.php';
+
+        $this->assertFileExists($observerPath);
+
+        $content = file_get_contents($observerPath);
+
+        // Check that the observer has the deleting method
+        $this->assertStringContainsString('public function deleting(User $user)', $content);
+        $this->assertStringContainsString("'Self'", $content);
+        $this->assertStringContainsString("'System'", $content);
+        $this->assertStringContainsString('deleted_by', $content);
+    }
+
+    /**
+     * Test that migration file exists for deleted_by column.
+     */
+    public function test_migration_for_deleted_by_exists(): void
+    {
+        $migrationFiles = glob(__DIR__.'/../../../database/migrations/*add_deleted_by_to_users_table*');
+
+        $this->assertNotEmpty($migrationFiles, 'Migration file for deleted_by column should exist');
+
+        $content = file_get_contents($migrationFiles[0]);
+
+        $this->assertStringContainsString('deleted_by', $content);
+        $this->assertStringContainsString('->nullable()', $content);
+    }
+
+    /**
+     * Test that the admin dashboard shows deleted_by in activity log.
+     */
+    public function test_dashboard_activity_log_shows_deleted_by(): void
+    {
+        $bladePath = __DIR__.'/../../../resources/views/admin/dashboard.blade.php';
+
+        $this->assertFileExists($bladePath);
+
+        $content = file_get_contents($bladePath);
+
+        // Check that the dashboard shows deleted_by for deleted activity
+        $this->assertStringContainsString("activity->type === 'deleted'", $content);
+        $this->assertStringContainsString("metadata['deleted_by']", $content);
+        $this->assertStringContainsString("metadata['permanent']", $content);
+    }
+
+    /**
+     * Test that the AdminPageController includes metadata in activity data.
+     */
+    public function test_admin_controller_includes_metadata_in_activity(): void
+    {
+        $controllerPath = __DIR__.'/../../../app/Http/Controllers/Admin/AdminPageController.php';
+
+        $this->assertFileExists($controllerPath);
+
+        $content = file_get_contents($controllerPath);
+
+        // Check that the controller includes metadata in activity data
+        $this->assertStringContainsString("'metadata' => \$activity->metadata", $content);
+    }
+}