app/Auth/PassportUserRepository.php

@@ -3,22 +3,13 @@
 namespace App\Auth;
 
 use Laravel\Passport\Bridge\UserRepository;
-use Laravel\Passport\Bridge\UserRepositoryInterface;
-use Laravel\Passport\Bridge\User;
 use League\OAuth2\Server\Entities\ClientEntityInterface;
+use Laravel\Passport\Bridge\User;
+use Illuminate\Support\Facades\Hash;
 use App\Models\User as UserModel;
 
 class PassportUserRepository extends UserRepository
 {
-    /**
-     * OAuth2.
-     *
-     * @param string $username
-     * @param string $password
-     * @param string $grantType
-     * @param ClientEntityInterface $clientEntity
-     * @return User|null
-     */
     public function getUserEntityByUserCredentials(
         $username,
         $password,
@@ -27,14 +18,37 @@ class PassportUserRepository extends UserRepository
     ) {
         $user = UserModel::where('email', $username)->first();
 
-        if (! $user) {
+        if (!$user) {
             return null;
         }
 
-        if (md5($password) === $user->password) {
-            return new User($user->getAuthIdentifier());
+        // Avoid Hash::check() error with non-bcrypt hashes
+        if ($this->isBcryptHash($user->password)) {
+            if (Hash::check($password, $user->password)) {
+                return new User($user->id);
+            }
+        } else {
+            // If the hash is not bcrypt, check for MD5 manually
+            if (md5($password) === $user->password) {
+                // Upgrade password to bcrypt
+                $user->password = Hash::make($password);
+                $user->save();
+
+                return new User($user->id);
+            }
         }
 
         return null;
     }
+
+    /**
+     * Check if the given hash uses the bcrypt algorithm.
+     *
+     * @param string $hashedPassword
+     * @return bool
+     */
+    protected function isBcryptHash($hashedPassword): bool
+    {
+        return password_get_info($hashedPassword)['algo'] === PASSWORD_BCRYPT;
+    }
 }

app/Http/Controllers/Api/ExerciseController.php

@@ -6,9 +6,9 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\CreateExerciseRequest;
 use App\Services\ExerciseService;
 use App\Services\ExerciseSkillService;
+use App\Services\QuestionGroupService;
 use App\Services\QuestionService;
 use App\Services\SkillService;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
 class ExerciseController extends Controller
@@ -24,25 +24,7 @@ class ExerciseController extends Controller
         $this->skillService = $skillService;
         $this->exerciseSkillService = $exerciseSkillService;
         $this->questionService = $questionService;
-    }
-
-    public function index(Request $request)
-    {
-        $exercises = $this->exerciseService->getExercises($request->all());
 
-        if ($exercises->isEmpty()) {
-            return response()->json([
-                'status' => true,
-                'data' => $exercises,
-                'message' => 'Không có dữ liệu.',
-            ]);
-        }
-
-        return response()->json([
-            'status' => true,
-            'data' => $exercises,
-            'message' => 'Lấy danh sách đề thi thành công.',
-        ]);
     }
 
     public function create(CreateExerciseRequest $request)
@@ -63,35 +45,16 @@ class ExerciseController extends Controller
 
             return response()->json([
                 'success' => true,
-                'message' => 'Tạo đề thi thành công.',
+                'message' => 'Exercise created successfully',
                 'exercise_id' => $exerciseId
             ], 201);
         } catch (\Exception $e) {
             DB::rollBack();
             return response()->json([
                 'success' => false,
-                'message' => 'Tạo đề thi thất bại.',
+                'message' => 'Failed to create exercise',
                 'error' => $e->getMessage()
             ], 500);
         }
     }
-
-    public function detail($id)
-    {
-        $exercise = $this->exerciseService->detail($id);
-
-        if (empty($exercise)) {
-            return response()->json([
-                'status' => true,
-                'data' => $exercise,
-                'message' => 'Không có dữ liệu.',
-            ]);
-        }
-
-        return response()->json([
-            'status' => true,
-            'data' => $exercise,
-            'message' => 'Lấy danh sách đề thi thành công.',
-        ]);
-    }
 }

app/Http/Resources/BlankResource.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class BlankResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'position' => $this->position,
-            'correct_answer' => $this->correct_answer,
-            'other_answers' => $this->other_answers,
-        ];
-    }
-}

app/Http/Resources/ChoiceResource.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class ChoiceResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'content' => $this->content,
-            'is_correct' => $this->is_correct,
-            'position' => $this->position,
-        ];
-    }
-}

app/Http/Resources/ExerciseResource.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class ExerciseResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'name' => $this->lesson_name,
-            'description' => $this->description,
-            'level' => $this->level_label,
-            'year' => $this->year,
-            'skills' => SkillResource::collection($this->whenLoaded('skills')),
-            'question_groups' => QuestionGroupResource::collection($this->whenLoaded('questionGroups')),
-        ];
-    }
-}

app/Http/Resources/QuestionGroupResource.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class QuestionGroupResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'content' => $this->content,
-            'questions' => QuestionResource::collection($this->whenLoaded('questions')),
-        ];
-    }
-}

app/Http/Resources/QuestionResource.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class QuestionResource extends JsonResource
-{
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'content' => $this->content,
-            'score' => $this->score,
-            'explanation' => $this->explanation,
-            'hint' => $this->hint,
-            'type' => [
-                'code' => $this->type->code ?? null,
-                'name' => $this->type->name ?? null,
-            ],
-            'choices' => $this->when($this->type->code === 'multiple_choice', ChoiceResource::collection($this->choices)),
-            'blanks' => $this->when($this->type->code !== 'multiple_choice', BlankResource::collection($this->blanks)),
-        ];
-    }
-}

