Merge pull request #554 from UniversityOfHelsinkiCS/trunk

Trunk

Author: qzuw

backend/app.js

@@ -113,7 +113,7 @@ const authenticate = (request, response, next) => {
       ;(request.decoded = decoded), (request.authenticated = { success: true, error: '' })
     } catch (e) {
       request.authenticated = { success: false, error: 'token verification failed' }
-      logger.error(e)
+      // logger.error(e)
     }
   }
 
@@ -139,9 +139,9 @@ app.get('*', (req, res) =>
   })
 )
 
-let server = app.listen(3001, function() {
-  let port = server.address().port
-  console.log('Backend is listening on port %s', port)
+const server = app.listen(3001, () => {
+  const port = server.address().port
+  logger.info('Backend started and listening on port ' + port)
 })
 
 module.exports = server

backend/server/config/config.js

@@ -6,6 +6,7 @@ module.exports = {
     password: process.env.DB_PASSWORD,
     database: process.env.DB_NAME,
     host: '127.0.0.1',
+    port: process.env.DB_PORT,
     dialect: 'postgres',
     operatorsAliases: 'false',
     kurki_url: process.env.KURKI_URL == null ? "https://opetushallinto.cs.helsinki.fi" : process.env.KURKI_URL

backend/server/controllers/admin.js

@@ -1,4 +1,5 @@
 const helper = require('../helpers/admin_helper')
+const logger = require('../utils/logger')
 
 module.exports = {
   /**
@@ -22,7 +23,7 @@ module.exports = {
         values2: areActive
       })
     } catch (e) {
-      console.log('\nadmin, async list catch: ', e, '\n')
+      logger.error(e)
 
       res.send('errored in controllers/admin/list')
     }

backend/server/controllers/assistants.js

@@ -9,6 +9,7 @@ const Op = Sequelize.Op
 const StudentInstanceController = require('../controllers').studentInstances
 const env = process.env.NODE_ENV || 'development'
 const config = require('./../config/config.js')[env]
+const logger = require('../utils/logger')
 
 module.exports = {
   async create(req, res) {
@@ -22,7 +23,6 @@ module.exports = {
         res.status(400).send('you have to be authenticated to do this')
         return
       }
-      console.log('\n\nAuthentication succeeded')
       const requestMakerId = req.decoded.id
       const studentInstance = await StudentInstance.findOne({
         where: {
@@ -67,13 +67,12 @@ module.exports = {
         res.status(400).send('The teacher is not from the same course as this student.')
         return
       }
-      console.log('\n\nCourses match')
       studentInstance.updateAttributes({
         teacherInstanceId: teacherInsId
       })
       res.status(200).send(studentInstance)
     } catch (e) {
-      console.log('\n\nAssistantInstance creation failed.\n', e)
+      logger.error(e)
     }
   },
 
@@ -139,7 +138,7 @@ module.exports = {
       })
       res.status(200).send(studentsForThisTeacherInstance)
     } catch (e) {
-      console.log('\nfindStudentsByTeacherInstance did not succeed\n\n')
+      logger.error(e)
       res.status(400).send(e)
     }
   }

backend/server/controllers/checklists.js

@@ -1,6 +1,7 @@
 const helper = require('../helpers/checklist_helper')
 const TeacherInstance = require('../models').TeacherInstance
 const Checklist = require('../models').Checklist
+const logger = require('../utils/logger')
 
 module.exports = {
   async create(req, res) {
@@ -89,8 +90,8 @@ module.exports = {
         data: req.body
       })
     } catch (e) {
+      logger.error(e)
       res.status(500).send('Unexpected error')
-      console.log(e)
     }
   },
   async getOne(req, res) {
@@ -121,8 +122,8 @@ module.exports = {
         })
       }
     } catch (e) {
+      logger.error(e)
       res.status(500).send(e)
-      console.log(e)
     }
   }
 }

backend/server/controllers/codeReviews.js

@@ -3,6 +3,7 @@ const StudentInstance = require('../models').StudentInstance
 const TeacherInstance = require('../models').TeacherInstance
 const CourseInstance = require('../models').CourseInstance
 const helper = require('../helpers/code_review_helper')
+const logger = require('../utils/logger')
 
 module.exports = {
   async bulkInsert(req, res) {
@@ -76,7 +77,7 @@ module.exports = {
         data: req.body
       })
     } catch (e) {
-      console.log('CodeReview bulk insert failed.\n', e)
+      logger.error('CodeReview bulk insert failed.\n', e)
       res.status(500).send('Unexpected error.')
     }
   },

backend/server/controllers/courseinstances.js

@@ -17,8 +17,8 @@ const config = require('./../config/config.js')[env]
 const logger = require('../utils/logger')
 
 const overkillLogging = (req, error) => {
-  console.log('request: ', req)
-  console.log('error: ', error)
+  logger.debug('request: ', req)
+  logger.error('error: ', error)
 }
 
 const validationErrorMessages = {
@@ -291,7 +291,7 @@ module.exports = {
       })
     }
     if (course.active === false) {
-      console.log('course is not active')
+      logger.info('course registration failed because course is not active')
       overkillLogging(req, null)
       return res.status(400).send({
         message: 'course is not active'
@@ -368,38 +368,32 @@ module.exports = {
 
     try {
       if (req.authenticated.success) {
-        console.log('\nauth success\n')
         CourseInstance.findOne({
           where: {
             ohid: req.body.ohid
           }
         })
           .then(course => {
             if (!course) {
-              console.log('\nkurssia ei löytynyt\n')
               res.status(404).send('course not found')
               return
             }
-            console.log('\nkurssi löytyi\n')
             StudentInstance.find({
               where: {
                 userId: req.decoded.id,
                 courseInstanceId: course.id
               }
             }).then(targetStudent => {
               if (!targetStudent) {
-                console.log('\nopiskelijaa ei löytynyt\n')
                 res.status(404).send('Student not found')
                 return
               }
-              console.log('\nopiskelija löytyi\n')
               return targetStudent
                 .update({
                   github: req.body.github || targetStudent.github,
                   projectName: req.body.projectname || targetStudent.projectName
                 })
                 .then(updatedStudentInstance => {
-                  console.log('\nUpdated student project info succesfully\n')
                   res.status(200).send(updatedStudentInstance)
                 })
                 .catch((error) => {
@@ -588,7 +582,6 @@ module.exports = {
   getNewer(req, res) {
     helper.controller_before_auth_check_action(req, res)
 
-    console.log('update next...')
     const auth = process.env.TOKEN || 'notset' //You have to set TOKEN in .env file in order for this to work
     const termAndYear = helper.CurrentTermAndYear()
     if (auth === 'notset') {

backend/server/controllers/login.js

@@ -3,6 +3,7 @@ const User = require('../models').User
 const request = require('request')
 const env = process.env.NODE_ENV || 'development'
 const config = require('./../config/config.js')[env]
+const logger = require('../utils/logger')
 
 module.exports = {
   /**
@@ -11,18 +12,17 @@ module.exports = {
    * @param res
    */
   login(req, res) {
-    console.log('entered login')
     const options = {
       method: 'post',
       uri: `${config.kurki_url}/login`,
       strictSSL: false,
-      json: { username: req.body.username, password: req.body.password }
+      json: { username: req.body.username.toLowerCase(), password: req.body.password }
     }
 
     try {
-      const result = request(options, function(err, resp, body) {
+      const result = request(options, (err, resp, body) => {
         if (err) {
-          console.log('\nlogin: ', err, 'n')
+          logger.error('\nlogin: ', err, 'n')
         }
         if (result.response && result.response.body && result.response.body.username && result.response.body.error !== 'wrong credentials') {
           let first
@@ -35,7 +35,7 @@ module.exports = {
             first = result.response.body.first_names.split(' ')[0]
           }
           User.findOrCreate({
-            where: { username: body.username },
+            where: { username: body.username.toLowerCase() },
             defaults: {
               firsts: first,
               lastname: last,
@@ -70,10 +70,10 @@ module.exports = {
         }
       })
     } catch (error) {
+      logger.error(error)
       res.status(500).send({
         error: 'Unexpected error'
       })
-      console.log(error)
     }
   }
 }

backend/server/controllers/weeks.js

@@ -68,7 +68,7 @@ module.exports = {
         res.status(400).send('token verific ation failed')
       }
     } catch (error) {
-      console.log('\nweeks, ', error, '\n')
+      logger.error('\nweeks, ', error, '\n')
     }
   },
   /**

backend/server/helpers/application_helper.js

@@ -9,6 +9,7 @@ exports.getCurrent = getCurrent
 exports.createCourse = createCourse
 const env = process.env.NODE_ENV || 'development'
 const config = require('./../config/config.js')[env]
+const logger = require('../utils/logger')
 
 /**
  *
@@ -239,7 +240,7 @@ async function createCourse(body) {
     }
     return result
   } catch (error) {
-    console.log(error)
+    logger.error(error)
   }
 }
 
@@ -262,7 +263,7 @@ async function getCurrent(req, res) {
       })
     return result
   } catch (error) {
-    console.log(error)
+    logger.error(error)
   }
 }
 
@@ -285,6 +286,6 @@ async function getNewer(req, res) {
       })
     return result
   } catch (error) {
-    console.log(error)
+    logger.error(error)
   }
 }