Merge pull request #90 from marc101101/feature/last_minute_courses

Feature/last minute courses

Author: marc101101

package.json

@@ -41,14 +41,13 @@
     "cookie-parser": "^1.4.3",
     "core-js": "^2.4.1",
     "cors": "^2.8.4",
-    "dateformat": "^3.0.3",
     "express": "^4.16.3",
     "http-server": "^0.10.0",
     "js-yaml": "^3.3.0",
     "jsonwebtoken": "^8.3.0",
     "knex": "^0.13.0",
     "mariasql": "^0.2.6",
-    "moment": "^2.18.1",
+    "moment": "^2.22.2",
     "nodemon": "^1.11.0",
     "rxjs": "^6.1.0",
     "rxjs-compat": "^6.0.0-rc.0",

server/api/swagger.yaml

@@ -276,6 +276,34 @@ paths:
       security:
       - PublicKey: []
       x-swagger-router-controller: "Courses"
+  /courses/lastminute:
+    get:
+      tags:
+      - "Courses"
+      summary: "get last minute courses"
+      description: "get last minute courses"
+      operationId: "coursesLastminuteGET"
+      parameters: []
+      responses:
+        200:
+          description: "OK"
+          schema:
+            type: "array"
+            items:
+              $ref: "#/definitions/Course"
+        401:
+          description: Invalid authentication credentials.
+        403:
+          description: Permission 'xxx' denied on file 'yyy'.  
+        404:
+          description: Permission 'xxx' denied on file 'yyy'.
+        409:
+          description: Resource 'xxx' already exists.
+        500:
+          description: Internal Server Error.
+      security:
+      - PublicKey: []
+      x-swagger-router-controller: "Courses"
   /courses/{course_id}/apply:
     post:
       tags:

server/controllers/Courses.js

@@ -73,3 +73,13 @@ module.exports.coursesHighlightsGET = function coursesHighlightsGET (req, res, n
       utils.writeJson(res, response);
     });
 };
+
+module.exports.coursesLastminuteGET = function coursesLastminuteGET (req, res, next) {
+  Courses.coursesLastminuteGET()
+    .then(function (response) {
+      utils.writeJson(res, response);
+    })
+    .catch(function (response) {
+      utils.writeJson(res, response);
+    });
+};

server/service/CoursesService.js

@@ -5,8 +5,8 @@ var Applications = require('../utils/database').Application;
 
 var knex = require('../utils/database').knex;
 var jwt = require('jsonwebtoken'); // used to create, sign, and verify tokens
-var dateFormat = require('dateformat');
 var Errors = require('../utils/errors');
