feature(profile-update): implement feedback changes and rebase off de…

…velop

.gitignore

@@ -33,6 +33,7 @@ node_modules
 
 # Optional npm cache directory
 .npm
+uploads
 
 # Optional REPL history
 .node_repl_history

package.json

@@ -4,7 +4,8 @@
   "description": "A Social platform for the creative at heart",
   "main": "index.js",
   "scripts": {
-    "test": "NODE_ENV=test npm run migration-rollback && npm run db-migration && nyc mocha src/**/*.spec.js --require @babel/register --exit || true",
+    "test": "NODE_ENV=test npm run migration-rollback && npm run db-migration && nyc mocha src/**/*.spec.js --require @babel/register --exit --timeout 100000|| true",
+    "test-watch": "nodemon --exec \"npm test\"",
     "start": "nodemon --exec babel-node src/index.js",
     "build": "npm run db-migration && npm run clean && npm run babel-build",
     "clean": "rm -rf dist",
@@ -26,6 +27,7 @@
     "body-parser": "^1.18.3",
     "chai": "^4.2.0",
     "chai-http": "^4.3.0",
+    "cloudinary": "^1.14.0",
     "cors": "^2.8.4",
     "cross-env": "^5.2.0",
     "dotenv": "^6.2.0",
@@ -37,6 +39,7 @@
     "lint-staged": "^9.0.2",
     "mocha": "^6.1.4",
     "morgan": "^1.9.1",
+    "multer": "^1.4.1",
     "pg": "^7.11.0",
     "pg-hstore": "^2.3.3",
     "sequelize": "^5.8.12",

src/controllers/auth.controllers.js

@@ -6,6 +6,7 @@ import {
   passwordResetServices
 } from '../services/auth.service';
 import Helper from '../services/helper';
+import upload from '../helpers/image.helper';
 
 export default {
   /**
@@ -124,5 +125,47 @@ export default {
         message: 'password reset was successful'
       }
     });
+  },
+
+  /**
+   *
+   * @description Handles the Logic for Updating a User profile
+   *  Route: PUT: /users/profileupdate
+   * @param {object} request
+   * @param {object} response
+   * @param {function} next
+   * @returns {object}JSON API Response
+   */
+  async profileUpdate(request, response, next) {
+    try {
+      let imagePath;
+      const previousImage = request.foundUser.image;
+      let imageUniqueName;
+      let uploadedImage;
+      if (request.file) {
+        imagePath = request.file.path;
+        imageUniqueName = request.file.originalname;
+        const imageResponse = await upload(imagePath, imageUniqueName);
+        uploadedImage = imageResponse.secure_url;
+      }
+
+      const fields = {
+        ...request.body,
+        image: uploadedImage || previousImage
+      };
+      const updatedUser = await request.foundUser.update(fields);
+
+      return Helper.successResponse(response, 200, {
+        firstName: updatedUser.dataValues.firstName,
+        lastName: updatedUser.dataValues.lastName,
+        bio: updatedUser.dataValues.bio,
+        userName: updatedUser.dataValues.userName,
+        twitterHandle: updatedUser.dataValues.twitterHandle,
+        facebookHandle: updatedUser.dataValues.facebookHandle,
+        image: updatedUser.dataValues.image
+      });
+    } catch (error) {
+      next(error);
+    }
   }
 };

src/db/migrations/add-bio.js

@@ -0,0 +1,11 @@
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.addColumn('Users', 'bio', {
+      type: Sequelize.TEXT,
+      allowNull: true
+    });
+  },
+  down: queryInterface => {
+    return queryInterface.removeColumn('Users', 'bio');
+  }
+};

src/db/migrations/add-facebook-handle.js

@@ -0,0 +1,11 @@
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.addColumn('Users', 'facebookHandle', {
+      type: Sequelize.STRING,
+      allowNull: true
+    });
+  },
+  down: queryInterface => {
+    return queryInterface.removeColumn('Users', 'facebookHandle');
+  }
+};

src/db/migrations/add-twitter-handle.js

@@ -0,0 +1,11 @@
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.addColumn('Users', 'twitterHandle', {
+      type: Sequelize.STRING,
+      allowNull: true
+    });
+  },
+  down: queryInterface => {
+    return queryInterface.removeColumn('Users', 'twitterHandle');
+  }
+};

src/db/models/user.js

@@ -95,6 +95,18 @@ export default (sequelize, DataTypes) => {
       type: DataTypes.STRING,
       allowNull: true,
       defaultValue: 'author'
+    },
+    bio: {
+      type: DataTypes.TEXT,
+      allowNull: true
+    },
+    twitterHandle: {
+      type: DataTypes.STRING,
+      allowNull: true
+    },
+    facebookHandle: {
+      type: DataTypes.STRING,
+      allowNull: true
     }
   });
 

src/helpers/image.helper.js

