Merge pull request #15660 from Toreg87/fixes/api_asset_create_fmcs2

Refactor asset creation with API

Author: snipe

app/Http/Controllers/Api/AssetsController.php

@@ -598,7 +598,6 @@ public function store(StoreAssetRequest $request): JsonResponse
         $asset->model()->associate(AssetModel::find((int) $request->get('model_id')));
 
         $asset->fill($request->validated());
-        $asset->company_id = Company::getIdForCurrentUser($request->validated()['company_id']);
         $asset->created_by    = auth()->id();
 
         /**

app/Http/Requests/StoreAssetRequest.php

@@ -26,18 +26,11 @@ public function authorize(): bool
 
     public function prepareForValidation(): void
     {
-        // Guard against users passing in an array for company_id instead of an integer.
-        // If the company_id is not an integer then we simply use what was
-        // provided to be caught by model level validation later.
-        $idForCurrentUser = is_int($this->company_id)
-            ? Company::getIdForCurrentUser($this->company_id)
-            : $this->company_id;
-
         $this->parseLastAuditDate();
 
         $this->merge([
             'asset_tag' => $this->asset_tag ?? Asset::autoincrement_asset(),
-            'company_id' => $idForCurrentUser,
+            'company_id' => Company::getIdForCurrentUser($this->company_id),
             'assigned_to' => $assigned_to ?? null,
         ]);
     }