Merge pull request #93 from marc101101/feature/my_courses

Feature/my courses

Author: marc101101

server/api/swagger.yaml

@@ -16,13 +16,13 @@ info:
 host: "localhost:8080"
 basePath: "/v1"
 paths:
-  /user:
+  /user/me:
     get:
       tags:
       - "User"
       summary: "get me"
       description: "Get authorized User (me)"
-      operationId: "userGET"
+      operationId: "userMeGET"
       parameters: []
       responses:
         200:
@@ -42,17 +42,11 @@ paths:
       security:
       - JWT: []
       x-swagger-router-controller: "User"
-    post:
+    put:
       tags:
       - "User"
-      summary: "register a new user"
-      description: "register new user"
-      operationId: "userPOST"
-      consumes:
-      - "application/json"
-      produces:
-      - "application/json"
-      - "application/xml"
+      summary: "edit user details"
+      operationId: "userPUT"
       parameters:
       - in: "body"
         name: "data"
@@ -61,8 +55,8 @@ paths:
         schema:
           type: "object"
       responses:
-        201:
-          description: "user created"
+        200:
+          description: "user has been edited"
           schema:
             type: "object"
             properties: {}
@@ -79,11 +73,46 @@ paths:
       security:
       - JWT: []
       x-swagger-router-controller: "User"
-    put:
+  /user/me/courses:
+    get:
       tags:
       - "User"
-      summary: "edit user details"
-      operationId: "userPUT"
+      summary: "get my courses"
+      description: "Get Users (me) courses"
+      operationId: "userMeCoursesGET"
+      parameters: []
+      responses:
+        200:
+          description: "request successful"
+          schema:
+            type: "array"
+            items:
+              $ref: "#/definitions/Category"
+        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:
+      - JWT: []
+      x-swagger-router-controller: "User"
+  /user:
+    post:
+      tags:
+      - "User"
+      summary: "register a new user"
+      description: "register new user"
+      operationId: "userPOST"
+      consumes:
+      - "application/json"
+      produces:
+      - "application/json"
+      - "application/xml"
       parameters:
       - in: "body"
         name: "data"
@@ -92,8 +121,8 @@ paths:
         schema:
           type: "object"
       responses:
-        200:
-          description: "user has been edited"
+        201:
+          description: "user created"
           schema:
             type: "object"
             properties: {}

server/controllers/User.js

@@ -7,9 +7,21 @@ var verifyToken = require('../utils/VerifyToken');
 var jwt = require('jsonwebtoken'); // used to create, sign, and verify tokens
 var config = require('../config'); // get config file
 
