Beautiful Open-Source Form Builder
Refactor Zapier webhook request handling
Julien Nahumd52d61a4fedc
diff --git a/api/app/Http/Controllers/Forms/Integration/FormZapierWebhookController.php b/api/app/Http/Controllers/Forms/Integration/FormZapierWebhookController.phpindex 8c7712e1e..2b8f0ecd1 100644--- a/api/app/Http/Controllers/Forms/Integration/FormZapierWebhookController.php+++ b/api/app/Http/Controllers/Forms/Integration/FormZapierWebhookController.php@@ -3,7 +3,7 @@namespace App\Http\Controllers\Forms\Integration;use App\Http\Controllers\Controller;-use App\Http\Requests\Integration\StoreFormZapierWebhookRequest;+use App\Http\Requests\Integration\Zapier\StoreFormZapierWebhookRequest;use App\Models\Integration\FormZapierWebhook;class FormZapierWebhookController extends Controllerdiff --git a/api/app/Http/Requests/Integration/StoreFormZapierWebhookRequest.php b/api/app/Http/Requests/Integration/Zapier/StoreFormZapierWebhookRequest.phpsimilarity index 93%rename from api/app/Http/Requests/Integration/StoreFormZapierWebhookRequest.phprename to api/app/Http/Requests/Integration/Zapier/StoreFormZapierWebhookRequest.phpindex 4388410a4..72b2e5ee3 100644--- a/api/app/Http/Requests/Integration/StoreFormZapierWebhookRequest.php+++ b/api/app/Http/Requests/Integration/Zapier/StoreFormZapierWebhookRequest.php@@ -1,6 +1,6 @@<?php-namespace App\Http\Requests\Integration;+namespace App\Http\Requests\Integration\Zapier;use App\Models\Forms\Form;use App\Models\Integration\FormZapierWebhook;diff --git a/api/tests/Feature/Forms/FormSubmissionExportTest.php b/api/tests/Feature/Forms/FormSubmissionExportTest.phpindex 73a9d315a..e74811f0f 100644--- a/api/tests/Feature/Forms/FormSubmissionExportTest.php+++ b/api/tests/Feature/Forms/FormSubmissionExportTest.php@@ -97,44 +97,6 @@ it('includes status column when partial submissions are enabled', function () {$workspace = $this->createUserWorkspace($user);$form = $this->createForm($user, $workspace, ['enable_partial_submissions' => true,-<<<<<<< HEAD- 'properties' => [- [- 'id' => 'name_field',- 'name' => 'Name',- 'type' => 'text',- 'required' => true,- ],- [- 'id' => 'email_field',- 'name' => 'Email',- 'type' => 'email',- 'required' => true,- ]- ]- ]);-- // Create a partial submission (In Progress)- $partialSubmissionData = $this->generateFormSubmissionData($form, [- 'name_field' => 'John Partial',- ]);- $partialSubmissionData['is_partial'] = true;- $this->postJson(route('forms.answer', $form->slug), $partialSubmissionData);-- // Create a completed submission- $completedSubmissionData = $this->generateFormSubmissionData($form, [- 'name_field' => 'Jane Complete',- 'email_field' => '[email protected]'- ]);- $this->postJson(route('forms.answer', $form->slug), $completedSubmissionData);-- // Export with selected columns- $response = $this->postJson(route('open.forms.submissions.export', [- 'form' => $form,- 'columns' => [- 'name_field' => true,- 'email_field' => true,-=======]);// Create a partial submission (In Progress)@@ -166,7 +128,6 @@ it('includes status column when partial submissions are enabled', function () {'columns' => [$textField['id'] => true,$emailField['id'] => true,->>>>>>> f011505849c7638f8250264957a9b95f1626d0df]]));@@ -174,21 +135,6 @@ it('includes status column when partial submissions are enabled', function () {->assertHeader('content-disposition', 'attachment; filename=' . $form->slug . '-submission-data.csv');// Verify the exported CSV contains status column and correct values-<<<<<<< HEAD- $content = $response->getContent();- $lines = explode("\n", $content);-- // Check that CSV has at least 3 lines (header + 2 data rows)- expect(count($lines))->toBeGreaterThanOrEqual(3);-- // Check header contains 'status'- $headerLine = trim($lines[0]);- expect($headerLine)->toContain('status');-- // Check that data rows contain 'In Progress' or 'Completed'- $dataContent = implode("\n", array_slice($lines, 1));- expect(str_contains($dataContent, 'In Progress') || str_contains($dataContent, 'Completed'))->toBeTrue();-=======ob_start();$response->sendContent();$content = ob_get_clean();@@ -196,7 +142,6 @@ it('includes status column when partial submissions are enabled', function () {expect(str_contains($content, 'status'))->toBeTrue();expect(str_contains($content, 'In Progress'))->toBeTrue();expect(str_contains($content, 'Completed'))->toBeTrue();->>>>>>> f011505849c7638f8250264957a9b95f1626d0df});it('does not include status column when partial submissions are disabled', function () {@@ -204,29 +149,6 @@ it('does not include status column when partial submissions are disabled', funct$workspace = $this->createUserWorkspace($user);$form = $this->createForm($user, $workspace, ['enable_partial_submissions' => false,-<<<<<<< HEAD- 'properties' => [- [- 'id' => 'name_field',- 'name' => 'Name',- 'type' => 'text',- 'required' => true,- ]- ]- ]);-- // Create a submission- $submissionData = $this->generateFormSubmissionData($form, [- 'name_field' => 'John Doe',- ]);- $this->postJson(route('forms.answer', $form->slug), $submissionData);-- // Export with selected columns- $response = $this->postJson(route('open.forms.submissions.export', [- 'form' => $form,- 'columns' => [- 'name_field' => true,-=======]);// Create a submission@@ -241,20 +163,14 @@ it('does not include status column when partial submissions are disabled', funct'form' => $form,'columns' => [$textField['id'] => true,->>>>>>> f011505849c7638f8250264957a9b95f1626d0df]]));$response->assertSuccessful();// Verify the exported CSV does not contain status column-<<<<<<< HEAD- $content = $response->getContent();-=======ob_start();$response->sendContent();$content = ob_get_clean();-->>>>>>> f011505849c7638f8250264957a9b95f1626d0dfexpect(str_contains($content, 'status'))->toBeFalse();});