refactor: some refactors

app/Http/Kernel.php

@@ -14,12 +14,11 @@ class Kernel extends HttpKernel
      * @var array<int, class-string|string>
      */
     protected $middleware = [
-        // \App\Http\Middleware\TrustHosts::class,
-        Middleware\TrustProxies::class,
+        \App\Http\Middleware\TrustProxies::class,
         \Illuminate\Http\Middleware\HandleCors::class,
-        Middleware\PreventRequestsDuringMaintenance::class,
+        \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        Middleware\TrimStrings::class,
+        \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
     ];
 
@@ -30,11 +29,11 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'web' => [
-            Middleware\EncryptCookies::class,
+            \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            Middleware\VerifyCsrfToken::class,
+            \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
@@ -53,19 +52,19 @@ class Kernel extends HttpKernel
      * @var array<string, class-string|string>
      */
     protected $middlewareAliases = [
-        'auth' => Middleware\Authenticate::class,
+        'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest' => Middleware\RedirectIfAuthenticated::class,
+        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
         'precognitive' => \Illuminate\Foundation\Http\Middleware\HandlePrecognitiveRequests::class,
-        'signed' => Middleware\ValidateSignature::class,
+        'signed' => \App\Http\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
-        'name' => Middleware\CheckName::class,
-        'letter' => Middleware\CheckLetter::class,
-        'list' => Middleware\CheckList::class,
+        'name' => \App\Http\Middleware\CheckName::class,
+        'letter' => \App\Http\Middleware\CheckLetter::class,
+        'list' => \App\Http\Middleware\CheckList::class,
     ];
 }

app/Http/ViewModels/Home/HomeViewModel.php

@@ -73,7 +73,7 @@ public static function serverStats(): array
         $totalNames = Name::where('name', '!=', '_PRENOMS_RARES')->count();
 
         return [
-            'total_names' => Number::format($totalNames, locale: 'fr'),
+            'total_names' => Number::format($totalNames),
         ];
     }
 }

app/Http/ViewModels/Names/AllNamesViewModel.php

@@ -15,7 +15,7 @@ public static function index(): Collection
         $allNames = Name::where('name', '!=', '_PRENOMS_RARES')->count();
         $letters->push([
             'letter' => 'Tous',
-            'count' => Number::format($allNames, locale: 'fr'),
+            'count' => Number::format($allNames),
             'url' => route('name.index'),
         ]);
 
@@ -25,7 +25,7 @@ public static function index(): Collection
 
             $letters->push([
                 'letter' => $letter,
-                'count' => Number::format($count, locale: 'fr'),
+                'count' => Number::format($count),
                 'url' => route('name.letter', ['letter' => Str::lcfirst($letter)]),
             ]);
         }

app/Http/ViewModels/Names/FemaleNamesViewModel.php

@@ -20,7 +20,7 @@ public static function index(): Collection
         $letters = collect();
         $letters->push([
             'letter' => 'Tous',
-            'count' => Number::format($total, locale: 'fr'),
+            'count' => Number::format($total),
             'url' => route('name.fille.index'),
         ]);
 
