Fix instance id not replaced in path for single form

Author: aguingand

docs/guide/single-form.md

@@ -54,10 +54,10 @@ class AccountSharpForm extends SharpSingleForm
 
     protected function updateSingle(array $data)
     {
-        $this->save(
+        return $this->save(
             User::findOrFail(auth()->id()), 
             $data
-        );
+        )->id;
     }
 }
 ```

src/Http/Controllers/FormController.php

@@ -135,7 +135,12 @@ public function update(string $parentUri, EntityKey $entityKey, ?string $instanc
         );
 
         $formattedData = $form->formatAndValidateRequestData(request()->all(), $instanceId);
-        $form->update($instanceId, $formattedData);
+        $instanceId = $form->update($instanceId, $formattedData);
+
+        if ($instanceId === null && ! $form instanceof SharpSingleForm) {
+            report(new SharpFormUpdateException('The update() method in '.get_class($form).' must return the newly created instance id'));
+        }
+
         $this->uploadManager->dispatchJobs($instanceId);
 
         $previousUrl = request()->query('previous_page_url') ?: sharp()->context()->breadcrumb()->getPreviousSegmentUrl();

src/Http/Jobs/HandleUploadedFileJob.php

@@ -2,6 +2,7 @@
 
 namespace Code16\Sharp\Http\Jobs;
 
+use Code16\Sharp\Exceptions\Form\SharpFormUpdateException;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -56,7 +57,11 @@ public function handle(): void
 
     private function determineFilePath(): string
     {
-        if ($this->instanceId) {
+        if (str_contains($this->filePath, '{id}')) {
+            if ($this->instanceId === null) {
+                throw new SharpFormUpdateException('Instance ID is required but not provided for file path template containing {id}');
+            }
+
             return str_replace('{id}', $this->instanceId, $this->filePath);
         }
 

tests/Http/Jobs/HandleUploadedFileJobTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Code16\Sharp\Exceptions\Form\SharpFormUpdateException;
 use Code16\Sharp\Http\Jobs\HandleUploadedFileJob;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
@@ -31,15 +32,29 @@
 
     HandleUploadedFileJob::dispatch(
         uploadedFileName: 'image.jpg',
-        filePath: 'data/things/{id}/image.jpg',
         disk: 'local',
-        instanceId: 50,
+        filePath: 'data/things/{id}/image.jpg',
         shouldOptimizeImage: false,
+        instanceId: 50,
     );
 
     Storage::disk('local')->assertExists('data/things/50/image.jpg');
 });
 
+it('throws if instance id null and {id} in segment', function () {
+    UploadedFile::fake()
+        ->image('image.jpg')
+        ->storeAs('/tmp', 'image.jpg', ['disk' => 'local']);
+
+    HandleUploadedFileJob::dispatch(
+        uploadedFileName: 'image.jpg',
+        disk: 'local',
+        filePath: 'data/things/{id}/image.jpg',
+        shouldOptimizeImage: false,
+    );
+})
+    ->throws(SharpFormUpdateException::class);
+
 it('optimizes uploaded images if configured', function () {
     $optimizer = new class()
     {