Update dependencies and fix errors

.travis.yml

@@ -3,8 +3,14 @@ language: node_js
 node_js:
   - stable
 
+before_install:
+  - psql -c 'create database mytestdatabase;' -U postgres
+
 install:
   - npm install
 
 script:
   - npm test
+
+services:
+  - postgresql

package.json

@@ -7,39 +7,41 @@
     "node": "10.11.0"
   },
   "scripts": {
-    "start": "nodemon --exec babel-node src/index.js",
+    "start": "nodemon --exec babel-node src/index.js --ignore src/tests/ || true",
     "test:run-server": "TEST_DATABASE=mytestdatabase npm start",
-    "test:execute-test": "mocha --require @babel/register 'src/**/*.spec.js'",
-    "test": "echo \"No test specified\" && exit 0"
+    "test:execute-test": "wait-on tcp:8000 && mocha --require @babel/register 'src/**/*.spec.js'",
+    "test": "run-p -r test:run-server test:execute-test"
   },
   "keywords": [],
   "author": "Robin Wieruch <[email protected]> (https://www.robinwieruch.de)",
   "license": "ISC",
   "devDependencies": {
-    "@babel/core": "^7.1.6",
-    "@babel/node": "^7.0.0",
-    "@babel/preset-env": "^7.1.6",
-    "@babel/register": "^7.0.0",
-    "axios": "^0.18.0",
-    "chai": "^4.2.0",
-    "mocha": "^5.2.0",
-    "nodemon": "^1.18.7",
-    "morgan": "^1.9.1"
+    "@babel/core": "7.7.7",
+    "@babel/node": "7.7.7",
+    "@babel/preset-env": "7.7.7",
+    "@babel/register": "7.7.7",
+    "axios": "0.19.0",
+    "chai": "4.2.0",
+    "mocha": "6.2.2",
+    "nodemon": "2.0.2",
+    "npm-run-all": "4.1.5",
+    "morgan": "1.9.1",
+    "wait-on": "3.3.0"
   },
   "dependencies": {
-    "apollo-server": "^2.2.3",
-    "apollo-server-express": "^2.2.3",
-    "bcrypt": "^3.0.2",
-    "cors": "^2.8.5",
-    "dataloader": "^1.4.0",
-    "dotenv": "^6.1.0",
-    "express": "^4.16.4",
-    "graphql": "^14.0.2",
-    "graphql-iso-date": "^3.6.1",
-    "graphql-resolvers": "^0.2.2",
-    "jsonwebtoken": "^8.4.0",
-    "pg": "^7.6.1",
-    "sequelize": "^4.41.2",
-    "uuid": "^3.3.2"
+    "apollo-server": "2.9.15",
+    "apollo-server-express": "2.9.15",
+    "bcrypt": "3.0.7",
+    "cors": "2.8.5",
+    "dataloader": "2.0.0",
+    "dotenv": "8.2.0",
+    "express": "4.17.1",
+    "graphql": "14.5.8",
+    "graphql-iso-date": "3.6.1",
+    "graphql-resolvers": "0.3.3",
+    "jsonwebtoken": "8.5.1",
+    "pg": "7.17.0",
+    "sequelize": "5.21.3",
+    "uuid": "3.3.3"
   }
 }

src/loaders/user.js

@@ -1,9 +1,7 @@
 export const batchUsers = async (keys, models) => {
   const users = await models.User.findAll({
     where: {
-      id: {
-        $in: keys,
-      },
+      id: keys,
     },
   });
 

src/resolvers/authorization.js

@@ -17,7 +17,7 @@ export const isMessageOwner = async (
   { id },
   { models, me },
 ) => {
-  const message = await models.Message.findById(id, { raw: true });
+  const message = await models.Message.findByPk(id, { raw: true });
 
   if (message.userId !== me.id) {
     throw new ForbiddenError('Not authenticated as owner.');

src/resolvers/message.js

@@ -42,7 +42,7 @@ export default {
       };
     },
     message: async (parent, { id }, { models }) => {
-      return await models.Message.findById(id);
+      return await models.Message.findByPk(id);
     },
   },
 

src/resolvers/user.js

@@ -17,14 +17,14 @@ export default {
       return await models.User.findAll();
     },
     user: async (parent, { id }, { models }) => {
-      return await models.User.findById(id);
+      return await models.User.findByPk(id);
     },
     me: async (parent, args, { models, me }) => {
       if (!me) {
         return null;
       }
 
-      return await models.User.findById(me.id);
+      return await models.User.findByPk(me.id);
     },
   },
 
@@ -68,7 +68,7 @@ export default {
     updateUser: combineResolvers(
       isAuthenticated,
       async (parent, { username }, { models, me }) => {
-        const user = await models.User.findById(me.id);
+        const user = await models.User.findByPk(me.id);
         return await user.update({ username });
       },
     ),