Added user blocking functionality

app/Actions/BlockUser.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions;
+
+use App\Models\BlockedUser;
+use App\Models\User;
+
+final class BlockUser
+{
+    public function handle(User $user, User $toBlock): void
+    {
+        BlockedUser::query()->firstOrCreate([
+            'user_id' => $user->id,
+            'blocked_user_id' => $toBlock->id,
+        ]);
+    }
+}

app/Actions/UnBlockUser.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions;
+
+use App\Models\BlockedUser;
+use App\Models\User;
+
+final class UnBlockUser
+{
+    public function handle(User $user, User $toBlock): void
+    {
+
+        BlockedUser::query()
+            ->where([
+                'user_id' => $user->id,
+                'blocked_user_id' => $toBlock->id,
+            ])
+            ->delete();
+    }
+}

app/Http/Controllers/BlockController.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers;
+
+use App\Actions\BlockUser;
+use App\Actions\UnBlockUser;
+use App\Models\User;
+use Illuminate\Container\Attributes\CurrentUser;
+use Illuminate\Http\Response;
+
+final class BlockController
+{
+    public function store(
+        #[CurrentUser] User $loggedInUser,
+        User $user,
+        BlockUser $action
+    ): Response {
+        $action->handle($loggedInUser, $user);
+
+        return response(status: 201);
+
+    }
+
+    public function destroy(
+        #[CurrentUser] User $loggedInUser,
+        User $user,
+        UnBlockUser $action
+    ): Response {
+        $action->handle($loggedInUser, $user);
+
+        return response(status: 204);
+
+    }
+}

app/Http/Controllers/ForYouFeedController.php

@@ -4,7 +4,9 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\User;
 use App\Queries\ForYouFeedQuery;
+use Illuminate\Container\Attributes\CurrentUser;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -13,9 +15,9 @@ final class ForYouFeedController
     /**
      * Get the for-you feed.
      */
-    public function __invoke(Request $request): JsonResponse
+    public function __invoke(Request $request, #[CurrentUser] ?User $user): JsonResponse
     {
-        $forYouFeed = new ForYouFeedQuery();
+        $forYouFeed = new ForYouFeedQuery($user);
 
         $posts = $forYouFeed->builder()
             ->paginate(

app/Models/BlockedUser.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Models;
+
+use Database\Factories\BlockedUserFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+final class BlockedUser extends Model
+{
+    /** @use HasFactory<BlockedUserFactory> */
+    use HasFactory;
+
+    /** @return BelongsTo<User, $this> */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    /** @return BelongsTo<User, $this> */
+    public function blockedUser(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'blocked_user_id');
+    }
+}

app/Models/User.php

@@ -79,4 +79,20 @@ public function following(): BelongsToMany
     {
         return $this->belongsToMany(self::class, 'followers', 'follower_id', 'user_id');
     }
+
+    /**
+     * @return HasMany<BlockedUser, $this>
+     */
+    public function blockedUsers(): HasMany
+    {
+        return $this->hasMany(BlockedUser::class, 'user_id');
+    }
+
+    /**
+     * @return HasMany<BlockedUser, $this>
+     */
+    public function blockedByUsers(): HasMany
+    {
+        return $this->hasMany(BlockedUser::class, 'blocked_user_id');
+    }
 }

app/Queries/FollowingFeedQuery.php

@@ -7,6 +7,7 @@
 use App\Models\Post;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Query\Builder as QueryBuilder;
 
 final readonly class FollowingFeedQuery
 {
@@ -23,7 +24,11 @@ public function builder(): Builder
 
         return Post::query()
             ->whereIn('user_id', $followingUsersQuery)
+            ->whereNotIn('user_id', fn (QueryBuilder $query): QueryBuilder => $query->select('blocked_user_id')
+                ->from('blocked_users')
+                ->where('user_id', $this->user->id))
             ->with(['user', 'likes'])
+
             ->latest('updated_at');
     }
 }

app/Queries/ForYouFeedQuery.php

@@ -5,17 +5,27 @@
 namespace App\Queries;
 
 use App\Models\Post;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Query\Builder as QueryBuilder;
 
 final readonly class ForYouFeedQuery
 {
+    public function __construct(
+        private ?User $user
+    ) {}
+
     /**
      * @return Builder<Post>
      */
     public function builder(): Builder
     {
         return Post::query()
             ->with(['user', 'likes'])
+            ->when($this->user, fn (Builder $query): Builder => $query->whereNotIn('user_id', fn (QueryBuilder $query): QueryBuilder => $query->select('blocked_user_id')
+                ->from('blocked_users')
+                ->where('user_id', $this->user?->id)))
+
             ->latest('updated_at');
     }
 }

database/factories/BlockedUserFactory.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Database\Factories;
+
+use App\Models\BlockedUser;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Carbon;
+
+/**
+ * @extends Factory<BlockedUser>
+ */
+final class BlockedUserFactory extends Factory
+{
+    protected $model = BlockedUser::class;
+
+    public function definition(): array
+    {
+        return [
+            'created_at' => Carbon::now(),
+            'updated_at' => Carbon::now(),
+            'user_id' => User::factory(),
+            'blocked_user_id' => User::factory(),
+        ];
+    }
+}

