added teacher emails to admin view also

UniversityOfHelsinkiCS · Sep 14, 2021 · 357a31e · 357a31e
1 parent 91c19cd
commit 357a31e
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 22 deletions.
diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
@@ -43,7 +43,7 @@ jobs:
 
   dockerhub-release:
     runs-on: ubuntu-latest
-    #needs: [cypress, eslint]
+    needs: [cypress, eslint]
     steps:
       - uses: actions/checkout@v2
 

diff --git a/src/server/controllers/adminController.js b/src/server/controllers/adminController.js
@@ -250,7 +250,8 @@ const resetTestCourse = async (_, res) => {
 }
 
 const findEmailsForToday = async (_, res) => {
-  const emails = await returnEmailsToBeSentToday()
+  const { students, teachers } = await returnEmailsToBeSentToday()
+  const emails = students.concat(teachers)
   res.send(emails)
 }
 

diff --git a/src/server/util/emailSender.js b/src/server/util/emailSender.js
@@ -41,7 +41,7 @@ const getOpenFeedbackTargetsForStudents = async () => {
         model: CourseUnit,
         as: 'courseUnit',
         required: true,
-        attributes: ['courseCode'],
+        attributes: ['courseCode', 'name'],
         include: [
           {
             model: Organisation,
@@ -102,7 +102,7 @@ const getFeedbackTargetsAboutToOpenForTeachers = async () => {
         model: CourseUnit,
         as: 'courseUnit',
         required: true,
-        attributes: ['courseCode'],
+        attributes: ['courseCode', 'name'],
         include: [
           {
             model: Organisation,
@@ -188,20 +188,20 @@ const sendEmailAboutSurveyOpeningToStudents = async () => {
   )
   const ids = feedbackTargets.map((target) => target.id)
 
-//  FeedbackTarget.update(
-//    {
-//      feedbackOpenNotificationEmailSent: true,
-//    },
-//    {
-//      where: {
-//        id: {
-//          [Op.in]: ids,
-//        },
-//      },
-//    },
-//  )
-//
-//  sendEmail(emailsToBeSent)
+  FeedbackTarget.update(
+    {
+      feedbackOpenNotificationEmailSent: true,
+    },
+    {
+      where: {
+        id: {
+          [Op.in]: ids,
+        },
+      },
+    },
+  )
+
+  sendEmail(emailsToBeSent)
 
   return emailsToBeSent
 }
@@ -221,25 +221,57 @@ const sendEmailReminderAboutSurveyOpeningToTeachers = async () => {
       ),
   )
 
+  const ids = feedbackTargets.map((target) => target.id)
+
+  FeedbackTarget.update(
+    {
+      feedbackOpeningReminderEmailSent: true,
+    },
+    {
+      where: {
+        id: {
+          [Op.in]: ids,
+        },
+      },
+    },
+  )
+
+  sendEmail(emailsToBeSent)
+
+  return emailsToBeSent
   /* eslint-enable */
 }
 
 const returnEmailsToBeSentToday = async () => {
-  const feedbackTargets = await getFeedbackTargetsForSpecialCase()
+  const studentFeedbackTargets = await getOpenFeedbackTargetsForStudents()
+  const teacherFeedbackTargets =
+    await getFeedbackTargetsAboutToOpenForTeachers()
 
   const studentsWithFeedbackTargets = await aggregateFeedbackTargets(
-    feedbackTargets,
+    studentFeedbackTargets,
   )
 
-  const emailsToBeSent = Object.keys(studentsWithFeedbackTargets).map(
+  const teachersWithFeedbackTargets = await aggregateFeedbackTargets(
+    teacherFeedbackTargets,
+  )
+
+  const studentEmailsToBeSent = Object.keys(studentsWithFeedbackTargets).map(
     (student) =>
       notificationAboutSurveyOpeningToStudents(
         student,
         studentsWithFeedbackTargets[student],
       ),
   )
 
-  return emailsToBeSent
+  const teacherEmailsToBeSent = Object.keys(teachersWithFeedbackTargets).map(
+    (teacher) =>
+      emailReminderAboutSurveyOpeningToTeachers(
+        teacher,
+        teachersWithFeedbackTargets[teacher],
+      ),
+  )
+
+  return { students: studentEmailsToBeSent, teachers: teacherEmailsToBeSent }
 }
 
 module.exports = {