wip

Author: driesvints

.env.example

@@ -53,5 +53,3 @@ LOG_STACK=single
 SESSION_ENCRYPT=false
 SESSION_PATH=/
 SESSION_DOMAIN=null
-
-APP_MAX_THREAD_COUNT = 5

app/Http/Controllers/Forum/ThreadsController.php

@@ -83,30 +83,26 @@ public function show(Thread $thread)
 
     public function create()
     {
-        $tags = Tag::all();
-        $selectedTags = old('tags') ?: [];
-
-        $threadCount = Auth::user()->threadsCountToday();
-        if ($threadCount >= 5) {
+        if (Auth::user()->hasTooManyThreadsToday()) {
             $this->error('You can only post a maximum of 5 threads per day.');
+
             return redirect()->route('forum');
         }
 
+        $tags = Tag::all();
+        $selectedTags = old('tags') ?: [];
+
         return view('forum.threads.create', ['tags' => $tags, 'selectedTags' => $selectedTags]);
     }
 
     public function store(ThreadRequest $request): RedirectResponse
     {
-
-        $threadCount = Auth::user()->threadsCountToday();
-
-        // Check if the user has reached the limit
-        if ($threadCount >= 5) {
+        if (Auth::user()->hasTooManyThreadsToday()) {
             $this->error('You can only post a maximum of 5 threads per day.');
+
             return redirect()->route('forum');
         }
 
-
         $this->dispatchSync(CreateThread::fromRequest($request, $uuid = Str::uuid()));
 
         $thread = Thread::findByUuidOrFail($uuid);

app/Models/User.php

@@ -197,14 +197,20 @@ public function countThreads(): int
         return $this->threadsRelation()->count();
     }
 
-
-    public function threadsCountToday(): int
+    public function countThreadsFromToday(): int
     {
+        $today = Carbon::today();
+
         return $this->threadsRelation()
-            ->whereDate('created_at', Carbon::today())
+            ->whereBetween('created_at', [$today, $today->copy()->endOfDay()])
             ->count();
     }
 
+    public function hasTooManyThreadsToday(): bool
+    {
+        return $this->countThreadsFromToday() >= 5;
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Collection
      */

tests/Feature/ForumTest.php

@@ -83,6 +83,22 @@
         ->assertSessionHas('success', 'Thread successfully created!');
 });
 
+test('users cannot create more than 5 threads per day', function () {
+    $tag = Tag::factory()->create(['name' => 'Test Tag']);
+
+    $user = $this->login();
+
+    Thread::factory()->count(5)->create(['author_id' => $user->id(), 'created_at' => now()]);
+
+    $this->post('/forum/create-thread', [
+        'subject' => 'How to work with Eloquent?',
+        'body' => 'This text explains how to work with Eloquent.',
+        'tags' => [$tag->id()],
+    ])
+        ->assertRedirect('/forum')
+        ->assertSessionHas('error', 'You can only post a maximum of 5 threads per day.');
+})->only();
+
 test('users can edit a thread', function () {
     $user = $this->createUser();
     $tag = Tag::factory()->create(['name' => 'Test Tag']);