perf: reduce number of queries (monicahq/chandler#218)

monicahq · Sep 14, 2022 · ef2496c · ef2496c
1 parent 1fa8db7
commit ef2496c
Show file tree

Hide file tree

Showing 34 changed files with 210 additions and 178 deletions.
diff --git a/app/Actions/Jetstream/DeleteUser.php b/app/Actions/Jetstream/DeleteUser.php
@@ -18,7 +18,7 @@ public function delete($user)
     {
         $data = [
             'account_id' => Auth::user()->account_id,
-            'author_id' => Auth::user()->id,
+            'author_id' => Auth::id(),
             'user_id' => $user->id,
         ];
 

diff --git a/app/Helpers/ContactImportantDateHelper.php b/app/Helpers/ContactImportantDateHelper.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Helpers;
+
+use App\Models\ContactImportantDateType;
+use App\Models\Vault;
+use Illuminate\Support\Facades\Cache;
+
+class ContactImportantDateHelper
+{
+    /**
+     * Get the important date type from the vault.
+     *
+     * @return null|ContactImportantDateType
+     */
+    public static function getImportantDateType(string $type, int $vault_id): ?ContactImportantDateType
+    {
+        return Cache::store('array')->remember("ImportantDateType:{$vault_id}:{$type}", 5,
+            fn () => ContactImportantDateType::where([
+                'vault_id' => $vault_id,
+                'internal_type' => $type,
+            ])
+            ->first()
+        );
+    }
+}
diff --git a/app/Helpers/UserHelper.php b/app/Helpers/UserHelper.php
@@ -4,6 +4,7 @@
 
 use App\Models\User;
 use App\Models\Vault;
+use Illuminate\Support\Facades\Cache;
 
 class UserHelper
 {
@@ -15,7 +16,8 @@ class UserHelper
      */
     public static function getInformationAboutContact(User $user, Vault $vault): ?array
     {
-        $contact = $user->getContactInVault($vault);
+        $contact = Cache::store('array')->remember("InformationAboutContact:{$user->id}:{$vault->id}", 5, fn () => $user->getContactInVault($vault)
+        );
 
         if (! $contact) {
             return null;

diff --git a/app/Helpers/VaultHelper.php b/app/Helpers/VaultHelper.php
@@ -4,6 +4,7 @@
 
 use App\Models\User;
 use App\Models\Vault;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 
 class VaultHelper
@@ -46,9 +47,15 @@ public static function getPermissionFriendlyName(int $permission): string
      */
     public static function getPermission(User $user, Vault $vault): ?int
     {
-        $permission = DB::table('user_vault')->where('vault_id', $vault->id)
-            ->where('user_id', $user->id)
-            ->select('permission')->first();
+        $permission = Cache::store('array')->remember("Permission:{$user->id}:{$vault->id}", 5,
+            fn () => DB::table('user_vault')
+                ->where([
+                    'vault_id' => $vault->id,
+                    'user_id' => $user->id,
+                ])
+                ->select('permission')
+                ->first()
+        );
 
         if (! $permission) {
             return null;

diff --git a/app/Http/Middleware/CheckAdministratorPrivilege.php b/app/Http/Middleware/CheckAdministratorPrivilege.php
@@ -17,10 +17,8 @@ class CheckAdministratorPrivilege
      */
     public function handle(Request $request, Closure $next)
     {
-        if (Auth::user()->is_account_administrator) {
-            return $next($request);
-        } else {
-            abort(401);
-        }
+        abort_if(! Auth::user()->is_account_administrator, 401);
+
+        return $next($request);
     }
 }
diff --git a/app/Http/Middleware/CheckContactAccess.php b/app/Http/Middleware/CheckContactAccess.php
@@ -20,14 +20,13 @@ public function handle(Request $request, Closure $next)
         $requestedVaultId = $request->route()->parameter('vault');
         $requestedContactId = $request->route()->parameter('contact');
 
-        $exists = DB::table('contacts')->where('vault_id', $requestedVaultId)
-            ->where('id', $requestedContactId)
-            ->count() > 0;
+        $exists = DB::table('contacts')->where([
+            'vault_id' => $requestedVaultId,
+            'id' => $requestedContactId,
+        ])->exists();
 
-        if ($exists) {
-            return $next($request);
-        } else {
-            abort(401);
-        }
+        abort_if(! $exists, 401);
+
+        return $next($request);
     }
 }
diff --git a/app/Http/Middleware/CheckVaultAccess.php b/app/Http/Middleware/CheckVaultAccess.php
@@ -20,14 +20,13 @@ public function handle(Request $request, Closure $next)
     {
         $requestedVaultId = $request->route()->parameter('vault');
 
-        $exists = DB::table('user_vault')->where('user_id', Auth::user()->id)
-            ->where('vault_id', $requestedVaultId)
-            ->count() > 0;
+        $exists = DB::table('user_vault')->where([
+            'user_id' => Auth::id(),
+            'vault_id' => $requestedVaultId,
+        ])->exists();
 
-        if ($exists) {
-            return $next($request);
-        } else {
-            abort(401);
-        }
+        abort_if(! $exists, 401);
+
+        return $next($request);
     }
 }
diff --git a/app/Http/Middleware/CheckVaultPermissionAtLeastEditor.php b/app/Http/Middleware/CheckVaultPermissionAtLeastEditor.php
@@ -20,15 +20,14 @@ public function handle(Request $request, Closure $next)
     {
         $requestedVaultId = $request->route()->parameter('vault');
 
-        $exists = DB::table('user_vault')->where('vault_id', $requestedVaultId)
-            ->where('user_id', Auth::user()->id)
-            ->where('permission', '<=', 200)
-            ->count() > 0;
+        $exists = DB::table('user_vault')->where([
+            ['vault_id', '=', $requestedVaultId],
+            ['user_id', '=', Auth::id()],
+            ['permission', '<=', 200],
+        ])->exists();
 
-        if ($exists) {
-            return $next($request);
-        } else {
-            abort(401);
-        }
+        abort_if(! $exists, 401);
+
+        return $next($request);
     }
 }
diff --git a/app/Http/Middleware/CheckVaultPermissionAtLeastManager.php b/app/Http/Middleware/CheckVaultPermissionAtLeastManager.php
@@ -20,15 +20,14 @@ public function handle(Request $request, Closure $next)
     {
         $requestedVaultId = $request->route()->parameter('vault');
 
-        $exists = DB::table('user_vault')->where('vault_id', $requestedVaultId)
-            ->where('user_id', Auth::user()->id)
-            ->where('permission', '<=', 100)
-            ->count() > 0;
+        $exists = DB::table('user_vault')->where([
+            ['vault_id', '=', $requestedVaultId],
+            ['user_id', '=', Auth::id()],
+            ['permission', '<=', 100],
+        ])->exists();
 
-        if ($exists) {
-            return $next($request);
-        } else {
-            abort(401);
-        }
+        abort_if(! $exists, 401);
+
+        return $next($request);
     }
 }
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
@@ -12,7 +12,7 @@ class TrustProxies extends Middleware
      *
      * @var array<string>|string|null
      */
-    protected $proxies = '*';
+    protected $proxies;
 
     /**
      * The headers that should be used to detect proxies.
@@ -25,15 +25,4 @@ class TrustProxies extends Middleware
         Request::HEADER_X_FORWARDED_PORT |
         Request::HEADER_X_FORWARDED_PROTO |
         Request::HEADER_X_FORWARDED_AWS_ELB;
-
-    /**
-     * Get the trusted proxies.
-     *
-     * @return array|string|null
-     * @codeCoverageIgnore
-     */
-    protected function proxies()
-    {
-        return config('app.trust_proxies');
-    }
 }
