From a7e78bc488d6ea1455001df5a4ee1474ee12d0aa Mon Sep 17 00:00:00 2001
From: pasha1coil <pashamullin202@gmail.com>
Date: Sun, 24 Aug 2025 10:15:32 +0300
Subject: [PATCH] update CTE LastContent and CTE Questions

---
 dal/db_query/queries.sql | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dal/db_query/queries.sql b/dal/db_query/queries.sql
index 510f06d..cd6f553 100644
--- a/dal/db_query/queries.sql
+++ b/dal/db_query/queries.sql
@@ -556,7 +556,8 @@ SELECT
              a.question_id,
              a.content AS last_answer_content,
              a.result,
-             a.start
+             a.start,
+             a.session
          FROM
              QuizAnswers a
                  LEFT JOIN (
@@ -574,6 +575,7 @@ SELECT
                  GROUP BY
                      question_id, session
              ) AS last_created_at_one_session ON a.session = last_created_at_one_session.session AND a.question_id = last_created_at_one_session.question_id AND a.created_at = last_created_at_one_session.last_created_at
+        WHERE a.start = FALSE
      ),
      Questions AS (
          SELECT
@@ -586,7 +588,7 @@ SELECT
          FROM
              question q
                  JOIN LastContent lc ON q.id = lc.question_id
-                 JOIN answer a ON q.id = a.question_id
+                 JOIN answer a ON q.id = a.question_id AND a.session = lc.session
          WHERE
              a.quiz_id = $1
            AND a.start = FALSE