fixed 0 score showing for new attempts

app/routes.py

@@ -317,7 +317,6 @@ def getTestDetails():
                 student_attempts_map[student_id] = attempt
 
     filtered_attempts = list(student_attempts_map.values())
-    print(filtered_attempts)
 
     return jsonify({
         'mcq_questions': mcq_questions,
@@ -336,47 +335,59 @@ def getStudentQuestions():
     # Retrieve the question attempts for this test attempt
     question_attempts = TestAttempt.getQuestionAttempts(test_attempt_id, db)
 
-    # Retrieve the correct answers and questions from the database for MCQ and FIB questions
-    mcq_data = TestDAO.getMCQQuestionsByTest(test_id, db)  # List of MCQ questions
-    fib_data = TestDAO.getFIBQuestionsByTest(test_id, db)  # List of FIB questions
+    # Retrieve all test questions with their details in one unified query
+    test_questions_stmt = text("""
+        SELECT tq.question_id, tq.question_type,
+               mcq.question AS mcq_question, mcq.answer AS mcq_answer,
+               fib.question AS fib_question, fib.answer AS fib_answer
+        FROM test_questions tq
+        LEFT JOIN MCQ mcq ON tq.question_type = 'MCQ' AND tq.question_id = mcq.id
+        LEFT JOIN FIB fib ON tq.question_type = 'FIB' AND tq.question_id = fib.id
+        WHERE tq.test_id = :test_id
+    """)
 
-    # Ensure we get a dictionary mapping question IDs to answers and questions
-    mcq_questions = {mcq["id"]: {"answer": mcq["answer"], "question": mcq["question"], "id": mcq["id"]} for mcq in mcq_data} if isinstance(mcq_data, list) else {}
-    fib_questions = {fib["id"]: {"answer": fib["answer"], "question": fib["question"], "id": fib["id"]} for fib in fib_data} if isinstance(fib_data, list) else {}
+    question_rows = db.session.execute(test_questions_stmt, {"test_id": test_id}).fetchall()
+
+    # Map questions by (type, id)
+    question_lookup = {}
+    for row in question_rows:
+        q_id = row[0]
+        q_type = row[1]
+        question = row[2] if q_type == "MCQ" else row[4]
+        answer = row[3] if q_type == "MCQ" else row[5]
+
+        question_lookup[(q_type, q_id)] = {
+            "question": question,
+            "answer": answer,
+            "id": q_id,
+            "type": q_type
+        }
 
-    # Convert objects to dictionaries manually before returning
+    # Build response
     serialized_attempts = []
     for attempt in question_attempts:
-        correct_answer = None
-        student_answer = None
-        question_type = None
-        original_question_id = None  # This will hold the original question ID
-        question_text = None  # This will hold the question content
-
-        # Check if the attempt corresponds to an MCQ question
         if attempt.mcq_id:
-            correct_answer = mcq_questions.get(attempt.mcq_id, {}).get("answer")
-            question_text = mcq_questions.get(attempt.mcq_id, {}).get("question")
-            question_type = "mcq"
-            original_question_id = mcq_questions.get(attempt.mcq_id, {}).get("id")  # Ensure the correct ID is used from mcq_questions
-        # Check if the attempt corresponds to a FIB question
+            key = ("MCQ", attempt.mcq_id)
         elif attempt.fib_id:
-            correct_answer = fib_questions.get(attempt.fib_id, {}).get("answer")
-            question_text = fib_questions.get(attempt.fib_id, {}).get("question")
-            question_type = "fib"
-            original_question_id = fib_questions.get(attempt.fib_id, {}).get("id")  # Ensure the correct ID is used from fib_questions
+            key = ("FIB", attempt.fib_id)
+        else:
+            continue  # Skip if no valid question ID
+
+        question_data = question_lookup.get(key, {})
 
         serialized_attempts.append({
-            "id": original_question_id,  # Use the original question ID (from MCQ or FIB)
+            "id": question_data.get("id"),
             "test_attempt_id": attempt.test_attempt_id,
-            "correct_answer": correct_answer,
+            "correct_answer": question_data.get("answer"),
             "student_answer": attempt.student_answer,
-            "question_type": question_type,  # Add question type
-            "question": question_text  # Add question text
+            "question_type": question_data.get("type", "").lower(),
+            "question": question_data.get("question")
         })
+
     return jsonify({"question_attempts": serialized_attempts})
 
 
+
 @routes_bp.route('/createTests', methods=['GET', 'POST'])
 def createTests():
     tests = TestORM.query.all()
@@ -1116,8 +1127,8 @@ def attemptTest():
 def attemptFormative(id):
     student_id = session["user_id"]
     test_id = id
+
     if request.method == 'POST':
-        # answer sent from front end
         answers = request.form.to_dict(flat=True)
 
         result = {
@@ -1142,7 +1153,7 @@ def attemptFormative(id):
                             'C': row.option_c,
                             'D': row.option_d
                         }
-                        # keep original option letter
+
                         user_letter = user_answer.strip().upper()
                         user_option_value = options_map.get(user_letter, '')
                         is_correct = user_letter == row.answer.strip().upper()
@@ -1150,10 +1161,10 @@ def attemptFormative(id):
                         result["mcq"].append({
                             "question_id": qid,
                             "your_answer": user_option_value,
-                            "your_answer_letter": user_letter,   # save the option letter
+                            "your_answer_letter": user_letter,
                             "answer": options_map.get(row.answer.strip().upper(), ''),
                             "is_correct": is_correct,
-                            "feedback": row.feedback if row.feedback != '' else ''
+                            "feedback": row.feedback if row.feedback else ''
                         })
 
                         total_questions += 1
@@ -1170,7 +1181,7 @@ def attemptFormative(id):
                             "your_answer": user_answer,
                             "answer": row.answer,
                             "is_correct": is_correct,
-                            "feedback": row.feedback if row.feedback != '' else ''
+                            "feedback": row.feedback if row.feedback else ''
                         })
 
                         total_questions += 1
