fix: fix contact create with birthdate age 0

CHANGELOG

@@ -10,6 +10,7 @@ Enhancements:
 
 Fixes:
 
+* Fix contact create with birthdate age 0
 * Fix contact link create on job queue
 * Fix /settings/dav route
 * Fix display relationship without a ofContact property

app/Services/BaseService.php

@@ -3,6 +3,7 @@
 namespace App\Services;
 
 use Carbon\Carbon;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Validator;
 
 abstract class BaseService
@@ -18,7 +19,7 @@ public function rules()
     }
 
     /**
-     * Validate all documents in an account.
+     * Validate all datas to execute the service.
      *
      * @param array $data
      * @return bool
@@ -40,11 +41,9 @@ public function validate(array $data) : bool
      */
     protected function nullOrValue($data, $index)
     {
-        if (empty($data[$index])) {
-            return;
-        }
+        $value = Arr::get($data, $index, null);
 
-        return $data[$index] == '' ? null : $data[$index];
+        return is_null($value) || $value === '' ? null : $value;
     }
 
     /**
@@ -56,10 +55,8 @@ protected function nullOrValue($data, $index)
      */
     protected function nullOrDate($data, $index)
     {
-        if (empty($data[$index])) {
-            return;
-        }
+        $value = Arr::get($data, $index, null);
 
-        return $data[$index] == '' ? null : Carbon::parse($data[$index]);
+        return is_null($value) || $value === '' ? null : Carbon::parse($value);
     }
 }

app/Services/Contact/Contact/UpdateBirthdayInformation.php

@@ -2,15 +2,22 @@
 
 namespace App\Services\Contact\Contact;
 
+use Illuminate\Support\Arr;
 use App\Services\BaseService;
 use App\Models\Contact\Contact;
+use Illuminate\Validation\Rule;
 use App\Models\Contact\Reminder;
 use App\Models\Instance\SpecialDate;
 use App\Services\Contact\Reminder\CreateReminder;
 use App\Services\Contact\Reminder\DestroyReminder;
 
 class UpdateBirthdayInformation extends BaseService
 {
+    /**
+     * @var array
+     */
+    public $data;
+
     /**
      * Get the validation rules that apply to the service.
      *
@@ -22,11 +29,29 @@ public function rules()
             'account_id' => 'required|integer|exists:accounts,id',
             'contact_id' => 'required|integer|exists:contacts,id',
             'is_date_known' => 'required|boolean',
-            'day' => 'nullable|integer',
-            'month' => 'nullable|integer',
-            'year' => 'nullable|integer',
             'is_age_based' => 'nullable|boolean',
-            'age' => 'nullable|integer',
+            'day' => [
+                'integer',
+                'nullable',
+                Rule::requiredIf(function () {
+                    return Arr::get($this->data, 'is_date_known', false) && ! Arr::get($this->data, 'is_age_based', false);
+                }),
+            ],
+            'month' => [
+                'integer',
+                'nullable',
+                Rule::requiredIf(function () {
+                    return Arr::get($this->data, 'is_date_known', false) && ! Arr::get($this->data, 'is_age_based', false);
+                }),
+            ],
+            'year' => 'nullable|integer',
+            'age' => [
+                'integer',
+                'nullable',
+                Rule::requiredIf(function () {
+                    return Arr::get($this->data, 'is_date_known', false) && Arr::get($this->data, 'is_age_based', false);
+                }),
+            ],
             'add_reminder' => 'nullable|boolean',
         ];
     }
@@ -39,6 +64,7 @@ public function rules()
      */
     public function execute(array $data)
     {
+        $this->data = $data;
         $this->validate($data);
 
         $contact = Contact::where('account_id', $data['account_id'])

app/Services/VCard/ImportVCard.php

@@ -672,11 +672,11 @@ private function importBirthday(Contact $contact, VCard $entry): void
                     'account_id' => $contact->account_id,
                     'contact_id' => $contact->id,
                     'is_date_known' => true,
+                    'is_age_based' => false,
                     'day' => $birthdate->day,
                     'month' => $birthdate->month,
                     'year' => $is_year_unknown ? null : $birthdate->year,
                     'add_reminder' => true,
-                    'is_age_based' => null,
                 ]);
             }
         }

tests/Unit/Helpers/RandomHelperTest.php

@@ -16,9 +16,6 @@ public function test_it_returns_a_unique_uuid()
             36,
             strlen(RandomHelper::uuid())
         );
-        $this->assertInternalType(
-            'string',
-            RandomHelper::uuid()
-        );
+        $this->assertIsString(RandomHelper::uuid());
     }
 }

tests/Unit/Jobs/ScheduleStayInTouchTest.php

@@ -50,7 +50,7 @@ function ($notification, $channels) use ($contact) {
         $notifications = NotificationFacade::sent($user, StayInTouchEmail::class);
         $message = $notifications[0]->toMail($user);
 
-        $this->assertArraySubset(['You asked to be reminded to stay in touch with John Doe every 5 days.'], $message->introLines);
+        $this->assertContains('You asked to be reminded to stay in touch with John Doe every 5 days.', $message->introLines);
 
         $this->assertDatabaseHas('contacts', [
             'stay_in_touch_trigger_date' => '2017-01-06 07:00:00',

tests/Unit/Models/IdHasherTest.php

@@ -38,15 +38,14 @@ public function testGetIDback()
         $this->assertEquals($test_id, $result_id);
     }
 
-    /**
-     * @expectedException App\Exceptions\WrongIdException
-     */
     public function test_bad_id_get_exception()
     {
         $idHasher = new IdHasher();
 
         $test_id = rand();
 
+        $this->expectException(\App\Exceptions\WrongIdException::class);
+
         $idHasher->decodeId($test_id);
     }
 

tests/Unit/Models/NoteTest.php

@@ -92,13 +92,13 @@ public function testGetCreatedAtReturnsAString()
         $note = new Note;
         $note->created_at = '2017-01-22 17:56:03';
 
-        $this->assertInternalType('string', $note->getCreatedAt());
+        $this->assertIsString($note->getCreatedAt());
     }
 
     public function testGetContentReturnsAString()
     {
         $note = factory(Note::class)->make();
 
-        $this->assertInternalType('string', $note->getContent());
+        $this->assertIsString($note->getContent());
     }
 }