Partial submissions

api/app/Http/Controllers/Forms/FormStatsController.php

@@ -4,6 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\FormStatsRequest;
+use App\Models\Forms\FormSubmission;
 use Carbon\CarbonPeriod;
 use Carbon\CarbonInterval;
 use Illuminate\Http\Request;
@@ -21,13 +22,14 @@ public function getFormStats(FormStatsRequest $request)
         $this->authorize('view', $form);
 
         $formStats = $form->statistics()->whereBetween('date', [$request->date_from, $request->date_to])->get();
-        $periodStats = ['views' => [], 'submissions' => []];
+        $periodStats = ['views' => [], 'submissions' => [], 'partial_submissions' => []];
         foreach (CarbonPeriod::create($request->date_from, $request->date_to) as $dateObj) {
             $date = $dateObj->format('d-m-Y');
 
             $statisticData = $formStats->where('date', $dateObj->format('Y-m-d'))->first();
             $periodStats['views'][$date] = $statisticData->data['views'] ?? 0;
-            $periodStats['submissions'][$date] = $form->submissions()->whereDate('created_at', $dateObj)->count();
+            $periodStats['submissions'][$date] = $form->submissions()->whereDate('created_at', $dateObj)->where('status', FormSubmission::STATUS_COMPLETED)->count();
+            $periodStats['partial_submissions'][$date] = $form->submissions()->whereDate('created_at', $dateObj)->where('status', FormSubmission::STATUS_PARTIAL)->count();
 
             if ($dateObj->toDateString() === now()->toDateString()) {
                 $periodStats['views'][$date] += $form->views()->count();

api/app/Http/Controllers/Forms/FormSubmissionController.php

@@ -36,8 +36,10 @@ public function update(AnswerFormRequest $request, $id, $submissionId)
     {
         $form = $request->form;
         $this->authorize('update', $form);
-        $job = new StoreFormSubmissionJob($request->form, $request->validated());
-        $job->setSubmissionId($submissionId)->handle();
+
+        $submissionData['submission_id'] = $submissionId;
+        $job = new StoreFormSubmissionJob($request->form, $submissionData);
+        $job->handle();
 
         $data = new FormSubmissionResource(FormSubmission::findOrFail($submissionId));
 
@@ -53,7 +55,7 @@ public function export(FormSubmissionExportRequest $request, string $id)
         $this->authorize('view', $form);
 
         $allRows = [];
-        $displayColumns = collect($request->columns)->filter(fn ($value, $key) => $value === true)->toArray();
+        $displayColumns = collect($request->columns)->filter(fn($value, $key) => $value === true)->toArray();
         foreach ($form->submissions->toArray() as $row) {
             $formatter = (new FormSubmissionFormatter($form, $row['data']))
                 ->outputStringsOnly()
@@ -64,7 +66,7 @@ public function export(FormSubmissionExportRequest $request, string $id)
             $formattedData = $formatter->getCleanKeyValue();
             $filteredData = ['id' => Hashids::encode($row['id'])];
             foreach ($displayColumns as $column => $value) {
-                $key = collect($formattedData)->keys()->first(fn ($key) => str_contains($key, $column));
+                $key = collect($formattedData)->keys()->first(fn($key) => str_contains($key, $column));
                 if ($key) {
                     $filteredData[$key] = $formattedData[$key];
                 }

api/app/Http/Controllers/Forms/PublicFormController.php

@@ -16,6 +16,7 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
 use Vinkla\Hashids\Facades\Hashids;
+use Illuminate\Support\Str;
 
 class PublicFormController extends Controller
 {
@@ -85,38 +86,128 @@ public function showAsset($assetFileName)
         return redirect()->to($internal_url);
     }
 
+    /**
+     * Handle partial form submissions
+     *
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    private function handlePartialSubmissions(Request $request)
+    {
+        $form = $request->form;
+
+        // Process submission data to extract submission ID
+        $submissionData = $this->processSubmissionIdentifiers($request, $request->all());
+
+        // Validate that at least one field has a value
+        $hasValue = false;
+        foreach ($submissionData as $key => $value) {
+            if (Str::isUuid($key) && !empty($value)) {
+                $hasValue = true;
+                break;
+            }
+        }
+        if (!$hasValue) {
+            return $this->error([
+                'message' => 'At least one field must have a value for partial submissions.'
+            ], 422);
+        }
+
+        // Explicitly mark this as a partial submission
+        $submissionData['is_partial'] = true;
+
+        // Use the same job as regular submissions to ensure consistent processing
+        $job = new StoreFormSubmissionJob($form, $submissionData);
+        $job->handle();
+
+        // Get the submission ID
+        $submissionId = $job->getSubmissionId();
+
+        return $this->success([
+            'message' => 'Partial submission saved',
+            'submission_hash' => Hashids::encode($submissionId)
+        ]);
+    }
+
     public function answer(AnswerFormRequest $request, FormSubmissionProcessor $formSubmissionProcessor)
     {
         $form = $request->form;
         $isFirstSubmission = ($form->submissions_count === 0);
-        $submissionId = false;
 
+        // Handle partial submissions
+        $isPartial = $request->get('is_partial') ?? false;
+        if ($isPartial && $form->enable_partial_submissions && $form->is_pro) {
+            return $this->handlePartialSubmissions($request);
+        }
+
+        // Get validated data (includes all metadata)
         $submissionData = $request->validated();
-        $completionTime = $request->get('completion_time') ?? null;
-        unset($submissionData['completion_time']); // Remove completion_time from the main data array
 
-        $job = new StoreFormSubmissionJob($form, $submissionData, $completionTime);
+        // Process submission hash and ID
+        $submissionData = $this->processSubmissionIdentifiers($request, $submissionData);
+
+        // Create the job with all data (including metadata)
+        $job = new StoreFormSubmissionJob($form, $submissionData);
 
+        // Process the submission
         if ($formSubmissionProcessor->shouldProcessSynchronously($form)) {
             $job->handle();
-            $submissionId = Hashids::encode($job->getSubmissionId());
+            $encodedSubmissionId = Hashids::encode($job->getSubmissionId());
             // Update submission data with generated values for redirect URL
             $submissionData = $job->getProcessedData();
         } else {
-            StoreFormSubmissionJob::dispatch($form, $submissionData, $completionTime);
+            $job->handle();
+            $encodedSubmissionId = Hashids::encode($job->getSubmissionId());
         }
 
+        // Return the response
         return $this->success(array_merge([
             'message' => 'Form submission saved.',
-            'submission_id' => $submissionId,
+            'submission_id' => $encodedSubmissionId,
             'is_first_submission' => $isFirstSubmission,
         ], $formSubmissionProcessor->getRedirectData($form, $submissionData)));
     }
 
+    /**
+     * Processes submission identifiers to ensure consistent numeric format
+     *
+     * Takes a submission hash or string ID and converts it to a numeric submission_id.
+     * This allows submissions to be identified by either a hashed value or direct ID
+     * while ensuring consistent internal storage format.
+     *
+     * @param Request $request
+     * @param array $submissionData
+     * @return array
+     */
+    private function processSubmissionIdentifiers(Request $request, array $submissionData): array
+    {
+        // Handle submission hash if present (convert to numeric submission_id)
+        $submissionHash = $request->get('submission_hash');
+        if ($submissionHash) {
+            $decodedHash = Hashids::decode($submissionHash);
+            if (!empty($decodedHash)) {
+                $submissionData['submission_id'] = (int)($decodedHash[0] ?? null);
+            }
+            unset($submissionData['submission_hash']);
+        }
+
+        // Handle string submission_id if present (convert to numeric)
+        if (isset($submissionData['submission_id']) && is_string($submissionData['submission_id']) && !is_numeric($submissionData['submission_id'])) {
+            $decodedId = Hashids::decode($submissionData['submission_id']);
+            if (!empty($decodedId)) {
+                $submissionData['submission_id'] = (int)($decodedId[0] ?? null);
+            }
+        }
+
+        return $submissionData;
+    }
+
     public function fetchSubmission(Request $request, string $slug, string $submissionId)
     {
-        $submissionId = ($submissionId) ? Hashids::decode($submissionId) : false;
-        $submissionId = isset($submissionId[0]) ? $submissionId[0] : false;
+        // Decode the submission ID using the same approach as in processSubmissionIdentifiers
+        $decodedId = Hashids::decode($submissionId);
+        $submissionId = !empty($decodedId) ? (int)($decodedId[0]) : false;
+
         $form = Form::whereSlug($slug)->whereVisibility('public')->firstOrFail();
         if ($form->workspace == null || !$form->editable_submissions || !$submissionId) {
             return $this->error([

api/app/Http/Requests/AnswerFormRequest.php

@@ -54,6 +54,11 @@ public function authorize()
      */
     public function rules()
     {
+        // Skip validation if this is a partial submission
+        if ($this->has('is_partial')) {
+            return [];
+        }
+
         $selectionFields = collect($this->form->properties)->filter(function ($pro) {
             return in_array($pro['type'], ['select', 'multi_select']);
         });

api/app/Http/Requests/UserFormRequest.php

@@ -114,6 +114,7 @@ public function rules()
             'show_progress_bar' => 'boolean',
             'auto_save' => 'boolean',
             'auto_focus' => 'boolean',
+            'enable_partial_submissions' => 'boolean',
 
             // Properties
             'properties' => 'required|array',

api/app/Http/Resources/FormSubmissionResource.php

@@ -40,6 +40,7 @@ public function publiclyAccessed($publiclyAccessed = true)
     private function addExtraData()
     {
         $this->data = array_merge($this->data, [
+            'status' => $this->status,
             'created_at' => $this->created_at->toDateTimeString(),
             'id' => $this->id,
         ]);