feat: add admin roles in api response

chorkleines · Aug 2, 2023 · 3014770 · 3014770
1 parent f35978c
commit 3014770
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 8 deletions.
diff --git a/api/app/Http/Controllers/AuthController.php b/api/app/Http/Controllers/AuthController.php
@@ -26,7 +26,8 @@ public function me()
     {
         $user = auth()->user()->toArray();
         $profile = auth()->user()->profile->toArray();
-        $me = array_merge($user, $profile);
+        $admin = auth()->user()->admin->toArray();
+        $me = array_merge($user, $profile, $admin);
 
         return response()->json($me);
     }

diff --git a/api/app/Models/Admin.php b/api/app/Models/Admin.php
@@ -4,6 +4,7 @@
 
 use App\Enums\Role;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
@@ -13,11 +14,7 @@ class Admin extends Model
 
     protected $fillable = [
         'user_id',
-        'role',
-    ];
-
-    protected $casts = [
-        'role' => Role::class,
+        'roles',
     ];
 
     protected $primaryKey = 'user_id';
@@ -26,4 +23,22 @@ public function user()
     {
         return $this->hasOne(User::class, 'user_id');
     }
+
+    private function is_role($value)
+    {
+        return in_array($value, Role::getValues());
+    }
+
+    /**
+     * Get the roles attribute.
+     *
+     * @return \Illuminate\Database\Eloquent\Casts\Attribute
+     */
+    protected function roles(): Attribute
+    {
+        return Attribute::make(
+            get: fn ($value) => array_filter(explode(',', $value), [$this, 'is_role']),
+            set: fn ($value) => implode(',', $value),
+        );
+    }
 }
diff --git a/api/database/migrations/2023_07_31_151057_alter_table_admins.php b/api/database/migrations/2023_07_31_151057_alter_table_admins.php
@@ -0,0 +1,47 @@
+<?php
+
+use App\Enums\Role;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('admins', function (Blueprint $table) {
+            $table->set('roles', [Role::MASTER, Role::MANAGER, Role::ACCOUNTANT, Role::CAMP])->nullable(true)->after('role');
+        });
+        $records = DB::table('admins')->get();
+        foreach ($records as $record) {
+            DB::table('admins')->where('user_id', $record->user_id)->update(['roles' => $record->role]);
+        }
+        Schema::table('admins', function (Blueprint $table) {
+            $table->dropColumn('role');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('admins', function (Blueprint $table) {
+            $table->string('role', 32)->nullable(true)->after('user_id');
+        });
+        $records = DB::table('admins')->get();
+        foreach ($records as $record) {
+            DB::table('admins')->where('user_id', $record->user_id)->update(['role' => explode(',', $record->roles)[0]]);
+        }
+        Schema::table('admins', function (Blueprint $table) {
+            $table->dropColumn('roles');
+        });
+    }
+};
diff --git a/api/database/seeders/DatabaseSeeder.php b/api/database/seeders/DatabaseSeeder.php
@@ -26,7 +26,7 @@ public function createAdminUser($role)
         ]);
         \App\Models\Admin::create([
             'user_id' => $user->id,
-            'role' => $role,
+            'roles' => [$role],
         ]);
     }
 
@@ -58,7 +58,7 @@ public function run()
         ]);
         \App\Models\Admin::create([
             'user_id' => $user->id,
-            'role' => Role::MASTER,
+            'roles' => [Role::MASTER],
         ]);
         echo 'Email: admin@chorkleines.com'.PHP_EOL;
         echo 'Password: password'.PHP_EOL;

diff --git a/api/tests/Feature/AuthTest.php b/api/tests/Feature/AuthTest.php
@@ -36,6 +36,7 @@ public function test_get_user_info_using_authenticated_user()
             'grade',
             'part',
             'birthday',
+            'roles' => [],
         ]);
         $response->assertJson([
             'email' => 'admin@chorkleines.com',
@@ -46,6 +47,7 @@ public function test_get_user_info_using_authenticated_user()
             'grade' => 18,
             'part' => Part::TENOR,
             'birthday' => '2000-01-01',
+            'roles' => ['MASTER'],
         ]);
     }
 

diff --git a/client/composables/useAuth.ts b/client/composables/useAuth.ts
@@ -9,6 +9,7 @@ export type User = {
   birthday: string;
   status: string;
   emailVerifiedAt: string;
+  roles: string[];
   createdAt: string;
   updatedAt: string;
   displayName: string;
@@ -40,6 +41,7 @@ export const useAuth = () => {
       user.value.birthday = u.birthday;
       user.value.status = u.status;
       user.value.emailVerifiedAt = u.email_verified_at;
+      user.value.roles = u.roles;
       user.value.createdAt = u.created_at;
       user.value.updatedAt = u.updated_at;
       user.value.displayName = `${u.grade}${u.part} ${u.last_name}${u.first_name}`;