Resolve most IDE warnings on existing code.

Also, bump package.json versions. Verified all test cases still pass.
DiscordTime · May 13, 2021 · 0af9047 · 0af9047
1 parent 04599fa
commit 0af9047
Show file tree

Hide file tree

Showing 21 changed files with 170 additions and 221 deletions.
diff --git a/index.js b/index.js
@@ -1,6 +1,6 @@
 const express = require('express')
 const app = express()
-var bodyParser = require('body-parser')
+const bodyParser = require('body-parser')
 app.use(bodyParser.json())
 app.use(bodyParser.urlencoded({
   extended: true

diff --git a/package.json b/package.json
@@ -22,26 +22,26 @@
   },
   "homepage": "https://github.com/DiscordTime/sticky-sessions-server#readme",
   "devDependencies": {
-    "chai": "^4.2.0",
+    "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "chai-http": "^4.3.0",
-    "coveralls": "^3.0.3",
-    "eslint": "^5.16.0",
-    "eslint-config-standard": "^12.0.0-alpha.0",
-    "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-node": "^7.0.1",
-    "eslint-plugin-promise": "^4.3.1",
-    "eslint-plugin-standard": "^4.1.0",
+    "coveralls": "^3.1.0",
+    "eslint": "^7.26.0",
+    "eslint-config-standard": "^16.0.2",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^5.0.0",
     "install-peers": "^1.0.3",
-    "mocha": "^6.1.4",
-    "nyc": "^14.1.1",
-    "sinon": "^7.3.2"
+    "mocha": "^8.4.0",
+    "nyc": "^15.1.0",
+    "sinon": "^10.0.0"
   },
   "dependencies": {
-    "body-parser": "^1.18.3",
-    "express": "^4.16.3",
+    "body-parser": "^1.19.0",
+    "express": "^4.17.1",
     "firebase-admin": "^9.8.0",
     "install": "^0.13.0",
-    "joi": "^13.6.0"
+    "joi": "^17.4.0"
   }
 }
diff --git a/server.js b/server.js
@@ -11,8 +11,8 @@ class Server {
   }
 
   startListening () {
-    var port = this.config.port
-    this.app.listen(process.env.PORT || port, (req, res) => {
+    const port = this.config.port
+    this.app.listen(process.env.PORT || port, () => {
       console.log('listening to port ' + port)
     })
   }

diff --git a/src/controllers/sessionController.js b/src/controllers/sessionController.js
@@ -28,23 +28,23 @@ class SessionController {
   }
 
   validateSessionId (session) {
-    Joi.validate(session, Joi.object({
+    Joi.object({
       id: Joi.string().required()
-    }))
+    }).validate(session)
   }
 
   validateFullSession (session) {
-    Joi.validate(session, Joi.object({
+    Joi.object({
       id: Joi.string().required(),
       topics: Joi.array().items(Joi.string()).required(),
       timestamp: Joi.date().timestamp().required()
-    }))
+    }).validate(session)
   }
 
   validateSession (session) {
-    Joi.validate(session, Joi.object({
+    Joi.object({
       topics: Joi.array().items(Joi.string()).required()
-    }))
+    }).validate(session)
   }
 }
 module.exports = SessionController
diff --git a/src/environment/DBFactory.js b/src/environment/DBFactory.js
@@ -1,13 +1,11 @@
+const FirestoreDB = require('./FirestoreDB')
+
 module.exports = {
   getDB: function (dbType) {
-    var db
     switch (dbType) {
       case 'firestore':
       default:
-        const FirestoreDB = require('./FirestoreDB')
-        db = new FirestoreDB()
-        break
+        return new FirestoreDB()
     }
-    return db
   }
 }
diff --git a/src/environment/FirestoreDB/index.js b/src/environment/FirestoreDB/index.js
@@ -7,10 +7,9 @@ db.settings(settings)
 class FirestoreDB {
   async executeQueryDB (query) {
     try {
-      var snapshot = await query.get()
+      const snapshot = await query.get()
       const mapper = require('./mapper')
-      var result = mapper.mapSnapshotToArray(snapshot)
-      return result
+      return mapper.mapSnapshotToArray(snapshot)
     } catch (err) {
       console.error('Error getting snapshot', err)
       throw err
@@ -19,12 +18,13 @@ class FirestoreDB {
 
   async executeGetDB (table, data) {
     console.log('Going to GET', data, 'on ', table)
-    var query = db.collection(table)
+    let query = db.collection(table)
 
     if (data) {
-      console.log('filtering')
-      var filter = data.getFilter()
-      for (var field in data) {
+      console.log('Filtering ' + JSON.stringify(data))
+      const filter = data.getFilter()
+      Object.keys(data).forEach(field => {
+        // TODO Why data[field] works and data.field doesn't?
         if (data[field] !== undefined && data[field] !== null) {
           if (field === 'id') {
             query = query.doc(data[field])
@@ -36,7 +36,7 @@ class FirestoreDB {
             }
           }
         }
-      }
+      })
     }
 
     return this.executeQueryDB(query)
@@ -48,7 +48,7 @@ class FirestoreDB {
       const ref = await db.collection(table).add(docData)
       console.log('inserted.')
       if (ref.id) {
-        docData['id'] = ref.id
+        docData.id = ref.id
         console.log('returning. docData = ', docData)
         return docData
       } else {
@@ -65,8 +65,7 @@ class FirestoreDB {
   }
 
   async executeUpdateDB (table, docId, docData) {
-    console.log('Going to update: id = ', docId, 'with this data ', docData,
-      ' on ', table)
+    console.log('Going to update: id = ', docId, 'with this data ', docData, ' on ', table)
     try {
       return await db.collection(table).doc(docId).update(docData)
     } catch (err) {

diff --git a/src/environment/FirestoreDB/mapper/index.js b/src/environment/FirestoreDB/mapper/index.js
@@ -1,7 +1,7 @@
 function mapDocumentToData (doc) {
   if (doc.exists) {
-    var data = doc.data()
-    data['id'] = doc.id
+    const data = doc.data()
+    data.id = doc.id
     return data
   }
   return {}

diff --git a/src/model/session.js b/src/model/session.js
@@ -3,16 +3,16 @@ class Session {
     this.id = id
     this.topics = topics
     this.timestamp = timestamp
-    this.meetId = this.meetId
+    this.meetId = meetId
   }
 
   getSession () {
-    var resp = {}
+    const resp = {}
     if (this.topics !== undefined) {
-      resp['topics'] = this.topics
+      resp.topics = this.topics
     }
     if (this.timestamp !== undefined) {
-      resp['timestamp'] = this.timestamp
+      resp.timestamp = this.timestamp
     }
     return resp
   }

diff --git a/src/router/index.js b/src/router/index.js
@@ -18,16 +18,16 @@ class RouterProvider {
     // Use middleware verifytoken function in before every route
     this.app.use(this.auth.verifyToken)
 
-    var notesRouter = new NotesRouter(this.controllers.getNotesController())
+    const notesRouter = new NotesRouter(this.controllers.getNotesController())
     this.app.use(notesFromSessionURL, notesRouter.getRoutes())
 
-    var sessionRouter = new SessionRouter(this.controllers.getSessionsController())
+    const sessionRouter = new SessionRouter(this.controllers.getSessionsController())
     this.app.use(sessionURL, sessionRouter.getRoutes())
 
-    var teamRouter = new TeamRouter(this.controllers.getTeamsController())
+    const teamRouter = new TeamRouter(this.controllers.getTeamsController())
     this.app.use(teamURL, teamRouter.getRoutes())
 
-    var meetRouter = new MeetRouter(this.controllers.getMeetsController())
+    const meetRouter = new MeetRouter(this.controllers.getMeetsController())
     this.app.use(meetURL, meetRouter.getRoutes())
   }
 }

diff --git a/src/router/meetRouter/meetMapper.js b/src/router/meetRouter/meetMapper.js
@@ -12,59 +12,51 @@ class MeetMapper {
   }
 
   mapGetMeet (req) {
-    var map = this.genericMapper.map(this.validateId.bind(this), req.params)
-    var model = new Meet(map.id, null, null, null)
-    return model
+    const map = this.genericMapper.map(this.validateId.bind(this), req.params)
+    return new Meet(map.id, null, null, null)
   }
 
   mapCreateMeet (req) {
-    var map = this.genericMapper.map(this.validateMeet.bind(this), req.body)
-    var model = new Meet(null, map.date, map.idTeam, map.members)
-    return model
+    const map = this.genericMapper.map(this.validateMeet.bind(this), req.body)
+    return new Meet(null, map.date, map.idTeam, map.members)
   }
 
   mapEditMeet (req) {
-    let newMeet = { ...req.params, ...req.body }
-    var map = this.genericMapper.map(this.validateMeetWithId.bind(this), newMeet)
-    var model = new Meet(null, map.date, map.idTeam, map.members)
-    return model
+    const newMeet = { ...req.params, ...req.body }
+    const map = this.genericMapper.map(this.validateMeetWithId.bind(this), newMeet)
+    return new Meet(null, map.date, map.idTeam, map.members)
   }
 
   mapDeleteMeet (req) {
-    var map = this.genericMapper.map(this.validateId.bind(this), req.params)
-    var model = new Meet(map.id, null, null, null)
-    return model
+    const map = this.genericMapper.map(this.validateId.bind(this), req.params)
+    return new Meet(map.id, null, null, null)
   }
 
   validateEmpty (meet) {
-    return Joi.validate(meet, Joi.object().required())
+    return Joi.object().required().validate(meet)
   }
 
   validateId (meet) {
-    return Joi.validate(meet, Joi.object({
+    return Joi.object({
       id: Joi.string().required()
-    }).required())
+    }).required().validate(meet)
   }
 
   validateMeetWithId (meet) {
-    var model = Joi.validate(meet, Joi.object({
+    return Joi.object({
       id: Joi.string().required(),
       date: Joi.string().required(),
       idTeam: Joi.string().required(),
       members: Joi.array().items(Joi.string()).required()
-    }))
-
-    return model
+    }).validate(meet)
   }
 
   validateMeet (meet) {
-    var model = Joi.validate(meet, Joi.object({
+    return Joi.object({
       date: Joi.string().required(),
       idTeam: Joi.string().required(),
       members: Joi.array().items(Joi.string()).required()
-    }))
-
-    return model
+    }).validate(meet)
   }
 }
 

diff --git a/src/router/meetRouter/meetRouter.js b/src/router/meetRouter/meetRouter.js
@@ -11,40 +11,35 @@ class MeetRouter {
   }
 
   getRoutes () {
-    this.app.get('/', (req, res) => {
+    this.app.get('/', (req, res) =>
       this.genericRouter.execute(
         this.meetController.getMeets.bind(this.meetController),
         this.meetMapper.mapGetMeets.bind(this.meetMapper),
-        req, res)
-    })
+        req, res))
 
-    this.app.get('/:id', (req, res) => {
+    this.app.get('/:id', (req, res) =>
       this.genericRouter.execute(
         this.meetController.getMeet.bind(this.meetController),
         this.meetMapper.mapGetMeet.bind(this.meetMapper),
-        req, res)
-    })
+        req, res))
 
-    this.app.post('/', (req, res) => {
+    this.app.post('/', (req, res) =>
       this.genericRouter.execute(
         this.meetController.createMeet.bind(this.meetController),
         this.meetMapper.mapCreateMeet.bind(this.meetMapper),
-        req, res)
-    })
+        req, res))
 
-    this.app.put('/:id', (req, res) => {
+    this.app.put('/:id', (req, res) =>
       this.genericRouter.execute(
         this.meetController.editMeet.bind(this.meetController),
         this.meetMapper.mapEditMeet.bind(this.meetMapper),
-        req, res)
-    })
+        req, res))
 
-    this.app.delete('/:id', (req, res) => {
+    this.app.delete('/:id', (req, res) =>
       this.genericRouter.execute(
         this.meetController.deleteMeet.bind(this.meetController),
         this.meetMapper.mapDeleteMeet.bind(this.meetMapper),
-        req, res)
-    })
+        req, res))
 
     return this.app
   }