feat: finla changes and fixes

Author: DimGiagias

app/Http/Controllers/CourseReviewController.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace App\Http\Controllers;
 
 use App\Models\Course;
@@ -10,7 +8,6 @@
 use App\Models\Quiz;
 use App\Models\QuizAnswer;
 use App\Models\QuizAttempt;
-use Exception;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -20,21 +17,20 @@
 use Inertia\Inertia;
 use Inertia\Response;
 
-final class CourseReviewController extends Controller
+class CourseReviewController extends Controller
 {
-    public const REVIEW_QUIZ_WRONG_QUESTIONS_TARGET = 5; // Target number of previously wrong questions
-
-    public const REVIEW_QUIZ_NEW_QUESTIONS_TARGET = 5;  // Target number of new/random questions
+    const REVIEW_QUIZ_WRONG_QUESTIONS_TARGET = 5; // Target number of previously wrong questions
+    const REVIEW_QUIZ_NEW_QUESTIONS_TARGET = 5;  // Target number of new/random questions
 
     /**
      * Generate and display the final review quiz for a course.
      */
-    public function generate(Course $course): Response|RedirectResponse
+    public function generate(Course $course): Response | RedirectResponse
     {
         $user = Auth::user();
 
         $placeholderQuiz = $course->finalReviewQuiz;
-        if (! $placeholderQuiz) {
+        if (!$placeholderQuiz) {
             Log::warning("CourseReview: Course {$course->id} has no final_review_quiz_id linked.");
             $quizTitle = "{$course->title} - Final Review";
             $quizDescription = "A comprehensive review of topics from {$course->title}.";
@@ -70,10 +66,11 @@ public function generate(Course $course): Response|RedirectResponse
                 ->get();
         }
 
+        // Combine and shuffle questions
         $finalQuestions = $wrongQuestions->concat($newQuestions)->shuffle();
 
         if ($finalQuestions->isEmpty()) {
-            return Inertia::render('Courses/Review/Show', [
+            return Inertia::render('courses/review/Show', [
                 'course' => $course->only('id', 'title', 'slug'),
                 'quizData' => null,
                 'message' => 'Not enough questions available for a review quiz for this course yet. Try completing more module quizzes.',
@@ -93,13 +90,13 @@ public function generate(Course $course): Response|RedirectResponse
         });
 
         $quizDataForView = [
-            'id' => 'final_review_'.$course->id.'_'.uniqid(),
+            'id' => 'final_review_' . $course->id . '_' . uniqid(),
             'title' => $quizTitle,
             'description' => $quizDescription,
             'questions' => $displayQuestions,
         ];
 
-        session(['_courseReviewQuestions_'.$course->id => $finalQuestions->keyBy('id')->toArray()]);
+        session(['_courseReviewQuestions_' . $course->id => $finalQuestions->keyBy('id')->toArray()]);
 
         return Inertia::render('courses/review/Show', [
             'course' => $course->only('id', 'title', 'slug'),
@@ -108,21 +105,23 @@ public function generate(Course $course): Response|RedirectResponse
         ]);
     }
 
+
     /**
      * Process and grade the submitted final review quiz.
      */
-    public function submit(Request $request, Course $course): Response|RedirectResponse
+    public function submit(Request $request, Course $course): Response | RedirectResponse
     {
         $user = Auth::user();
         $submittedAnswers = $request->input('answers', []);
         $request->input('quizId');
 
         $request->validate(['answers' => 'required|array', 'quizId' => 'required|string']);
 
-        $correctQuestionsData = session('_courseReviewQuestions_'.$course->id);
-        session()->forget('_courseReviewQuestions_'.$course->id);
+        // Retrieve correct answers from session
+        $correctQuestionsData = session('_courseReviewQuestions_' . $course->id);
+        session()->forget('_courseReviewQuestions_' . $course->id);
 
-        if (! $correctQuestionsData) {
+        if (!$correctQuestionsData) {
             return Redirect::route('course.review.generate', $course)
                 ->with('error', 'Review quiz session expired. Please try again.');
         }
@@ -147,7 +146,7 @@ public function submit(Request $request, Course $course): Response|RedirectRespo
                 ]);
 
                 foreach ($submittedAnswers as $questionId => $userAnswer) {
-                    if (! $correctQuestions->has($questionId)) {
+                    if (!$correctQuestions->has($questionId)) {
                         continue;
                     }
 
@@ -158,16 +157,16 @@ public function submit(Request $request, Course $course): Response|RedirectRespo
                         ? (json_decode($question->options, true) ?? [])
                         : ($question->options ?? []);
 
+
                     $isCorrect = false;
                     $correctAnswer = $question->correct_answer ?? null;
 
-                    // TODO: Refactor the grading logic to Service/Trait later
                     switch ($question->type ?? 'multiple_choice') {
                         case 'multiple_choice':
                         case 'fill_blank':
                         case 'true_false':
                             if (is_string($userAnswer) && is_string($correctAnswer)) {
-                                $isCorrect = mb_strtolower(mb_trim($userAnswer)) === mb_strtolower(mb_trim($correctAnswer));
+                                $isCorrect = strtolower(trim($userAnswer)) === strtolower(trim($correctAnswer));
                             }
                             break;
                     }
@@ -201,9 +200,8 @@ public function submit(Request $request, Course $course): Response|RedirectRespo
                 $attempt->score = $score;
                 $attempt->save();
             });
-        } catch (Exception $e) {
-            Log::error('CourseReviewSubmit: Failed to save attempt.', ['error' => $e->getMessage()]);
-
+        } catch (\Exception $e) {
+            Log::error("CourseReviewSubmit: Failed to save attempt.", ['error' => $e->getMessage()]);
             return Redirect::route('course.review.generate', $course)
                 ->with('error', 'An error occurred saving your review attempt.');
         }
@@ -213,7 +211,7 @@ public function submit(Request $request, Course $course): Response|RedirectRespo
             if ($result['is_correct']) {
                 continue;
             }
-            if (! $result['lesson_id']) {
+            if (!$result['lesson_id']) {
                 continue;
             }
             if (isset($lessonsToReviewDeeply[$result['lesson_id']])) {
@@ -225,7 +223,7 @@ public function submit(Request $request, Course $course): Response|RedirectRespo
                     'id' => $lessonModel->id,
                     'title' => $lessonModel->title,
                     'url' => route('lessons.show', ['course' => $course->slug, 'lesson' => $lessonModel->slug]),
-                    'external_resources' => $lessonModel->externalResources->map(fn ($res) => $res->only('title', 'url', 'type', 'description'))->toArray(),
+                    'external_resources' => $lessonModel->externalResources->map(fn($res) => $res->only('title', 'url', 'type', 'description'))->toArray(),
                 ];
             }
         }
@@ -234,7 +232,7 @@ public function submit(Request $request, Course $course): Response|RedirectRespo
             'quiz' => ['id' => $attempt->quiz_id, 'title' => $course->finalReviewQuiz?->title ?? "{$course->title} - Final Review"],
             'attempt' => $attempt,
             'results' => $resultsData,
-            'reviewSuggestions' => [], // TODO: Legacy, not used here
+            'reviewSuggestions' => [],
             'deepReviewSuggestions' => array_values($lessonsToReviewDeeply),
         ]);
     }

