Merge branch 'prerelease' into release

package.json

@@ -9,26 +9,26 @@
     "test": "mocha --reporter spec --exit"
   },
   "dependencies": {
-    "chai": "^4.3.7",
-    "chai-http": "^4.4.0",
-    "connect-pg-simple": "^8.0.0",
-    "cookie-parser": "~1.4.4",
-    "cors": "^2.8.5",
-    "dotenv": "^16.0.3",
-    "express": "~4.16.1",
-    "express-fileupload": "^1.4.0",
-    "express-session": "^1.17.3",
-    "http-errors": "~1.6.3",
-    "ims-lti": "^3.0.2",
-    "jszip": "^3.10.1",
-    "ltijs": "^5.9.0",
-    "ltijs-sequelize": "^2.4.4",
-    "mocha": "^10.2.0",
-    "morgan": "~1.9.1",
-    "node-cron": "^3.0.2",
-    "nodemailer": "^6.9.1",
-    "pg": "^8.8.0",
-    "postgrator": "^7.2.0",
-    "request": "^2.88.2"
+    "chai": "~4.3.10",
+    "chai-http": "~4.4.0",
+    "connect-pg-simple": "~9.0.1",
+    "cookie-parser": "~1.4.6",
+    "cors": "~2.8.5",
+    "dotenv": "~16.3.1",
+    "express": "~4.18.2",
+    "express-fileupload": "~1.4.2",
+    "express-session": "~1.17.3",
+    "http-errors": "~2.0.0",
+    "ims-lti": "~3.0.2",
+    "jszip": "~3.10.1",
+    "ltijs": "~5.9.3",
+    "ltijs-sequelize": "~2.4.4",
+    "mocha": "~10.2.0",
+    "morgan": "~1.10.0",
+    "node-cron": "~3.0.2",
+    "nodemailer": "~6.9.7",
+    "pg": "~8.11.3",
+    "postgrator": "~7.2.0",
+    "request": "~2.88.2"
   }
 }

public/javascripts/auth.js

@@ -109,7 +109,7 @@ module.exports = {
     //TODO: Toteuta oikea client secret -hallintamekanismi tietokantaan.
     return new Promise(function(resolve, reject) {
 
-      console.log(request.body);
+      //console.log(request.body);
 
       let consumerKey = request.body.oauth_consumer_key;
       if (consumerKey !== process.env.TEMP_CLIENT_KEY) {

public/javascripts/mailer.js

@@ -50,7 +50,7 @@ module.exports = {
       });
 
       let receiverIdList = arrayTools.extractAttributes(receiverList, 'id');
-      return { recipients: receiverIdList, ticket: storedTicketData, course: storedCourseData };
+      return { recipients: receiverIdList, ticket: storedTicketData, course: storedCourseData, creator: storedCreator };
     })
 
   },
