odon
/
free-pmo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Remove user roles feature

pull/1/head
Nafies Luthfi 8 years ago
parent
69b9e6af5a
commit
d8092404ad
11 changed files with 52 additions and 225 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 71
      app/Entities/Users/User.php
  2. 13
      app/Entities/Users/UserPresenter.php
  3. 19
      app/Entities/Users/UsersRepository.php
  4. 5
      app/Http/Controllers/AuthController.php
  5. 1
      app/Http/Requests/Users/UpdateRequest.php
  6. 2
      app/Providers/AuthServiceProvider.php
  7. 1
      tests/Feature/Auth/MemberLoginTest.php
  8. 7
      tests/Feature/ManageFeaturesTest.php
  9. 31
      tests/Feature/ManageTasksTest.php
  10. 2
      tests/Feature/Users/ManageUsersTest.php
  11. 41
      tests/Unit/Models/UserTest.php

71
app/Entities/Users/User.php
View File

@ -25,77 +25,6 @@ class User extends Authenticatable
return link_to_route('users.show', $this->name, [$this->id], ['target' => '_blank']);
}
/**
* A user may have multiple roles.
*
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
*/
public function roles()
{
return $this->belongsToMany(Role::class);
}
/**
* Assign the given role to the user.
*
* @param string $role
* @return mixed
*/
public function assignRole($roleName)
{
$role = Role::firstOrNew(['name' => $roleName]);
if ($role->exists == false) {
$role->type = 0;
$role->label = ucwords($roleName);
$role->save();
}
return $this->roles()->attach($role);
}
/**
* Remove the given role from the user.
*
* @param string $role
* @return mixed
*/
public function removeRole($role)
{
$roleId = Role::whereName($role)->firstOrFail()->id;
return $this->roles()->detach($roleId);
}
/**
* Determine if the user has the given role.
*
* @param mixed $role
* @return boolean
*/
public function hasRole($role)
{
if (is_string($role)) {
return $this->roles->contains('name', $role);
}
return ! ! $role->intersect($this->roles)->count();
}
public function hasRoles(array $roleNameArray)
{
return $this->roles->pluck('name')
->contains(function ($role, $key) use ($roleNameArray) {
return in_array($role, $roleNameArray);
});
}
public function scopeHasRoles($query, array $roleNameArray)
{
return $query->whereHas('roles', function ($q) use ($roleNameArray) {
$q->whereIn('name', $roleNameArray);
});
}
public function agency()
{
return $this->hasOne('App\Entities\Agencies\Agency', 'owner_id');

13
app/Entities/Users/UserPresenter.php
View File

@ -2,7 +2,6 @@
namespace App\Entities\Users;
use Html;
use Laracasts\Presenter\Presenter;
class UserPresenter extends Presenter
@ -10,10 +9,6 @@ class UserPresenter extends Presenter
public function displayRoles()
{
$string = '';
foreach($this->roles as $key => $role) {
$string .= ($key != 0) ? ' | ' : '';
$string .= $role->label;
}
return $string;
}
@ -21,10 +16,6 @@ class UserPresenter extends Presenter
public function rolesLink()
{
$string = '';
foreach($this->roles as $key => $role) {
$string .= ($key != 0) ? ' | ' : '';
$string .= link_to_route('users.index', $role->label, ['role' => $role->name], ['title' => 'Lihat semua ' . $role->label]);
}
return $string;
}
@ -32,10 +23,6 @@ class UserPresenter extends Presenter
public function usernameRoles()
{
$string = $this->name.' (';
foreach($this->roles as $key => $role) {
$string .= ($key != 0) ? ' | ' : '';
$string .= $role->label;
}
$string .= ')';
return $string;

19
app/Entities/Users/UsersRepository.php
View File

@ -3,8 +3,6 @@ namespace App\Entities\Users;
use App\Entities\BaseRepository;
use App\Exceptions\UpdateUserException;
use App\Exceptions\UserDeleteException;
use App\Exceptions\UserNotFoundException;
use App\Services\Facades\Option;
/**
@ -24,22 +22,16 @@ class UsersRepository extends BaseRepository
{
return $this->model->latest()
->where('name', 'like', '%'.$q.'%')
->whereHas('roles', function($query) use ($rolesString) {
if (!is_null($rolesString)) {
$query->whereIn('name', explode('|', $rolesString));
}
})
->with('roles')
->paginate($this->_paginate);
}
public function create($userData)
{
if ($userData['password'] == '')
if ($userData['password'] == '') {
$userData['password'] = Option::get('password_default', 'member');
}
$user = $this->storeArray($userData);
$user->roles()->sync($userData['role']);
return $user;
}
@ -49,14 +41,12 @@ class UsersRepository extends BaseRepository
$user = $this->requireById($userId);
foreach ($userData as $key => $value) {
if ($value == '' || $key == 'role') continue;
$user->{$key} = $value;
}
$user->roles()->sync($userData['role']);
if ($user->save())
if ($user->save()) {
return $user;
}
throw new UpdateUserException('Failed to update User');
}
@ -69,7 +59,6 @@ class UsersRepository extends BaseRepository
public function delete($userId)
{
$user = $this->requireById($userId);
$user->roles()->detach();
return $user->delete();
}

5
app/Http/Controllers/AuthController.php
View File

@ -31,9 +31,6 @@ class AuthController extends Controller
$registerData['api_token'] = str_random(32);
$user = User::create($registerData);
$user->assignRole('admin');
$user->assignRole('worker');
Auth::login($user);
$agency = Agency::create([
'name' => $request->get('agency_name'),
@ -42,6 +39,8 @@ class AuthController extends Controller
'owner_id' => $user->id,
]);
Auth::login($user);
flash()->success(trans('auth.welcome', ['name' => $user->name]));
return redirect()->route('home');
}

1
app/Http/Requests/Users/UpdateRequest.php
View File

@ -26,7 +26,6 @@ class UpdateRequest extends Request
return [
'name' => 'required|min:5',
'email' => 'required|email|unique:users,email,'.$this->segment(2),
'role' => 'required|array',
'password' => 'nullable|required_with:password_confirmation|between:6,15|confirmed',
'password_confirmation' => 'required_with:password',
];

2
app/Providers/AuthServiceProvider.php
View File

@ -36,7 +36,7 @@ class AuthServiceProvider extends ServiceProvider
}
Gate::define('add_project', function ($user) {
return $user->hasRole('admin');
return ! is_null($user->agency);
});
Gate::define('manage_project', function ($user, $project) {

1
tests/Feature/Auth/MemberLoginTest.php
View File

@ -11,7 +11,6 @@ class MemberLoginTest extends TestCase
public function user_can_login_and_logout()
{
$user = factory(User::class)->create(['name' => 'Nama Member', 'email' => 'email@mail.com']);
$user->assignRole('worker');
$this->visit(route('auth.login'));

7
tests/Feature/ManageFeaturesTest.php
View File

@ -38,7 +38,7 @@ class ManageFeaturesTest extends TestCase
'price' => 100000,
'worker_id' => $worker->id,
'type_id' => 1,
'project_id' => $project->id
'project_id' => $project->id,
]);
}
@ -46,9 +46,6 @@ class ManageFeaturesTest extends TestCase
public function admin_can_edit_feature_data()
{
$user = factory(User::class, 3)->create();
$user[0]->assignRole('admin');
$user[1]->assignRole('worker');
$user[2]->assignRole('worker');
$this->actingAs($user[0]);
$project = factory(Project::class)->create(['owner_id' => $user[0]->id]);
@ -73,7 +70,7 @@ class ManageFeaturesTest extends TestCase
'price' => 33333,
'worker_id' => $user[2]->id,
'project_id' => $project->id,
'type_id' => 2
'type_id' => 2,
]);
}

31
tests/Feature/ManageTasksTest.php
View File

@ -13,7 +13,6 @@ class ManageTasksTest extends TestCase
public function admin_can_entry_task()
{
$user = factory(User::class)->create();
$user->assignRole('admin');
$this->actingAs($user);
$feature = factory(Feature::class)->create(['worker_id' => $user->id]);
@ -43,8 +42,6 @@ class ManageTasksTest extends TestCase
public function admin_can_edit_task_data()
{
$user = factory(User::class)->create();
$user->assignRole('admin');
$user->assignRole('worker');
$this->actingAs($user);
$feature = factory(Feature::class)->create(['worker_id' => $user->id]);
@ -67,7 +64,7 @@ class ManageTasksTest extends TestCase
$this->seeInDatabase('tasks', [
'name' => 'Nama Task Edit',
'progress' => 77,
'feature_id' => $feature->id
'feature_id' => $feature->id,
]);
}
@ -75,8 +72,6 @@ class ManageTasksTest extends TestCase
public function admin_can_delete_a_task()
{
$user = factory(User::class)->create();
$user->assignRole('admin');
$user->assignRole('worker');
$this->actingAs($user);
$feature = factory(Feature::class)->create(['worker_id' => $user->id]);
@ -90,28 +85,4 @@ class ManageTasksTest extends TestCase
$this->seePageIs('features/'.$feature->id);
$this->see(trans('task.deleted'));
}
// /** @test */
// public function admin_can_see_all_tasks()
// {
// $user = factory(User::class)->create();
// $user->assignRole('admin');
// $user->assignRole('worker');
// $this->actingAs($user);
// $feature = factory(Feature::class)->create(['worker_id' => $user->id]);
// $tasks = factory(Task::class, 5)->create(['feature_id' => $feature->id]);
// $this->assertEquals(5, $tasks->count());
// $this->visit('features/'.$feature->id);
// $this->see($tasks[1]->name);
// $this->see($tasks[1]->progress);
// $this->see($tasks[1]->description);
// $this->see($tasks[1]->route_name);
// $this->see($tasks[4]->name);
// $this->see($tasks[4]->progress);
// $this->see($tasks[4]->description);
// $this->see($tasks[4]->route_name);
// }
}

2
tests/Feature/Users/ManageUsersTest.php
View File

@ -49,7 +49,6 @@ class ManageUsersTest extends TestCase
{
$user = $this->adminUserSigningIn();
$user2 = factory(User::class)->create();
$user2->assignRole('worker');
$this->visit(route('users.edit', $user2->id));
$this->type('Ganti nama User', 'name');
@ -72,7 +71,6 @@ class ManageUsersTest extends TestCase
{
$user = $this->adminUserSigningIn();
$user2 = factory(User::class)->create();
$user2->assignRole('worker');
$this->visit(route('users.edit', $user2->id));

41
tests/Unit/Models/UserTest.php
View File

@ -19,47 +19,6 @@ class UserTest extends TestCase
}
/** @test */
public function user_can_assigned_to_a_role()
{
$user = factory(User::class)->create();
$user->assignRole('admin');
$this->assertTrue($user->hasRole('admin'));
}
/** @test */
public function user_has_many_roles()
{
$user = factory(User::class)->create();
$user->assignRole('admin');
$user->assignRole('worker');
$this->assertTrue($user->hasRoles(['admin', 'worker']));
}
/** @test */
public function user_can_be_removed_from_a_role()
{
$user = factory(User::class)->create();
$user->assignRole('admin');
$user->assignRole('worker');
$this->assertTrue($user->hasRoles(['admin', 'worker']));
$user->removeRole('worker');
$this->assertFalse($user->fresh()->hasRole('worker'));
}
/** @test */
public function user_can_queried_by_roles()
{
$user = factory(User::class)->create();
$user->assignRole('worker');
$this->assertCount(1, User::orderBy('name')->hasRoles(['worker'])->get());
}
/** @test */
public function user_can_owns_one_agency()
{
$user = factory(User::class)->create();

Write Preview
Loading…
Cancel
Save