fixed conflicts

Author: Rupeshiya

app.js

@@ -24,27 +24,30 @@ const notificationRouter = require('./app/routes/notification')
 const proposalRouter = require('./app/routes/proposal')
 const app = express()
 const server = require('http').Server(app)
-server.listen(process.env.SOCKET_PORT || 8810)
+if (process.env.NODE_ENV !== 'testing') {
+  server.listen(process.env.SOCKET_PORT || 8810)
+}
 // WARNING: app.listen(80) will NOT work here!
 const io = socket.listen(server)
 
 class ServerBuilder {
   constructor () {
-    this.initDB()
-    this.initMiddleware()
-    this.initViewEngine()
-    this.initLogger()
-    this.initSocket()
-    this.initRouter()
-    this.initErrorHandler()
+    this.#initDB()
+    this.#initMiddleware()
+    this.#initViewEngine()
+    this.#initLogger()
+    this.#initSocket()
+    this.#initRouter()
+    this.#initErrorHandler()
   }
 
-  initDB () {
-    const db = new Connection().getInstance()
-    db.connect()
+  // PRIVATE METHOD (ES6)
+  #initDB = async () => {
+    await Connection.connect()
   }
 
-  initMiddleware () {
+  // PRIVATE METHOD (ES6)
+  #initMiddleware = () => {
     app.use(cors())
 
     app.use(bodyParser.json({ limit: '200mb' }))
@@ -59,13 +62,15 @@ class ServerBuilder {
     app.use(cookieParser())
   }
 
-  initViewEngine () {
+  // PRIVATE METHOD (ES6)
+  #initViewEngine = () => {
     // view engine setup
     app.set('views', path.join(__dirname, 'views'))
     app.set('view engine', 'ejs')
   }
 
-  initLogger () {
+  // PRIVATE METHOD (ES6)
+  #initLogger = () => {
     morgan.token('data', (req, res) => {
       return JSON.stringify(req.body)
     })
@@ -78,7 +83,8 @@ class ServerBuilder {
     )
   }
 
-  initSocket () {
+  // PRIVATE METHOD (ES6)
+  #initSocket = () => {
     let count = 0
     io.on('connection', (socket) => {
       console.log('socket connected count ', count++)
@@ -91,7 +97,8 @@ class ServerBuilder {
     })
   }
 
-  initRouter () {
+  // PRIVATE METHOD (ES6)
+  #initRouter = () => {
     app.use('/notification', notificationRouter)
     app.use('/', indexRouter)
     app.use('/auth', authRouter)
@@ -105,7 +112,8 @@ class ServerBuilder {
     app.use('/proposal', proposalRouter)
   }
 
-  initErrorHandler () {
+  // PRIVATE METHOD (ES6)
+  #initErrorHandler = () => {
     // catch 404 and forward to error handler
     app.use(function (req, res, next) {
       next(createError(404, "route doesn't exist"))
@@ -134,8 +142,11 @@ class ServerBuilder {
       next()
     })
   }
+  static startServer() {
+    return new ServerBuilder()
+  }
 }
 
-// ANONYMOUS OBJECT
-new ServerBuilder()
+// STATIC METHOD CALLED
+ServerBuilder.startServer()
 module.exports = { app, io }

app/controllers/auth.js

@@ -3,10 +3,11 @@ const HttpStatus = require('http-status-codes')
 class Auth {
   constructor (UserModel) {
     this.UserModel = UserModel
-    this.initBinding()
+    this.#initBinding()
   }
 
-  initBinding () {
+  // PRIVATE ES6
+  #initBinding = () => {
     this.authenticateUser = this.authenticateUser.bind(this)
     this.logout = this.logout.bind(this)
     this.logoutAll = this.logoutAll.bind(this)

app/controllers/comment.js

@@ -6,10 +6,11 @@ const helper = require('../utils/paginate')
 class Comment {
   constructor(CommentModel) {
     this.CommentModel = CommentModel
-    this.initBinding()
+    this.#initBinding()
   }
 
-  initBinding () {
+  // PRIVATE ES6
+  #initBinding = () => {
     this.comment = this.comment.bind(this)
     this.update = this.update.bind(this)
     this.delete = this.delete.bind(this)

app/controllers/notification.js

@@ -7,17 +7,19 @@ const ProposalNotifications = require('../models/ProposalNotification')
 
 class NotificationProvider {
   constructor(NotificationModel, UserModel, ProposalModel) {
-    this.initModels(NotificationModel, UserModel, ProposalModel)
-    this.initBinding()
+    this.#initModels(NotificationModel, UserModel, ProposalModel)
+    this.#initBinding()
   }
 
-  initModels (NotificationModel, UserModel, ProposalModel) {
+  // PRIVATE ES6
+  #initModels = (NotificationModel, UserModel, ProposalModel) => {
     this.UserModel = UserModel
     this.NotificationModel = NotificationModel
     this.ProposalModel = ProposalModel
   }
 
-  initBinding () {
+  // PRIVATE ES6
+  #initBinding = () => {
     this.getOrgNotifications = this.getOrgNotifications.bind(this)
     this.getUserNotification = this.getUserNotification.bind(this)
     this.getProposalNotifications = this.getProposalNotifications.bind(this)

app/controllers/user.js

@@ -91,7 +91,7 @@ class UserController extends Notification {
       'phone',
       'info',
       'about',
-      'isDeactivated'
+      'socialMedia'
     ]
     // added control as per org settings
     if (settingHelper.canChangeName()) {
@@ -158,7 +158,7 @@ class UserController extends Notification {
           'Forgot password!',
           'Password successfully updated!',
           TAGS.UPDATE)
-        notificationHelper.addToNotificationForUser(id, res, newNotif, next)
+        await notificationHelper.addToNotificationForUser(id, res, newNotif, next)
         return res.status(HttpStatus.OK).json({ updated: true })
       } else {
         res.status(HttpStatus.BAD_REQUEST).json({ error: 'Token expired' })
@@ -215,7 +215,7 @@ class UserController extends Notification {
           'Account successfully activated!',
           TAGS.ACTIVATE
         )
-        notificationHelper.addToNotificationForUser(user._id, res, newNotif, next)
+        await notificationHelper.addToNotificationForUser(user._id, res, newNotif, next)
         return res.status(HttpStatus.OK).json({ msg: 'Succesfully activated!' })
       }
     } catch (Error) {
@@ -299,7 +299,7 @@ class UserController extends Notification {
         `${req.user.name.firstName} started following you!`,
         TAGS.FOLLOWER
       )
-      notificationHelper.addToNotificationForUser(user._id, res, newNotif, next)
+      await notificationHelper.addToNotificationForUser(user._id, res, newNotif, next)
       const userData = await this.UserModel.findById(req.user._id)
         .populate('followings', ['name.firstName', 'name.lastName', 'info.about.designation', '_id', 'isAdmin'])
         .populate('followers', ['name.firstName', 'name.lastName', 'info.about.designation', '_id', 'isAdmin'])

app/models/Proposal.js

@@ -7,6 +7,9 @@ const proposalSchema = new Schema(
       type: String,
       required: true
     },
+    organization: {
+      type: String
+    },
     content: {
       type: String,
       required: true

config/mongoose.js

@@ -20,17 +20,5 @@ class Connection {
       })
   }
 }
-
 // SINGLETON CLASS
-class Singleton {
-  constructor () {
-    if (!Singleton.instance) {
-      Singleton.instance = new Connection()
-    }
-  }
-
-  getInstance () {
-    return Singleton.instance
-  }
-}
-module.exports = Singleton
+module.exports = new Connection()

test/organisation.test.js

@@ -108,14 +108,14 @@ describe('POST /org/', () => {
       .set('Authorization', `Bearer ${token}`)
       .send(testOrg)
       .expect(HttpStatus.CREATED)
-    orgId = response.body.org._id
+    orgId = response.body.orgData._id
     /** DB must be changed **/
-    const org = await Organization.findById(response.body.org._id)
+    const org = await Organization.findById(response.body.orgData._id)
     expect(org).not.toBeNull()
 
     /** Check the response **/
     expect(response.body).toMatchObject({
-      org: {
+      orgData: {
         isArchived: false,
         _id: `${orgId}`,
         name: `${testOrg.name}`,

test/proposal.test.js

@@ -1,4 +1,4 @@
-const app = require('../app')
+const app = require('../app').app
 const mongoose = require('mongoose')
 const jwt = require('jsonwebtoken')
 const HttpStatus = require('http-status-codes')
@@ -195,3 +195,12 @@ test('Should return the proposal by the given Id', async (done) => {
 
   done()
 })
+
+afterAll(async () => {
+  // avoid jest open handle error
+  await new Promise((resolve) => setTimeout(() => resolve(), 500))
+  // close server
+  await server.close()
+  // Closing the DB connection allows Jest to exit successfully.
+  await mongoose.connection.close()
+})

test/user.test.js

@@ -185,6 +185,38 @@ test('Should not get profile for unauthenticated user', async () => {
     .expect(HttpStatus.UNAUTHORIZED)
 })
 
+/** Should update user profile */
+test('Should update profile or authenticated user', async () => {
+  await request(app)
+    .patch('/user/me')
+    .set('Authorization', `Bearer ${testUser.tokens[0].token}`)
+    .send({
+      email: '[email protected]'
+    })
+    .expect(HttpStatus.OK)
+})
+
+/** Should fail to make updates that are not allowed to user profile */
+test('Should be able to make only allowed updates to authenticated user', async () => {
+  await request(app)
+    .patch('/user/me')
+    .set('Authorization', `Bearer ${testUser.tokens[0].token}`)
+    .send({
+      gender: 'Male'
+    })
+    .expect(HttpStatus.BAD_REQUEST)
+})
+
+/** Should Fail updating profile of unauthenticate user */
+test('Should not update profile or unauthenticated user', async () => {
+  await request(app)
+    .patch('/user/me')
+    .send({
+      email: '[email protected]'
+    })
+    .expect(HttpStatus.UNAUTHORIZED)
+})
+
 /** Delete authenticated user profile */
 test('Should delete profile of authenticated user', async () => {
   await request(app)
@@ -209,7 +241,7 @@ test('Should not delete profile of unauthenticated user', async () => {
 /** Forgot password request **/
 test('Should send the request to change the password ', async () => {
   const response = await request(app)
-    .post('/user/password_reset')
+    .patch('/user/password_reset/request')
     .send({
       email: `${testUser.email}`
     })
@@ -221,7 +253,7 @@ test('Should send the request to change the password ', async () => {
 /* Password update */
 test('Should update the password ', async () => {
   await request(app)
-    .post(`/user/password_reset/${passwordToken}`)
+    .patch(`/user/password_reset/${passwordToken}`)
     .send({
       password: 'newPassword',
       id: testUserId
@@ -243,7 +275,7 @@ test('Should activate the account ', async (done) => {
 /* Get invite link */
 test('Should generate an invite link and send', async () => {
   const response = await request(app)
-    .get('/user/invite')
+    .get('/user/invite?role=user')
     .set('Authorization', `Bearer ${testUser.tokens[0].token}`)
     .send()
     .expect(HttpStatus.OK)
@@ -258,7 +290,7 @@ test('Should validate the invite link token ', async () => {
   await request(app)
     .get(`/user/invite/${inviteToken}`)
     .send()
-    .expect(HttpStatus.OK)
+    .expect(HttpStatus.MOVED_TEMPORARILY)
 })
 
 /* Logout the user */