From 52cf3d32a6d4529421ff799b4d39e8da06d23f1c Mon Sep 17 00:00:00 2001
From: Anastasia Diseth <58883418+anadis504@users.noreply.github.com>
Date: Thu, 28 Mar 2024 17:38:50 +0200
Subject: [PATCH] Fix research questions download  (#1257)

* add user variables to custom view

* fix Uuid from prev pr

* Consent form ansers csv expert and fixes

* small fix

* remove console.log

* add module completion date to data sent for custom view exercise service

* attempt to fix undefined user_answer

* rename db function to more descriptive

* Fix research form question download, db query distinct on both question AND user_id
---
 ...91407d3ee9d303cdfdd850c3933d9b31759e71da995fcf678ec6.json} | 4 ++--
 services/headless-lms/models/src/research_forms.rs            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename services/headless-lms/models/.sqlx/{query-bdf6c7a6ff6ecd02bf62a5e8ec4e22fd2d87fecbcab0830a647ba5676cd75afc.json => query-46dfc070116291407d3ee9d303cdfdd850c3933d9b31759e71da995fcf678ec6.json} (63%)

diff --git a/services/headless-lms/models/.sqlx/query-bdf6c7a6ff6ecd02bf62a5e8ec4e22fd2d87fecbcab0830a647ba5676cd75afc.json b/services/headless-lms/models/.sqlx/query-46dfc070116291407d3ee9d303cdfdd850c3933d9b31759e71da995fcf678ec6.json
similarity index 63%
rename from services/headless-lms/models/.sqlx/query-bdf6c7a6ff6ecd02bf62a5e8ec4e22fd2d87fecbcab0830a647ba5676cd75afc.json
rename to services/headless-lms/models/.sqlx/query-46dfc070116291407d3ee9d303cdfdd850c3933d9b31759e71da995fcf678ec6.json
index 84aeeb76974e..81c05b35ad91 100644
--- a/services/headless-lms/models/.sqlx/query-bdf6c7a6ff6ecd02bf62a5e8ec4e22fd2d87fecbcab0830a647ba5676cd75afc.json
+++ b/services/headless-lms/models/.sqlx/query-46dfc070116291407d3ee9d303cdfdd850c3933d9b31759e71da995fcf678ec6.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n    SELECT DISTINCT ON (a.research_form_question_id)\n        q.course_id,\n        q.research_consent_form_id,\n        a.research_form_question_id,\n        q.question,\n        a.user_id,\n        a.research_consent,\n        a.created_at,\n        a.updated_at\n        FROM course_specific_consent_form_answers a\n    LEFT JOIN course_specific_consent_form_questions q ON a.research_form_question_id = q.id\n    WHERE a.course_id = $1\n    AND a.deleted_at IS NULL\n    AND q.deleted_at IS NULL\n    ORDER BY a.research_form_question_id, a.updated_at DESC\n    ",
+  "query": "\n    SELECT DISTINCT ON (a.research_form_question_id, a.user_id)\n        q.course_id,\n        q.research_consent_form_id,\n        a.research_form_question_id,\n        q.question,\n        a.user_id,\n        a.research_consent,\n        a.created_at,\n        a.updated_at\n        FROM course_specific_consent_form_answers a\n    LEFT JOIN course_specific_consent_form_questions q ON a.research_form_question_id = q.id\n    WHERE a.course_id = $1\n    AND a.deleted_at IS NULL\n    AND q.deleted_at IS NULL\n    ORDER BY a.user_id, a.research_form_question_id, a.updated_at DESC\n    ",
   "describe": {
     "columns": [
       {
@@ -49,5 +49,5 @@
     },
     "nullable": [false, false, false, false, false, false, false, false]
   },
-  "hash": "bdf6c7a6ff6ecd02bf62a5e8ec4e22fd2d87fecbcab0830a647ba5676cd75afc"
+  "hash": "46dfc070116291407d3ee9d303cdfdd850c3933d9b31759e71da995fcf678ec6"
 }
diff --git a/services/headless-lms/models/src/research_forms.rs b/services/headless-lms/models/src/research_forms.rs
index 39a4e8938577..c327abbf6d75 100644
--- a/services/headless-lms/models/src/research_forms.rs
+++ b/services/headless-lms/models/src/research_forms.rs
@@ -197,7 +197,7 @@ pub fn stream_course_research_form_user_answers(
     sqlx::query_as!(
         ExportedCourseResearchFormQustionAnswer,
         r#"
-    SELECT DISTINCT ON (a.research_form_question_id)
+    SELECT DISTINCT ON (a.research_form_question_id, a.user_id)
         q.course_id,
         q.research_consent_form_id,
         a.research_form_question_id,
@@ -211,7 +211,7 @@ pub fn stream_course_research_form_user_answers(
     WHERE a.course_id = $1
     AND a.deleted_at IS NULL
     AND q.deleted_at IS NULL
-    ORDER BY a.research_form_question_id, a.updated_at DESC
+    ORDER BY a.user_id, a.research_form_question_id, a.updated_at DESC
     "#,
         course_id
     )