removed group by for permissions

Author: sarthaksavvy

.phpunit.result.cache

@@ -16,7 +16,7 @@ class PermissionController extends Controller
      */
     public function index()
     {
-        return response(['data' => Permission::all()->groupBy('parent')], 200);
+        return response(['data' => Permission::all()], 200);
     }
 
     /**

src/Http/Controllers/PermissionController.php

@@ -21,7 +21,7 @@ public function toArray($request)
             'admins_attached'=> $this->admins->count(),
             'permissions'    => $this->permissions->map(function ($permission) {
                 return $permission->only('id', 'name', 'parent');
-            })->groupBy('parent'),
+            }),
         ];
     }
 }

src/Http/Resources/RoleResource.php

@@ -65,10 +65,10 @@ public function allPermissions()
     {
         $byRole = $this->permissionsByRole()->map(function ($role) {
             return $role->only(['id', 'name', 'parent']);
-        })->groupBy('parent')->toArray();
+        })->toArray();
         $direct = $this->directPermissions->map(function ($role) {
             return $role->only(['id', 'name', 'parent']);
-        })->groupBy('parent')->toArray();
+        })->toArray();
         return array_merge($direct, $byRole);
     }
 }

src/Traits/hasPermissions.php

@@ -62,6 +62,6 @@ public function api_can_give_admin_with_all_its_permissions()
         $permission = $this->create_permission();
         $admin->addDirectPermission($permission->id);
         $res        = $this->getJson(route('admin.all'))->json();
-        $this->assertEquals($permission->name, $res['data'][0]['permissions'][''][0]['name']);
+        $this->assertEquals($permission->name, $res['data'][0]['permissions'][0]['name']);
     }
 }

tests/Feature/PermissionTest.php

@@ -110,7 +110,7 @@ public function an_admin_can_get_all_permission()
         $permission2 = $this->create_permission(['parent' => 'publisher']);
         $admin->addDirectPermission($permission->id);
         $admin->addDirectPermission($permission2->id);
-        $this->assertEquals(3, count($admin->allPermissions()));
+        $this->assertEquals(5, count($admin->allPermissions()));
     }
 
     /**