database/migrations/0001_01_01_000000_create_users_table.php

@@ -20,15 +20,15 @@ public function up(): void
             $table->timestamp('email_verified_at')->nullable();
             $table->string('password');
             $table->rememberToken();
-            $table->enum('preferred_learning_style', ['reading', 'visual', 'balanced'])
-                ->default('balanced')
-                ->nullable() // Allow null if user hasn't set it
-                ->after('password'); // Place it after password
+            $table->enum('preferred_learning_style', ['reading', 'visual'])
+                ->default('reading')
+                ->nullable()
+                ->after('password');
 
-            $table->foreignId('learning_path_id') // New column name
+            $table->foreignId('learning_path_id')
                 ->nullable()
                 ->after('preferred_learning_style')
-                ->constrained('learning_paths') // Foreign key to learning_paths table
+                ->constrained('learning_paths')
                 ->onDelete('set null');
             $table->timestamps();
         });

database/migrations/2025_04_17_141934_create_lessons_table.php

@@ -22,8 +22,7 @@ public function up(): void
             $table->text('video_embed_html')->nullable()->after('content');
             $table->text('assignment')->nullable()->comment('Assignment description');
             $table->text('initial_code')->nullable()->comment('Starting code for editor');
-            //            $table->text('solution')->nullable()->comment('Optional solution code/explanation');
-            $table->text('expected_output')->nullable()->comment('For simple stdout checks'); // Example addition
+            $table->text('expected_output')->nullable()->comment('For simple stdout checks');
             $table->unsignedSmallInteger('order')->default(0);
             $table->timestamps();
 

database/migrations/2025_04_22_192108_create_questions_table.php

