From d5f6f6cafe6d74341cde93331ac250beb53d463d Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Sat, 15 Jan 2022 03:46:28 -0600
Subject: [PATCH 1/3] Fixes duplicate API endpoint that returns fieldsets
 instead of customfields

---
 routes/api.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/routes/api.php b/routes/api.php
index 175d17587..508358f3d 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -368,18 +368,18 @@ Route::group(['prefix' => 'v1', 'middleware' => 'api'], function () {
     
         });
 
-        Route::resource('fields', 
+        Route::resource('fieldsets', 
         Api\CustomFieldsetsController::class,
             ['names' => 
                 [
-                    'index' => 'api.customfields.index',
-                    'show' => 'api.customfields.show',
-                    'update' => 'api.customfields.update',
-                    'store' => 'api.customfields.store',
-                    'destroy' => 'api.customfields.destroy',
+                    'index' => 'api.fieldsets.index',
+                    'show' => 'api.fieldsets.show',
+                    'update' => 'api.fieldsets.update',
+                    'store' => 'api.fieldsets.store',
+                    'destroy' => 'api.fieldsets.destroy',
                 ],
             'except' => ['create', 'edit'],
-            'parameters' => ['field' => 'field_id'],
+            'parameters' => ['fieldset' => 'fieldset_id'],
             ]
         ); // end custom fieldsets API routes
 

From 8bd280b416716248cce6add6ff4426b49e55745e Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Sat, 15 Jan 2022 04:12:30 -0600
Subject: [PATCH 2/3] Add to Importer the capacity to search Models only with
 Model Name since Model Number is not required

---
 app/Importer/ItemImporter.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/Importer/ItemImporter.php b/app/Importer/ItemImporter.php
index 1584539ee..0c3a18835 100644
--- a/app/Importer/ItemImporter.php
+++ b/app/Importer/ItemImporter.php
@@ -178,6 +178,7 @@ class ItemImporter extends Importer
      */
     public function createOrFetchAssetModel(array $row)
     {
+        $condition = array();
         $asset_model_name = $this->findCsvMatch($row, 'asset_model');
         $asset_modelNumber = $this->findCsvMatch($row, 'model_number');
         // TODO: At the moment, this means  we can't update the model number if the model name stays the same.
@@ -189,8 +190,16 @@ class ItemImporter extends Importer
         } elseif ((empty($asset_model_name)) && (empty($asset_modelNumber))) {
             $asset_model_name = 'Unknown';
         }
+
+        if ((!empty($asset_model_name)) && (empty($asset_modelNumber))) {
+            $condition[] = ['name', '=', $asset_model_name];
+        } elseif ((!empty($asset_model_name)) && (!empty($asset_modelNumber))) {
+            $condition[] = ['name', '=', $asset_model_name];
+            $condition[] = ['model_number', '=', $asset_modelNumber];
+        }
+
         $editingModel = $this->updating;
-        $asset_model = AssetModel::where(['name' => $asset_model_name, 'model_number' => $asset_modelNumber])->first();
+        $asset_model = AssetModel::where($condition)->first();
 
         if ($asset_model) {
             if (! $this->updating) {
@@ -201,7 +210,6 @@ class ItemImporter extends Importer
             $this->log('Matching Model found, updating it.');
             $item = $this->sanitizeItemForStoring($asset_model, $editingModel);
             $item['name'] = $asset_model_name;
-            $item['model_number'] = $asset_modelNumber;
             $asset_model->update($item);
             $asset_model->save();
             $this->log('Asset Model Updated');

From 58b1db29e24fb5447450bce42327fdc1720ad7f2 Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Sat, 15 Jan 2022 04:15:38 -0600
Subject: [PATCH 3/3] Adds condition to only update the Asset's Model Number if
 is provided by import file

---
 app/Importer/ItemImporter.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/Importer/ItemImporter.php b/app/Importer/ItemImporter.php
index 0c3a18835..5dbfccb23 100644
--- a/app/Importer/ItemImporter.php
+++ b/app/Importer/ItemImporter.php
@@ -210,6 +210,11 @@ class ItemImporter extends Importer
             $this->log('Matching Model found, updating it.');
             $item = $this->sanitizeItemForStoring($asset_model, $editingModel);
             $item['name'] = $asset_model_name;
+            
+            if(!empty($asset_modelNumber)){
+                $item['model_number'] = $asset_modelNumber;
+            }
+            
             $asset_model->update($item);
             $asset_model->save();
             $this->log('Asset Model Updated');