@@ -0,0 +1,28 @@
+import cloudinary from 'cloudinary';
+import fs from 'fs';
+
+cloudinary.config({
+  cloud_name: process.env.CLOUDINARY_NAME,
+  api_key: process.env.CLOUDINARY_API_KEY,
+  api_secret: process.env.CLOUDINARY_API_SECRET
+});
+/**
+ * Handles the upload of image to cloudinary
+ *
+ * @param {string} path
+ * @param {string} uniqueFilename
+ * @returns {object} uploaded image response
+ */
+const upload = async (path, uniqueFilename) => {
+  return cloudinary.v2.uploader.upload(
+    path,
+    { public_id: `avatar/${uniqueFilename}`, tags: `avatar` }, // directory and tags are optional
+    image => {
+      // remove file from server
+      fs.unlinkSync(path);
+      // return image details
+      return image;
+    }
+  );
+};
+export default upload;

src/index.js

@@ -9,7 +9,8 @@ import Routes from './routes/v1';
 const app = express();
 
 // Normal express config defaults
-app.use(bodyParser.urlencoded({ extended: false }));
+app.use(bodyParser.urlencoded({ extended: true }));
+app.use('/uploads', express.static('uploads'));
 app.use(bodyParser.json());
 app.use(logger('dev'));
 Routes(app);
@@ -23,24 +24,21 @@ app.get('/', (request, response) => {
   });
 });
 
-app.use((req, res, next) => {
+app.use((request, response, next) => {
   const error = new Error('You are trying to access a wrong Route');
   error.status = 404;
   next(error);
 });
 
-app.use((error, req, res, next) => {
-  res.status(error.status || 500);
-  res.json({
+app.use((error, request, response, next) => {
+  response.status(error.status || 500);
+  response.json({
     status: error.status || 500,
     error: error.name,
     message: error.message
   });
-  next();
 });
-
 const PORT = process.env.PORT || 3000;
-
 // finally, let's start our server...
 app.listen(PORT, () => {
   console.log(`Listening on port: ${PORT}`);

src/middlewares/imageUpload.middleware.js

@@ -0,0 +1,31 @@
+import multer from 'multer';
+
+const fileFilter = (request, file, callback) => {
+  const error = new Error('Only JPG/PNG images are allowed');
+  error.status = 422;
+  // accept only jpg or png images
+  if (file.mimetype === 'image/jpeg' || file.mimetype === 'image/png') {
+    callback(null, true);
+  } else {
+    callback(error, false);
+  }
+};
+
+const storage = multer.diskStorage({
+  destination: (request, file, callback) => {
+    callback(null, 'uploads/');
+  },
+  filename: (request, file, callback) => {
+    callback(null, new Date().toISOString() + file.originalname);
+  }
+});
+
+const upload = multer({
+  storage,
+  fileFilter,
+  limits: {
+    fileSize: 1024 * 1024 * 5
+  }
+});
+
+export default upload;

src/middlewares/profileUpdateCheck.middleware.js

@@ -0,0 +1,37 @@
+import { findByUserName, findUserById } from '../services/auth.service';
+import Helper from '../services/helper';
+/**
+ *
+ * @description Handles neccessary checks on profile update
+ * @param {object} request
+ * @param {object} response
+ * @param {function} next
+ * @returns {(function|Object)} Function next() or an error Object
+ */
+const profileChecks = async (request, response, next) => {
+  try {
+    const userInstance = await findUserById(request.user.id);
+    if (!userInstance) {
+      return Helper.failResponse(response, 404, {
+        message: 'User account does not exist'
+      });
+    }
+
+    if (request.body.userName) {
+      const userNameExists = await findByUserName(request.body.userName);
+      const { id } = userNameExists;
+      if (userNameExists && id !== request.user.id) {
+        return Helper.failResponse(response, 409, {
+          message: 'Username has already been taken'
+        });
+      }
+    }
+    request.foundUser = userInstance;
+
+    return next();
+  } catch (error) {
+    return Helper.errorResponse(response, 500, error);
+  }
+};
+
+export default { profileChecks };

src/routes/v1/auth.route.js

@@ -2,13 +2,18 @@ import express from 'express';
 import authenticationValidator from '../../validators/user.validator';
 import authenticationController from '../../controllers/auth.controllers';
 import authorization from '../../middlewares/auth.middleware';
+import profileUpdateCheck from '../../middlewares/profileUpdateCheck.middleware';
+import upload from '../../middlewares/imageUpload.middleware';
 
 const { validator, checkValidationResult } = authenticationValidator;
+const { verifyToken } = authorization;
+const { profileChecks } = profileUpdateCheck;
 const {
   signUp,
   login,
   forgotPassword,
-  passwordReset
+  passwordReset,
+  profileUpdate
 } = authenticationController;
 
 const router = express.Router();
@@ -29,4 +34,12 @@ router
     passwordReset
   );
 
+router.put(
+  '/profileupdate',
+  verifyToken,
+  upload.single('image'),
+  profileChecks,
+  profileUpdate
+);
+
 export default router;

src/routes/v1/index.js

@@ -2,6 +2,6 @@ import auth from './auth.route';
 import users from './user.route';
 
 export default app => {
-  app.use('/api/v1/users', auth);
-  app.use('/api/v1/users/', users);
+  app.use(`${process.env.API_VERSION}/users`, auth);
+  app.use(`${process.env.API_VERSION}/users/`, users);
 };