From ded0e6fd57358df9c01c1fff9de4faa0b41cdb61 Mon Sep 17 00:00:00 2001 From: Leticia Esiagu Date: Wed, 20 Mar 2019 16:43:18 +0100 Subject: [PATCH] resolve houndci --- package.json | 2 +- server/controllers/follow-controller.js | 20 ++++++++----------- .../20190319180606-create-bookmark.js | 2 +- server/models/User.js | 2 -- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 01a1f65..2fbd7fd 100644 --- a/package.json +++ b/package.json @@ -86,4 +86,4 @@ "node_modules/*" ] } -} \ No newline at end of file +} diff --git a/server/controllers/follow-controller.js b/server/controllers/follow-controller.js index bcd4e45..4ea2718 100644 --- a/server/controllers/follow-controller.js +++ b/server/controllers/follow-controller.js @@ -52,12 +52,10 @@ export default class Follow { if (!followers) { return successResponse(res, 'you have no followers yet'); } - const followerArr = followers.map(current => { - return { - email: current.email, - username: current.username - }; - }); + const followerArr = followers.map(current => ({ + email: current.email, + username: current.username + })); return successResponse(res, { message: ' Your followers', Followers: followerArr @@ -86,12 +84,10 @@ export default class Follow { if (!following) { return successResponse(res, 'you are not following anyone yet'); } - const followerArr = following.map(current => { - return { - email: current.email, - username: current.username - }; - }); + const followerArr = following.map(current => ({ + email: current.email, + username: current.username + })); return successResponse(res, { message: ' Your are currently following', following: followerArr diff --git a/server/migrations/20190319180606-create-bookmark.js b/server/migrations/20190319180606-create-bookmark.js index 6cf7e45..1e60d48 100644 --- a/server/migrations/20190319180606-create-bookmark.js +++ b/server/migrations/20190319180606-create-bookmark.js @@ -23,7 +23,7 @@ module.exports = { } }); }, - down: (queryInterface /* , Sequelize */) => { + down: queryInterface => { return queryInterface.dropTable('bookmarks'); } }; diff --git a/server/models/User.js b/server/models/User.js index 7c160e3..e160f63 100644 --- a/server/models/User.js +++ b/server/models/User.js @@ -1,7 +1,5 @@ import { hashPassword } from '../utils/helpers'; -import models from './index'; -const { Follower } = models; module.exports = (sequelize, DataTypes) => { const User = sequelize.define( 'User',