fixes

monicahq · Jul 8, 2023 · 5ce031e · 5ce031e
1 parent a882794
commit 5ce031e
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 28 deletions.
diff --git a/app/Domains/Contact/DavClient/Jobs/SynchronizeAddressBooks.php b/app/Domains/Contact/DavClient/Jobs/SynchronizeAddressBooks.php
@@ -2,6 +2,7 @@
 
 namespace App\Domains\Contact\DavClient\Jobs;
 
+use App\Domains\Contact\DavClient\Services\SynchronizeAddressBook;
 use App\Models\AddressBookSubscription;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;

diff --git a/app/Domains/Contact/DavClient/Services/CreateAddressBookSubscription.php b/app/Domains/Contact/DavClient/Services/CreateAddressBookSubscription.php
@@ -40,8 +40,10 @@ public function permissions(): array
 
     /**
      * Add a new Adress Book.
+     *
+     * @throws DavClientException
      */
-    public function execute(array $data): ?AddressBookSubscription
+    public function execute(array $data): AddressBookSubscription
     {
         $this->validateRules($data);
 
@@ -53,7 +55,7 @@ public function execute(array $data): ?AddressBookSubscription
         return $this->createAddressBook($data, $addressBookData);
     }
 
-    private function createAddressBook(array $data, array $addressBookData): ?AddressBookSubscription
+    private function createAddressBook(array $data, array $addressBookData): AddressBookSubscription
     {
         return AddressBookSubscription::create([
             'user_id' => $this->author->id,

diff --git a/app/Domains/Contact/DavClient/Services/Utils/AddressBookContactsPushMissed.php b/app/Domains/Contact/DavClient/Services/Utils/AddressBookContactsPushMissed.php
@@ -44,8 +44,8 @@ private function preparePushMissedContacts(array $added, Collection $distContact
         $addedUuids = collect($added)->map(fn (string $uri): string => $this->backend()->getUuid($uri));
 
         return collect($localContacts)
-            ->filter(fn (Contact $contact): bool => ! $distUuids->contains($contact->uuid)
-                && ! $addedUuids->contains($contact->uuid)
+            ->filter(fn (Contact $contact): bool => ! $distUuids->contains($contact->id)
+                && ! $addedUuids->contains($contact->id)
             )
             ->map(function (Contact $contact): PushVCard {
                 $card = $this->backend()->prepareCard($contact);

diff --git a/app/Domains/Contact/DavClient/Services/Utils/AddressBookContactsUpdaterMissed.php b/app/Domains/Contact/DavClient/Services/Utils/AddressBookContactsUpdaterMissed.php
@@ -13,15 +13,14 @@ class AddressBookContactsUpdaterMissed
     /**
      * Update local missed contacts.
      *
-     * @param  Collection<array-key, \App\Models\Contact\Contact>  $localContacts
+     * @param  Collection<array-key, \App\Models\Contact>  $localContacts
      * @param  Collection<array-key, \App\Domains\Contact\DavClient\Services\Utils\Model\ContactDto>  $distContacts
      */
     public function execute(Collection $localContacts, Collection $distContacts): Collection
     {
-        $uuids = $localContacts->pluck('uuid');
+        $uuids = $localContacts->pluck('id');
 
-        $missed = $distContacts->reject(fn (ContactDto $contact): bool => $uuids->contains($this->backend()->getUuid($contact->uri))
-        );
+        $missed = $distContacts->reject(fn (ContactDto $contact): bool => $uuids->contains($this->backend()->getUuid($contact->uri)));
 
         return app(AddressBookContactsUpdater::class)
             ->withSubscription($this->subscription)

diff --git a/app/Domains/Contact/DavClient/Services/Utils/Dav/DavClient.php b/app/Domains/Contact/DavClient/Services/Utils/Dav/DavClient.php
@@ -372,6 +372,8 @@ private function iterateOver(array $list, string $name, callable $callback): mix
                 return $callback($item);
             }
         }
+
+        return null;
     }
 
     /**

diff --git a/app/Domains/Contact/DavClient/Services/Utils/Traits/HasCapability.php b/app/Domains/Contact/DavClient/Services/Utils/Traits/HasCapability.php
@@ -11,6 +11,9 @@ trait HasCapability
      */
     private function hasCapability(string $capability): bool
     {
-        return Arr::get($this->subscription->capabilities, $capability, false);
+        /** @var \App\Models\AddressBookSubscription */
+        $subscription = $this->subscription;
+
+        return Arr::get($subscription->capabilities, $capability, false);
     }
 }
diff --git a/app/Domains/Contact/DavClient/Services/Utils/Traits/HasSubscription.php b/app/Domains/Contact/DavClient/Services/Utils/Traits/HasSubscription.php
@@ -16,13 +16,13 @@ public function withSubscription(AddressBookSubscription $subscription): self
         return $this;
     }
 
-    private ?CardDAVBackend $backend = null;
+    protected ?CardDAVBackend $backend = null;
 
     /**
      * Get carddav backend.
      */
     protected function backend(): CardDAVBackend
     {
-        return $backend ?? $backend = app(CardDAVBackend::class)->withUser($this->subscription->user);
+        return $this->backend ?? $this->backend = app(CardDAVBackend::class)->withUser($this->subscription->user);
     }
 }
diff --git a/app/Models/AddressBookSubscription.php b/app/Models/AddressBookSubscription.php
@@ -9,8 +9,6 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use function safe\json_decode;
-use function safe\json_encode;
 
 class AddressBookSubscription extends Model
 {
@@ -51,10 +49,13 @@ class AddressBookSubscription extends Model
      * @var array<string, string>
      */
     protected $casts = [
+        'user_id' => 'string',
+        'vault_id' => 'string',
         'last_synchronized_at' => 'datetime',
         'readonly' => 'boolean',
         'active' => 'boolean',
         'localSyncToken' => 'integer',
+        'capabilities' => 'array',
     ];
 
     /**
@@ -96,19 +97,6 @@ public function vault()
         return $this->belongsTo(Vault::class);
     }
 
-    /**
-     * Get capabilities.
-     *
-     * @return Attribute<string,string>
-     */
-    public function capabilities(): Attribute
-    {
-        return Attribute::make(
-            get: fn ($value) => json_decode($value, true),
-            set: fn ($value) => json_encode($value)
-        );
-    }
-
     /**
      * Get password.
      *
@@ -117,8 +105,8 @@ public function capabilities(): Attribute
     public function password(): Attribute
     {
         return Attribute::make(
-            get: fn ($value) => decrypt($value, true),
-            set: fn ($value) => encrypt($value)
+            get: fn (?string $value) => decrypt($value, true),
+            set: fn (string $value) => encrypt($value)
         );
     }