fix(app): Fix relationships errors

common/models/author.json

@@ -15,6 +15,17 @@
       "type": "string",
       "required": true
     },
+    "Genre": {
+      "type": "string",
+      "required": false,
+      "enum": [
+        "HUMOR",
+        "SCI_FI",
+        "HORROR",
+        "ROMANCE",
+        "NON_FICTION"
+      ]
+    },
     "birth_date": {
       "type": "date",
       "required": true

common/models/note.json

@@ -11,8 +11,8 @@
   },
   "validations": [],
   "relations": {
-    "authors": {
-      "type": "hasOne",
+    "author": {
+      "type": "belongsTo",
       "model": "Author",
       "foreignKey": ""
     }

data.json

@@ -5,18 +5,28 @@
     "ACL": 1,
     "RoleMapping": 1,
     "Role": 1,
-    "Note": 1,
-    "Author": 2
+    "Note": 6,
+    "Author": 6
   },
   "models": {
     "User": {},
     "AccessToken": {},
     "ACL": {},
     "RoleMapping": {},
     "Role": {},
-    "Note": {},
+    "Note": {
+      "1": "{\"title\":\"1st note\",\"content\":\"Hope it will work\",\"id\":1}",
+      "2": "{\"title\":\"Who is Afraid\",\"content\":\"Hope it will work\",\"authorId\":3,\"id\":2}",
+      "3": "{\"title\":\"A room with a View\",\"content\":\"Hope it will work\",\"authorId\":3,\"id\":3}",
+      "4": "{\"title\":\"2nd  note\",\"content\":\"Hope it will work\",\"authorId\":4,\"id\":4}",
+      "5": "{\"title\":\"Of Mice and Men\",\"content\":\"A long one\",\"authorId\":4,\"id\":5}"
+    },
     "Author": {
-      "1": "{\"first_name\":\"John\",\"last_name\":\"Steinback\",\"birth_date\":\"2016-10-06T00:00:00.000Z\",\"id\":1}"
+      "1": "{\"first_name\":\"Ernest\",\"last_name\":\"Hemingway\",\"birth_date\":\"1960-02-29T22:00:00.000Z\",\"id\":1}",
+      "2": "{\"first_name\":\"Mark\",\"last_name\":\"Twain\",\"birth_date\":\"2016-10-08T18:22:58.307Z\",\"id\":2}",
+      "3": "{\"first_name\":\"Virginia\",\"last_name\":\"Wolf\",\"birth_date\":\"1960-02-29T22:00:00.000Z\",\"id\":3}",
+      "4": "{\"first_name\":\"John\",\"last_name\":\"Steinback\",\"Genre\":\"HUMOR\",\"birth_date\":\"2016-10-12T00:00:00.000Z\",\"id\":4}",
+      "5": "{\"first_name\":\"Tony\",\"last_name\":\"Morrison\",\"birth_date\":\"1943-12-31T22:00:00.000Z\",\"id\":5}"
     }
   }
 }

lib/helper.js

@@ -10,8 +10,8 @@ const typesMapping = {
     Date: 'Date'
 };
 
-function validProps(model){
-    return _.omitBy(model.definition.properties, p=>{
+function validProps(model) {
+    return _.omitBy(model.definition.properties, p => {
         return p.deprecated;
     });
 }
@@ -43,9 +43,9 @@ function propsTypes(model) {
         .join(' \n ');
 }
 
-function validRelations (model) {
-    return _.omitBy(model.relations, r=>{
-        return !r.shared;
+function validRelations(model) {
+    return _.omitBy(model.relations, r => {
+        return !r.modelTo.shared;
     });
 }
 

package.json

@@ -16,10 +16,8 @@
     "test": "mocha --reporter spec --timeout 10000",
     "start": "node server/server.js",
     "nodemon": "nodemon server/server.js",
-    "vocha:coverage": "istanbul cover --root . --include-all-sources --dir ./coverage --report text --report text-summary --report lcov --print none  _mocha -- test/**/*.spec.js --require test/test.helpers.js --reporter spec --timeout 10000",
-    "mocha:watch": "mocha -R nyan -w --timeout 10000",
-    "publish:patch": "npm-bump patch && npm publish",
-    "publish:minor": "npm-bump minor && npm publish"
+    "mocha:coverage": "istanbul cover --root . --include-all-sources --dir ./coverage --report text --report text-summary --report lcov --print none  _mocha -- test/**/*.spec.js --require test/test.helpers.js --reporter spec --timeout 10000",
+    "mocha:watch": "mocha -R nyan -w --timeout 10000"
   },
   "repository": {
     "type": "git",
@@ -48,17 +46,17 @@
   },
   "devDependencies": {
     "apollo-client": "^0.4.20",
-    "babel-eslint": "^6.1.2",
+    "babel-eslint": "^7.0.0",
     "bluebird": "^3.4.6",
     "chai": "^3.5.0",
     "chai-http": "^3.0.0",
     "compression": "^1.0.3",
     "conventional-changelog-cli": "^1.2.0",
     "cors": "^2.5.2",
     "cpy-cli": "^1.0.1",
-    "eslint": "^2.13.1",
+    "eslint": "^3.7.1",
     "eslint-plugin-nodeca": "^1.0.3",
-    "helmet": "^1.3.0",
+    "helmet": "^2.3.0",
     "istanbul": "^0.4.5",
     "loopback": "^2.22.0",
     "loopback-boot": "^2.6.5",
@@ -72,4 +70,4 @@
     "standard-version": "^3.0.0",
     "strong-error-handler": "^1.0.1"
   }
-}
+}

server/datasources.json

@@ -2,6 +2,6 @@
   "db": {
     "name": "db",
     "connector": "memory",
-    "file": "../data.json"
+    "file": "./data.json"
   }
 }

server/model-config.json

@@ -34,7 +34,7 @@
   },
   "Note": {
     "dataSource": "db",
-    "public": true 
+    "public": true
   },
   "Author": {
     "dataSource": "db",