Change middleware. Update tests.

Author: unknown

app/Http/Middleware/IsAdmin.php

@@ -15,10 +15,15 @@ class IsAdmin
      */
     public function handle($request, Closure $next)
     {
-        if (auth()->user() &&  auth()->user()->hasRole('admin')) {
+        $user = auth()->user();
+
+        if(!$user)
+            return response()->json(['error'=>'Unauthorized'], 401);
+
+        if ($user->hasRole('admin')) {
             return $next($request);
         }
 
-        return response()->json(['error'=>'Unauthorized'], 403);
+        return response()->json(['error'=>'Not admin'], 403);
     }
 }

app/Http/Middleware/IsAdvertiser.php

@@ -17,10 +17,13 @@ public function handle($request, Closure $next)
     {
         $user = auth()->user();
 
-        if ($user &&  ($user->hasRole('advertiser') || $user->isAdmin()) ) {
+        if(!$user)
+            return response()->json(['error'=>'Unauthorized'], 401);
+
+        if ($user->hasRole('advertiser') || $user->isAdmin()) {
             return $next($request);
         }
 
-        return response()->json(['error'=>'Unauthorized'], 403);
+        return response()->json(['error'=>'Not advertiser'], 403);
     }
 }

app/Http/Middleware/IsStreamer.php

@@ -17,10 +17,13 @@ public function handle($request, Closure $next)
     {
         $user = auth()->user();
 
-        if ($user &&  ($user->hasRole('streamer') || $user->isAdmin()) ) {
+        if(!$user)
+            return response()->json(['error'=>'Unauthorized'], 401);
+
+        if ($user->hasRole('streamer') || $user->isAdmin()) {
             return $next($request);
         }
 
-        return response()->json(['error'=>'Unauthorized'], 403);
+        return response()->json(['error'=>'Not streamer'], 403);
     }
 }

tests/Feature/AdvCampaignTest.php

@@ -12,13 +12,6 @@ class AdvCampaignTest extends TestCase
 {
     use RefreshDatabase;
 
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->generateRoles();
-    }
-
     /** @test */
     public function not_auth_user_cannot_create_it()
     {
@@ -41,7 +34,7 @@ public function auth_user_not_advertiser_cannot_create_campaign()
 
             $campaign = factory(AdvCampaign::class)->make();
 
-            $this->storeAssertFieldFailed($campaign->toArray(), $token, 'title', 401, false);
+            $this->storeAssertFieldFailed($campaign->toArray(), $token, 'title', 403, false);
 
             auth()->logout();
         }
@@ -89,10 +82,29 @@ public function auth_user_create_but_wrong_dates()
         $this->storeAssertFieldFailed($data, $token, 'from');
     }
 
+    /** @test */
+    public function auth_user_create_not_enough_money()
+    {
+        $user = factory(User::class)->create(['role_id' => 4]);
+        $user->account->update(['amount' => 50]);
+        $token = auth()->login($user);
+
+        $data = [
+            'title' => "Updated stream",
+            'brand' => 'Brand',
+            'limit' => 100,
+            'from' => Carbon::now('UTC')->addMinutes(45)->toDateTimeString(),
+            'to' => Carbon::now('UTC')->addMinutes(245)->toDateTimeString(),
+        ];
+
+        $this->storeAssertFieldFailed($data, $token, 'limit');
+    }
+
     /** @test */
     public function auth_user_create_successfully()
     {
         $user = factory(User::class)->create(['role_id' => 4]);
+        $user->account->update(['amount' => 200]);
         $token = auth()->login($user);
 
         $data = [
@@ -119,7 +131,7 @@ public function auth_user_role_user_cannot_watch_list_it()
         $token = auth()->login($user);
 
         $this->json('GET', '/api/campaigns', [],  ['Authorization' => "Bearer $token"])
-            ->assertStatus(401);
+            ->assertStatus(403);
     }
 
     /** @test */

tests/Feature/AdvTaskTest.php

@@ -15,13 +15,6 @@ class AdvTaskTest extends TestCase
 {
     use RefreshDatabase;
 
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->generateRoles();
-    }
-
     /** @test */
     public function not_auth_user_cannot_create_it()
     {
@@ -49,7 +42,7 @@ public function auth_user_not_advertiser_cannot_create_it()
             $task = factory(AdvTask::class)->make(['campaign_id' => $campaign->id]);
 
             $this->json('POST', '/api/campaigns/'.$campaign->id."/tasks", $task->toArray(), ['Authorization' => "Bearer $token"])
-                ->assertStatus(401);
+                ->assertStatus(403);
 
             auth()->logout();
         }
@@ -92,33 +85,6 @@ public function auth_user_create_but_requires_fields_not_filled()
         }
     }
 
-    /** @test */
-    public function auth_user_create_but_campaign_already_started()
-    {
-        $user = factory(User::class)->create(['role_id' => 4]);
-        $campaign = factory(AdvCampaign::class)->create([
-            'user_id' => $user->id,
-            'from' => Carbon::now('UTC')->subMinutes(245)->toDateTimeString(),
-            'to' => Carbon::now('UTC')->addMinutes(45)->toDateTimeString()
-        ]);
-        $token = auth()->login($user);
-
-        $url = '/api/campaigns/'.$campaign->id."/tasks";
-
-        $data = [
-            'campaign_id' => $campaign->id,
-            'small_desc' => 'task',
-            'full_desc' => 'full task',
-            'limit' => 50,
-            'type' => 1,
-            'price' => 5,
-            'min_rating' => 0
-        ];
-
-        $this->storeAssertFieldFailed($url, $data, $token, 'price');
-    }
-
-
     /** @test */
     public function auth_user_create_successfully()
     {
@@ -158,7 +124,7 @@ public function auth_user_role_user_cannot_view_all()
         $token = auth()->login($user);
 
         $this->json('GET', '/api/campaigns/all/tasks', [],  ['Authorization' => "Bearer $token"])
-            ->assertStatus(401);
+            ->assertStatus(403);
     }
 
     /** @test */

tests/Feature/ChannelTest.php

@@ -26,6 +26,7 @@ public function show_it_by_slug_and_id()
         $channel->refresh();
         $r = new ChannelResource($channel);
         $d = json_decode(json_encode($r->toResponse(app('request'))->getData()), true);
+        $d = $d['data'];
 
         $this->json('get', '/api/channels/'.$channel->id)
             ->assertStatus(200)

tests/Feature/StreamTest.php

@@ -373,6 +373,7 @@ public function show_it_by_id()
         $stream->refresh();
         $r = new StreamResource($stream);
         $d = json_decode(json_encode($r->toResponse(app('request'))->getData()), true);
+        $d = $d['data'];
 
         $this->json('get', '/api/streams/'.$stream->id)
             ->assertStatus(200)

tests/TestCase.php

@@ -18,6 +18,7 @@ protected function setUp(): void
 
         Auth::shouldUse('api');
         JsonResource::wrap('data');
+        $this->generateRoles();
     }
 
     protected function generateRoles()