fix onfilixt

Reviewed-on: #17

backend/app/Admin/Controllers/ExpertManagementController.php

@@ -67,8 +67,7 @@ class ExpertManagementController extends Controller
      */
     public function show(Expert $expert): JsonResponse
     {
-        return $this->successResponse(
-            new ExpertManagementResource($expert)
+        return $this->successResponse($expert->load(['roles','permissions'])
         );
     }
 

backend/app/Admin/Controllers/ProfileController.php

@@ -3,6 +3,7 @@
 namespace App\Admin\Controllers;
 
 use App\Admin\Requests\Profile\ChangePasswordRequest;
+use App\Admin\Requests\Profile\EditRequest;
 use App\Admin\Resources\ExpertResource;
 use App\Http\Controllers\Controller;
 use App\Traits\ApiResponse;
@@ -19,6 +20,24 @@ class ProfileController extends Controller
         return $this->successResponse(new ExpertResource(Auth::guard('expert')->user()));
     }
 
+    public function edit(EditRequest $request): JsonResponse
+    {
+        $expert = $request->user('expert');
+
+        $expert->update([
+            'username' => $request->username,
+            'first_name' => $request->first_name,
+            'last_name' => $request->last_name,
+            'email' => $expert->email,
+            'national_id' => $request->national_id,
+            'phone_number' => $request->phone_number,
+            'province_id' => $request->province_id,
+            'city_id' => $request->city_id,
+        ]);
+
+        return $this->successResponse();
+    }
+
     public function changePassword(ChangePasswordRequest $request): JsonResponse
     {
         $expert = Auth::guard('expert')->user();
@@ -34,4 +53,5 @@ class ProfileController extends Controller
 
         return $this->successResponse();
     }
+
 }

backend/app/Admin/Requests/PermissionManagement/UpdateRequest.php

@@ -27,7 +27,7 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'name' => ['required', 'string', 'max:255', Rule::unique('permission', 'name')->ignore($this->permission->id)],
+            'name' => ['required', 'string', 'max:255', Rule::unique('permissions', 'name')->ignore($this->permission->id)],
         ];
     }
 }

backend/app/Admin/Requests/Profile/EditRequest.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Admin\Requests\Profile;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class EditRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'username' => 'string|max:255',
+            'first_name' => 'string',
+            'last_name' => 'string',
+            'email' => 'string|email|max:255',
+            'national_id' => 'string',
+            'phone_number' => 'string',
+            'province_id' => 'string',
+            'city_id' => 'string',
+        ];
+    }
+}

backend/app/Admin/Requests/RoleManagement/StoreRequest.php

@@ -24,8 +24,8 @@ class StoreRequest extends FormRequest
     {
         return [
             'name' => 'required|string|unique:roles,name',
-            'permissions' => 'required|array',
-            'permissions.*.name' => 'required|string|exists:permissions,name',
+            'permissions' => 'array',
+            'permissions.*' => 'integer|exists:permissions,id',
         ];
     }
 }

backend/app/Admin/Requests/RoleManagement/UpdateRequest.php

@@ -27,9 +27,9 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'name' => ['required', 'string', 'max:255', Rule::unique('roles', 'name')->ignore($this->role->id)],
-            'permissions' => 'required|array',
-            'permissions.*.name' => 'required|string|exists:permissions,name',
+            'name' => ['string', 'max:255', Rule::unique('roles', 'name')->ignore($this->role->id)],
+            'permissions' => 'array',
+            'permissions.*' => 'integer|exists:permissions,id',
         ];
     }
 }

backend/app/Admin/Resources/ExpertManagementResource.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Admin\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/**
- * @method roles()
- * @method getAllPermissions()
- */
-class ExpertManagementResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'username' => $this->username,
-            'first_name' => $this->first_name,
-            'last_name' => $this->last_name,
-            'national_id' => $this->national_id,
-            'email' => $this->email,
-            'phone_number' => $this->phone_number,
-            'province_name' => $this->province_name,
-            'city_name' => $this->city_name,
-            'roles' => $this->roles()
-                ->pluck('name')
-                ->values(),
-
-            'permissions' => $this->getAllPermissions()
-                ->pluck('name')
-                ->values(),
-        ];
-    }
-}
-

backend/app/Models/Expert.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use Database\Factories\ExpertFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Spatie\Permission\Traits\HasRoles;
 
 /**
  * @method roles()
@@ -14,6 +15,8 @@ class Expert extends Model
 {
     /** @use HasFactory<ExpertFactory> */
     use HasFactory;
+    use HasRoles;
 
     protected $guarded = ['id'];
+    protected string $guard_name = 'web';
 }

backend/app/Models/Gateway.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Database\Factories\GatewayFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Gateway extends Model
+{
+    /** @use HasFactory<GatewayFactory> */
+    use HasFactory;
+
+    protected $guarded = ['id'];
+}

backend/app/Models/GatewayCategory.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Database\Factories\GatewayCategoryFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GatewayCategory extends Model
+{
+    /** @use HasFactory<GatewayCategoryFactory> */
+    use HasFactory;
+
+    protected $guarded = ['id'];
+}

backend/app/Models/Payment.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Database\Factories\PaymentFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Payment extends Model
+{
+    /** @use HasFactory<PaymentFactory> */
+    use HasFactory;
+
+    protected $guarded = ['id'];
+}

backend/app/Models/PaymentStatus.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Database\Factories\PaymentStatusFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class PaymentStatus extends Model
+{
+    /** @use HasFactory<PaymentStatusFactory> */
+    use HasFactory;
+
+    protected $guarded = ['id'];
+}

backend/app/Models/User.php

@@ -10,8 +10,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
-use Illuminate\Support\Facades\Hash;
-use Laravel\Passport\Bridge\Client;
 use Laravel\Passport\HasApiTokens;
 
 #[Guarded(['id'])]
@@ -26,14 +24,4 @@ class User extends Authenticatable
     {
         return $this->morphToMany(Document::class, 'documentable');
     }
-
-    public function validateForPassportPasswordGrant(string $password): bool
-    {
-        return Hash::check($password, $this->password);
-    }
-
-    public function findForPassport(string $username, Client $client): User
-    {
-        return $this->where('username', $username)->first();
-    }
 }

backend/app/Providers/AppServiceProvider.php

@@ -22,8 +22,6 @@ class AppServiceProvider extends ServiceProvider
     public function boot(): void
     {
         Passport::enablePasswordGrant();
-        Passport::tokensExpireIn(CarbonInterval::minutes(1));
-        Passport::refreshTokensExpireIn(CarbonInterval::minutes(5));
         Passport::personalAccessTokensExpireIn(CarbonInterval::minutes(1));
     }
 }

backend/app/User/Controllers/Dashboard/ConfirmController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\User\Controllers\Dashboard;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class ConfirmController extends Controller
+{
+    public function index()
+    {
+        //
+    }
+}

backend/app/User/Controllers/Dashboard/DocumentationController.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\User\Controller\Dashboard;
+
+use App\Http\Controllers\Controller;
+use App\Traits\ApiResponse;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DocumentationController extends Controller
+{
+    use ApiResponse;
+
+    public function store(StoreRequest $request): jsonResponse
+    {
+        //
+    }
+
+    public function update(UpdateRequest $request): JsonResponse
+    {
+        //
+    }
+
+}