@@ -97,8 +97,8 @@ module.exports = {
 
         let subject = 'TUKKI viesti - message: ' + storedCourseName;
         let message = '<h1>' + storedCourseName + '</h1> \
-        <p>Kysymykseen <b>' + storedTicketTitle + '</b> on tullut viesti:<br>\
-        Question <b>' + storedTicketTitle + '</b> has received a comment:</b></p> \
+        <p>' + storedCreator.nimi + ' on lisännyt viestin kysymykseen <b>' + storedTicketTitle + '</b>:<br>\
+        ' + storedCreator.nimi + ' has added a comment to question <b>' + storedTicketTitle + '</b>:</p> \
         <p>' + content + '</p><hr> \
         <p>Voit käydä vastaamassa siihen osoitteessa:<br>\
         You may answer it in the following address:<br>\
@@ -150,8 +150,8 @@ module.exports = {
 
         let subject = 'TUKKI Uusi kysymys - New question: ' + storedNotificationData.course.nimi;
         let message = '<h1>' + storedNotificationData.course.nimi + '</h1> \
-        <p>Tukissa on uusi kysymys:<br>\
-        Tukki has a new question:</p> \
+        <p>Tukissa on uusi kysymys käyttäjältä ' + storedNotificationData.creator.nimi + ':<br>\
+        Tukki has a new question from ' + storedNotificationData.creator.nimi + ':</p> \
         <h2>' + storedNotificationData.ticket.otsikko + '</h2>\
         <p>' + commentDataList[0].viesti + '</p><hr> \
         <p>Voit käydä vastaamassa siihen osoitteessa:<br>\
@@ -366,15 +366,15 @@ module.exports = {
     return sql.courses.getCourseInfo(courseId)
     .then((courseData) => {
       content = content + title.replace('[Kurssi]', courseData.nimi);
-      return sql.tickets.getAllCommentsFromCourseSinceYesterday(courseId, [profileId])
+      return sql.tickets.getAllCommentsFromCourseSinceYesterdayWithFaqs(courseId, [profileId])
     })
     .then((commentList) => {
       let ticketIds = arrayTools.extractAttributes(commentList, 'tiketti');
       return sql.tickets.getAllTicketsFromList(ticketIds);
     })
     .then((ticketList) => {
       return ticketList.filter((value, index, array) => {
-        return value.aloittaja == profileId;
+        return value.aloittaja == profileId || value.ukk == true;
       })
     })
     .then((ticketList) => {
@@ -388,7 +388,6 @@ module.exports = {
             content = content + newRow;
           }
         }
-
         content += "<h3>Uusia usein kysyttyjä kysymyksiä:<br>Frequently asked questions</h3>"
 
         for (ticket of ticketList) {
@@ -409,6 +408,9 @@ module.exports = {
       }
       return { contentCount: contentCount, rowCount: rowCount, message: message };
     })
+    .catch(() => {
+      return oldContent;
+    })
   },
 
   createTeacherAggregateForCourse: function(courseId, profileId, oldContent) {
@@ -420,14 +422,17 @@ module.exports = {
     let rowCount = 0;
     let content = '';
 
-    return sql.courses.getCourseInfo(courseId)
+    return sql.courses.isCourseActive(courseId)
+    .then((isActive) => {
+      return sql.courses.getCourseInfo(courseId);
+    })
     .then((courseData) => {
       content = content + title.replace('[Kurssi]', courseData.nimi);
       return sql.tickets.getAllTickets(courseId);
     })
     .then((ticketList) => {
       ticketList = ticketList.filter((value, index, array) => {
-        return value.tila == TicketState.sent || value.tila == TicketState.read;
+        return (value.tila == TicketState.sent || value.tila == TicketState.read);
       })
       if (ticketList.length > 0) {
         content += ingress1;
@@ -461,8 +466,11 @@ module.exports = {
       }
       return { contentCount: contentCount, rowCount: rowCount,
                message: message };
+    })
+    .catch(() => {
+      console.log('Opettajan sähköpostin luonnissa virhe ' + profileId + ' ' + courseId);
+      return oldContent;
     });
-
   }
 
 }

public/javascripts/sqlcourses.js

@@ -1,4 +1,4 @@
-const { countReset } = require('console');
+const { countReset, error } = require('console');
 const crypto = require('crypto');
 const { Pool, Client } = require('pg');
 
@@ -25,6 +25,23 @@ module.exports = {
     return connection.queryOne(query, [courseId]);
   },
 
+  isCourseActive: function(courseId) {
+    const query = 'SELECT kurssi \
+    FROM core.tiketti t INNER JOIN core.kommentti k \
+    ON t.id = k.tiketti \
+    WHERE t.kurssi = $1 AND k.aikaleima >= NOW() - INTERVAL \'14 days\'';
+    return connection.queryAll(query, [courseId])
+    .then((courseIdList) => {
+      if (courseIdList.length > 0) {
+        return Promise.resolve(true);
+      } else {
+        return Promise.reject();
+      }
+    }); 
+
+  },
+
+
   getLtiCourseInfo: function(ltiClientId, ltiCourseId) {
     const query = 'SELECT k.id, k.nimi \
     FROM core.kurssi k INNER JOIN core.lti_kurssi lk\

public/javascripts/sqltickets.js

@@ -182,12 +182,12 @@ module.exports = {
     return connection.queryAll(query, [courseId, profileBlackList]);
   },
 
-  getAllCommentsFromCourseSinceYesterday: function(courseId, profileBlackList) {
+  getAllCommentsFromCourseSinceYesterdayWithFaqs: function(courseId, profileBlackList) {
     const query = 'SELECT * \
     FROM core.kommentti k \
     INNER JOIN core.tiketti t \
     ON k.tiketti = t.id \
-    WHERE t.kurssi=$1 AND k.aikaleima>= NOW() - INTERVAL \'24 hours\' AND NOT k.lahettaja=ANY($2) AND t.ukk=false';
+    WHERE t.kurssi=$1 AND k.aikaleima>= NOW() - INTERVAL \'24 hours\' AND NOT k.lahettaja=ANY($2)';
     return connection.queryAll(query, [courseId, profileBlackList]);
   },
 

routes/index.js

@@ -113,6 +113,7 @@ router.post('/luotili/', function(req, res, next) {
   });
 });
 
+/*
 router.post('/testi-cron/', function(req, res, next) {
   //timedJobs.archiveOldTickets();
   //timedJobs.deletePendingLtiLogins();
@@ -121,6 +122,7 @@ router.post('/testi-cron/', function(req, res, next) {
     res.send({ success: true });
   })
   .catch((error) => {
+    console.log('ERROR ' + error);
     errorFactory.createError(res, error);
   })
 })
@@ -181,6 +183,7 @@ router.get('/hash/:password', function(req, res) {
 
   res.send(array);
 });
+*/
 
 
 router.get('/minun/', function(req, res, next) {

routes/lti.js

@@ -56,7 +56,6 @@ router.post('/gdpr-lupa-ok/', function(req, res, next) {
     res.send({ success: true, kurssi: data.courseId });
   })
   .catch((error) => {
-    console.log('error: ' + error);
     errorFactory.createError(req, res, error);
   });
 });