fix: (LAR-154) fixing bug when displaying user thread suscription

laravelcm · Dec 30, 2024 · 082a20b · 082a20b
1 parent 6cec17e
commit 082a20b
Show file tree

Hide file tree

Showing 8 changed files with 124 additions and 135 deletions.
diff --git a/app/Http/Controllers/Api/Auth/RegisterController.php b/app/Http/Controllers/Api/Auth/RegisterController.php
@@ -31,7 +31,7 @@ public function register(RegisterRequest $request): JsonResponse
 
         $user->assignRole('company');
 
-        //TODO: Send new company registration notification on Slack
+        // TODO: Send new company registration notification on Slack
         event(new ApiRegistered($user));
 
         return response()->json(
@@ -81,9 +81,9 @@ public function googleAuthenticator(Request $request): JsonResponse
             'avatar' => $socialUser['photoUrl'],
         ]);
 
-        //TODO: Send welcome email to user 1 hour after registration
+        // TODO: Send welcome email to user 1 hour after registration
 
-        //TODO: Send new company registration notification on Slack
+        // TODO: Send new company registration notification on Slack
 
         $user->last_login_at = Carbon::now();
         $user->last_login_ip = $request->ip();

diff --git a/app/Livewire/Pages/Forum/Index.php b/app/Livewire/Pages/Forum/Index.php
@@ -36,7 +36,7 @@ final class Index extends Component
     #[Url(as: 'no-replies')]
     public ?string $unAnswered = null;
 
-    #[Url]
+    #[Url(as: 'follow')]
     public ?string $subscribe = null;
 
     public ?Channel $currentChannel = null;
@@ -129,6 +129,12 @@ protected function applyChannel(Builder $query): Builder
 
     protected function applySubscribe(Builder $query): Builder
     {
+        if (Auth::check() && $this->subscribe) {
+            $query->whereHas('subscribes', function (Builder $query): void {
+                $query->where('user_id', Auth::id());
+            });
+        }
+
         return $query;
     }
 

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -477,10 +477,8 @@ public function scopeWithCounts(Builder $query): Builder
             'articles as articles_count',
             'threads as threads_count',
             'replyAble as replies_count',
-            'replyAble as solutions_count' => function (Builder $query) {
-                return $query->join('threads', 'threads.solution_reply_id', '=', 'replies.id')
-                    ->where('replyable_type', 'thread');
-            },
+            'replyAble as solutions_count' => fn (Builder $query) => $query->join('threads', 'threads.solution_reply_id', '=', 'replies.id')
+                ->where('replyable_type', 'thread'),
         ]);
     }
 

diff --git a/app/Widgets/MostActiveUsersPerWeek.php b/app/Widgets/MostActiveUsersPerWeek.php
@@ -33,12 +33,10 @@ public function run(): View
         $users = User::with('activities')
             ->withCount('activities')
             ->verifiedUsers()
-            ->whereHas('activities', function (Builder $query) {
-                return $query->whereBetween('created_at', [
-                    now()->startOfWeek(),
-                    now()->endOfWeek(),
-                ]);
-            })
+            ->whereHas('activities', fn (Builder $query) => $query->whereBetween('created_at', [
+                now()->startOfWeek(),
+                now()->endOfWeek(),
+            ]))
             ->orderByDesc('activities_count')
             ->limit(5)
             ->get();