-module.exports.userGET = function userGET (req, res, next) {  
+module.exports.userMeGET = function userMeGET (req, res, next) {  
   verifyToken(req, res, (decoded) => {
-    User.userGET(decoded.id)
+    User.userMeGET(decoded.id)
+    .then(function (response) {
+      utils.writeJson(res, response);
+    })
+    .catch(function (response) {
+      utils.writeJson(res, response, response.code);
+    });
+  });
+};
+
+module.exports.userMeCoursesGET = function userMeCoursesGET (req, res, next) {
+  verifyToken(req, res, (decoded) => {
+    User.userMeCoursesGET(decoded.id)
     .then(function (response) {
       utils.writeJson(res, response);
     })

server/service/CoursesService.js

@@ -74,26 +74,28 @@ function applicationFound(applications, user_id, course_id) {
 }
 
 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: ""
-    };
+  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: ""
+  };
 }
 
+exports.generateApplicationFor = generateApplicationFor; 
+
 /**
  * give feedback to a course
  * give feedback to a course
@@ -272,7 +274,7 @@ if (process.env.NODE_ENV === 'test') {
       Promise.all(courses.invokeMap('save'))
         .then((data) => {
           console.log("Finished Setting up Content in Table vhslq_kurse")
-          resolve("done");
+          resolve(data);
         })
         .catch((error) => {
           reject(error);

server/service/UserService.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var User = require('../utils/database').User;
+var Applications = require('../utils/database').Application
 var knex = require('../utils/database').knex;
 
 var jwt = require('jsonwebtoken'); // used to create, sign, and verify tokens
@@ -14,7 +15,7 @@ var Errors = require('../utils/errors');
  *
  * returns User
  **/
-exports.userGET = function(id) {
+exports.userMeGET = function(id) {
   return new Promise((resolve, reject) => {
     User.where({teil_id: id})
       .fetch()
@@ -30,6 +31,20 @@ exports.userGET = function(id) {
      });
 }
 
+exports.userMeCoursesGET = function(user_id) {
+  return new Promise(function (resolve, reject) {
+    Applications
+      .where({ANM_TEIL_ID: user_id})
+      .fetchAll({withRelated: ["course"]})
+      .then((applications) => {
+        resolve(applications.map(item => item.related('course').toJSON()))
+      })
+      .catch((error) => {
+        reject(error);
+      });
+  });
+}
+
 
 /**
  * register a new user
@@ -92,4 +107,25 @@ if (process.env.NODE_ENV === 'test') {
         })
     })
   }
+
+  exports.addCoursesToSampleUser = (user_id) => {
+    return new Promise((resolve, reject) => {
+      console.log("Adding Sample Courses To User ID " + user_id);
+        let setupCourses = require('../service/CoursesService').setupDataBase;
+        setupCourses().then((courses) => {
+          let _Applications = require('../utils/database').Applications
+          let generateApplicationFor = require('../service/CoursesService').generateApplicationFor;
+          let applications = courses
+            .map(item => item.attributes.id)
+            .map(course_id => generateApplicationFor(user_id, course_id))
+          Promise.all(_Applications.forge(applications).invokeMap('save')).then(() => {
+            console.log("Finished Adding Courses to User ID " + user_id);
+            resolve("done");
+          }).catch((error) => {
+            console.log(error)
+            reject(error);
+          })
+        })
+    });
+  }
 }

server/test/user.js

@@ -11,13 +11,14 @@ chai.use(chaiHttp);
 
 describe('User', () => {
   let authToken = "";
+  let userID = "";
   before(() => {
     return userService
       .clearDataBase()
   });
   it("it should fail with 401 because auth token is missing", (done) => {
     chai.request(server)
-      .get('/v1/user')
+      .get('/v1/user/me')
       .end((err, res) => {
         let compareError = Errors.missingAuth();
         res.should.have.status(compareError.code);
@@ -27,7 +28,7 @@ describe('User', () => {
   })
   it("it should fail with 401 because auth token is incorrect", (done) => {
     chai.request(server)
-      .get('/v1/user')
+      .get('/v1/user/me')
       .set('authorization', 'Bearer ' + "obviously.incorrect.token")
       .end((err, res) => {
         let compareError = Errors.invalidAuth();
@@ -57,13 +58,14 @@ describe('User', () => {
         res.body.user.teil_vorname.should.equal(user.teil_vorname);
         res.body.user.teil_nachname.should.equal(user.teil_nachname);
         res.body.user.teil_email.should.equal(user.teil_email);
+        userID = res.body.user.id;
         authToken = res.body.token;
         done();
       })
   });
   it("it should get user John Doe", (done) => {
     chai.request(server)
-      .get('/v1/user')
+      .get('/v1/user/me')
       .set('authorization', 'Bearer ' + authToken)
       .end((err, res) => {
         res.should.have.status(200);
@@ -75,15 +77,15 @@ describe('User', () => {
   });
   it("it should update John Doe's Name to John Although", (done) => {
     chai.request(server)
-      .put('/v1/user')
+      .put('/v1/user/me')
       .set('authorization', 'Bearer ' + authToken)
       .send({teil_nachname: "Although"})
       .end((err, res) => {
         res.should.have.status(200);
         res.body.should.be.a('object');
         res.body.teil_nachname.should.equal("Although");
         chai.request(server)
-          .get('/v1/user')
+          .get('/v1/user/me')
           .set('authorization', 'Bearer ' + authToken)
           .end((err, res) => {
             res.should.have.status(200);
@@ -94,4 +96,17 @@ describe('User', () => {
           });
       });
   });
+  it("it should get John Doe's Courses", (done) => {
+    userService.addCoursesToSampleUser(userID).then(() => {
+      chai.request(server)
+      .get('/v1/user/me/courses')
+      .set('authorization', 'Bearer ' + authToken)
+      .end((err, res) => {
+        res.should.have.status(200);
+        res.body.should.be.a('array');
+        res.body.length.should.equal(2);
+        done();
+      })
+    })
+  })
 });

server/utils/database.js

@@ -53,6 +53,12 @@ exports.User = bookshelf.Model.extend({
 // -- APPLICATIONS
 let application  = bookshelf.Model.extend({
   tableName: 'vhslq_anmeldungen',
+  course: function() {
+    return this.belongsTo(course, "KURS_ID", "ANM_KURS_ID")
+  },
+  user: function() {
+    return this.belongsTo(user, "TEIL_ID", "ANM_TEIL_ID")
+  }
 })
 
 exports.Application = application;