From ed33ac713093c90958be0fb7c75df8e6dee2b3f2 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 2 Nov 2021 21:03:49 +1100 Subject: [PATCH] Check for archived entities prior to import --- app/Jobs/Company/CompanyImport.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php index 077ac8ebd856..0001deac7888 100644 --- a/app/Jobs/Company/CompanyImport.php +++ b/app/Jobs/Company/CompanyImport.php @@ -1032,10 +1032,12 @@ class CompanyImport implements ShouldQueue unset($user_array['hashed_id']); unset($user_array['id']); - $new_user = User::firstOrNew( + /*Make sure we are searching for archived users also and restore if we find them.*/ + + $new_user = User::withTrashed()->firstOrNew( ['email' => $user->email], $user_array, - ); + )->restore(); $new_user->account_id = $this->account->id; $new_user->save(['timestamps' => false]); @@ -1062,10 +1064,10 @@ class CompanyImport implements ShouldQueue unset($cu_array['company_id']); unset($cu_array['user_id']); - $new_cu = CompanyUser::firstOrNew( + $new_cu = CompanyUser::withTrashed()->firstOrNew( ['user_id' => $user_id, 'company_id' => $this->company->id], $cu_array, - ); + )->restore(); $new_cu->account_id = $this->account->id; $new_cu->save(['timestamps' => false]);