fix: fix VCard import without firstname (#2093)

monicahq · Nov 29, 2018 · 3ea2654 · 3ea2654
1 parent 0fc6b76
commit 3ea2654
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,7 @@ UNRELEASED CHANGES:
 
 * Fix Storage page not being displayed
 * Add ability to create tasks that are not linked to any contacts
+* Fix VCard import without firstname
 * Fix avatar display in searches
 
 RELEASED VERSIONS:

diff --git a/app/Services/VCard/ImportVCard.php b/app/Services/VCard/ImportVCard.php
@@ -468,9 +468,11 @@ private function importFromNICKNAME(Contact $contact, VCard $entry): void
      */
     private function importFromFN(Contact $contact, VCard $entry): void
     {
-        $fullnameParts = preg_split('/ +/', $entry->FN);
+        $fullnameParts = preg_split('/\s+/', $entry->FN, 2);
         $contact->first_name = $this->formatValue($fullnameParts[0]);
-        $contact->last_name = $this->formatValue($fullnameParts[1]);
+        if (count($fullnameParts) > 1) {
+            $contact->last_name = $this->formatValue($fullnameParts[1]);
+        }
 
         if (! empty($entry->NICKNAME)) {
             $contact->nickname = $this->formatValue($entry->NICKNAME);

diff --git a/tests/Unit/Services/VCard/ImportVCardTest.php b/tests/Unit/Services/VCard/ImportVCardTest.php
@@ -292,6 +292,40 @@ public function test_it_imports_names_FN_extra_space()
         $this->assertEquals('Doe', $contact->last_name);
     }
 
+    public function test_it_imports_name_FN()
+    {
+        $contact = new Contact;
+
+        $account = factory(Account::class)->create([]);
+        $importVCard = new ImportVCard($account->id);
+
+        $vcard = new VCard([
+            'FN' => 'John',
+            'N' => 'Mike;;;;',
+        ]);
+        $this->invokePrivateMethod($importVCard, 'importNames', [$contact, $vcard]);
+
+        $this->assertEquals('John', $contact->first_name);
+        $this->assertEquals('', $contact->last_name);
+    }
+
+    public function test_it_imports_names_FN_multiple()
+    {
+        $contact = new Contact;
+
+        $account = factory(Account::class)->create([]);
+        $importVCard = new ImportVCard($account->id);
+
+        $vcard = new VCard([
+            'FN' => 'John Doe Marco',
+            'N' => 'Mike;;;;',
+        ]);
+        $this->invokePrivateMethod($importVCard, 'importNames', [$contact, $vcard]);
+
+        $this->assertEquals('John', $contact->first_name);
+        $this->assertEquals('Doe Marco', $contact->last_name);
+    }
+
     public function test_it_imports_work_information()
     {
         $account = factory(Account::class)->create([]);