app/Http/Resources/SkillResource.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class SkillResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'name' => $this->name
-        ];
-    }
-}

app/Models/Exercise.php

@@ -23,18 +23,6 @@ class Exercise extends Model
         'media_object_id',
     ];
 
-    protected $appends = ['level_label'];
-
-    public function getLevelLabelAttribute()
-    {
-        return match ($this->level) {
-            0 => 'easy',
-            1 => 'normal',
-            2 => 'hard',
-            default => 'normal',
-        };
-    }
-
     public function subject()
     {
         return $this->belongsTo(Subject::class, 'subject_id');

app/Models/QuestionBlank.php

@@ -17,10 +17,6 @@ class QuestionBlank extends Model
         'other_answers',
     ];
 
-    protected $casts = [
-        'other_answers' => 'array', // Laravel tự động json_decode
-    ];
-
     public function question()
     {
         return $this->belongsTo(Question::class, 'question_id');

app/Models/User.php

@@ -15,7 +15,7 @@ class User extends Authenticatable
     /** @use HasFactory<\Database\Factories\UserFactory> */
     use HasApiTokens, HasFactory, Notifiable, HasRoles;
 
-    protected $table = 'users';
+    protected $table = 'users_laravel';
 
     /**
      * The attributes that are mass assignable.

app/Services/ExerciseService.php

@@ -2,41 +2,10 @@
 
 namespace App\Services;
 
-use App\Http\Resources\ExerciseResource;
 use App\Models\Exercise;
 
 class ExerciseService
 {
-
-    public function getExercises($params)
-    {
-        $limit = isset($params['limit']) ? min((int)$params['limit'], 100) : 10;
-        $offset = isset($params['offset']) ? max((int)$params['offset'], 0) : 0;
-        $lessonName = $params['search'] ?? null;
-
-        $query = Exercise::select('id', 'lesson_name', 'description', 'status', 'level', 'year', 'created_at');
-
-        if (!empty($lessonName)) {
-            $query->where('lesson_name', 'like', '%' . $lessonName . '%');
-        }
-
-        // Lấy dữ liệu chính
-        $data = $query->orderByDesc('created_at')
-            ->skip($offset)
-            ->take($limit)
-            ->get()
-            ->map(function ($item) {
-                $item->level = match ((int)$item->level) {
-                    0 => 'easy',
-                    1 => 'normal',
-                    2 => 'hard',
-                    default => 'unknown',
-                };
-                return $item;
-            });
-
-        return $data;
-    }
     public function createExercise($dataExercise)
     {
         $dataCreateExercise = [
@@ -53,22 +22,4 @@ class ExerciseService
 
         return $exercise->id;
     }
-
-    public function detail($id)
-    {
-        $exercise = Exercise::with([
-            'skills:id,name',
-            'questionGroups' => function ($q) {
-                $q->select('id', 'exercise_id', 'content');
-            },
-            'questionGroups.questions' => function ($q) {
-                $q->select('id', 'content', 'group_id', 'question_type_id', 'description', 'score', 'explanation', 'hint');
-            },
-            'questionGroups.questions.type:id,code,name',
-            'questionGroups.questions.choices',
-            'questionGroups.questions.blanks',
-        ])->findOrFail($id);
-
-        return new ExerciseResource($exercise);
-    }
 }

app/Services/QuestionService.php

@@ -6,7 +6,6 @@ use App\Models\Question;
 use App\Models\QuestionBlank;
 use App\Models\QuestionChoice;
 use App\Models\QuestionGroup;
-use App\Models\QuestionType;
 use Illuminate\Support\Facades\DB;
 
 class QuestionService
@@ -60,20 +59,19 @@ class QuestionService
             foreach ($data as $groupKey => $value) {
                 $groupId = $groupIds[$groupKey];
                 foreach ($value->questions as $qIndex => $question) {
-                    $questionType = QuestionType::where('code', $question->type)->first();
-                    $questionTypeId = $questionType ? $questionType->id : 1;
                     $dataQuestion[] = [
                         'exercise_id'      => $exerciseId,
                         'content'          => $question->content,
                         'description'      => $question->description ?? null,
                         'group_id'         => $groupId,
-                        'question_type_id' => $questionTypeId,
+                        'question_type_id' => 1,
                         'level'            => 2,
                         'score'            => $question->score ?? null,
                         'explanation'      => $question->explanation ?? null,
                         'hint'             => $question->hint ?? null,
                         'created_at'       => $now,
-                        'updated_at'       => $now
+                        'updated_at'       => $now,
+                        'custom_key'       => "{$groupKey}_{$qIndex}", // dùng để map lại
                     ];
                     $questionMap["{$groupKey}_{$qIndex}"] = [
                         'type'    => $question->type,

routes/api.php

@@ -13,7 +13,5 @@ Route::middleware(['auth:api', 'role:admin'])->get('/user', function (Request $r
 });
 
 Route::middleware('auth:api')->group(function () {
-    Route::get('/exercises', [ExerciseController::class, 'index'])->name('exercise.index');
     Route::post('/exercise/create', [ExerciseController::class, 'create'])->name('exercise.create');
-    Route::get('/exercise/{id}', [ExerciseController::class, 'detail'])->name('exercise.detail');
 });