Fixed backend added github pages

Author: Supporterino

api/routes.js

@@ -51,7 +51,19 @@ router.get('/lectures/:course', (req, res) => {
     if (err) res.json(err);
     var response = [];
     data.forEach(e => response.push({start: e.dtstart, end: e.dtend, lastModified: e['last-modified'], title: e.summary, description: e.description, location: e.location, course: e.course}));
-    if (res == null) res.json({error: "No course found or there are no lectures yet!"});
+    if (res == []) res.json({error: "No course found or there are no lectures yet!"});
+    else res.json(response);
+  });
+});
+
+router.get('/futureLectures/:course', (req, res) => {
+  lecture.find({course: req.params.course.toUpperCase()}, (err, data) => {
+    if (err) res.json(err);
+    var response = [];
+    data.forEach(e => {
+      if((new Date(e.dtstart)) > (new Date())) response.push({start: e.dtstart, end: e.dtend, lastModified: e['last-modified'], title: e.summary, description: e.description, location: e.location, course: e.course});
+    });
+    if (res == []) res.json({error: "No course found or there are no lectures yet!"});
     else res.json(response);
   });
 });
@@ -78,7 +90,7 @@ router.get('/news', (req, res) => {
   feed.find((err, data) => {
     if (err) res.json(err);
     var response = [];
-    data.forEach(e => response.push({title: e.title, description: e.description, url: e.url, created: new Date(e.created)}));
+    data.forEach(e => response.push({title: e.title, description: e['content:encoded'], url: e.link, created: new Date(e.isoDate)}));
     res.json(response);
   });
 });

datacollectors/newsfeed/feed.js

@@ -1,4 +1,5 @@
-var reader = require('rss-to-json');
+var Reader = require('rss-parser');
+var reader = new Reader();
 var mongo = require('mongodb').MongoClient;
 var dbProvider = require('../../utils/db');
 
@@ -7,11 +8,9 @@ var url_DB = dbProvider.getUrl();
 
 var db_env = dbProvider.getEnv();
 
-const loadFeed = (url, resolve, reject) => {
-  reader.load(url, (err, res) => {
-    if (err) reject(err);
-    updateEvents(res, resolve, reject);
-  });
+const loadFeed = async (url, resolve, reject) => {
+  let data = await reader.parseURL(url);
+  updateEvents(data, resolve, reject);
 };
 
 const updateEvents = (data, resolve, reject) => {
@@ -26,7 +25,7 @@ const updateEvents = (data, resolve, reject) => {
         counter++;
         if (res == null) {
           insertElement(e, dbo, resolve, reject);
-        } else if (res.description != e.description) {
+        } else if (res.content != e.content) {
           updateElement(e, dbo, resolve, reject);
         }
         if (counter >= data.items.length) {

package.json

@@ -20,6 +20,7 @@
     "mongoose": "^5.4.18",
     "request": "^2.88.0",
     "request-promise": "^4.2.4",
+    "rss-parser": "^3.7.0",
     "rss-to-json": "^1.0.4",
     "split-lines": "^2.0.0"
   }

utils/provider.js

@@ -22,11 +22,16 @@ var eventSchema = new Schema({
 });
 
 var feedSchema = new Schema({
+  creator: String,
   title: String,
-  description: String,
   link: String,
-  url: String,
-  created: Number
+  pubDate: String,
+  'content:encoded': String,
+  'dc:creator': String,
+  content: String,
+  contentSnippet: String,
+  guid: String,
+  isoDate: String
 });
 
 var lectureSchema = new Schema({