From f2eb0dd42ec30c26096361cb0de743f882b727ed Mon Sep 17 00:00:00 2001
From: Ciprian Platica <platica.ciprian@gmail.com>
Date: Thu, 11 May 2023 00:44:58 +0300
Subject: [PATCH] Populate NGO name in email with evaluation results

---
 .../src/api/evaluation/controllers/evaluation.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/server/src/api/evaluation/controllers/evaluation.js b/server/src/api/evaluation/controllers/evaluation.js
index 1b93a3d..5363f67 100644
--- a/server/src/api/evaluation/controllers/evaluation.js
+++ b/server/src/api/evaluation/controllers/evaluation.js
@@ -60,7 +60,7 @@ module.exports = createCoreController(
                 `${acc}<h3>Intrebare: ${matrixQuiz.question}</h3><p>Raspuns: ${
                   matrixQuiz[
                     `option_${
-                      dimensions[dimensionIndex]?.quiz[quizIndex]?.answer + 1
+                      +dimensions[dimensionIndex]?.quiz[quizIndex]?.answer + 1
                     }`
                   ]
                 }</p>`,
@@ -74,10 +74,20 @@ module.exports = createCoreController(
         );
         try {
           const email = response?.data?.attributes?.email;
-          if (email)
+          const evaluation = await strapi.entityService.findOne(
+            "api::evaluation.evaluation",
+            response.data.id,
+            {
+              populate: "report.user",
+            }
+          );
+          if (email) {
             await sendMailToUserWhenEvaluationIsFinished(email, {
-              content: mailHtml,
+              content: mailHtml, // TODO: legacy
+              EVALUATION_RESULTS: mailHtml,
+              ONG_NAME: evaluation?.report?.user?.ongName,
             });
+          }
         } catch (err) {
           console.log(err);
         }