Merge branch 'issue/60-Assign-route' into 'develop'

Issue #60: Add route to assign users to forms

See merge request !58

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.1.8 - 30-01-2020
+### Added
+- Route to assign users to forms #60 (Richard Heise)
+## Changed
+- Route to write a form now has an extra stage in the waterfall
+- THis stage assigns the user to a form by ID
+
 ## 1.1.7 - 29-01-2020
 ### Added
 - Function to assign users to forms #54 (Gianfranco)

package.json

 {
   "name": "form-creator-api",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "RESTful API used to manage and answer forms.",
   "main": "index.js",
   "scripts": {

src/api/controllers/form.spec.ts

@@ -55,6 +55,7 @@ before(function (done): void {
 
 export let testToken: string;
 
+describe("Initial test User", () => {
     it ("Should respond 200 when signing up a valid user", (done) => {
         request(server) 
             .post("/user/signUp")
@@ -88,6 +89,8 @@ it("Should respond 200 when validating an user signIn", (done) => {
             })
             .end(done);
     });
+})
+
 
 describe("API data controller - form", () => {    
     it("should respond 200 when getting a list of forms", (done) => {

src/api/controllers/form.ts

@@ -96,12 +96,30 @@ export class FormCtrl {
                     callback(null, formUpdate);
                 });
             },
-            (formUpdate: FormUpdate, callback: (err: Error, formId: number) => void) => {
+            (formUpdate: FormUpdate, callback: (err: Error, formId?: number) => void) => {
                 req.db.form.update(formUpdate, (err: Error) => {
-                        callback(err, formUpdate.form.id);
+
+                    if (err) {
+                        callback(err);
+                        return;
+                    }
+
+                    callback(null, formUpdate.form.id);
                 });
+            },
+            (formId: number, callback: (err: Error) => void) => {
+                /** req.userData has to be parsed into an object so we can get its ID */
+                req.db.user.assign(Object(req.userData).id, formId, (err: Error) => {
+
+                    if (err) {
+                        callback(err);
+                        return;
                     }
-        ], (err, resultId) => {
+
+                    callback(null);
+                });
+            }
+        ], (err) => {
             if (err) {
                 res.status(500).json({
                     message: "Could not insert form. Some error has occurred. Check error property for details."
@@ -111,8 +129,7 @@ export class FormCtrl {
             }
 
             res.json({
-                id: resultId
-                , message: "Form added. Id on key 'id'"
+                message: "Form added."
             });
             return;
         });