Beautiful Open-Source Form Builder
Enhance UserActionService to manage form visibility status during user blocking/unblocking
JhumanJbb0959915ac1
diff --git a/api/app/Service/Forms/FormSpamService.php b/api/app/Service/Forms/FormSpamService.phpindex 974e6c0d5..c50058b81 100644--- a/api/app/Service/Forms/FormSpamService.php+++ b/api/app/Service/Forms/FormSpamService.php@@ -43,6 +43,10 @@ class FormSpamServicereturn false;}+ if ($form->creator->created_at->diffInMonths(now()) > 3) {+ return false;+ }+if ($this->containsKeywords($form)) {return true;}diff --git a/api/app/Service/UserActionService.php b/api/app/Service/UserActionService.phpindex 4405410b1..81f0e6b43 100644--- a/api/app/Service/UserActionService.php+++ b/api/app/Service/UserActionService.php@@ -2,10 +2,11 @@namespace App\Service;-use App\Http\Controllers\Admin\AdminController;use App\Mail\UserBlockedEmail;use App\Mail\UserUnblockedEmail;+use App\Models\Forms\Form;use App\Models\User;+use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Mail;class UserActionService@@ -14,12 +15,20 @@ class UserActionService{$user->blockUser($reason, $moderatorId);- $user->forms()->update(['visibility' => 'draft']);+ // Store current visibility status in tags before setting to draft+ $user->forms()->get()->each(function ($form) {+ if ($form->visibility !== 'draft') {+ $this->storePreviousFormStatus($form);+ $form->update(['visibility' => 'draft']);+ }+ });- AdminController::log('User blocked π«', [- 'user' => $user->email . ' (' . $user->id . ')',+ Log::channel('slack_admin')->info('User blocked π«', [+ 'user_id' => $user->id,+ 'user_email' => $user->email,'reason' => $reason,'moderator_id' => $moderatorId,+ 'forms_count' => $user->forms()->count(),'actions' => ['Admin Panel' => front_url('/admin?user_id=' . $user->id),]@@ -34,10 +43,26 @@ class UserActionService{$user->unblockUser($reason, $moderatorId);- AdminController::log('User unblocked π', [- 'user' => $user->email . ' (' . $user->id . ')',+ // Restore form visibility from previous-status tags+ $restoredFormsCount = 0;+ $user->forms()->get()->each(function ($form) use (&$restoredFormsCount) {+ $wasModified = $this->restorePreviousFormStatus($form);+ // Save the form if it was modified (either restored or cleaned up)+ if ($wasModified || $form->isDirty()) {+ $form->save();+ if ($wasModified) {+ $restoredFormsCount++;+ }+ }+ });++ Log::channel('slack_admin')->info('User unblocked π', [+ 'user_id' => $user->id,+ 'user_email' => $user->email,'reason' => $reason,'moderator_id' => $moderatorId,+ 'forms_count' => $user->forms()->count(),+ 'restored_forms' => $restoredFormsCount,'actions' => ['Admin Panel' => front_url('/admin?user_id=' . $user->id),]@@ -47,4 +72,67 @@ class UserActionServicereturn $user->fresh();}++ /**+ * Store the current form visibility status in tags before changing to draft+ */+ private function storePreviousFormStatus(Form $form): void+ {+ if ($form->visibility === 'draft') {+ return; // Don't store draft as previous status+ }++ $currentTags = $form->tags ?? [];++ // Remove any existing previous-status tags to avoid duplicates+ $currentTags = array_filter($currentTags, function ($tag) {+ return !str_starts_with($tag, 'previous-status-');+ });++ // Add the current status as a tag+ $currentTags[] = "previous-status-{$form->visibility}";++ $form->tags = $currentTags;+ }++ /**+ * Restore form visibility from previous-status tags+ * Returns true if form was successfully restored, false otherwise+ * Always cleans up invalid previous-status tags regardless of return value+ */+ private function restorePreviousFormStatus(Form $form): bool+ {+ $currentTags = $form->tags ?? [];++ // Find the previous-status tag+ $previousStatusTag = collect($currentTags)+ ->first(function ($tag) {+ return str_starts_with($tag, 'previous-status-');+ });++ if (!$previousStatusTag) {+ return false; // No previous status found+ }++ // Extract the previous status from the tag+ $previousStatus = str_replace('previous-status-', '', $previousStatusTag);++ // Remove the previous-status tag regardless of validity+ $updatedTags = array_filter($currentTags, function ($tag) {+ return !str_starts_with($tag, 'previous-status-');+ });++ // Validate the previous status is still valid+ if (!in_array($previousStatus, Form::VISIBILITY)) {+ // Still update tags to remove the invalid tag+ $form->tags = array_values($updatedTags);+ return false;+ }++ // Restore the form to its previous visibility+ $form->visibility = $previousStatus;+ $form->tags = array_values($updatedTags); // Re-index the array++ return true;+ }}diff --git a/api/tests/Feature/Admin/UserBlockTest.php b/api/tests/Feature/Admin/UserBlockTest.phpindex 735a7a9ea..f5a479e4f 100644--- a/api/tests/Feature/Admin/UserBlockTest.php+++ b/api/tests/Feature/Admin/UserBlockTest.php@@ -17,12 +17,24 @@ function setupUsers()$user = User::factory()->create();- return [$moderator, $user];+ // Create workspace for user+ $workspace = \App\Models\Workspace::create([+ 'name' => 'Test Workspace',+ 'icon' => 'π§ͺ',+ ]);++ $user->workspaces()->sync([+ $workspace->id => [+ 'role' => 'admin',+ ],+ ], false);++ return [$moderator, $user, $workspace];}it('can block a user', function () {Mail::fake();- [$moderator, $user] = setupUsers();+ [$moderator, $user, $workspace] = setupUsers();$this->actingAs($moderator)->postJson('/moderator/block-user', [@@ -50,7 +62,7 @@ it('can block a user', function () {it('can unblock a user', function () {Mail::fake();- [$moderator, $user] = setupUsers();+ [$moderator, $user, $workspace] = setupUsers();$user->blockUser('Initial reason', $moderator->id);$user->refresh();expect($user->is_blocked)->toBeTrue();@@ -90,3 +102,141 @@ it('does not allow a non-moderator to block a user', function () {])->assertForbidden();});++it('stores previous form visibility status when blocking a user', function () {+ Mail::fake();+ [$moderator, $user, $workspace] = setupUsers();++ // Create forms with different visibility statuses+ $publicForm = \App\Models\Forms\Form::factory()->create([+ 'creator_id' => $user->id,+ 'visibility' => 'public',+ 'workspace_id' => $workspace->id,+ 'properties' => [],+ ]);++ $closedForm = \App\Models\Forms\Form::factory()->create([+ 'creator_id' => $user->id,+ 'visibility' => 'closed',+ 'workspace_id' => $workspace->id,+ 'properties' => [],+ ]);++ $draftForm = \App\Models\Forms\Form::factory()->create([+ 'creator_id' => $user->id,+ 'visibility' => 'draft',+ 'workspace_id' => $workspace->id,+ 'properties' => [],+ ]);++ $this->actingAs($moderator)+ ->postJson('/moderator/block-user', [+ 'user_id' => $user->id,+ 'reason' => 'Test block reason',+ ])+ ->assertSuccessful();++ // Refresh forms from database+ $publicForm->refresh();+ $closedForm->refresh();+ $draftForm->refresh();++ // Check that all forms are now draft+ expect($publicForm->visibility)->toBe('draft');+ expect($closedForm->visibility)->toBe('draft');+ expect($draftForm->visibility)->toBe('draft');++ // Check that previous status is stored in tags for non-draft forms+ expect($publicForm->tags)->toContain('previous-status-public');+ expect($closedForm->tags)->toContain('previous-status-closed');+ expect($draftForm->tags)->not->toContain('previous-status-draft');+});++it('restores previous form visibility status when unblocking a user', function () {+ Mail::fake();+ [$moderator, $user, $workspace] = setupUsers();++ // Create forms and block user first+ $publicForm = \App\Models\Forms\Form::factory()->create([+ 'creator_id' => $user->id,+ 'visibility' => 'public',+ 'workspace_id' => $workspace->id,+ 'properties' => [],+ ]);++ $closedForm = \App\Models\Forms\Form::factory()->create([+ 'creator_id' => $user->id,+ 'visibility' => 'closed',+ 'workspace_id' => $workspace->id,+ 'properties' => [],+ ]);++ // Block the user+ $this->actingAs($moderator)+ ->postJson('/moderator/block-user', [+ 'user_id' => $user->id,+ 'reason' => 'Test block reason',+ ])+ ->assertSuccessful();++ // Now unblock the user+ $this->actingAs($moderator)+ ->postJson('/moderator/unblock-user', [+ 'user_id' => $user->id,+ 'reason' => 'Test unblock reason',+ ])+ ->assertSuccessful();++ // Refresh forms from database+ $publicForm->refresh();+ $closedForm->refresh();++ // Check that forms are restored to their previous visibility+ expect($publicForm->visibility)->toBe('public');+ expect($closedForm->visibility)->toBe('closed');++ // Check that previous status tags are removed+ expect($publicForm->tags)->not->toContain('previous-status-public');+ expect($closedForm->tags)->not->toContain('previous-status-closed');+});++it('handles forms with invalid previous status tags gracefully', function () {+ Mail::fake();+ [$moderator, $user, $workspace] = setupUsers();++ // Create a form with an invalid previous status tag+ $form = \App\Models\Forms\Form::factory()->create([+ 'creator_id' => $user->id,+ 'visibility' => 'draft',+ 'tags' => ['previous-status-invalid', 'other-tag'],+ 'workspace_id' => $workspace->id,+ 'properties' => [],+ ]);++ // Block and then unblock the user+ $this->actingAs($moderator)+ ->postJson('/moderator/block-user', [+ 'user_id' => $user->id,+ 'reason' => 'Test block reason',+ ])+ ->assertSuccessful();++ $this->actingAs($moderator)+ ->postJson('/moderator/unblock-user', [+ 'user_id' => $user->id,+ 'reason' => 'Test unblock reason',+ ])+ ->assertSuccessful();++ // Refresh form from database+ $form->refresh();++ // Form should remain as draft (not restored to invalid status)+ expect($form->visibility)->toBe('draft');++ // Invalid previous-status tag should be cleaned up+ expect($form->tags)->not->toContain('previous-status-invalid');++ // Other tags should be preserved+ expect($form->tags)->toContain('other-tag');+});