Merge pull request 'refactor(usermanagement): streamline UsersSeeder by utilizing RolesSeeder and improving user creation logic' (#1) from new_adk into master

Reviewed-on: #1

app/Models/User.php

@@ -1,94 +1,105 @@
 <?php
 
-    namespace Modules\Usermanagement\Models;
+namespace Modules\Usermanagement\Models;
 
-    use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
-    use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\SoftDeletes;
-    use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Foundation\Auth\User as Authenticatable;
-    use Illuminate\Notifications\Notifiable;
+use Illuminate\Notifications\Notifiable;
-    use Modules\Basicdata\Models\Branch;
+use Modules\Basicdata\Models\Branch;
-    use Spatie\Permission\Traits\HasRoles;
+use Modules\Adk\Models\Appointment;
-    use Mattiverse\Userstamps\Traits\Userstamps;
+use Spatie\Permission\Traits\HasRoles;
+use Mattiverse\Userstamps\Traits\Userstamps;
+
+/**
+ * Class User
+ *
+ * This class extends the Laravel's Authenticatable class and represents a User in the application.
+ * It includes traits for using factories, notifications, API tokens, and UUIDs.
+ *
+ * @property string $name           The name of the user.
+ * @property string $email          The email of the user.
+ * @property string $password       The hashed password of the user.
+ * @property string $remember_token The token used for "remember me" functionality.
+ *
+ * @package App\Models
+ */
+class User extends Authenticatable
+{
+    use HasFactory, Notifiable, Userstamps, HasRoles, softDeletes;
+
+    protected $guard_name = ['web'];
 
     /**
-     * Class User
+     * The attributes that are mass assignable.
      *
-     * This class extends the Laravel's Authenticatable class and represents a User in the application.
+     * These are the attributes that can be set in bulk during a create or update operation.
-     * It includes traits for using factories, notifications, API tokens, and UUIDs.
      *
-     * @property string $name           The name of the user.
+     * @var array<int, string>
-     * @property string $email          The email of the user.
-     * @property string $password       The hashed password of the user.
-     * @property string $remember_token The token used for "remember me" functionality.
-     *
-     * @package App\Models
      */
-    class User extends Authenticatable
+    protected $fillable = [
+        'name',
+        'email',
+        'password',
+        'nik',
+        'branch_id',
+        'profile_photo_path',
+        'last_login_at',
+        'last_login_ip',
+        'sign'
+    ];
+
+    /**
+     * The attributes that should be hidden for serialization.
+     *
+     * These are the attributes that will be hidden when the model is converted to an array or JSON.
+     *
+     * @var array<int, string>
+     */
+    protected $hidden = [
+        'password',
+        'remember_token',
+    ];
+
+    /**
+     * Get the attributes that should be cast.
+     *
+     * This method defines how the attributes should be cast when accessed.
+     * In this case, 'email_verified_at' is cast to 'datetime', 'password' is cast to 'hashed', and 'id' is cast to 'string'.
+     *
+     * @return array<string, string>
+     */
+    protected function casts(): array
     {
-        use HasFactory, Notifiable, Userstamps, HasRoles, softDeletes;
+        return [
-
+            'email_verified_at' => 'datetime',
-        protected $guard_name = ['web'];
+            'password'          => 'hashed',
-
+            'id'                => 'string',
-        /**
-         * The attributes that are mass assignable.
-         *
-         * These are the attributes that can be set in bulk during a create or update operation.
-         *
-         * @var array<int, string>
-         */
-        protected $fillable = [
-            'name',
-            'email',
-            'password',
-            'nik',
-            'branch_id',
-            'profile_photo_path',
-            'last_login_at',
-            'last_login_ip',
-            'sign'
         ];
-
-        /**
-         * The attributes that should be hidden for serialization.
-         *
-         * These are the attributes that will be hidden when the model is converted to an array or JSON.
-         *
-         * @var array<int, string>
-         */
-        protected $hidden = [
-            'password',
-            'remember_token',
-        ];
-
-        /**
-         * Get the attributes that should be cast.
-         *
-         * This method defines how the attributes should be cast when accessed.
-         * In this case, 'email_verified_at' is cast to 'datetime', 'password' is cast to 'hashed', and 'id' is cast to 'string'.
-         *
-         * @return array<string, string>
-         */
-        protected function casts()
-        : array
-        {
-            return [
-                'email_verified_at' => 'datetime',
-                'password'          => 'hashed',
-                'id'                => 'string',
-            ];
-        }
-
-        public function branch(){
-            return $this->belongsTo(Branch::class);
-        }
-
-        /**
-         * Create a new factory instance for the model.
-         *
-         * @return \Illuminate\Database\Eloquent\Factories\Factory
-         */
-        protected static function newFactory()
-        {
-            return \Modules\Usermanagement\Database\Factories\UserFactory::new();
-        }
     }
+
+    public function branch()
+    {
+        return $this->belongsTo(Branch::class);
+    }
+
+    /**
+     * Create a new factory instance for the model.
+     *
+     * @return \Illuminate\Database\Eloquent\Factories\Factory
+     */
+    protected static function newFactory()
+    {
+        return \Modules\Usermanagement\Database\Factories\UserFactory::new();
+    }
+
+    /**
+     * Get all of the appointments for the User
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function appointments()
+    {
+        return $this->hasMany(Appointment::class, 'admin_id');
+    }
+}

database/seeders/UsersSeeder.php

@@ -1,35 +1,42 @@
 <?php
 
-    namespace Modules\Usermanagement\Database\Seeders;
+namespace Modules\Usermanagement\Database\Seeders;
 
-    use Faker\Generator;
+use Illuminate\Database\Seeder;
-    use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\Hash;
-    use Illuminate\Support\Facades\Hash;
+use Modules\Usermanagement\Models\User;
-    use Modules\Usermanagement\Models\User;
+use Modules\Usermanagement\Database\Seeders\RolesSeeder;
-    use Spatie\Permission\Models\Role;
 
-    class UsersSeeder extends Seeder
+class UsersSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
     {
-        /**
+        $roleSeeder = new RolesSeeder();
-         * Run the database seeds.
+        $rolesData = $roleSeeder->data();
-         *
-         * @return void
-         */
-        public function run(Generator $faker)
-        {
-            $roles = Role::all();
 
-            foreach ($roles as $role) {
+        foreach ($rolesData as $roleData) {
-                $user = User::create([
+            if ($roleData['name'] === 'administrator') {
-                    'name'              => $role->name,
+                $user = User::firstOrCreate(
-                    'email'             => $role->name . '@ag.co.id',
+                    ['email' => $roleData['name'] . '@ag.co.id'],
-                    'password'          => Hash::make('bagbag'),
+                    [
-                    'branch_id'         => 1,
+                        'name' => $roleData['name'],
-                    'nik'               => '000000',
+                        'password' => Hash::make('bagbag'),
-                    'email_verified_at' => now(),
+                        'branch_id' => 1,
-                ]);
+                        'nik' => '000000',
+                        'email_verified_at' => now(),
+                    ]
+                );
+
+                $role = \Spatie\Permission\Models\Role::firstOrCreate(
+                    ['name' => $roleData['name']],
+                    ['guard_name' => 'web']
+                );
 
                 $user->assignRole($role);
             }
         }
     }
+}