refactor: use services in import vcard (#5513)

monicahq · Sep 18, 2021 · c380928 · c380928
1 parent 3883de7
commit c380928
Show file tree

Hide file tree

Showing 4 changed files with 377 additions and 187 deletions.
diff --git a/app/Models/Contact/Contact.php b/app/Models/Contact/Contact.php
@@ -116,6 +116,7 @@ class Contact extends Model
         'last_consulted_at',
         'created_at',
         'first_met_additional_info',
+        'address_book_id',
     ];
 
     /**

diff --git a/app/Services/Contact/Contact/CreateContact.php b/app/Services/Contact/Contact/CreateContact.php
@@ -10,6 +10,7 @@
 use function Safe\json_encode;
 use App\Models\Account\Account;
 use App\Models\Contact\Contact;
+use App\Models\Account\AddressBook;
 use App\Jobs\AuditLog\LogAccountAudit;
 use App\Models\Contact\ContactFieldType;
 use App\Jobs\Avatars\GenerateDefaultAvatar;
@@ -28,6 +29,7 @@ public function rules()
         return [
             'account_id' => 'required|integer|exists:accounts,id',
             'author_id' => 'required|integer|exists:users,id',
+            'address_book_id' => 'nullable|integer|exists:addressbooks,id',
             'first_name' => 'required|string|max:255',
             'middle_name' => 'nullable|string|max:255',
             'last_name' => 'nullable|string|max:255',
@@ -69,6 +71,11 @@ public function execute(array $data): Contact
             abort(402);
         }
 
+        if (Arr::get($data, 'address_book_id')) {
+            AddressBook::where('account_id', $data['account_id'])
+                ->findOrFail($data['address_book_id']);
+        }
+
         // filter out the data that shall not be updated here
         $dataOnly = Arr::except(
             $data,
@@ -183,7 +190,7 @@ private function updateEmail(array $data, Contact $contact)
             return;
         }
 
-        $contactField = app(CreateContactField::class)->execute([
+        app(CreateContactField::class)->execute([
             'account_id' => $data['account_id'],
             'contact_id' => $contact->id,
             'contact_field_type_id' => $contactFieldType->id,