+var moment = require('moment');
 
 /**
  * apply to participate in specific course
@@ -30,25 +30,7 @@ exports.coursesCourse_idApplyPOST = function (course_id, req) {
             .fetchAll()
             .then((applications) => {
               if (applicationFound(applications, user_id, course_id)) {
-                let data = {
-                  ANM_DATUM: dateFormat(Date.now(), "yyyy-mm-dd"),
-                  ANM_TEIL_ID: user_id,
-                  ANM_KURS_ID: course_id,
-                  ANM_BEARBEITER: 0,
-                  ANM_STAT_ID: 0,
-                  ANM_ABR_DATUM: 0,
-                  ANM_ABR_RUECKLAST_DATUM: 0,
-                  ANM_TNB_GEM_DRUCKEN: 0,
-                  ANM_TEIL_ID_ZAHLER: 0,
-                  ANM_WARTEL_INFORMIEREN: 0,
-                  ANM_ABR_ABRECHNEN: 0,
-                  ANM_ABR_ABGERECHNET: 0,
-                  EINGEGEBEN_VON_USER: user_id,
-                  EINGEGEBEN_AM_DATUM: 0,
-                  EINGEGEBEN_AM_ZEIT: 0,
-                  DATENHISTORY: ""
-                };
-                new Applications(data)
+                new Applications(generateApplicationFor(user_id, course_id))
                   .save()
                   .then((application) => {
                     resolve(application);
@@ -91,6 +73,27 @@ function applicationFound(applications, user_id, course_id) {
   return applicationFound;
 }
 
+function generateApplicationFor(user_id, course_id) {
+    return {
+      ANM_DATUM: moment().format('YYYY-MM-DD'),
+      ANM_TEIL_ID: user_id,
+      ANM_KURS_ID: course_id,
+      ANM_BEARBEITER: 0,
+      ANM_STAT_ID: 0,
+      ANM_ABR_DATUM: 0,
+      ANM_ABR_RUECKLAST_DATUM: 0,
+      ANM_TNB_GEM_DRUCKEN: 0,
+      ANM_TEIL_ID_ZAHLER: 0,
+      ANM_WARTEL_INFORMIEREN: 0,
+      ANM_ABR_ABRECHNEN: 0,
+      ANM_ABR_ABGERECHNET: 0,
+      EINGEGEBEN_VON_USER: user_id,
+      EINGEGEBEN_AM_DATUM: 0,
+      EINGEGEBEN_AM_ZEIT: 0,
+      DATENHISTORY: ""
+    };
+}
+
 /**
  * give feedback to a course
  * give feedback to a course
@@ -156,7 +159,7 @@ exports.coursesCourse_idSignoffPOST = function (course_id, req) {
         ANM_TEIL_ID: user_id,
         ANM_KURS_ID: course_id
       })
-      .save({ANM_ABR_ABRECHNEN: 1, ANM_ABR_DATUM: dateFormat(Date.now(), "yyyy-mm-dd")}, {
+      .save({ANM_ABR_ABRECHNEN: 1, ANM_ABR_DATUM: moment().format('YYYY-MM-DD')}, {
         patch: true
       })
       .then(applicationModel => {
@@ -222,6 +225,27 @@ exports.coursesHighlightsGET = function () {
   });
 }
 
+exports.coursesLastminuteGET = function() {
+  return new Promise(function(resolve, reject) {
+    Courses
+      .forge()
+      .query(function(qb) {
+        qb.whereBetween('KURS_ANMFRIST', [moment().format('YYYY-MM-DD'), moment().add(6, 'weeks').format('YYYY-MM-DD')]);
+      })
+      .fetchAll({withRelated: ["applications"]})
+      .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.attributes)
+        )
+      })
+      .catch((error) => {
+        reject(error);
+      });
+  });
+}
+
 if (process.env.NODE_ENV === 'test') {
   exports.clearDataBase = () => {
     console.log("Clearing all Content in Table vhslq_kurse");
@@ -256,6 +280,37 @@ if (process.env.NODE_ENV === 'test') {
     });
   }
 
+  exports.setupLastMinute = () => {
+    console.log("Setting up Last Minute Content in Table vhslq_kurse")
+    return new Promise((resolve, reject) => {
+      let sample = require('../utils/sampleData').coursesForLastMinute();
+      let _Courses = require('../utils/database').Courses;
+      let courses = _Courses.forge(sample);
+        
+      Promise.all(courses.invokeMap('save'))
+        .then((data) => {
+          let courseIDs = data.map(item => item.attributes.id);
+          let fullCourse = courseIDs[2];
+          let _Applications = require('../utils/database').Applications
+          let applications = _Applications.forge([
+            generateApplicationFor(1222313, fullCourse),
+            generateApplicationFor(1222312, fullCourse)
+          ])
+          Promise.all(applications.invokeMap('save')).then(() => {
+            console.log("Finished Setting up Last Minute Content in Table vhslq_kurse")
+            resolve("done");
+          }).catch((error) => {
+            console.log(error)
+            reject(error);
+          })
+        })
+        .catch((error) => {
+          reject(error);
+        })
+    });
+  }
+
+
   exports.setupCoursesOfCategory = (category_id) => {
     return new Promise((resolve, reject) => {
       console.log("Setting up Content for Category with ID " + category_id);

server/test/courses.js

@@ -5,7 +5,7 @@ let sampleAppliactions = require('../utils/sampleData').applications();
 let chai = require('chai');
 let chaiHttp = require('chai-http');
 let server = require('../../index');
-let dateFormat = require('dateformat');
+let moment = require('moment');
 
 let should = chai.should();
 
@@ -131,7 +131,7 @@ describe('Courses', () => {
         .end((err, res) => {
           res.should.have.status(200);          
           res.body.ANM_ABR_ABRECHNEN.should.equal(1);
-          res.body.ANM_ABR_DATUM.should.equal(dateFormat(Date.now(), "yyyy-mm-dd"));
+          res.body.ANM_ABR_DATUM.should.equal(moment().format('YYYY-MM-DD'));
           done();
         });
     });
@@ -147,4 +147,32 @@ describe('Courses', () => {
         });
     });
 
-});
+});
+
+describe("Courses Last Minute", () => {
+  it("it should get an empty array of courses", (done) => {
+    coursesService.clearDataBase().then(() => {
+      chai.request(server)
+        .get('/v1/courses/lastminute')
+        .end((err, res) => {
+          res.should.have.status(200);
+          res.body.should.be.a('array');
+          res.body.should.be.empty;
+          done();
+        })
+    })
+  });
+
+  it("it should create 4 courses but only return 1 course as valid last minute course", (done) => {
+    coursesService.setupLastMinute().then(() => {
+      chai.request(server)
+        .get('/v1/courses/lastminute')
+        .end((err, res) => {
+          res.should.have.status(200);
+          res.body.should.be.a('array');
+          res.body.length.should.equal(1);
+          done();
+        })
+    })
+  });
+}); 

server/utils/database.js

@@ -10,6 +10,7 @@ var knex = require('knex')({
   }
 });
 
+var moment = require('moment');
 var bookshelf = require('bookshelf')(knex);
 exports.knex = knex;
 
@@ -19,7 +20,10 @@ let course = bookshelf.Model.extend({
   // use function() instead of lambda big arrow here otherwise "this" is not the correct this ....
   category: function() {
     return this.belongsTo(category, "RUB_ID")
-  }
+  },
+  applications: function() {
+    return this.hasMany(application, "ANM_KURS_ID", "KURS_ID")
+  },
 })
 
 exports.Course = course
@@ -49,10 +53,6 @@ exports.User = bookshelf.Model.extend({
 // -- APPLICATIONS
 let application  = bookshelf.Model.extend({
   tableName: 'vhslq_anmeldungen',
-  // use function() instead of lambda big arrow here otherwise "this" is not the correct this ....
-  applications: function() {
-    return this.hasMany(application, "ANM_ID")
-  }
 })
 
 exports.Application = application;