From 41b65bd9a2ce1f7cebb2cac2e033b9f25415bf39 Mon Sep 17 00:00:00 2001
From: slong753 <spencer@spencerlong.com>
Date: Mon, 17 Jul 2023 14:37:32 -0500
Subject: [PATCH] small changes

---
 app/Importer/AssetImporter.php                           | 9 ++++-----
 ...ed_eol_and_add_column_for_explicit_date_to_assets.php | 8 +++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/Importer/AssetImporter.php b/app/Importer/AssetImporter.php
index 08f6c06d3d..4286b62d51 100644
--- a/app/Importer/AssetImporter.php
+++ b/app/Importer/AssetImporter.php
@@ -128,6 +128,10 @@ class AssetImporter extends ItemImporter
         if (isset($this->item['eol_explicit'])) {
             $item['eol_explicit'] = $this->item['eol_explicit'];
         }
+       
+        if(($item['asset_eol_date'] == null) && ($item['eol_explicit'] == null) && ($asset->model->eol != null) && ($asset->asset_purchase_date != null)){
+            $asset->asset_eol_date = Carbon::parse($asset->asset_purchase_date)->addMonths($asset->model->eol)->format('Y-m-d');
+        }
 
         if ($editingAsset) {
             $asset->update($item);
@@ -142,11 +146,6 @@ class AssetImporter extends ItemImporter
             }
         }
        
-        if(($item['asset_eol_date'] == null) && ($item['eol_explicit'] == null) && ($asset->model->eol != null) && ($asset->asset_purchase_date != null)){
-            $asset->asset_eol_date = Carbon::parse($asset->asset_purchase_date)->addMonths($asset->model->eol)->format('Y-m-d');
-        }
-
-
         if ($asset->save()) {
 
             $asset->logCreate(trans('general.importer.import_note'));
diff --git a/database/migrations/2023_07_13_052204_denormalized_eol_and_add_column_for_explicit_date_to_assets.php b/database/migrations/2023_07_13_052204_denormalized_eol_and_add_column_for_explicit_date_to_assets.php
index 1d4d09404f..4e46c1db40 100644
--- a/database/migrations/2023_07_13_052204_denormalized_eol_and_add_column_for_explicit_date_to_assets.php
+++ b/database/migrations/2023_07_13_052204_denormalized_eol_and_add_column_for_explicit_date_to_assets.php
@@ -2,10 +2,8 @@
 
 use App\Models\Asset;
 use Carbon\Carbon;
-use Carbon\CarbonInterval;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
 class DenormalizedEolAndAddColumnForExplicitDateToAssets extends Migration
@@ -28,20 +26,20 @@ class DenormalizedEolAndAddColumnForExplicitDateToAssets extends Migration
             if($asset->asset_eol_date && $asset->asset_purchase_date) {
                 $months = Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->asset_purchase_date);
                 if($months != $asset->model->eol) {
-                    DB::table('assets')->find($asset->id)->update(['eol_explicit' => $asset->asset_eol_date]);
+                    Asset::find($asset->id)->update(['eol_explicit' => $asset->asset_eol_date]);
                 }
             }
         }
 
         // Update the asset_eol_date column with the calculated value if it doesn't exist 
-        $assets = DB::table('assets')->whereNull('asset_eol_date')->get();
+        $assets = Asset::whereNull('asset_eol_date')->get();
         foreach ($assets as $asset) {
             $model = Asset::find($asset->id)->model;
             if ($model) {
                 $eol = $model->eol;
                 if ($eol) {
                     $asset_eol_date = Carbon::parse($asset->asset_purchase_date)->addMonths($eol)->format('Y-m-d');
-                    DB::table('assets')->where('id', $asset->id)->update(['asset_eol_date' => $asset_eol_date]);
+                    Asset::fine($asset->id)->update(['asset_eol_date' => $asset_eol_date]);
                 }
             }
         }