From 57dd721ad05ba84f570a15be91951c2852c865cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?=
 <53110792+CihanSenturk@users.noreply.github.com>
Date: Fri, 16 Jun 2023 17:23:56 +0300
Subject: [PATCH] wip import

---
 app/Abstracts/Import.php |  4 ++--
 app/Traits/Import.php    | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/Abstracts/Import.php b/app/Abstracts/Import.php
index 653cda224..eb05b9ab0 100644
--- a/app/Abstracts/Import.php
+++ b/app/Abstracts/Import.php
@@ -42,9 +42,9 @@ abstract class Import implements HasLocalePreference, ShouldQueue, SkipsEmptyRow
 
         // created_by is equal to the owner id. Therefore, the value in export is owner email.
         if (isset($row['created_by'])) {
-            $row['created_by'] = User::where('email', $row['created_by'])->first()?->id ?? $this->user->id;
+            $row['created_by'] = $this->getCreatedById($row);
         }
-        
+
         $row['created_from'] = $this->getSourcePrefix() . 'import';
 
         // Make enabled field integer
diff --git a/app/Traits/Import.php b/app/Traits/Import.php
index e04b113ec..8681e785c 100644
--- a/app/Traits/Import.php
+++ b/app/Traits/Import.php
@@ -14,6 +14,7 @@ use App\Jobs\Common\CreateItem;
 use App\Jobs\Setting\CreateCategory;
 use App\Jobs\Setting\CreateCurrency;
 use App\Jobs\Setting\CreateTax;
+use App\Models\Auth\User;
 use App\Models\Banking\Account;
 use App\Models\Common\Contact;
 use App\Models\Common\Item;
@@ -110,6 +111,17 @@ trait Import
         return $currency->code;
     }
 
+    public function getCreatedById($row)
+    {
+        $user = User::where('email', $row['created_by'])->first();
+
+        if (! empty($user)) {
+            return $user->id;
+        }
+
+        return $this->user->id;
+    }
+
     public function getDocumentId($row)
     {
         $id = isset($row['document_id']) ? $row['document_id'] : null;