From 107f8db9bc27245951ee37e67d02e8b1097f9261 Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Tue, 23 Apr 2024 17:35:33 -0500
Subject: [PATCH] another option

---
 app/Http/Requests/UpdateAssetRequest.php | 15 +++++++-
 app/Models/Asset.php                     | 48 ++++++++++++------------
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/app/Http/Requests/UpdateAssetRequest.php b/app/Http/Requests/UpdateAssetRequest.php
index 53844dc761..2ac11ccc81 100644
--- a/app/Http/Requests/UpdateAssetRequest.php
+++ b/app/Http/Requests/UpdateAssetRequest.php
@@ -38,6 +38,19 @@ class UpdateAssetRequest extends ImageUploadRequest
                 ],
             ],
         );
-        return $rules;
+
+        // OR
+
+        $rules2 = array_merge(
+            parent::rules(),
+            collect((new Asset)->getRules())->map(function ($rules) {
+                return collect($rules)->reject(function ($rule) {
+                    return $rule === 'required';
+                })->values()->all();
+            })->all(),
+        // remove 'required' rules where they exist
+        );
+
+        return $rules2;
     }
 }
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index f37880391f..4df74659a2 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -89,30 +89,30 @@ class Asset extends Depreciable
     ];
 
     protected $rules = [
-        'model_id'         => 'required|integer|exists:models,id,deleted_at,NULL|not_array',
-        'status_id'        => 'required|integer|exists:status_labels,id',
-        'asset_tag'        => 'required|min:1|max:255|unique_undeleted:assets,asset_tag|not_array',
-        'name'             => 'nullable|max:255',
-        'company_id'       => 'nullable|integer|exists:companies,id',
-        'warranty_months'  => 'nullable|numeric|digits_between:0,240',
-        'last_checkout'    => 'nullable|date_format:Y-m-d H:i:s',
-        'last_checkin'     => 'nullable|date_format:Y-m-d H:i:s',
-        'expected_checkin' => 'nullable|date',
-        'last_audit_date'  => 'nullable|date_format:Y-m-d H:i:s',
-        'next_audit_date'  => 'nullable|date|after:last_audit_date',
-        'location_id'      => 'nullable|exists:locations,id',
-        'rtd_location_id'  => 'nullable|exists:locations,id',
-        'purchase_date'    => 'nullable|date|date_format:Y-m-d',
-        'serial'           => 'nullable|unique_undeleted:assets,serial',
-        'purchase_cost'    => 'nullable|numeric|gte:0',
-        'supplier_id'      => 'nullable|exists:suppliers,id',
-        'asset_eol_date'   => 'nullable|date',
-        'eol_explicit'     => 'nullable|boolean',
-        'byod'             => 'nullable|boolean',
-        'order_number'     => 'nullable|string|max:191',
-        'notes'            => 'nullable|string|max:65535',
-        'assigned_to'      => 'nullable|integer',
-        'requestable'      => 'nullable|boolean',
+        'model_id'         => ['required', 'integer', 'exists:models,id,deleted_at,NULL', 'not_array'],
+        'status_id'        => ['required', 'integer', 'exists:status_labels,id'],
+        'asset_tag'        => ['required', 'min:1', 'max:255', 'unique_undeleted:assets,asset_tag', 'not_array'],
+        'name'             => ['nullable', 'max:255'],
+        'company_id'       => ['nullable', 'integer', 'exists:companies,id'],
+        'warranty_months'  => ['nullable', 'numeric', 'digits_between:0,240'],
+        'last_checkout'    => ['nullable', 'date_format:Y-m-d H:i:s'],
+        'last_checkin'     => ['nullable', 'date_format:Y-m-d H:i:s'],
+        'expected_checkin' => ['nullable', 'date'],
+        'last_audit_date'  => ['nullable', 'date_format:Y-m-d H:i:s'],
+        'next_audit_date'  => ['nullable', 'date', 'after:last_audit_date'],
+        'location_id'      => ['nullable', 'exists:locations,id'],
+        'rtd_location_id'  => ['nullable', 'exists:locations,id'],
+        'purchase_date'    => ['nullable', 'date', 'date_format:Y-m-d'],
+        'serial'           => ['nullable', 'unique_undeleted:assets,serial'],
+        'purchase_cost'    => ['nullable', 'numeric', 'gte:0'],
+        'supplier_id'      => ['nullable', 'exists:suppliers,id'],
+        'asset_eol_date'   => ['nullable', 'date'],
+        'eol_explicit'     => ['nullable', 'boolean'],
+        'byod'             => ['nullable', 'boolean'],
+        'order_number'     => ['nullable', 'string', 'max:191'],
+        'notes'            => ['nullable', 'string', 'max:65535'],
+        'assigned_to'      => ['nullable', 'integer'],
+        'requestable'      => ['nullable', 'boolean'],
     ];