Merge cddc2d1 into 9c47b15

.gitignore

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

package.json

@@ -6,6 +6,7 @@
   "scripts": {
     "test": "NODE_ENV=test npm run db:drop && 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\"",
+    "table-reset": "sequelize db:drop && sequelize db:create",
     "start": "nodemon --exec babel-node src/index.js",
     "build": "npm run db-migration && npm run clean && npm run babel-build",
     "clean": "rm -rf dist",

src/controllers/auth.controllers.js

@@ -1,3 +1,4 @@
+import fs from 'fs';
 import {
   loginService,
   signUpService,
@@ -7,7 +8,7 @@ import {
   saveToBlackListServices
 } from '../services/auth.service';
 import Helper from '../services/helper';
-import upload from '../helpers/image.helper';
+import { upload } from '../helpers/image.helper';
 
 const { failResponse, successResponse } = Helper;
 
@@ -120,7 +121,7 @@ export default {
   /**
    *
    * @description Handles the Logic for Updating a User profile
-   *  Route: PUT: /users/profileupdate
+   *  Route: PUT: /users
    * @param {object} request
    * @param {object} response
    * @param {function} next
@@ -141,10 +142,18 @@ export default {
           'avatar'
         );
         uploadedImage = imageResponse.secure_url;
+        fs.unlinkSync(imagePath);
       }
 
       const fields = {
-        ...request.body,
+        firstName: request.body.firstName || request.foundUser.firstName,
+        lastName: request.body.lastName || request.foundUser.lastName,
+        bio: request.body.bio || request.foundUser.bio,
+        userName: request.body.userName || request.foundUser.userName,
+        twitterHandle:
+          request.body.twitterHandle || request.foundUser.twitterHandle,
+        facebookHandle:
+          request.body.facebookHandle || request.foundUser.facebookHandle,
         image: uploadedImage || previousImage
       };
       const updatedUser = await request.foundUser.update(fields);

src/controllers/user.controller.js

@@ -4,7 +4,8 @@ import {
   adminDeleteUserService,
   adminUpdateUserService,
   followUserService,
-  getUserFollowersService
+  getUserFollowersService,
+  getUserProfile
 } from '../services/user.service';
 import { isUserExist } from '../services/auth.service';
 import Helper from '../services/helper';
@@ -160,11 +161,36 @@ const getFollowers = async (request, response, next) => {
   }
 };
 
+/**
+ * @method viewProfile
+ * Route: GET profiles/:username
+ * Handles the logic to view a user's profile
+ * @param {object} request
+ * @param {object} response
+ * @returns {object} API response object
+ */
+
+const viewProfile = async (request, response, next) => {
+  try {
+    const { username } = request.params;
+    const user = await getUserProfile(username, request.user.id);
+    if (!user) {
+      return Helper.failResponse(response, 404, {
+        message: 'User does not exist'
+      });
+    }
+    return Helper.successResponse(response, 200, user);
+  } catch (error) {
+    return next(error);
+  }
+};
+
 export default {
   getUsers,
   adminCreateUser,
   adminUpdateUser,
   adminDeleteUser,
   followUser,
-  getFollowers
+  getFollowers,
+  viewProfile
 };

src/db/migrations/20190627124710-create-user.js

@@ -64,6 +64,18 @@ module.exports = {
         allowNull: true,
         defaultValue: 'author'
       },
+      bio: {
+        type: Sequelize.TEXT,
+        allowNull: true
+      },
+      facebookHandle: {
+        type: Sequelize.STRING,
+        allowNull: true
+      },
+      twitterHandle: {
+        type: Sequelize.STRING,
+        allowNull: true
+      },
       createdAt: {
         allowNull: false,
         type: Sequelize.DATE,

src/db/models/user.js

@@ -111,6 +111,7 @@ export default (sequelize, DataTypes) => {
   });
 
   User.associate = models => {
+    // associations can be defined here
     User.hasMany(models.Follow, {
       foreignKey: 'userId',
       as: 'followers'

src/helpers/image.helper.js

@@ -1,5 +1,4 @@
 import cloudinary from 'cloudinary';
-import fs from 'fs';
 import dotenv from 'dotenv';
 
 dotenv.config();
@@ -17,7 +16,8 @@ cloudinary.config({
  * @returns {object} uploaded image response
  */
 
-const upload = async (path, uniqueFilename, destination) => {
+// eslint-disable-next-line import/prefer-default-export
+export const upload = async (path, uniqueFilename, destination) => {
   let publicId;
   let tags;
   /* istanbul ignore next */
@@ -37,11 +37,8 @@ const upload = async (path, uniqueFilename, destination) => {
     path,
     { public_id: publicId, tags }, // directory and tags are optional
     image => {
-      // remove file from server
-      fs.unlinkSync(path);
       // return image details
       return image;
     }
   );
 };
-export default upload;

src/helpers/utilities.helper.js

@@ -0,0 +1,12 @@
+/**
+ * @method isNumber
+ * Checks if the string provided is a number
+ * @param {string} value
+ * @returns {boolean}
+ */
+
+const isNumeric = async value => {
+  return !!Number(value);
+};
+
+export default isNumeric;

src/middlewares/profileUpdateCheck.middleware.js

@@ -1,5 +1,6 @@
 import { findByUserName, findUserById } from '../services/auth.service';
 import Helper from '../services/helper';
+
 /**
  *
  * @description Handles neccessary checks on profile update
@@ -10,12 +11,43 @@ import Helper from '../services/helper';
  */
 const profileChecks = async (request, response, next) => {
   try {
+    const errors = [];
+    if ('firstName' in request.body) {
+      if (!request.body.firstName) errors.push('firstName cannot be empty');
+    }
+    if ('lastName' in request.body) {
+      if (!request.body.lastName) errors.push('lastName cannot be empty');
+    }
+    if ('bio' in request.body) {
+      if (!request.body.bio) errors.push('bio cannot be empty');
+    }
+    if ('userName' in request.body) {
+      if (!request.body.userName) errors.push('userName cannot be empty');
+    }
+    if ('twitterHandle' in request.body) {
+      if (!request.body.twitterHandle) {
+        errors.push('twitterHandle cannot be empty');
+      }
+    }
+    if ('facebookHandle' in request.body) {
+      if (!request.body.facebookHandle) {
+        errors.push('facebookHandle cannot be empty');
+      }
+    }
+    if (errors.length > 0) {
+      return Helper.failResponse(response, 400, errors[0]);
+    }
     const userInstance = await findUserById(request.user.id);
     if (!userInstance) {
       return Helper.failResponse(response, 404, {
         message: 'User account does not exist'
       });
     }
+    if (Object.keys(request.body).length < 1) {
+      return Helper.failResponse(response, 400, {
+        message: 'Field(s) to update cannot be empty'
+      });
+    }
 
     if (request.body.userName) {
       const userNameExists = await findByUserName(request.body.userName);

src/routes/v1/auth.route.js

@@ -38,7 +38,7 @@ router
   .get('/logout', verifyToken, logout);
 
 router.put(
-  '/profileupdate',
+  '/',
   verifyToken,
   upload.single('image'),
   profileChecks,

src/routes/v1/index.js

@@ -1,9 +1,11 @@
 import auth from './auth.route';
 import users from './user.route';
 import article from './article.route';
+import profile from './profile.route';
 
 export default app => {
   app.use(`${process.env.API_VERSION}/users`, auth);
   app.use(`${process.env.API_VERSION}/users/`, users);
   app.use(`${process.env.API_VERSION}/articles/`, article);
+  app.use(`${process.env.API_VERSION}/profiles`, profile);
 };

src/routes/v1/profile.route.js

@@ -0,0 +1,9 @@
+import express from 'express';
+import userController from '../../controllers/user.controller';
+import authorization from '../../middlewares/auth.middleware';
+
+const { verifyToken } = authorization;
+const { viewProfile } = userController;
+const router = express.Router();
+router.get('/:username', verifyToken, viewProfile);
+export default router;

src/services/article.service.js

@@ -1,5 +1,6 @@
+import fs from 'fs';
 import models from '../db/models';
-import upload from '../helpers/image.helper';
+import { upload } from '../helpers/image.helper';
 
 const { Article, User } = models;
 /** Istanbul ignore next */
@@ -18,7 +19,7 @@ export const createArticleService = async data => {
 
   const uploadedImage = [];
   const images = data.files;
-
+  const imagePaths = [];
   const loopUpload = async image => {
     // eslint-disable-next-line no-restricted-syntax
     for (const imageItem of image) {
@@ -27,11 +28,15 @@ export const createArticleService = async data => {
       // eslint-disable-next-line no-await-in-loop
       const imageResponse = await upload(imagePath, imageUniqueName, 'post');
       uploadedImage.push(imageResponse.secure_url);
+      imagePaths.push(imagePath);
     }
   };
 
   if (images) {
     await loopUpload(images);
+    imagePaths.forEach(path => {
+      fs.unlinkSync(path);
+    });
   }
   const finalUploads = JSON.stringify(Object.assign({}, uploadedImage));
   const article = await Article.create({

src/services/user.service.js

@@ -195,6 +195,38 @@ export const getUserFollowersService = async userId => {
   if (followers.length === 0) {
     return 'User has no follower';
   }
-
   return followers;
 };
+
+/**
+ * Queries the database to get a user profile
+ * @method getUserProfile
+ * Route: GET profiles/:username
+ * @param {string} username
+ * @returns {object|boolean} response object or false if no user is found
+ */
+
+export const getUserProfile = async (username, id) => {
+  let isfollowing = false;
+  const user = await User.findOne({
+    where: { userName: username }
+  });
+  if (user) {
+    const follower = await Follow.findOne({
+      where: { friendUserId: user.dataValues.id, userId: id }
+    });
+    if (follower) {
+      isfollowing = follower.dataValues.isFollowing;
+    }
+    const response = {
+      firstName: user.dataValues.firstName,
+      lastName: user.dataValues.lastName,
+      userName: username,
+      bio: user.dataValues.bio,
+      image: user.dataValues.image,
+      following: isfollowing
+    };
+    return response;
+  }
+  return false;
+};