feat: add notion of addressbooks

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ### New features:
 
+* Add the notion of AddressBooks
 * Add Japanese langage
 * Change title of birthday reminder for deceased people
 

app/Helpers/SearchHelper.php

@@ -16,9 +16,10 @@ class SearchHelper
      * @param  string $needle
      * @param  string $orderByColumn
      * @param  string $orderByDirection
+     * @param  string|null $addressBookName
      * @return Builder
      */
-    public static function searchContacts(string $needle, string $orderByColumn, string $orderByDirection = 'asc'): Builder
+    public static function searchContacts(string $needle, string $orderByColumn, string $orderByDirection = 'asc', string $addressBookName = null): Builder
     {
         $accountId = Auth::user()->account_id;
 
@@ -39,9 +40,11 @@ public static function searchContacts(string $needle, string $orderByColumn, str
                     ['contact_field_type_id', $field_id],
                 ]);
             })
+                ->addressBook($accountId, $addressBookName)
                 ->orderBy($orderByColumn, $orderByDirection);
         }
 
-        return Contact::search($needle, $accountId, $orderByColumn, $orderByDirection);
+        return Contact::search($needle, $accountId, $orderByColumn, $orderByDirection)
+            ->addressBook($accountId, $addressBookName);
     }
 }

app/Http/Controllers/Api/ApiContactController.php

