refactored file controller

okgreece · Apr 11, 2018 · d8f6a84 · d8f6a84
1 parent 0e66cf7
commit d8f6a84
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/app/Http/Controllers/FileController.php b/app/Http/Controllers/FileController.php
@@ -5,8 +5,6 @@
 use Illuminate\Http\Request;
 
 use App\File;
-use App\User;
-use Auth;
 
 class FileController extends Controller
 {
@@ -21,21 +19,10 @@ public function __construct()
      * @return Response
      */
     public function mygraphs()
-    {
-        $user = Auth::user();
-        $files = $this->ownGraphs($user)->merge($this->publicGraphs($user));
-        return view('files.index',["user"=>$user, "files"=>$files]);
-    }
-
-    public function ownGraphs(User $user){
-        $files = File::where("user_id", $user->id)->withCount("projects")->with("projects")->get();
-        return $files;
-    }
-
-    public function publicGraphs(User $user){
-        $files = File::where("public", true)->where("user_id", "!=", $user->id)->withCount("projects")->with("projects")->get();
-        return $files;
-    }
+    {   
+        $user = auth()->user();
+        return view('files.index',["user"=>$user, "files"=>$user->userGraphs()]);
+    }    
 
     public function store()
     {

diff --git a/app/User.php b/app/User.php
@@ -22,9 +22,7 @@ class User extends Authenticatable
      */
     protected $hidden = [
         'password', 'remember_token',
-    ];
-
-
+    ];    
 
     public function links(){
         return $this->hasMany("App\Link");
@@ -50,4 +48,16 @@ public function social(){
         return $this->hasMany("App\SocialAccount");
     }
 
+    public function userGraphs(){
+        return $this->ownGraphs()->merge($this->publicGraphs());        
+    }
+
+    public function ownGraphs(){
+        return File::where("user_id", $this->id)->withCount("projects")->with("projects")->get();        
+    }
+
+    public function publicGraphs(){
+        return File::where("public", true)->where("user_id", "!=", $this->id)->withCount("projects")->with("projects")->get();        
+    }
+
 }