diff --git a/app/Models/Contact.php b/app/Models/Contact.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Helpers\AvatarHelper;
+use App\Helpers\ContactImportantDateHelper;
 use App\Helpers\ImportantDateHelper;
 use App\Helpers\NameHelper;
 use App\Helpers\ScoutHelper;
@@ -213,7 +214,7 @@ public function notes(): HasMany
      *
      * @return HasMany
      */
-    public function dates(): HasMany
+    public function importantDates(): HasMany
     {
         return $this->hasMany(ContactImportantDate::class);
     }
@@ -362,15 +363,13 @@ protected function age(): Attribute
     {
         return Attribute::make(
             get: function ($value) {
-                $type = ContactImportantDateType::where('vault_id', $this->vault_id)
-                    ->where('internal_type', ContactImportantDate::TYPE_BIRTHDATE)
-                    ->first();
+                $type = ContactImportantDateHelper::getImportantDateType(ContactImportantDate::TYPE_BIRTHDATE, $this->vault_id);
 
                 if (! $type) {
                     return null;
                 }
 
-                $birthdate = $this->dates()
+                $birthdate = $this->importantDates
                     ->where('contact_important_date_type_id', $type->id)
                     ->first();
 

diff --git a/config/app.php b/config/app.php
@@ -123,18 +123,6 @@
 
     'cipher' => 'AES-256-CBC',
 
-    /*
-    |--------------------------------------------------------------------------
-    | Trust proxies
-    |--------------------------------------------------------------------------
-    |
-    | List of trusted proxies.
-    | Example: set it to '*' to allow any proxy.
-    |
-    */
-
-    'trust_proxies' => env('APP_TRUSTED_PROXIES'),
-
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers

diff --git a/config/trustedproxy.php b/config/trustedproxy.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application trusted proxies
+    |--------------------------------------------------------------------------
+    |
+    | Set trusted proxy IP addresses.
+    | Both IPv4 and IPv6 addresses are supported, along with CIDR notation.
+    |
+    | The "*" character is syntactic sugar within TrustedProxy to trust any
+    | proxy that connects directly to your server, a requirement when you
+    | cannot know the address of your proxy (e.g. if using ELB or similar).
+    |
+    */
+
+    'proxies' => env('APP_TRUSTED_PROXIES', null),
+
+];
diff --git a/domains/Contact/ManageContact/Services/ToggleFavoriteContact.php b/domains/Contact/ManageContact/Services/ToggleFavoriteContact.php
@@ -70,27 +70,26 @@ private function validate(): void
 
     private function toggle(): void
     {
+        $contact = [
+            'contact_id' => $this->data['contact_id'],
+            'vault_id' => $this->data['vault_id'],
+            'user_id' => $this->data['author_id'],
+        ];
+
         $exists = DB::table('contact_vault_user')
-            ->where('contact_id', $this->data['contact_id'])
-            ->where('vault_id', $this->data['vault_id'])
-            ->where('user_id', $this->data['author_id'])
+            ->where($contact)
             ->first();
 
         if ($exists) {
             $this->isFavorite = $exists->is_favorite;
 
             DB::table('contact_vault_user')
-                ->where('contact_id', $this->data['contact_id'])
-                ->where('vault_id', $this->data['vault_id'])
-                ->where('user_id', $this->data['author_id'])
+                ->where($contact)
                 ->update(['is_favorite' => ! $this->isFavorite]);
         } else {
             $this->isFavorite = true;
 
-            DB::table('contact_vault_user')->insert([
-                'contact_id' => $this->data['contact_id'],
-                'vault_id' => $this->data['vault_id'],
-                'user_id' => $this->data['author_id'],
+            DB::table('contact_vault_user')->insert($contact + [
                 'is_favorite' => true,
                 'number_of_views' => 1,
             ]);

diff --git a/domains/Contact/ManageContact/Services/UpdateContactView.php b/domains/Contact/ManageContact/Services/UpdateContactView.php
@@ -58,23 +58,22 @@ public function execute(array $data): void
 
     private function updateView(): void
     {
+        $contact = [
+            'contact_id' => $this->data['contact_id'],
+            'vault_id' => $this->data['vault_id'],
+            'user_id' => $this->data['author_id'],
+        ];
+
         $exists = DB::table('contact_vault_user')
-            ->where('contact_id', $this->data['contact_id'])
-            ->where('vault_id', $this->data['vault_id'])
-            ->where('user_id', $this->data['author_id'])
-            ->first();
+            ->where($contact)
+            ->exists();
 
         if ($exists) {
             DB::table('contact_vault_user')
-                ->where('contact_id', $this->data['contact_id'])
-                ->where('vault_id', $this->data['vault_id'])
-                ->where('user_id', $this->data['author_id'])
+                ->where($contact)
                 ->increment('number_of_views');
         } else {
-            DB::table('contact_vault_user')->insert([
-                'contact_id' => $this->data['contact_id'],
-                'vault_id' => $this->data['vault_id'],
-                'user_id' => $this->data['author_id'],
+            DB::table('contact_vault_user')->insert($contact + [
                 'number_of_views' => 1,
             ]);
         }

diff --git a/domains/Contact/ManageContact/Web/Controllers/ContactController.php b/domains/Contact/ManageContact/Web/Controllers/ContactController.php
@@ -77,11 +77,13 @@ public function store(Request $request, int $vaultId)
     public function show(Request $request, int $vaultId, int $contactId)
     {
         $vault = Vault::findOrFail($vaultId);
-        $contact = Contact::with('gender')
-            ->with('pronoun')
-            ->with('notes')
-            ->with('dates')
-            ->with('vault')
+        $contact = Contact::with([
+            'gender',
+            'pronoun',
+            'notes',
+            'importantDates',
+            'vault',
+        ])
             ->findOrFail($contactId);
 
         if (! $contact->template_id) {

diff --git a/domains/Contact/ManageContact/Web/Controllers/ContactPageController.php b/domains/Contact/ManageContact/Web/Controllers/ContactPageController.php
@@ -18,11 +18,13 @@ class ContactPageController extends Controller
     public function show(Request $request, int $vaultId, int $contactId, string $slug)
     {
         $vault = Vault::findOrFail($vaultId);
-        $contact = Contact::with('gender')
-            ->with('pronoun')
-            ->with('notes')
-            ->with('dates')
-            ->with('vault')
+        $contact = Contact::with([
+            'gender',
+            'pronoun',
+            'notes',
+            'importantDates',
+            'vault',
+        ])
             ->findOrFail($contactId);
 
         if (! $contact->template_id) {