framework-220 Deleted articles should not show on dashboard

app/Classes/Repositories/ArticleRepository.php

@@ -40,7 +40,7 @@ public function __construct(Article $model)
      */
     public function all()
     {
-        return $this->model->withoutGlobalScope('public')->all();
+        return $this->model->all();
     }
 
     public function whereSitemappable()

app/Classes/Repositories/BaseRepository.php

@@ -37,7 +37,7 @@ public function all()
      */
     public function allDescendingOrder()
     {
-        return $this->model->withoutGlobalScopes()->orderBy('created_at', 'desc')->get();
+        return $this->model->whereNull('deleted_at')->orderBy('created_at', 'desc')->get();
     }
 
     /**

app/Classes/Roles/Administrator.php

@@ -26,7 +26,7 @@ class Administrator implements RoleInterface
      */
     public function apply(Account $account)
     {
-        return $account->update(['role_id' => self::$key]);
+        return $account->setAttribute('role_id', self::$key);
     }
 
     /**

app/Classes/Roles/Developer.php

@@ -26,7 +26,7 @@ class Developer implements RoleInterface
      */
     public function apply(Account $account)
     {
-        return $account->update(['role_id' => self::$key]);
+        return $account->setAttribute('role_id', self::$key);
     }
 
     /**

app/Classes/Roles/Disabled.php

@@ -26,7 +26,7 @@ class Disabled implements RoleInterface
      */
     public function apply(Account $account)
     {
-        return $account->update(['role_id' => self::$key]);
+        return $account->setAttribute('role_id', self::$key);
     }
 
     /**

app/Classes/Roles/Publisher.php

@@ -26,7 +26,7 @@ class Publisher implements RoleInterface
      */
     public function apply(Account $account)
     {
-        return $account->update(['role_id' => self::$key]);
+        return $account->setAttribute('role_id', self::$key);
     }
 
     /**

app/Model/Account.php

@@ -264,6 +264,8 @@ public function setRole($role)
         }
 
         if ($role instanceof RoleInterface) {
+            $role->apply($this);
+
             return $role->apply($this);
         }
 

app/Modules/Accounts/Blade/index.blade.php

@@ -55,7 +55,7 @@
 
             <div class="stats">
                 <div class="timestamp">
-                    Last Logged IP: {{ optional(AccessLog::latestAttemptFrom($account))->ip_address ?? 'Never' }}
+                    Last Logged IP: {{ optional(\App\Model\AccessLog::latestAttemptFrom($account))->ip_address ?? 'Never' }}
                 </div>
                 <div class="views">
                     Last Login: {{ optional($account->last_login)->diffForHumans() ?? 'Never' }}

app/Modules/Accounts/Controller.php

@@ -159,11 +159,12 @@ public function storeDataFrom(Request $request, Account $account)
             $account->password = $request->input('password');
         }
 
-        $account->save();
-
         // assign the role from the request.
         $account->setRole($request->input('role'));
 
+        // save the new account.
+        $account->save();
+
         // return the data that was created.
         return $account;
     }

tests/Account/AccountRoleTest.php

@@ -13,10 +13,10 @@ class AccountRoleTest extends TestCase
      */
     public function a_developer_obtains_role_of_administrator()
     {
-        $developer = factory('App\Model\Account')->make();
+        $account = factory('App\Model\Account')->make();
 
-        $developer->setRole(new Developer);
+        $account->setRole(new Developer);
 
-        $this->assertTrue($developer->hasRole(new Administrator));
+        $this->assertTrue($account->hasRole(new Administrator));
     }
 }