refactor following-recommendation

app/Http/Controllers/FollowSuggestionsController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Resources\TinyUserResource;
+use App\Services\FollowSuggestions;
+
+class FollowSuggestionsController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth:sanctum');
+    }
+
+    public function index(FollowSuggestions $followSuggestionsService)
+    {
+        $suggestions = $followSuggestionsService->suggest();
+
+        return $this->ok(
+            TinyUserResource::collection($suggestions)
+        );
+    }
+}

app/Http/Controllers/UserFollowingController.php

@@ -3,9 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Http\Resources\TinyUserResource;
-use App\Http\Resources\UserRecommendationResource;
 use App\Models\User;
-use App\Services\FollowingRecommendation;
 
 class UserFollowingController extends Controller
 {
@@ -25,14 +23,4 @@ public function index(User $user)
             TinyUserResource::collection($following)
         );
     }
-
-    public function recommendations(User $user)
-    {
-        $recommendations = (new FollowingRecommendation($user))
-            ->recommend();
-
-        return $this->ok(
-            UserRecommendationResource::collection($recommendations)
-        );
-    }
 }

app/Services/FollowingRecommendation.php → app/Services/FollowSuggestions.php

@@ -5,26 +5,28 @@
 use App\Models\User;
 use Illuminate\Support\Facades\DB;
 
-class FollowingRecommendation
+class FollowSuggestions
 {
     public function __construct(
-        private User $user,
+        private $user = null
     ) {
     }
 
-    public function recommend($count = 5)
+    public function suggest($count = 5)
     {
+        $user = $this->user ?: request()->user();
+
         $followingIds = DB::table('followers')
             ->select('following_id')
-            ->where('follower_id', $this->user->id)
+            ->where('follower_id', $user->id)
             ->pluck('following_id');
 
         return User::query()
             ->select('id', 'nick_name', 'avatar_url', 'bio')
             ->whereNotIn('id', $followingIds)
-            ->whereNot('id', $this->user->id)
-            ->where('country_id', '=', $this->user->country_id)
-            ->where('addiction_type', '=', $this->user->addiction_type)
+            ->whereNot('id', $user->id)
+            ->where('country_id', '=', $user->country_id)
+            ->where('addiction_type', '=', $user->addiction_type)
             ->inRandomOrder()
             ->limit($count)
             ->get();

database/migrations/2014_10_12_000000_create_users_table.php

@@ -18,7 +18,7 @@ public function up(): void
             $table->string('nick_name');
             $table->string('bio')->nullable();
             $table->string('avatar_url')->nullable();
-            $table->foreignId('country_id')->index('country_id_index')->constrained();
+            $table->foreignId('country_id')->constrained();
             $table->unsignedTinyInteger('addiction_type')->index('addiction_type_index');
             $table->boolean('is_recovered')->default(false);
             $table->unsignedInteger('score')->default(0);

routes/api.php

@@ -8,6 +8,7 @@
 use App\Http\Controllers\ContinueChallengeController;
 use App\Http\Controllers\CountriesController;
 use App\Http\Controllers\DeactivationRequestsController;
+use App\Http\Controllers\FollowSuggestionsController;
 use App\Http\Controllers\NotificationsController;
 use App\Http\Controllers\ProfileController;
 use App\Http\Controllers\ReportsController;
@@ -51,11 +52,14 @@
     });
 
 Route::apiResource('users', UsersController::class)->only('index', 'show');
+Route::get('users/{user}/following', [UserFollowingController::class, 'index']);
 Route::get('users/{user}/followers', [UserFollowersController::class, 'index']);
 Route::post('users/{user}/followers', [UserFollowersController::class, 'store']);
 Route::delete('users/{user}/followers', [UserFollowersController::class, 'destroy']);
 Route::get('users/{user}/achievements', [UserAchievementsController::class, 'index']);
 
+Route::get('follow-suggestions', [FollowSuggestionsController::class, 'index']);
+
 Route::post('reports', [ReportsController::class, 'store']);
 
 Route::get('countries', [CountriesController::class, 'index']);

tests/Feature/UserFollowingRecommendationTest.php → tests/Feature/FollowSuggestionsControllerTest.php

@@ -7,7 +7,7 @@
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
-class UserFollowingRecommendationTest extends TestCase
+class FollowSuggestionsControllerTest extends TestCase
 {
     use RefreshDatabase;
 
@@ -25,24 +25,22 @@ public function setUp(): void
         $this->user = $this->signIn();
     }
 
-    public function test_user_can_gets_recommendation_list_contain_users_from_same_addiction_and_country()
+    public function test_user_can_get_suggetion_list()
     {
         $followers = User::factory()->count(5)->create();
+
         $this->user->following()->attach($followers->pluck('id'));
+
         User::factory()->create();
-        $recommendations = User::factory()->count(5)->create([
+
+        User::factory()->count(5)->create([
             'country_id' => $this->user->country_id,
             'addiction_type' => $this->user->addiction_type,
         ]);
 
-        $response = $this
-            ->getJson("api/users/{$this->user->id}/following/recommendations");
-
-        $response->assertOk();
-        $this->assertCount(5, $response['data']);
-        $this->assertEquals(
-            $recommendations->pluck(['id', 'nike_name', 'avatar_url', 'bio']),
-            collect($response['data'])->pluck(['id', 'nike_name', 'avatar_url', 'bio']),
-        );
+        $this
+            ->getJson('api/follow-suggestions')
+            ->assertOk()
+            ->assertJsonCount(5, 'data');
     }
 }