feat: introduce sortByCollator (monicahq/chandler#534)

monicahq · May 27, 2023 · 039f478 · 039f478
1 parent 8e39de4
commit 039f478
Show file tree

Hide file tree

Showing 44 changed files with 487 additions and 296 deletions.
diff --git a/app/Actions/Jetstream/UserProfile.php b/app/Actions/Jetstream/UserProfile.php
@@ -4,6 +4,7 @@
 
 use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
+use LaravelWebauthn\Models\WebauthnKey;
 
 class UserProfile
 {
@@ -22,7 +23,7 @@ public function __invoke(Request $request, array $data): array
             ]);
 
         $webauthnKeys = $request->user()->webauthnKeys
-            ->map(fn ($key) => [
+            ->map(fn (WebauthnKey $key) => [
                 'id' => $key->id,
                 'name' => $key->name,
                 'type' => $key->type,
@@ -34,7 +35,7 @@ public function __invoke(Request $request, array $data): array
         $data['userTokens'] = $request->user()->userTokens()->get();
         $data['webauthnKeys'] = $webauthnKeys;
 
-        $data['locales'] = collect(config('lang-detector.languages'))->map(fn ($locale) => [
+        $data['locales'] = collect(config('lang-detector.languages'))->map(fn (string $locale) => [
             'id' => $locale,
             'name' => __('auth.lang', [], $locale),
         ]);

diff --git a/app/Domains/Contact/Dav/Web/Backend/CardDAV/AddressBookHome.php b/app/Domains/Contact/Dav/Web/Backend/CardDAV/AddressBookHome.php
@@ -23,7 +23,7 @@ private function getPrincipalUri(): string
     public function getChildren(): array
     {
         return collect($this->carddavBackend->getAddressBooksForUser($this->getPrincipalUri()))
-            ->map(fn ($addressBookInfo) => new AddressBook($this->carddavBackend, $addressBookInfo))
+            ->map(fn (array $addressBookInfo) => new AddressBook($this->carddavBackend, $addressBookInfo))
             ->toArray();
     }
 }
diff --git a/app/Domains/Contact/Dav/Web/Backend/CardDAV/CardDAVBackend.php b/app/Domains/Contact/Dav/Web/Backend/CardDAV/CardDAVBackend.php
@@ -250,7 +250,7 @@ public function getObjects(?string $collectionId): Collection
         }
 
         return $vaults->get()
-            ->map(fn ($vault) => $vault->contacts()
+            ->map(fn (Vault $vault) => $vault->contacts()
                 ->active()
                 ->get()
             )
@@ -272,7 +272,7 @@ public function getDeletedObjects(?string $collectionId): Collection
         }
 
         return $vaults->get()
-            ->map(fn ($vault) => $vault->contacts()
+            ->map(fn (Vault $vault) => $vault->contacts()
                 ->onlyTrashed()
                 ->get()
             )
@@ -302,7 +302,7 @@ public function getCards($addressbookId): array
         $contacts = $this->getObjects($addressbookId);
 
         return $contacts
-            ->map(fn ($contact) => $this->prepareCard($contact))
+            ->map(fn (Contact $contact) => $this->prepareCard($contact))
             ->toArray();
     }
 

diff --git a/app/Domains/Contact/ManageContact/Web/Controllers/ContactController.php b/app/Domains/Contact/ManageContact/Web/Controllers/ContactController.php
@@ -25,7 +25,7 @@ class ContactController extends Controller
 {
     public function index(Request $request, Vault $vault)
     {
-        $contacts = Contact::where('vault_id', $vault->id)
+        $contacts = $vault->contacts()
             ->where('listed', true);
 
         switch (Auth::user()->contact_sort_order) {

diff --git a/app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactCreateViewHelper.php b/app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactCreateViewHelper.php
@@ -2,6 +2,9 @@
 
 namespace App\Domains\Contact\ManageContact\Web\ViewHelpers;
 
+use App\Models\Gender;
+use App\Models\Pronoun;
+use App\Models\Template;
 use App\Models\Vault;
 
 class ContactCreateViewHelper
@@ -10,35 +13,34 @@ public static function data(Vault $vault): array
     {
         $account = $vault->account;
 
-        $genders = $account->genders()->orderBy('name', 'asc')->get();
-        $genderCollection = $genders->map(function ($gender) {
-            return [
+        $genders = $account->genders()
+            ->get()
+            ->sortByCollator('name')
+            ->map(fn (Gender $gender) => [
                 'id' => $gender->id,
                 'name' => $gender->name,
-            ];
-        });
+            ]);
 
-        $pronouns = $account->pronouns()->orderBy('name', 'asc')->get();
-        $pronounCollection = $pronouns->map(function ($pronoun) {
-            return [
+        $pronouns = $account->pronouns()
+            ->get()
+            ->sortByCollator('name')
+            ->map(fn (Pronoun $pronoun) => [
                 'id' => $pronoun->id,
                 'name' => $pronoun->name,
-            ];
-        });
+            ]);
 
-        $templates = $account->templates;
-        $templateCollection = $templates->map(function ($template) use ($vault) {
-            return [
+        $templates = $account->templates
+            ->sortByCollator('name')
+            ->map(fn (Template $template) => [
                 'id' => $template->id,
                 'name' => $template->name,
                 'selected' => $template->id === $vault->default_template_id,
-            ];
-        });
+            ]);
 
         return [
-            'genders' => $genderCollection,
-            'pronouns' => $pronounCollection,
-            'templates' => $templateCollection,
+            'genders' => $genders,
+            'pronouns' => $pronouns,
+            'templates' => $templates,
             'url' => [
                 'store' => route('contact.store', [
                     'vault' => $vault->id,

diff --git a/app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactIndexViewHelper.php b/app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactIndexViewHelper.php
@@ -26,9 +26,9 @@ public static function data($contacts, Vault $vault, int $labelId = null, User $
         }
 
         $labelsCollection = $vault->labels()
-            ->orderBy('name', 'asc')
             ->withCount('contacts')
             ->get()
+            ->sortByCollator('name')
             ->filter(fn (Label $label): bool => $label->contacts_count > 0)
             ->map(fn (Label $label) => [
                 'id' => $label->id,

diff --git a/app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactShowMoveViewHelper.php b/app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactShowMoveViewHelper.php
@@ -12,8 +12,8 @@ public static function data(Contact $contact, User $user): array
     {
         $vaultsCollection = $user->vaults()
             ->withCount('contacts')
-            ->orderBy('name', 'asc')
             ->get()
+            ->sortByCollator('name')
             ->filter(fn (Vault $vault) => $vault->id !== $contact->vault_id)
             ->map(fn (Vault $vault) => [
                 'id' => $vault->id,

diff --git a/app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelper.php b/app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelper.php
@@ -20,7 +20,7 @@ class ModuleFeedViewHelper
 {
     public static function data($items, User $user, Vault $vault): array
     {
-        $itemsCollection = $items->map(fn ($item) => [
+        $itemsCollection = $items->map(fn (ContactFeedItem $item) => [
             'id' => $item->id,
             'action' => $item->action,
             'author' => self::getAuthor($item, $vault),

diff --git a/...s/Contact/ManageContactInformation/Web/ViewHelpers/ModuleContactInformationViewHelper.php b/...s/Contact/ManageContactInformation/Web/ViewHelpers/ModuleContactInformationViewHelper.php
@@ -4,6 +4,7 @@
 
 use App\Models\Contact;
 use App\Models\ContactInformation;
+use App\Models\ContactInformationType;
 use App\Models\User;
 
 class ModuleContactInformationViewHelper
@@ -12,21 +13,20 @@ public static function data(Contact $contact, User $user): array
     {
         $infos = $contact->contactInformations()
             ->with('contactInformationType')
-            ->get();
-
-        $infosCollection = $infos->map(fn ($info) => self::dto($contact, $info));
+            ->get()
+            ->map(fn (ContactInformation $info) => self::dto($contact, $info));
 
-        $infoTypesCollection = $user->account
+        $infoTypes = $user->account
             ->contactInformationTypes()
             ->get()
-            ->map(fn ($contactInformationType) => [
+            ->map(fn (ContactInformationType $contactInformationType) => [
                 'id' => $contactInformationType->id,
                 'name' => $contactInformationType->name,
             ]);
 
         return [
-            'contact_information' => $infosCollection,
-            'contact_information_types' => $infoTypesCollection,
+            'contact_information' => $infos,
+            'contact_information_types' => $infoTypes,
             'url' => [
                 'store' => route('contact.contact_information.store', [
                     'vault' => $contact->vault_id,

diff --git a/app/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupIndexViewHelper.php b/app/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupIndexViewHelper.php
@@ -15,8 +15,8 @@ class GroupIndexViewHelper
     public static function data(Vault $vault): Collection
     {
         return $vault->groups()->with('contacts')
-            ->orderBy('name')
             ->get()
+            ->sortByCollator('name')
             ->map(function (Group $group) {
                 $contactsCollection = $group->contacts()
                     ->get()

diff --git a/app/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupsViewHelper.php b/app/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupsViewHelper.php
@@ -3,6 +3,7 @@
 namespace App\Domains\Contact\ManageGroups\Web\ViewHelpers;
 
 use App\Models\Contact;
+use App\Models\Group;
 use Illuminate\Support\Collection;
 
 class GroupsViewHelper
@@ -14,10 +15,11 @@ class GroupsViewHelper
      */
     public static function summary(Contact $contact): Collection
     {
-        $groupsInContact = $contact->groups()->with('contacts')->orderBy('name')->get();
-
-        return $groupsInContact->map(function ($group) {
-            return [
+        return $contact->groups()
+            ->with('contacts')
+            ->get()
+            ->sortByCollator('name')
+            ->map(fn (Group $group) => [
                 'id' => $group->id,
                 'name' => $group->name,
                 'url' => [
@@ -26,7 +28,6 @@ public static function summary(Contact $contact): Collection
                         'group' => $group->id,
                     ]),
                 ],
-            ];
-        });
+            ]);
     }
 }
diff --git a/app/Domains/Contact/ManageGroups/Web/ViewHelpers/ModuleGroupsViewHelper.php b/app/Domains/Contact/ManageGroups/Web/ViewHelpers/ModuleGroupsViewHelper.php
@@ -13,28 +13,28 @@ class ModuleGroupsViewHelper
      */
     public static function data(Contact $contact): array
     {
-        $groupsInVault = $contact->vault->groups()->with('contacts')->orderBy('name')->get();
-        $groupsInContact = $contact->groups()->with('contacts')->orderBy('name')->get();
+        $groupsInVault = $contact->vault->groups()
+            ->with('contacts')
+            ->get()
+            ->sortByCollator('name');
+        $groupsInContact = $contact->groups()
+            ->with('contacts')
+            ->get()
+            ->sortByCollator('name');
 
         $availableGroups = $groupsInVault->diff($groupsInContact);
 
-        $availableGroupsCollection = $availableGroups->map(function ($group) use ($contact) {
-            return self::dto($contact, $group);
-        });
+        $availableGroupsCollection = $availableGroups->map(fn (Group $group) => self::dto($contact, $group));
         $availableGroupsCollection->prepend([
             'id' => 0,
             'name' => trans('+ Create a group'),
             'selected' => false,
         ]);
 
-        $groupsInContactCollection = $groupsInContact->map(function ($group) use ($contact) {
-            return self::dto($contact, $group);
-        });
+        $groupsInContactCollection = $groupsInContact->map(fn (Group $group) => self::dto($contact, $group));
 
         $groupTypes = $contact->vault->account->groupTypes()->orderBy('position')->get();
-        $groupTypesCollection = $groupTypes->map(function ($groupType) {
-            return self::dtoGroupType($groupType);
-        });
+        $groupTypesCollection = $groupTypes->map(fn (GroupType $groupType) => self::dtoGroupType($groupType));
 
         return [
             'groups' => $groupsInContactCollection,
@@ -55,8 +55,8 @@ public static function data(Contact $contact): array
     public static function dto(Contact $contact, Group $group, bool $taken = false): array
     {
         $contacts = $group->contacts()
-            ->orderBy('first_name')
             ->get()
+            ->sortByCollator('first_name')
             ->map(function ($contact) {
                 return [
                     'id' => $contact->id,

diff --git a/app/Domains/Contact/ManageJobInformation/Web/ViewHelpers/ModuleCompanyViewHelper.php b/app/Domains/Contact/ManageJobInformation/Web/ViewHelpers/ModuleCompanyViewHelper.php
@@ -35,12 +35,10 @@ public static function data(Contact $contact): array
 
     public static function list(Vault $vault, Contact $contact): Collection
     {
-        $collection = $vault->companies()->orderBy('name', 'asc')
-            ->get()->map(function ($company) use ($contact) {
-                return self::dto($company, $contact);
-            });
-
-        return $collection;
+        return $vault->companies()
+            ->get()
+            ->sortByCollator('name')
+            ->map(fn (Company $company) => self::dto($company, $contact));
     }
 
     public static function dto(Company $company, Contact $contact): array

diff --git a/app/Domains/Contact/ManageLoans/Web/ViewHelpers/ModuleLoanViewHelper.php b/app/Domains/Contact/ManageLoans/Web/ViewHelpers/ModuleLoanViewHelper.php
@@ -41,8 +41,8 @@ public static function dtoLoan(Loan $loan, Contact $contact, User $user): array
         $loaners = $loan->loaners->unique('id');
         $loanees = $loan->loanees->unique('id');
 
-        $loanersCollection = $loaners->map(fn ($loaner) => ContactCardHelper::data($loaner));
-        $loaneesCollection = $loanees->map(fn ($loanee) => ContactCardHelper::data($loanee));
+        $loanersCollection = $loaners->map(fn (Contact $loaner) => ContactCardHelper::data($loaner));
+        $loaneesCollection = $loanees->map(fn (Contact $loanee) => ContactCardHelper::data($loanee));
 
         $currency = optional($loan->currency)->code;