From 30dade1fbad27ff5b66f5d1edc0860b675cfbcf1 Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Wed, 6 Sep 2023 17:01:00 -0500
Subject: [PATCH] cleanup

---
 app/Importer/ItemImporter.php       |  5 ++---
 app/Observers/AssetObserver.php     | 13 ++++++-------
 database/factories/AssetFactory.php |  1 -
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/Importer/ItemImporter.php b/app/Importer/ItemImporter.php
index 8f979dfde..0a03ae8b8 100644
--- a/app/Importer/ItemImporter.php
+++ b/app/Importer/ItemImporter.php
@@ -95,11 +95,10 @@ class ItemImporter extends Importer
                 try {
                     $this->item['asset_eol_date'] = CarbonImmutable::parse($csvMatch)->format('Y-m-d');
                 } catch (\Exception $e) {
-                    Log::alert($e->getMessage());
-                    $this->log('Error parsing date: '.$csvMatch);
+                    Log::info($e->getMessage());
+                    $this->log('Unable to parse date: '.$csvMatch);
                 }
         } elseif ($this->createOrFetchAssetModel($row) != null) {
-                //woof this is ugly
                 if($eol = AssetModel::find($this->createOrFetchAssetModel($row))->eol) {
                     $this->item['asset_eol_date'] = CarbonImmutable::parse($this->findCsvMatch($row, 'purchase_date'))->addMonths($eol)->format('Y-m-d');
                 }
diff --git a/app/Observers/AssetObserver.php b/app/Observers/AssetObserver.php
index 5e76a73ed..4bcbc6882 100644
--- a/app/Observers/AssetObserver.php
+++ b/app/Observers/AssetObserver.php
@@ -130,17 +130,16 @@ class AssetObserver
         } 
 
        //determine if explicit and set eol_explit to true 
-      //conditions might need more work 
-       if(!is_null($asset->asset_eol_date) && !is_null($asset->purchase_date)) { 
-            if($asset->model->eol) { 
+       if(!is_null($asset->asset_eol_date) && !is_null($asset->purchase_date)) {
+            if($asset->model->eol) {
                 $months = Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date); 
                 if($months != $asset->model->eol) {
                     $asset->eol_explicit = true;
-                } 
-            } else {
-                $asset->eol_explicit = true;
+                }
             }
-       } 
+       } elseif (!is_null($asset->asset_eol_date) && is_null($asset->purchase_date)) {
+           $asset->eol_explicit = true;
+       }
       
 
     }
diff --git a/database/factories/AssetFactory.php b/database/factories/AssetFactory.php
index 644d292eb..ccb6474e5 100644
--- a/database/factories/AssetFactory.php
+++ b/database/factories/AssetFactory.php
@@ -352,5 +352,4 @@ class AssetFactory extends Factory
     {
         return $this->state(['requestable' => false]);
     }
-   
 }