Merge branch 'main' into 160-signin-flow-angie

Watts-Lab · Jul 20, 2024 · cfdcf9a · cfdcf9a
2 parents a5e5cbc + 1b1150f
commit cfdcf9a
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 27 deletions.
diff --git a/client/src/pages/Dashboard.tsx b/client/src/pages/Dashboard.tsx
@@ -129,7 +129,7 @@ const Dashboard: React.FC = () => {
   // For I_agree: handleCheckboxChange(id, 'I_agree')
   // For others_agree: handleCheckboxChange(id, 'others_agree')
   const handleCheckboxChange = async (id: number, type: 'I_agree' | 'others_agree') => {
-    const stateKey = type === 'I_agree' ? 'agreeCheckboxStates' : 'checkboxStates';
+    const stateKey = type === 'I_agree' ? 'agreeCheckboxStates' : 'othersAgreeCheckboxStates';
     const setState = type === 'I_agree' ? setAgreeCheckboxStates : setOthersAgreeCheckboxStates;
     const newCheckedState = !((type === 'I_agree' ? agreeCheckboxStates : othersAgreeCheckboxStates)[id]);
     const currentAnswer = answerList.find(answer => answer.id === id);
@@ -155,7 +155,12 @@ const Dashboard: React.FC = () => {
         perceived_commonsense: 0,
         sessionId: surveySession,
       });
-      console.error(`${type} updated`, response.data);
+      console.log(`${type} updated`, response.data);
+      if (type == 'I_agree') {
+        currentAnswer.I_agree = newCheckedState;
+      } else {
+        currentAnswer.others_agree = newCheckedState;
+      }
     } catch (error) {
       console.error(`Error updating ${type}`, error);
       // Revert the state change in case of an error

diff --git a/server/controllers/emails.js b/server/controllers/emails.js
@@ -14,7 +14,7 @@ const ses = new aws.SES({
   },
 });
 
-// create Nodemailer SES transporter
+//create Nodemailer SES transporter
 let transporter = nodemailer.createTransport({
   SES: { ses, aws },
 });

diff --git a/server/routes/answers.js b/server/routes/answers.js
@@ -117,7 +117,10 @@ router.post(
                       i = 0;
                       while (i < result.length) {
                         if (item.statementId == result[i].statementId) {
-                          if (item.id < result[i].id) {
+                          if (
+                            new Date(item.createdAt).getTime() <
+                            new Date(result[i].createdAt).getTime()
+                          ) {
                             return false;
                           }
                         }

diff --git a/server/routes/results.js b/server/routes/results.js
@@ -164,7 +164,13 @@ const calculateAgreementPercentage = async (statementIds) => {
         attributes: [],
       },
     ],
-    attributes: ["sessionId", "id", "statementId", "I_agree", "others_agree"],
+    attributes: [
+      "sessionId",
+      "createdAt",
+      "statementId",
+      "I_agree",
+      "others_agree",
+    ],
     raw: true,
     where: {
       statementId: statementIds,
@@ -186,7 +192,10 @@ const calculateAgreementPercentage = async (statementIds) => {
       i = 0;
       while (i < answersForOneStatement.length) {
         if (item.sessionId == answersForOneStatement[i].sessionId) {
-          if (item.id < answersForOneStatement[i].id) {
+          if (
+            new Date(item.createdAt).getTime() <
+            new Date(answersForOneStatement[i].createdAt).getTime()
+          ) {
             return false;
           }
         }
@@ -196,29 +205,63 @@ const calculateAgreementPercentage = async (statementIds) => {
     });
 
     const totalAnswers = answersForStatement.length;
-    const actualIAgree = answersForStatement.reduce(
-      (acc, answer) => acc + (answer.I_agree ? 1 : 0),
-      0
-    );
-    const actualIAgreePercentage =
-      totalAnswers === 1
-        ? actualIAgree
-          ? 100
-          : 0
-        : (actualIAgree / totalAnswers) * 100;
-
-    let count = 0;
-    for (let i = 0; i < totalAnswers; i++) {
-      if (answersForStatement[i].I_agree === 1) {
-        count++;
+    //hardcoded values for if the user is the only one that has answered this statement
+    if (totalAnswers == 1) {
+      if (
+        answersForStatement[0].I_agree == 1 &&
+        answersForStatement[0].others_agree == 1
+      ) {
+        result[statementId] = {
+          I_agree: 100,
+          others_agree: 100,
+        };
+      }
+      if (
+        answersForStatement[0].I_agree == 0 &&
+        answersForStatement[0].others_agree == 1
+      ) {
+        result[statementId] = {
+          I_agree: 0,
+          others_agree: 0,
+        };
+      }
+      if (
+        answersForStatement[0].I_agree == 1 &&
+        answersForStatement[0].others_agree == 0
+      ) {
+        result[statementId] = {
+          I_agree: 100,
+          others_agree: 100,
+        };
+      }
+      if (
+        answersForStatement[0].I_agree == 0 &&
+        answersForStatement[0].others_agree == 0
+      ) {
+        result[statementId] = {
+          I_agree: 0,
+          others_agree: 0,
+        };
+      }
+      //if the there is more than one user who has answered the statement -- more likely case
+    } else {
+      const actualIAgree = answersForStatement.reduce(
+        (acc, answer) => acc + (answer.I_agree ? 1 : 0),
+        0
+      );
+      const actualIAgreePercentage = (actualIAgree / totalAnswers) * 100;
+      let count = 0;
+      for (let i = 0; i < totalAnswers; i++) {
+        if (answersForStatement[i].I_agree === 1) {
+          count++;
+        }
       }
+      const perceptionAccuracy = (count / totalAnswers) * 100;
+      result[statementId] = {
+        I_agree: actualIAgreePercentage,
+        others_agree: perceptionAccuracy,
+      };
     }
-    const perceptionAccuracy =
-      totalAnswers === 1 ? 100 : (count / totalAnswers) * 100;
-    result[statementId] = {
-      I_agree: actualIAgreePercentage,
-      others_agree: perceptionAccuracy,
-    };
   }
   return result;
 };