Update main.py

main.py

@@ -822,67 +822,71 @@ def submit_quiz_attempt(quiz_id):
 
     try:
         data = request.get_json()
-        user_answers = data.get('answers') # Expected format: { "0": "A", "1": "C", ... } (index as string key)
+        user_answers = data.get('answers') # Expected format: { "questionId": "A", ... }
 
         if not isinstance(user_answers, dict):
             return jsonify({'error': 'answers must be provided as a JSON object'}), 400
 
-        # --- Fetch Quiz Data (including correct answers) ---
-        quiz_res = supabase.table('quizzes').select('questions, user_id').eq('id', quiz_id).maybe_single().execute()
+        # Fetch Quiz Data
+        quiz_res = supabase.table('quizzes')\
+            .select('questions, user_id')\
+            .eq('id', quiz_id)\
+            .maybe_single()\
+            .execute()
+            
         if not quiz_res.data:
             return jsonify({'error': 'Quiz not found'}), 404
-        # Optional: Check if user owns the quiz, though submitting attempts might be allowed more broadly
-        # if quiz_res.data['user_id'] != user.id:
-        #     return jsonify({'error': 'Cannot submit attempt for this quiz'}), 403
 
-        quiz_questions = json.loads(quiz_res.data['questions']) # Load JSONB data
+        quiz_questions = quiz_res.data['questions']
+        if isinstance(quiz_questions, str):
+            quiz_questions = json.loads(quiz_questions)
 
-        # --- Calculate Score ---
+        # Calculate Score
         correct_count = 0
         total_questions = len(quiz_questions)
-        feedback = {} # Optional: Provide feedback on each question
-
-        for index, question_data in enumerate(quiz_questions):
-            q_index_str = str(index)
-            correct_answer = question_data.get('correct_answer')
-            user_answer = user_answers.get(q_index_str)
-
-            is_correct = (user_answer == correct_answer)
-            if is_correct:
-                correct_count += 1
-
-            feedback[q_index_str] = {
-                "correct": is_correct,
-                "correct_answer": correct_answer,
-                "user_answer": user_answer
-            }
+        feedback = {}
+        correct_answers = {}
+
+        for i, question in enumerate(quiz_questions):
+            question_id = question.get('id', str(i))  # Use question.id if exists, otherwise index
+            user_answer = user_answers.get(str(question_id))  # Match by question_id
+            correct_answer = question.get('correct_answer')
+
+            if user_answer and correct_answer:
+                is_correct = user_answer.upper() == correct_answer.upper()
+                if is_correct:
+                    correct_count += 1
+                
+                correct_answers[str(question_id)] = correct_answer
+                feedback[str(question_id)] = {
+                    "correct": is_correct,
+                    "correct_answer": correct_answer,
+                    "user_answer": user_answer
+                }
 
         score = (correct_count / total_questions) * 100 if total_questions > 0 else 0.0
 
-        # --- Save Quiz Attempt ---
+        # Save Quiz Attempt
         attempt_res = supabase.table('quiz_attempts').insert({
             'quiz_id': str(quiz_id),
             'user_id': user.id,
             'score': score,
-            'answers': json.dumps(user_answers) # Save user's submitted answers
+            'answers': json.dumps(user_answers)
         }).execute()
-        if not attempt_res.data: raise Exception(f"Failed to save quiz attempt: {attempt_res.error}")
-        attempt_id = attempt_res.data[0]['id']
 
         return jsonify({
             'success': True,
-            'attempt_id': attempt_id,
+            'attempt_id': attempt_res.data[0]['id'],
             'score': round(score, 2),
             'correct_count': correct_count,
             'total_questions': total_questions,
-            'feedback': feedback # Return feedback for the user interface
+            'correct_answers': correct_answers,  # Send back correct answers
+            'feedback': feedback
         }), 201
 
-    except json.JSONDecodeError:
-         return jsonify({'error': 'Invalid format for quiz questions data in database.'}), 500
     except Exception as e:
-        logging.error(f"Unexpected error submitting quiz attempt for user {user.id}, quiz {quiz_id}: {traceback.format_exc()}")
-        return jsonify({'error': f'An unexpected error occurred: {e}'}), 500
+        logging.error(f"Error submitting quiz: {traceback.format_exc()}")
+        return jsonify({'error': str(e)}), 500