@@ -1180,43 +1191,67 @@ def attemptFormative(id):
         # Calculate score
         score = round((correct_answers / total_questions) * 100, 2) if total_questions > 0 else 0.0
 
-        # Save to TestAttempt
+        # Create test_attempt record
         new_attempt = TestAttempt(
             student_id=student_id,
             test_id=test_id,
             score=score,
-            time_taken=0  # Set time_taken to 0, you can modify this if needed
+            time_taken=0
         )
         new_attempt.attempt_date = datetime.now()
         db.session.add(new_attempt)
-        db.session.commit()
+        db.session.commit()  # Commit to generate ID for test_attempt
 
-        # Get the latest TestAttempt (top 1 by id descending)
-        latest_attempt = TestAttempt.query.filter_by(student_id=student_id, test_id=test_id).order_by(TestAttempt.id.desc()).first()
+        for key, user_answer in answers.items():
+            if '_' in key:
+                qtype, qid = key.split('_')
+                qid = int(qid)
 
-        # Insert QuestionAttempt records
-        for mcq_data in result["mcq"]:
-            qa = QuestionAttempt(
-                test_attempt_id=latest_attempt.id,
-                student_answer=mcq_data["your_answer_letter"],  # Store the original option letter (A/B/C/D)
-                mcq_id=mcq_data["question_id"]
-            )
-            db.session.add(qa)
+                if qtype == 'mcq':
+                    row = MCQ.query.get(qid)
+                    if row:
+                        options_map = {
+                            'A': row.option_a,
+                            'B': row.option_b,
+                            'C': row.option_c,
+                            'D': row.option_d
+                        }
+
+                        user_letter = user_answer.strip().upper()
+                        user_option_value = options_map.get(user_letter, '')
+                        is_correct = user_letter == row.answer.strip().upper()
+
+                        attempt = QuestionAttempt(
+                        test_attempt_id=new_attempt.id,
+                        mcq_id=qid,
+                        fib_id=None,
+                        student_answer=mcq[user_letter]
+                        )
+                        db.session.add(attempt)
+                        db.session.commit()
+
+                elif qtype == 'fib':
+                    row = FIB.query.get(qid)
+                    if row:
+                        is_correct = user_answer.strip().lower() == row.answer.strip().lower()
+
+                        attempt = QuestionAttempt(
+                        test_attempt_id=new_attempt.id,
+                        mcq_id=None,
+                        fib_id=qid,
+                        student_answer=user_answer
+                    )
+                    db.session.add(attempt)
+                    db.session.commit()
 
-        for fib_data in result["fib"]:
-            qa = QuestionAttempt(
-                test_attempt_id=latest_attempt.id,
-                student_answer=fib_data["your_answer"],
-                fib_id=fib_data["question_id"]
-            )
-            db.session.add(qa)
 
-        db.session.commit()
 
-        # Save to session, redirect to feedback page
+
+        # Store feedback in session and redirect
         session["formative_result"] = result
         return redirect(url_for("routes.formative_answer"))
 
+
     # GET method: Render the test page
     sql_test = text("SELECT * FROM tests WHERE id = :id")
     test = db.engine.connect().execute(sql_test, {"id": id}).fetchone()