Merge branch 'develop' into bg-fix-jwt-165595365

.travis.yml

@@ -7,4 +7,4 @@ services:
 before_script:
   - psql -c 'create database travis_ci_test;' -U postgres
 after_success:
-  - npm run coverage
+  - npm run coverage

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "start": "node dist/index.js",
-    "heroku-postbuild": "npm run initdb && npm run build",
+    "heroku-postbuild": "npm run build",
     "build": "babel server -d dist --source-maps",
     "test": "cross-env NODE_ENV=test npm run initdb && DEBUG=vale-ah*  nyc --reporter=text --reporter=html mocha --timeout=20000 --recursive --exit",
     "coverage": "nyc report --reporter=lcov --reporter=text-lcov | coveralls",
@@ -40,7 +40,7 @@
     "passport-twitter": "1.0.4",
     "pg": "7.8.1",
     "pg-hstore": "2.3.2",
-    "sequelize": "4.43.0",
+    "sequelize": "5.7.6",
     "sequelize-cli": "5.4.0",
     "slug": "1.0.0",
     "swagger-ui-express": "4.0.2",

server/config/db-config.js

@@ -6,20 +6,17 @@ module.exports = {
   development: {
     env_variable: 'DATABASE_URL',
     dialect: 'postgres',
-    operatorsAliases: false,
     url: DATABASE_URL
   },
   test: {
     env_variable: 'DATABASE_URL',
     dialect: 'postgres',
-    operatorsAliases: false,
     url: DATABASE_URL,
     logging: false
   },
   production: {
     env_variable: 'DATABASE_URL',
     dialect: 'postgres',
-    operatorsAliases: false,
     url: DATABASE_URL,
     logging: false
   }

server/controllers/recipe-controller.js

@@ -48,7 +48,8 @@ class RecipeController {
       ingredients,
       steps,
       cookingTime,
-      preparationTime
+      preparationTime,
+      videoList
     } = req.body;
     try {
       await validate(req.body, recipeSchema);
@@ -58,7 +59,8 @@ class RecipeController {
         ingredients,
         steps,
         cookingTime,
-        preparationTime
+        preparationTime,
+        videoList
       })
         .then(({ dataValues }) => {
           return successResponse(res, { recipe: dataValues }, 201);
@@ -82,9 +84,16 @@ class RecipeController {
   static async updateRecipe(req, res) {
     const { id } = req.user;
     const { slug } = req.params;
-    const { ...newRecipe } = req.body;
+    const {
+      title,
+      ingredients,
+      steps,
+      cookingTime,
+      preparationTime,
+      videoList
+    } = req.body;
     try {
-      await validate(newRecipe, recipeUpdateSchema);
+      await validate(req.body, recipeUpdateSchema);
       const recipe = await Recipe.findOne({ where: { slug } });
       if (!recipe) {
         return errorResponse(res, 'recipe not found', 404);
@@ -98,11 +107,12 @@ class RecipeController {
       }
       const data = await recipe.update(
         {
-          title: newRecipe.title || recipe.title,
-          ingredients: newRecipe.ingredients || recipe.ingredients,
-          cookingTime: newRecipe.cookingTime || recipe.cookingTime,
-          preparationTime: newRecipe.preparationTime || recipe.preparationTime,
-          steps: newRecipe.steps || recipe.steps
+          title,
+          ingredients,
+          steps,
+          cookingTime,
+          preparationTime,
+          videoList
         },
         { returning: true }
       );
@@ -112,7 +122,7 @@ class RecipeController {
         200
       );
     } catch (error) {
-      return errorResponse(res, error.message);
+      return validationErrorResponse(res, error.details);
     }
   }
 

server/migrations/20190409100733-change-social-provider-to-enum.js

@@ -1,7 +1,7 @@
 module.exports = {
   up: (queryInterface, Sequelize) =>
     queryInterface.sequelize
-      .query('drop type if exists "enum_Users_socialProvider"')
+      .query('drop type if exists "enum_Users_socialProvider" cascade')
       .then(() =>
         queryInterface.addColumn('Users', 'socialProvider', {
           type: Sequelize.ENUM(['facebook', 'google', 'twitter'])

server/migrations/20190417200650-rename-following-id-column.js

@@ -0,0 +1,7 @@
+module.exports = {
+  up: queryInterface =>
+    queryInterface.renameColumn('Followers', 'followingId', 'userId'),
+
+  down: queryInterface =>
+    queryInterface.renameColumn('Followers', 'userId', 'followingId')
+};

server/migrations/20190418464787-recipe-userid.js

@@ -0,0 +1,12 @@
+module.exports = {
+  up: (queryInterface, Sequelize) =>
+    queryInterface.addColumn('Recipes', 'userId', {
+      type: Sequelize.INTEGER,
+      allowNull: false,
+      references: {
+        model: 'Users',
+        key: 'id'
+      }
+    }),
+  down: queryInterface => queryInterface.removeColumn('Recipes', 'userId')
+};