@@ -29,7 +29,7 @@ public static function index(): Collection
                 ->where('name', 'like', $letter . '%')->count();
             $letters->push([
                 'letter' => $letter,
-                'count' => Number::format($total, locale: 'fr'),
+                'count' => Number::format($total),
                 'url' => route('name.fille.letter', [
                     'letter' => Str::lcfirst($letter),
                 ]),

app/Http/ViewModels/Names/MaleNamesViewModel.php

@@ -20,7 +20,7 @@ public static function index(): Collection
         $letters = collect();
         $letters->push([
             'letter' => 'Tous',
-            'count' => Number::format($total, locale: 'fr'),
+            'count' => Number::format($total),
             'url' => route('name.garcon.index'),
         ]);
 
@@ -29,7 +29,7 @@ public static function index(): Collection
                 ->where('name', 'like', $letter . '%')->count();
             $letters->push([
                 'letter' => $letter,
-                'count' => Number::format($total, locale: 'fr'),
+                'count' => Number::format($total),
                 'url' => route('name.garcon.letter', [
                     'letter' => Str::lcfirst($letter),
                 ]),

app/Http/ViewModels/Names/MixteNamesViewModel.php

@@ -20,7 +20,7 @@ public static function index(): Collection
         $letters = collect();
         $letters->push([
             'letter' => 'Tous',
-            'count' => Number::format($total, locale: 'fr'),
+            'count' => Number::format($total),
             'url' => route('name.mixte.index'),
         ]);
 
@@ -29,7 +29,7 @@ public static function index(): Collection
                 ->where('name', 'like', $letter . '%')->count();
             $letters->push([
                 'letter' => $letter,
-                'count' => Number::format($total, locale: 'fr'),
+                'count' => Number::format($total),
                 'url' => route('name.mixte.letter', [
                     'letter' => Str::lcfirst($letter),
                 ]),

app/Http/ViewModels/Names/NameViewModel.php

@@ -30,8 +30,6 @@ public static function summary(mixed $name): array
 
     public static function details(Name $name): array
     {
-        Carbon::setLocale('fr');
-
         return [
             'id' => $name->id,
             'name' => StringHelper::formatNameFromDB($name->name),
@@ -84,11 +82,7 @@ public static function popularity(Name $name): array
         // now we need to add the percentage of popularity for each decade
         $total = $decadesCollection->sum('popularity');
         $decadesCollection = $decadesCollection->map(function ($decade) use ($total) {
-            if ($total > 0) {
-                $decade['percentage'] = Number::format(round($decade['popularity'] / $total * 100), locale: 'fr');
-            } else {
-                $decade['percentage'] = 0;
-            }
+            $decade['percentage'] = $total > 0 ? Number::format(round($decade['popularity'] / $total * 100)) : 0;
 
             return $decade;
         });
@@ -98,7 +92,7 @@ public static function popularity(Name $name): array
 
         return [
             'decades' => $decadesCollection,
-            'total' => Number::format($total, locale: 'fr'),
+            'total' => Number::format($total),
         ];
     }
 

app/Http/ViewModels/Search/SearchViewModel.php

@@ -27,9 +27,7 @@ public static function names(?string $term = null, int $limit = 20): array
                     ]),
                 ],
             ])
-            ->filter(function ($name) {
-                return strpos($name['name'], '_prenoms_rares') === false;
-            });
+            ->filter(fn ($name) => strpos($name['name'], '_prenoms_rares') === false);
 
         return [
             'names' => $names,

app/Http/ViewModels/User/ListViewModel.php

@@ -22,7 +22,7 @@ public static function index(): array
             ->map(fn (NameList $list) => [
                 'id' => $list->id,
                 'name' => $list->name,
-                'total' => Number::format($list->names_count, locale: 'fr'),
+                'total' => Number::format($list->names_count),
                 'url' => [
                     'show' => route('list.show', [
                         'liste' => $list->id,
@@ -42,7 +42,7 @@ public static function show(NameList $list): array
             ->map(fn (Name $name) => [
                 'id' => $name->id,
                 'name' => StringHelper::formatNameFromDB($name->name),
-                'total' => Number::format($name->total, locale: 'fr'),
+                'total' => Number::format($name->total),
                 'url' => [
                     'show' => route('name.show', [
                         'id' => $name->id,

app/Http/ViewModels/User/UserViewModel.php

@@ -34,7 +34,7 @@ public static function index(): array
             ->map(fn (Name $name) => [
                 'id' => $name->id,
                 'name' => StringHelper::formatNameFromDB($name->name),
-                'total' => Number::format($name->total, locale: 'fr'),
+                'total' => Number::format($name->total),
                 'note' => $name->getNoteForUser(),
                 'url' => [
                     'show' => route('name.show', [

app/Models/NameList.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -43,4 +44,9 @@ public function names(): BelongsToMany
     {
         return $this->belongsToMany(Name::class, 'list_name', 'list_id', 'name_id');
     }
+
+    public function scopeFavorite(Builder $query): void
+    {
+        $query->where('is_list_of_favorites', 1);
+    }
 }

app/Providers/AppServiceProvider.php

@@ -2,6 +2,8 @@
 
 namespace App\Providers;
 
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Number;
 use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
@@ -19,6 +21,6 @@ public function register(): void
      */
     public function boot(): void
     {
-        //
+        Number::useLocale(App::currentLocale());
     }
 }

app/Services/ToggleNameToFavorites.php

@@ -27,8 +27,8 @@ public function execute(): bool
 
     private function findFavoritesList(): void
     {
-        $this->list = NameList::where('user_id', auth()->id())
-            ->where('is_list_of_favorites', true)
+        $this->list = auth()->user()->lists()
+            ->favorite()
             ->firstOrFail();
     }
 

app/Services/ToggleNameToNameList.php

@@ -23,9 +23,8 @@ public function execute(): void
 
     private function addOrRemove(): void
     {
-        $list = NameList::where('user_id', auth()->id())
-            ->where('id', $this->listId)
-            ->firstOrFail();
+        $list = auth()->user()->lists() 
+            ->findOrFail($this->listId);
 
         $list->names()->toggle([$this->nameId]);
     }