Skip to content

Commit 874261b

Browse files
committed
Use of our own Role and Permission Models
1 parent 0ea1d82 commit 874261b

File tree

3 files changed

+29
-53
lines changed

3 files changed

+29
-53
lines changed

database/seeders/PermissionsTableSeeder.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ public function run(): void
5151
*/
5252
foreach ($Permissionitems as $Permissionitem) {
5353
$newPermissionitem = Permission::where('slug', '=', $Permissionitem['slug'])->first();
54-
if ($newPermissionitem === null) {
54+
if (null === $newPermissionitem) {
5555
$newPermissionitem = Permission::create([
56-
'name' => $Permissionitem['name'],
57-
'slug' => $Permissionitem['slug'],
58-
'description' => $Permissionitem['description'],
59-
'model' => $Permissionitem['model'],
56+
'name' => $Permissionitem['name'],
57+
'slug' => $Permissionitem['slug'],
58+
'description' => $Permissionitem['description'],
59+
'model' => $Permissionitem['model'],
6060
]);
6161
}
6262
}

database/seeders/RolesTableSeeder.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ public function run(): void
4545
*/
4646
foreach ($RoleItems as $RoleItem) {
4747
$newRoleItem = Role::where('slug', '=', $RoleItem['slug'])->first();
48-
if ($newRoleItem === null) {
48+
if (null === $newRoleItem) {
4949
$newRoleItem = Role::create([
50-
'name' => $RoleItem['name'],
51-
'slug' => $RoleItem['slug'],
52-
'description' => $RoleItem['description'],
53-
'level' => $RoleItem['level'],
50+
'name' => $RoleItem['name'],
51+
'slug' => $RoleItem['slug'],
52+
'description' => $RoleItem['description'],
53+
'level' => $RoleItem['level'],
5454
]);
5555
}
5656
}

database/seeders/UsersTableSeeder.php

+19-43
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
namespace Database\Seeders;
44

55
use App\Models\Profile;
6+
use App\Models\Role;
67
use App\Models\User;
8+
use Faker\Factory;
79
use Illuminate\Database\Seeder;
810
use Illuminate\Support\Facades\Hash;
9-
use jeremykenedy\LaravelRoles\Models\Role;
1011

1112
class UsersTableSeeder extends Seeder
1213
{
@@ -17,58 +18,33 @@ class UsersTableSeeder extends Seeder
1718
*/
1819
public function run(): void
1920
{
20-
$profile = new Profile();
21-
$adminRole = Role::whereName('Admin')->first();
22-
$userRole = Role::whereName('User')->first();
23-
24-
// Seed test admin
25-
$seededAdminEmail = '[email protected]';
26-
$user = User::where('email', '=', $seededAdminEmail)->first();
27-
if ($user === null) {
28-
$user = User::create([
29-
'name' => 'Admin',
30-
'first_name' => 'Harry',
31-
'last_name' => 'Potter',
32-
'email' => $seededAdminEmail,
33-
'password' => Hash::make('password'),
34-
'token' => str_random(64),
35-
'activated' => true,
36-
'signup_confirmation_ip_address' => '127.0.0.1',
37-
'admin_ip_address' => '127.0.0.1',
38-
]);
39-
40-
$user->profile()->save($profile);
41-
$user->attachRole($adminRole);
42-
$user->save();
21+
$faker = Factory::create();
22+
$roles = Role::all();
23+
foreach ($roles as $role) {
24+
$email = $role->slug.'@user.com';
25+
$this->createUser($faker, $email, $role);
4326
}
27+
}
4428

45-
// Seed test user
46-
$user = User::where('email', '=', '[email protected]')->first();
47-
if ($user === null) {
29+
private function createUser($faker, $email, $role)
30+
{
31+
$user = User::where('email', '=', $email)->first();
32+
if (null === $user) {
4833
$user = User::create([
49-
'name' => 'User',
50-
'first_name' => 'Hermione',
51-
'last_name' => 'Granger',
52-
'email' => '[email protected]',
34+
'name' => $faker->userName,
35+
'first_name' => $faker->firstName,
36+
'last_name' => $faker->lastName,
37+
'email' => $email,
5338
'password' => Hash::make('password'),
5439
'token' => str_random(64),
5540
'activated' => true,
56-
'signup_ip_address' => '127.0.0.1',
57-
'signup_confirmation_ip_address' => '127.0.0.1',
41+
'signup_ip_address' => $faker->ipv4,
42+
'signup_confirmation_ip_address' => $faker->ipv4,
5843
]);
5944

6045
$user->profile()->save(new Profile());
61-
$user->attachRole($userRole);
46+
$user->attachRole($role);
6247
$user->save();
6348
}
64-
65-
// Seed test users
66-
// $user = factory(App\Models\Profile::class, 5)->create();
67-
// $users = User::All();
68-
// foreach ($users as $user) {
69-
// if (!($user->isAdmin()) && !($user->isUnverified())) {
70-
// $user->attachRole($userRole);
71-
// }
72-
// }
7349
}
7450
}

0 commit comments

Comments
 (0)