Merge pull request #14488 from marcusmoore/bug/pass-last-audit-date-t…

…hrough-for-validation Handle badly formatted `last_audit_date` in `StoreAssetRequest`
snipe · Mar 25, 2024 · 67b5e90 · 67b5e90
2 parents 83ef7c6 + 57d1c03
commit 67b5e90
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/app/Http/Requests/StoreAssetRequest.php b/app/Http/Requests/StoreAssetRequest.php
@@ -5,6 +5,7 @@
 use App\Models\Asset;
 use App\Models\Company;
 use Carbon\Carbon;
+use Carbon\Exceptions\InvalidFormatException;
 use Illuminate\Support\Facades\Gate;
 
 class StoreAssetRequest extends ImageUploadRequest
@@ -28,11 +29,7 @@ public function prepareForValidation(): void
             ? Company::getIdForCurrentUser($this->company_id)
             : $this->company_id;
 
-        if ($this->input('last_audit_date')) {
-            $this->merge([
-                'last_audit_date' => Carbon::parse($this->input('last_audit_date'))->startOfDay()->format('Y-m-d H:i:s'),
-            ]);
-        }
+        $this->parseLastAuditDate();
 
         $this->merge([
             'asset_tag' => $this->asset_tag ?? Asset::autoincrement_asset(),
@@ -55,4 +52,21 @@ public function rules(): array
 
         return $rules;
     }
+
+    private function parseLastAuditDate(): void
+    {
+        if ($this->input('last_audit_date')) {
+            try {
+                $lastAuditDate = Carbon::parse($this->input('last_audit_date'));
+
+                $this->merge([
+                    'last_audit_date' => $lastAuditDate->startOfDay()->format('Y-m-d H:i:s'),
+                ]);
+            } catch (InvalidFormatException $e) {
+                // we don't need to do anything here...
+                // we'll keep the provided date in an
+                // invalid format so validation picks it up later
+            }
+        }
+    }
 }
diff --git a/tests/Feature/Api/Assets/AssetStoreTest.php b/tests/Feature/Api/Assets/AssetStoreTest.php
@@ -113,6 +113,20 @@ public function testLastAuditDateCanBeNull()
         $this->assertNull($asset->last_audit_date);
     }
 
+    public function testNonDateUsedForLastAuditDateReturnsValidationError()
+    {
+        $response = $this->actingAsForApi(User::factory()->superuser()->create())
+            ->postJson(route('api.assets.store'), [
+                'last_audit_date' => 'this-is-not-valid',
+                'asset_tag' => '1234',
+                'model_id' => AssetModel::factory()->create()->id,
+                'status_id' => Statuslabel::factory()->create()->id,
+            ])
+            ->assertStatusMessageIs('error');
+
+        $this->assertNotNull($response->json('messages.last_audit_date'));
+    }
+
     public function testArchivedDepreciateAndPhysicalCanBeNull()
     {
         $model = AssetModel::factory()->ipadModel()->create();