@@ -16,10 +16,7 @@ public function up(): void
         Schema::create('questions', function (Blueprint $table) {
             $table->id();
             $table->foreignId('quiz_id')->constrained()->onDelete('cascade');
-            // Crucial link for suggesting review topics!
-            // Can be null if a question is general, or set null if lesson deleted.
             $table->foreignId('lesson_id')->nullable()->constrained()->onDelete('set null');
-            // Start with multiple choice, add more later if needed
             $table->enum('type', ['multiple_choice', 'true_false', 'fill_blank'])->default('multiple_choice');
             $table->text('text')->comment('The question text');
             $table->json('options')->nullable();

database/migrations/2025_04_22_192108_create_quiz_answers_table.php

@@ -17,7 +17,6 @@ public function up(): void
             $table->id();
             $table->foreignId('quiz_attempt_id')->constrained()->onDelete('cascade');
             $table->foreignId('question_id')->constrained()->onDelete('cascade');
-            // Store the user's selected option ID (e.g., "a", "b")
             $table->string('user_answer')->nullable();
             $table->boolean('is_correct')->nullable()->comment('Graded result');
             $table->timestamps();

database/migrations/2025_04_22_192108_create_quiz_attempts_table.php

@@ -18,10 +18,9 @@ public function up(): void
             $table->foreignId('user_id')->constrained()->onDelete('cascade');
             $table->foreignId('quiz_id')->nullable()->constrained()->onDelete('cascade');
             $table->string('type')->default('standard')->after('quiz_id');
-            // Score as percentage (0-100), calculated after submission
             $table->unsignedTinyInteger('score')->nullable();
             $table->timestamp('started_at')->useCurrent();
-            $table->timestamp('completed_at')->nullable(); // Set when submitted
+            $table->timestamp('completed_at')->nullable();
             $table->timestamps();
         });
     }

database/migrations/2025_04_22_192603_create_lesson_quiz_table.php

@@ -17,7 +17,7 @@ public function up(): void
             $table->id();
             $table->foreignId('lesson_id')->constrained()->onDelete('cascade');
             $table->foreignId('quiz_id')->constrained()->onDelete('cascade');
-            $table->timestamps(); // Optional, but good practice
+            $table->timestamps();
 
             $table->unique(['lesson_id', 'quiz_id']);
         });

database/migrations/2025_04_24_114041_create_user_progress_table.php

@@ -15,13 +15,12 @@ public function up(): void
     {
         Schema::create('user_progress', function (Blueprint $table) {
             $table->id();
-            // Foreign keys linking to users and lessons
             $table->foreignId('user_id')->constrained()->onDelete('cascade');
             $table->foreignId('lesson_id')->constrained()->onDelete('cascade');
             $table->timestamp('completed_at')->useCurrent(); // Record when completed
             $table->timestamps();
 
-            // IMPORTANT: A user can complete a specific lesson only once
+            // A user can complete a specific lesson only once
             $table->unique(['user_id', 'lesson_id']);
         });
     }

database/migrations/2025_05_17_170453_create_learning_path_course_table.php

@@ -17,10 +17,10 @@ public function up(): void
             $table->id();
             $table->foreignId('learning_path_id')->constrained()->onDelete('cascade');
             $table->foreignId('course_id')->constrained()->onDelete('cascade');
-            $table->unsignedSmallInteger('order')->default(0); // Order of the course in the path
-            $table->timestamps(); // Usually not needed for simple pivot unless tracking when added
+            $table->unsignedSmallInteger('order')->default(0);
+            $table->timestamps();
 
-            $table->unique(['learning_path_id', 'course_id']); // A course appears once per path
+            $table->unique(['learning_path_id', 'course_id']);
             $table->index(['learning_path_id', 'order']);
         });
     }

database/seeders/ExternalResourceSeeder.php

@@ -29,7 +29,7 @@ public function run(): void
             ExternalResource::create([
                 'lesson_id' => $lessonDeclare->id,
                 'title' => 'Understanding var, let, and const in JavaScript (Video)',
-                'url' => 'https://www.youtube.com/watch?v=s-hLgT_t3uA', // Example video
+                'url' => 'https://www.youtube.com/watch?v=s-hLgT_t3uA',
                 'type' => 'video',
                 'description' => 'A video explaining the differences and use cases for variable declarations.',
             ]);
@@ -44,6 +44,5 @@ public function run(): void
                 'type' => 'documentation',
             ]);
         }
-        // Add more resources for other lessons...
     }
 }