Merge remote-tracking branch 'origin/master' into feature/testing

Author: Markus Guder

dist/ngsw.json

@@ -110,11 +110,7 @@
     "/assets/img/loading.gif": "cdc1627a1ff312a43d1700a3694da1050e0e026d",
     "/assets/js/idb.js": "6f82cc3f3c743e77b6931a0129d7afddd6cfe3c4",
     "/favicon.ico": "84161b857f5c547e3699ddfbffc6d8d737542e01",
-<<<<<<<<< Temporary merge branch 1
-    "/index.html": "ddd41bb17fac02df04e340345552a3ccfa37bf92"
-=========
-    "/index.html": "03eb209dd5570c5324be09681b2438acd2300697"
->>>>>>>>> Temporary merge branch 2
+    "/index.html": "73c0cb44bb3ccb7f09aa06ad1cf8b10fa369a6e6"
   },
   "navigationUrls": [
     {

server/service/CategoriesService.js

@@ -3,6 +3,7 @@
 var Categories = require('../utils/database').Category;
 var knex = require('../utils/database').knex;
 var Errors = require('../utils/errors');
+var Trimmer = require('../utils/trim');
 /**
  * get all courses of a category
  * get all courses of a category
@@ -20,7 +21,7 @@ exports.categoriesCategory_idCoursesGET = function(category_id) {
           reject(Errors.notFound("GET ID " +category_id, "Category"));
         }
         let courses = category.related("courses").toJSON();
-        resolve(courses);
+        resolve(Trimmer.courses(courses));
       }))
       .catch((error) => {
         reject(error);
@@ -64,7 +65,7 @@ exports.categoriesGET = function() {
     Categories
       .fetchAll()
       .then((categories) => {
-        resolve(categories.map(item => item.attributes));
+        resolve(Trimmer.categories(categories.toJSON()));
       })
       .catch((error) => {
         reject(error);

server/service/CoursesService.js

@@ -8,6 +8,7 @@ var knex = require('../utils/database').knex;
 var jwt = require('jsonwebtoken'); // used to create, sign, and verify tokens
 var Errors = require('../utils/errors');
 var moment = require('moment');
+var Trimmer = require('../utils/trim');
 
 /**
  * apply to participate in specific course
@@ -45,7 +46,7 @@ exports.coursesCourse_idApplyPOST = function (course_id, req) {
               new Applications(generateApplicationFor(user_id, course_id, areSlotsLefToParticipate))
               .save()
               .then((application) => {
-                resolve(application);
+                resolve(application.toJSON());
               })
               .catch((error) => {
                 reject(error);
@@ -106,7 +107,7 @@ exports.coursesCourse_idFeedbackPOST = function (course_id, data) {
     new CourseFeedback({...data, kurs_id: course_id})
       .save()
       .then((feedback) => {
-        resolve(feedback.attributes);
+        resolve(feedback.toJSON());
       })
       .catch((error) => {
         console.log(error);
@@ -128,12 +129,12 @@ exports.coursesCourse_idGET = function (course_id) {
     Courses.where({
         kurs_id: course_id
       })
-      .fetch({withRelated: ["location"]})
+      .fetch({withRelated: ["location", "teacher"]})
       .then((course) => {
         if (!course) {
           reject(Errors.notFound("GET ID " + course_id, "COURSE"));
         }
-        resolve(course.toJSON());
+        resolve(Trimmer.course(course.toJSON()));
       })
       .catch((error) => {
         reject(error);
@@ -161,11 +162,11 @@ exports.coursesCourse_idSignoffPOST = function (course_id, req) {
       .save({ANM_STAT_ID: 3}, {
         patch: true
       })
-      .then(applicationModel => {
-        if (!applicationModel) {
+      .then(application => {
+        if (!application) {
           reject(Errors.notFound("course with ID ", course_id));
         }
-        resolve(applicationModel);
+        resolve(application.toJSON());
       })
       .catch(err => {
         reject(Errors.notFound("course with ID ", course_id));
@@ -198,9 +199,9 @@ exports.coursesGET = function (query) {
         });
     } else {
     Courses
-      .fetchAll({withRelated: ["location"]})
-      .then((course) => {
-        resolve(course.toJSON());
+      .fetchAll({withRelated: ["location", "teacher"]})
+      .then((courses) => {
+        resolve(Trimmer.courses(courses.toJSON()));
       })
       .catch((error) => {
         reject(error);
@@ -220,9 +221,9 @@ exports.coursesHighlightsGET = function () {
   return new Promise(function (resolve, reject) {
     Courses
       .where({kurs_highlight: 1})
-      .fetchAll({withRelated: ["location"]})
+      .fetchAll({withRelated: ["location", "teacher"]})
       .then((courses) => {
-        resolve(courses.toJSON());
+        resolve(Trimmer.courses(courses.toJSON()));
       })
       .catch((error) => {
         reject(error);
@@ -237,12 +238,14 @@ exports.coursesLastminuteGET = function() {
       .query(function(qb) {
         qb.whereBetween('KURS_ANMFRIST', [moment().format('YYYY-MM-DD'), moment().add(6, 'weeks').format('YYYY-MM-DD')]);
       })
-      .fetchAll({withRelated: ["applications", "location"]})
+      .fetchAll({withRelated: ["applications", "location", "teacher"]})
       .then((courses) => {
-        resolve(courses
-          .filter(item => item.related('applications').toJSON().length < item.attributes.KURS_TEIL_MAX)
-          .filter(item => item.attributes.KURS_KURSSTAT_ID === 3)
-          .map(item => item.toJSON())
+        resolve(Trimmer.courses(
+          courses
+            .filter(item => item.related('applications').toJSON().length < item.attributes.KURS_TEIL_MAX)
+            .filter(item => item.attributes.KURS_KURSSTAT_ID === 3)
+            .map(item => item.toJSON())
+          )
         )
       })
       .catch((error) => {

server/service/UserService.js

@@ -8,6 +8,7 @@ var jwt = require('jsonwebtoken'); // used to create, sign, and verify tokens
 var bcrypt = require('bcryptjs');
 var config = require('../config'); // get config file
 var Errors = require('../utils/errors');
+var Trimmer = require('../utils/trim');
 
 /**
  * get me
@@ -25,7 +26,7 @@ exports.userMeGET = function (id) {
         if (!user) {
           reject(Errors.notFound("GET ID " + id, "USER"))
         }
-        resolve(user);
+        resolve(Trimmer.user(user.toJSON()));
       })
       .catch((error) => {
         reject(error);
@@ -45,7 +46,7 @@ exports.userMeCoursesGET = function (user_id) {
       })
       .then((applications) => {
         let courses = applications.map(item => item.related('course').toJSON());
-        resolve(courses);
+        resolve(Trimmer.courses(courses));
       })
       .catch((error) => {
         reject(error);
@@ -63,7 +64,7 @@ exports.userMeCoursesGET = function (user_id) {
  **/
 exports.userPOST = function (data) {
   return new Promise(function (resolve, reject) {
-    User.where({teil_email: data.teil_email})
+    User.where({TEIL_EMAIL  : data.TEIL_EMAIL})
       .fetch()
       .then((model) => {
           if (!model) {
@@ -75,8 +76,11 @@ exports.userPOST = function (data) {
               }, config.secret, {
                 expiresIn: 86400 // expires in 24 hours
               });
+              // for some reason, bookshelf returns TEIL_ID just as id after saving
+              let trimmedUser = Trimmer.user(user.toJSON());
+              trimmedUser.TEIL_ID = user.attributes.id;
               resolve({
-                user: user,
+                user: trimmedUser,
                 token: token
               });
             })
@@ -108,11 +112,11 @@ exports.userPUT = function (id, data) {
       .save(data, {
         patch: true
       })
-      .then(userModel => {
-        if (!userModel) {
+      .then(user => {
+        if (!user) {
           reject(Errors.notFound("PUT ID " + id, "USER"));
         }
-        resolve(userModel);
+        resolve(Trimmer.user(user.toJSON()));
       })
       .catch(err => {
         reject(err);

server/test/courses.js

@@ -224,6 +224,23 @@ describe("Courses Highlights", () => {
       })
   })
 
+  it("it should show valid teacher data for all highlight courses", (done) => {
+
+    dbHelper.Courses.setupHighlightsCoursesWithTeacher()
+      .then(() => {
+        chai.request(server)
+      .get('/v1/courses/highlights')
+      .end((err, res) => {
+        res.should.have.status(200);
+        res.body.should.be.a('array');
+        res.body.forEach(item => {
+          item.teacher.TEIL_VORNAME.should.equal("John");
+          item.teacher.DATENHISTORY.should.equal("USER_IDENTIFIER");
+        })        
+        done();
+      })
+      })
+  })
   it("it should get all courses with found by a query", (done) => {
     chai.request(server)
       .get('/v1/courses')

server/test/helpers/dbhelpers.js

@@ -9,6 +9,8 @@ var User = require('../../utils/database').User;
 var Applications = require('../../utils/database').Application;
 var Location = require('../../utils/database').Location;
 
+let sampleUser = require('./sampleData').user();
+
 var generateApplicationFor = require('../../service/CoursesService').generateApplicationFor;
 
 
@@ -17,23 +19,12 @@ const AuthHelper = {
   clearDataBaseInsertUser: () => {
     return new Promise((resolve, reject) => {
       console.log("Clearing all Content in Table vhslq_teilnehmer and Insert valid user");
-      let user =  {
-        teil_vorname: "John",
-        teil_nachname: "Doe",
-        teil_email: "johndoe@vhslq.de",
-        teil_notizen: "john's notes",
-        teil_passwort: "hunter22",
-        eingegeben_von_user: 0,
-        eingegeben_am_datum: "2018-01-01",
-        eingegeben_am_zeit: "00:00:00",
-        datenhistory: "John's data history"
-      };
 
       knex("vhslq_teilnehmer")
         .del()
         .then(() => {
           console.log("Finished clearing all Content in Table vhslq_teilnehmer");
-          new User(user)
+          new User(sampleUser)
             .save()
             .then((user) => {
               resolve(user);
@@ -131,6 +122,21 @@ const CoursesHelper = {
     });
   },
 
+  setupHighlightsCoursesWithTeacher: () => {
+    return new Promise((resolve, reject) => {
+      User.where({TEIL_VORNAME: "John"})
+        .fetch()
+        .then(user => {
+          Courses
+          .where({KURS_HIGHLIGHT: 1})
+          .save({KURS_REFERENT_ID: user.attributes.TEIL_ID}, {patch: true})
+          .then(courses => {
+            resolve(courses.toJSON());
+          })
+        })
+    })
+  },
+
   setupLastMinute: () => {
     console.log("Setting up Last Minute Content in Table vhslq_kurse")
     return new Promise((resolve, reject) => {

server/test/helpers/sampleData.js

@@ -616,4 +616,18 @@ if (process.env.NODE_ENV === 'test') {
       DATENHISTORY: "LOCATION_IDENTIFIER"
     }
   }
+
+  exports.user = () => {
+    return {
+      TEIL_VORNAME: "John",
+      TEIL_NACHNAME: "Doe",
+      TEIL_EMAIL: "johndoe@vhslq.de",
+      TEIL_NOTIZEN: "john's notes",
+      TEIL_PASSWORT: "hunter22",
+      EINGEGEBEN_VON_USER: 0,
+      EINGEGEBEN_AM_DATUM: "2018-01-01",
+      EINGEGEBEN_AM_ZEIT: "00:00:00",
+      DATENHISTORY: "USER_IDENTIFIER"
+    }
+  }
 }