database/migrations/2025_10_03_144125_create_blocked_users_table.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('blocked_users', function (Blueprint $table): void {
+            $table->id();
+            $table->foreignId('user_id')->constrained();
+            $table->foreignId('blocked_user_id')->constrained('users');
+            $table->unique(['user_id', 'blocked_user_id']);
+            $table->timestamps();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('blocked_users');
+    }
+};

routes/api.php

@@ -43,6 +43,10 @@
     Route::post('/follows/{user}', [FollowController::class, 'store'])->name('follows.store');
     Route::delete('/follows/{user}', [FollowController::class, 'destroy'])->name('follows.destroy');
 
+    // Blocks
+    Route::post('/blocks/{user}', [App\Http\Controllers\BlockController::class, 'store'])->name('blocks.store');
+    Route::delete('/blocks/{user}', [App\Http\Controllers\BlockController::class, 'destroy'])->name('blocks.destroy');
+
     // Likes...
     Route::post('/likes/{post}', [LikeController::class, 'store'])->name('likes.store');
     Route::delete('/likes/{post}', [LikeController::class, 'destroy'])->name('likes.destroy');

tests/Feature/Http/BlockControllerTest.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Models\User;
+use Laravel\Sanctum\Sanctum;
+
+it('may block a user', function () {
+    $user = User::factory()->create();
+    $targetUser = User::factory()->create();
+
+    Sanctum::actingAs($user, ['*']);
+
+    $response = $this->postJson(route('blocks.store', $targetUser));
+
+    $response->assertStatus(201);
+
+    expect($user->blockedUsers()->count())->toBe(1);
+});
+
+it('may unblock a user', function () {
+    $user = User::factory()->create();
+    $targetUser = User::factory()->create();
+
+    App\Models\BlockedUser::factory()->create([
+        'user_id' => $user->id,
+        'blocked_user_id' => $targetUser->id,
+    ]);
+    expect($user->blockedUsers()->count())->toBe(1);
+
+    Sanctum::actingAs($user, ['*']);
+
+    $response = $this->deleteJson(route('blocks.destroy', $targetUser));
+
+    $response->assertStatus(204);
+
+    expect($user->refresh()->blockedUsers()->count())->toBe(0);
+});
+
+it('cannot block a user twice', function () {
+    $user = User::factory()->create();
+    $targetUser = User::factory()->create();
+
+    App\Models\BlockedUser::factory()->create([
+        'user_id' => $user->id,
+        'blocked_user_id' => $targetUser->id,
+    ]);
+    Sanctum::actingAs($user, ['*']);
+
+    $response = $this->postJson(route('blocks.store', $targetUser));
+
+    $response->assertStatus(201);
+
+    expect($user->blockedUsers()->count())->toBe(1);
+});

tests/Unit/Actions/BlockUserTest.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Models\User;
+
+it('may block a user', function (): void {
+    $user = User::factory()->create();
+    $targetUser = User::factory()->create();
+    $action = app(App\Actions\BlockUser::class);
+
+    $action->handle($user, $targetUser);
+
+    expect($user->blockedUsers()->count())->toBe(1)
+        ->and($targetUser->blockedByUsers()->count())->toBe(1);
+});
+
+test('re-block a user does not duplicate the block', function (): void {
+    $user = User::factory()->create();
+    $targetUser = User::factory()->create();
+    $action = app(App\Actions\BlockUser::class);
+
+    $action->handle($user, $targetUser);
+
+    expect($user->blockedUsers()->count())->toBe(1)
+        ->and($targetUser->blockedByUsers()->count())->toBe(1);
+
+    $action->handle($user, $targetUser);
+
+    expect($user->blockedUsers()->count())->toBe(1)
+        ->and($targetUser->blockedByUsers()->count())->toBe(1);
+});
+
+test('block users models returns correct data', function (): void {
+    $user = User::factory()->create();
+    $targetUser = User::factory()->create();
+    $action = app(App\Actions\BlockUser::class);
+    $action->handle($user, $targetUser);
+    $blockedUser = App\Models\BlockedUser::first();
+    expect($blockedUser->user->id)->toEqual($user->id);
+    expect($blockedUser->blockedUser->id)->toEqual($targetUser->id);
+});

tests/Unit/Actions/UnBlockUserTest.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Models\User;
+
+it('may unblock a user', function (): void {
+    $user = User::factory()->create();
+    $targetUser = User::factory()->create();
+    app(App\Actions\BlockUser::class)->handle($user, $targetUser);
+    $action = app(App\Actions\UnBlockUser::class);
+
+    expect($user->blockedUsers()->count())->toBe(1)
+        ->and($targetUser->blockedByUsers()->count())->toBe(1);
+    $action->handle($user, $targetUser);
+
+    expect($user->blockedUsers()->count())->toBe(0)
+        ->and($targetUser->blockedByUsers()->count())->toBe(0);
+
+});
+
+test('re-unblock does nothing', function (): void {
+    $user = User::factory()->create();
+    $targetUser = User::factory()->create();
+    $action = app(App\Actions\UnBlockUser::class);
+
+    expect($user->blockedUsers()->count())->toBe(0);
+
+    $action->handle($user, $targetUser);
+
+    expect($user->blockedUsers()->count())->toBe(0);
+});