@@ -67,8 +67,7 @@ public function index(Request $request)
         }
 
         try {
-            $contacts = auth()->user()->account->contacts()
-                            ->real()
+            $contacts = auth()->user()->account->addressBookContacts()
                             ->active()
                             ->orderBy($this->sort, $this->sortDirection)
                             ->paginate($this->getLimitPerPage());

app/Http/Controllers/Api/ApiTagController.php

@@ -144,8 +144,7 @@ public function destroy(Request $request, $id)
     public function contacts(Request $request, int $tagId)
     {
         try {
-            $contacts = auth()->user()->account->contacts()
-                ->real()
+            $contacts = auth()->user()->account->addressBookContacts()
                 ->active()
                 ->whereHas('tags', function (Builder $query) use ($tagId) {
                     $query->where('id', $tagId);

app/Http/Controllers/Contacts/IntroductionsController.php

@@ -21,10 +21,9 @@ class IntroductionsController extends Controller
      */
     public function edit(Contact $contact)
     {
-        $contacts = auth()->user()->account->contacts()
-                        ->real()
-                        ->active()
-                        ->get();
+        $contacts = $contact->addressBookContacts()
+                      ->active()
+                      ->get();
 
         return view('people.introductions.edit')
             ->withContact($contact)

app/Http/Controllers/ContactsController.php

@@ -78,7 +78,7 @@ private function contacts(Request $request, bool $active)
             ]);
         }
 
-        $contacts = $user->account->contacts()->real();
+        $contacts = $user->account->addressBookContacts();
         if ($active) {
             $archived = (clone $contacts)->notActive();
             $contacts = (clone $contacts)->active();
@@ -674,13 +674,13 @@ public function list(Request $request)
         $url = '';
         $count = 1;
 
-        $contacts = $user->account->contacts()->real();
+        $addressBook = $user->account->addressBookContacts();
 
         // filter out archived contacts if necessary
         if ($request->input('show_archived') != 'true') {
-            $contacts = $contacts->active();
+            $contacts = $addressBook->active();
         } else {
-            $contacts = $contacts->notActive();
+            $contacts = $addressBook->notActive();
         }
 
         // filter out deceased if necessary

app/Http/Controllers/DAV/Backend/CalDAV/AbstractCalDAVBackend.php

@@ -15,7 +15,7 @@ abstract class AbstractCalDAVBackend implements ICalDAVBackend, IDAVBackend
 
     public function getDescription()
     {
-        $token = DAVSyncPlugin::SYNCTOKEN_PREFIX.$this->refreshSyncToken()->id;
+        $token = DAVSyncPlugin::SYNCTOKEN_PREFIX.$this->refreshSyncToken(null)->id;
         $des = [
             'id' => $this->backendUri(),
             'uri' => $this->backendUri(),

app/Http/Controllers/DAV/Backend/CalDAV/CalDAVBackend.php

@@ -125,7 +125,7 @@ public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limi
     {
         $backend = $this->getBackend($calendarId);
         if ($backend) {
-            return $backend->getChanges($syncToken);
+            return $backend->getChanges($calendarId, $syncToken);
         }
 
         return [];
@@ -166,7 +166,7 @@ public function getCalendarObjects($calendarId)
     {
         $backend = $this->getBackend($calendarId);
         if ($backend) {
-            $objs = $backend->getObjects();
+            $objs = $backend->getObjects($calendarId);
 
             return $objs
                 ->map(function ($date) use ($backend) {
@@ -201,7 +201,7 @@ public function getCalendarObject($calendarId, $objectUri)
     {
         $backend = $this->getBackend($calendarId);
         if ($backend) {
-            $obj = $backend->getObject($objectUri);
+            $obj = $backend->getObject($calendarId, $objectUri);
 
             if ($obj) {
                 return $backend->prepareData($obj);
@@ -257,7 +257,7 @@ public function updateCalendarObject($calendarId, $objectUri, $calendarData): ?s
         $backend = $this->getBackend($calendarId);
 
         return $backend ?
-            $backend->updateOrCreateCalendarObject($objectUri, $calendarData)
+            $backend->updateOrCreateCalendarObject($calendarId, $objectUri, $calendarData)
             : null;
     }
 

app/Http/Controllers/DAV/Backend/CalDAV/CalDAVBirthdays.php

@@ -95,10 +95,11 @@ private function hasBirthday($contact)
     /**
      * Returns the date for the specific uuid.
      *
+     * @param string|null $collectionId
      * @param string  $uuid
      * @return mixed
      */
-    public function getObjectUuid($uuid)
+    public function getObjectUuid($collectionId, $uuid)
     {
         return SpecialDate::where([
             'account_id' => Auth::user()->account_id,
@@ -111,11 +112,10 @@ public function getObjectUuid($uuid)
      *
      * @return \Illuminate\Support\Collection
      */
-    public function getObjects()
+    public function getObjects($collectionId)
     {
-        $contacts = Auth::user()->account
-                    ->contacts()
-                    ->real()
+        // We only return the birthday of default addressBook
+        $contacts = Auth::user()->account->addressBookContacts()
                     ->active()
                     ->get();
 
@@ -130,7 +130,7 @@ public function getObjects()
     /**
      * @return string|null
      */
-    public function updateOrCreateCalendarObject($objectUri, $calendarData): ?string
+    public function updateOrCreateCalendarObject($calendarId, $objectUri, $calendarData): ?string
     {
         return null;
     }

app/Http/Controllers/DAV/Backend/CalDAV/CalDAVTasks.php

@@ -42,7 +42,7 @@ public function getDescription()
      *
      * @return \Illuminate\Support\Collection
      */
-    public function getObjects()
+    public function getObjects($collectionId)
     {
         return Auth::user()->account
                     ->tasks()
@@ -52,10 +52,11 @@ public function getObjects()
     /**
      * Returns the contact for the specific uuid.
      *
+     * @param mixed|null $collectionId
      * @param string  $uuid
      * @return mixed
      */
-    public function getObjectUuid($uuid)
+    public function getObjectUuid($collectionId, $uuid)
     {
         return Task::where([
             'account_id' => Auth::user()->account_id,
@@ -123,11 +124,11 @@ public function prepareData($task)
      * @param string $calendarData
      * @return string|null
      */
-    public function updateOrCreateCalendarObject($objectUri, $calendarData): ?string
+    public function updateOrCreateCalendarObject($calendarId, $objectUri, $calendarData): ?string
     {
         $task_id = null;
         if ($objectUri) {
-            $task = $this->getObject($objectUri);
+            $task = $this->getObject($this->backendUri(), $objectUri);
 
             if ($task) {
                 $task_id = $task->id;
@@ -167,7 +168,7 @@ public function updateOrCreateCalendarObject($objectUri, $calendarData): ?string
      */
     public function deleteCalendarObject($objectUri)
     {
-        $task = $this->getObject($objectUri);
+        $task = $this->getObject($this->backendUri(), $objectUri);
 
         if ($task) {
             try {

app/Http/Controllers/DAV/Backend/CalDAV/ICalDAVBackend.php

@@ -55,10 +55,11 @@ public function getDescription();
      * The getChanges method returns all the changes that have happened, since
      * the specified syncToken in the specified calendar.
      *
+     * @param string|null $calendarId
      * @param string $syncToken
      * @return array
      */
-    public function getChanges($syncToken);
+    public function getChanges($calendarId, $syncToken);
 
     /**
      * Returns calendar object.
@@ -98,11 +99,12 @@ public function prepareData($obj);
      * calendar-data. If the result of a subsequent GET to this object is not
      * the exact same as this request body, you should omit the ETag.
      *
+     * @param string|null $calendarId
      * @param string $objectUri
      * @param string $calendarData
      * @return string|null
      */
-    public function updateOrCreateCalendarObject($objectUri, $calendarData): ?string;
+    public function updateOrCreateCalendarObject($calendarId, $objectUri, $calendarData): ?string;
 
     /**
      * Deletes an existing calendar object.

app/Http/Controllers/DAV/Backend/CardDAV/AddressBook.php

@@ -70,7 +70,7 @@ public function getLastModified(): ?int
     {
         $carddavBackend = $this->carddavBackend;
         if ($carddavBackend instanceof CardDAVBackend) {
-            $date = $carddavBackend->getLastModified();
+            $date = $carddavBackend->getLastModified(null);
             if (! is_null($date)) {
                 return $date->timestamp;
             }
@@ -92,7 +92,7 @@ public function getSyncToken(): ?string
     {
         $carddavBackend = $this->carddavBackend;
         if ($carddavBackend instanceof CardDAVBackend) {
-            return (string) $carddavBackend->refreshSyncToken()->id;
+            return (string) $carddavBackend->refreshSyncToken(null)->id;
         }
 
         return null;