groups with companies/employees and minor fixes

Author: carduz

app/Group.php

@@ -60,6 +60,7 @@ public function getPlannerNameAttribute()
     {
         if(is_object($this->planner) && $this->planner->exists)
             return $this->planner->name;
+        return null;
     }
 
     /**

app/Http/Controllers/Companies/Employees/EmployeesController.php

@@ -39,7 +39,7 @@ public function index()
          * @var $company Company
          */
         $company = \Auth::user();
-        return $company->employees;
+        return $company->employees()->with('groups.planner')->get();
     }
 
     /**
@@ -68,7 +68,7 @@ public function store(EmployeeRequest $request)
     public function show($id)
     {
         //
-        $employee = Employee::findOrFail($id);
+        $employee = Employee::with('groups.planner')->findOrFail($id);
         $this->authorize($employee);
         return $employee;
     }

app/Http/Controllers/Companies/Groups/GroupsController.php

@@ -38,7 +38,8 @@ public function index()
          * @var $company Company
          */
         $company = \Auth::user();
-        return $company->groups;
+        $groups = $company->groups()->with('planner')->get();
+        return $groups;
     }
 
     /**
@@ -63,7 +64,7 @@ public function store(GroupRequest $request)
      */
     public function show($id)
     {
-        $group = Group::findOrFail($id);
+        $group = Group::with('planner')->findOrFail($id);
         $this->authorize($group);
         return $group;
     }

app/Http/Controllers/Employees/EmployeesController.php

@@ -79,7 +79,4 @@
             Route::post('reset', ['as' => 'companies.auth.reset', 'uses'=>'PasswordController@postReset']);
         });
     });
-
-    Route::resource('employees', 'EmployeesController');
-    Route::resource('groups', 'GroupsController');
 });

app/Http/Controllers/Employees/GroupsController.php

@@ -26,7 +26,7 @@ public function testIndex()
         $company = \plunner\Company::findOrFail(1);
         $response = $this->actingAs($company)->json('GET', '/companies/employees');
         $response->assertResponseOk();
-        $response->seeJsonEquals($company->employees->toArray());
+        $response->seeJsonEquals($company->employees()->with('groups.planner')->get()->toArray());
     }
 
     public function testErrorIndex()
@@ -41,7 +41,7 @@ public function testShow()
          * @var $company \plunner\Company
          */
         $company = \plunner\Company::findOrFail(1);
-        $employee = $company->employees->first();
+        $employee = $company->employees()->with('groups.planner')->first();
         $response = $this->actingAs($company)->json('GET', '/companies/employees/'.$employee->id);
         $response->assertResponseOk();
         $response->seeJsonEquals($employee->toArray());
@@ -123,7 +123,7 @@ public function testSameEmailDifferentCompany()
     public function testDelete()
     {
         $company = \plunner\Company::findOrFail(1);
-        $employee = $company->employees->first();
+        $employee = $company->employees()->with('groups.planner')->first();
         $id = $employee->id;
 
         //employee exists

app/Http/routes.php

@@ -36,7 +36,7 @@ public function testIndexAllGroups()
         $response = $this->actingAs($this->company)->json('GET', '/companies/groups');
 
         $response->assertResponseOk();
-        $response->seeJsonEquals($this->company->groups->toArray());
+        $response->seeJsonEquals($this->company->groups()->with('planner')->get()->toArray());
     }
 
     public function testErrorIndexNoCompany()
@@ -48,7 +48,7 @@ public function testErrorIndexNoCompany()
 
     public function testShowSpecificGroup()
     {
-        $group = $this->company->groups->first();
+        $group = $this->company->groups()->with('planner')->first();
 
         $response = $this->actingAs($this->company)->json('GET', '/companies/groups/' . $group->id);