Merge pull request #507 from UniversityOfHelsinkiCS/dev

Dev

backend/server/config/config.js

@@ -27,6 +27,7 @@ module.exports = {
     host: process.env.DB_HOST,
     dialect: 'postgres',
     operatorsAliases: 'false',
+    logging: false,
     kurki_url: "https://opetushallinto.cs.helsinki.fi"
   }
 }

backend/server/controllers/assistants.js

@@ -123,18 +123,14 @@ module.exports = {
         res.status(200).send(returnedAssistantInfo)
       }
     } catch (e) {
-      console.log('\n\nAAAA\n\n')
       res.status(400).send(e)
     }
   },
 
   async findStudentsByTeacherInstance(req, res) {
-    console.log('Etsitään assarin oppilaat')
-
     helper.controller_before_auth_check_action(req, res)
     try {
       const teacherInsId = req.params.id
-      console.log('\n\nteacherInsId: ', req.param.id)
 
       const studentsForThisTeacherInstance = await StudentInstance.findAll({
         where: {

backend/server/controllers/courseinstances.js

@@ -24,11 +24,8 @@ module.exports = {
   findByUserTeacherInstance(req, res) {
     helper.controller_before_auth_check_action(req, res)
     const errors = []
-    console.log('***REQ BODY***: ', req.body)
 
     const id = parseInt(req.body.userId) //TODO: CHECK THAT THIS IS SANITICED ID
-    console.log('TOKEN VERIFIED: ', req.authenticated)
-    console.log('token.data.id: ', req.decoded.id)
     db.sequelize
       .query(`SELECT * FROM "CourseInstances" JOIN "TeacherInstances" ON "CourseInstances"."id" = "TeacherInstances"."courseInstanceId" WHERE "TeacherInstances"."userId" = ${req.decoded.id}`)
       .then(instance => res.status(200).send(instance[0]))
@@ -53,18 +50,13 @@ module.exports = {
       data: undefined
     }
     const user = req.decoded.id
-    console.log(req.decoded)
-    console.log('user.id: ', user)
     const teacher = await TeacherInstance.findAll({
       where: {
         userId: user,
         courseInstanceId: courseInst
       }
     })
     if (teacher[0] === undefined) {
-      console.log('studentti')
-      console.log('userId: ', user)
-      console.log('courseInstanceId:', courseInst)
       const student = await StudentInstance.findOne({
         attributes: {
           exclude: ['createdAt', 'updatedAt']
@@ -156,7 +148,6 @@ module.exports = {
           }
         ]
       })
-      console.log('studentInst: ', student)
 
       try {
         if (student) {
@@ -267,9 +258,6 @@ module.exports = {
    */
   registerToCourseInstance(req, res) {
     helper.controller_before_auth_check_action(req, res)
-    console.log(`----------------------------------`)
-    console.log(req.decoded)
-    console.log(`----------------------------------`)
 
     CourseInstance.findOne({
       where: {
@@ -293,7 +281,6 @@ module.exports = {
           })
         }
         let promisingThatWeboodiStatusIsChecked = new Promise((resolve, reject) => {
-          console.log('user.studentNumber', user.studentNumber)
           helper.checkWebOodi(req, res, user, resolve) // this does not work.
 
           setTimeout(function() {
@@ -302,9 +289,6 @@ module.exports = {
         })
 
         promisingThatWeboodiStatusIsChecked.then(barf => {
-          console.log('Yay! ' + barf)
-          console.log(req.body)
-
           if (barf === 'found') {
             StudentInstance.findOrCreate({
               where: {
@@ -419,8 +403,6 @@ module.exports = {
   update(req, res) {
     helper.controller_before_auth_check_action(req, res)
 
-    console.log('REQ body: ', req.body)
-    console.log('REQ params: ', req.params)
     CourseInstance.findOne({
       where: {
         ohid: req.params.id
@@ -519,7 +501,6 @@ module.exports = {
     helper.controller_before_auth_check_action(req, res)
 
     const termAndYear = helper.CurrentTermAndYear()
-    console.log('term and year: ', termAndYear)
     if (this.remoteAddress === '127.0.0.1') {
       res.send('gtfo')
     } else {
@@ -535,8 +516,6 @@ module.exports = {
       }
       request(options, function(err, resp, body) {
         const json = JSON.parse(body)
-        console.log('json palautta...')
-        console.log(json)
         json.forEach(instance => {
           CourseInstance.findOrCreate({
             attributes: {
@@ -569,7 +548,6 @@ module.exports = {
     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()
-    console.log('term and year: ', termAndYear)
     if (auth === 'notset') {
       res.send('Please restart the backend with the correct TOKEN environment variable set')
     } else {
@@ -588,7 +566,6 @@ module.exports = {
         }
         request(options, function(err, resp, body) {
           const json = JSON.parse(body)
-          console.log(json)
           json.forEach(instance => {
             CourseInstance.findOrCreate({
               attributes: {

backend/server/controllers/login.js

@@ -21,19 +21,13 @@ module.exports = {
 
     try {
       const result = request(options, function(err, resp, body) {
-        if (result.response) {
-          console.log('testitulostus: ', result.response.body)
-        } else {
-          console.log('testitulostus: result.response.body is undefined')
-        }
         if (err) {
           console.log('\nlogin: ', err, 'n')
         }
         if (result.response && result.response.body && result.response.body.username && result.response.body.error !== 'wrong credentials') {
           let first
           const last = body.last_name
           const number = body.student_number
-          console.log('\n\n\nbody: ', body, '\n\n\n')
           // If first_names from Kurki contains *, use the name after that, otherwise use first name
           if (body.first_names.includes('*')) {
             first = result.response.body.first_names.split('*')[1].split(' ')[0]
@@ -61,7 +55,6 @@ module.exports = {
               email: newuser.email,
               username: newuser.username
             }
-            console.log('user: ', user)
 
             const token = jwt.sign({ username: newuser.username, id: newuser.id }, process.env.SECRET)
             res.status(200).send({

backend/server/controllers/weeks.js

@@ -5,7 +5,6 @@ const helper = require('../helpers/weeks_controller_helper')
 
 module.exports = {
   async create(req, res) {
-    console.log('\n\n\nweeks.create req: ', req, '\n\n\n')
     try {
       await helper.controller_before_auth_check_action(req, res)
 
@@ -34,9 +33,7 @@ module.exports = {
             studentInstanceId: req.body.studentInstanceId
           }
         })
-        console.log('\n\n\nweeks, week: ', week)
         if (week) {
-          console.log('\n\nupdating a week\n\n')
           let updatedChecks = {}
           if (req.body.checks) {
             Object.keys(week.checks).map(key => {
@@ -48,16 +45,13 @@ module.exports = {
           } else {
             updatedChecks = week.checks
           }
-          console.log('\n\nreq.body.checks: ', req.body.checks, '\n\n')
-          console.log('\n\nupdatedChecks: ', updatedChecks, '\n\n')
           await week.update({
             points: req.body.points || week.points,
             feedback: req.body.feedback || week.feedback,
             checks: updatedChecks
           })
           res.status(200).send(week)
         } else {
-          console.log('\n\ncreating a new week\n\n')
           await Week.create({
             points: req.body.points,
             studentInstanceId: req.body.studentInstanceId,

backend/server/helpers/application_helper.js

@@ -30,16 +30,13 @@ function CurrentTermAndYear() {
   const month = date.getMonth() + 1
   const currentTerm = getCurrentTerm(month)
   var year = date.getFullYear()
-  //console.log('month is: ', month)
-  //console.log('date: ', date)
   if (month >= 11) {
     year = year + 1
   }
   const currentYear = year.toString()
   var nextYear = getNextYear(currentTerm, year)
   nextYear.toString()
   const nextTerm = getNextTerm(currentTerm)
-  //console.log('year: ', year)
   return { currentYear, currentTerm, nextTerm, nextYear }
 }
 
@@ -226,7 +223,6 @@ async function createCourse(body) {
     }).save()
 
     if (result.teachers.length > 0) {
-      console.log('')
       for (let i in result.teachers) {
         const user = await User.findOrCreate({
           where: {
@@ -248,7 +244,6 @@ async function createCourse(body) {
   } catch (error) {
     console.log(error)
   }
-  //await console.log(result.teachers)
 }
 
 /**

backend/server/helpers/course_instance_helper.js

@@ -37,11 +37,9 @@ function checkWebOodi(req, res, user, resolve) {
     try {
       json = JSON.parse(body)
     } catch (e) {
-      console.log('\n\ncheckWebOodi received this body: ', body, '\n\n\n')
       resolve('notfound')
       return
     }
-    console.log('\njson students to string', json['students'].toString())
     if (json['students'].toString().match(user.studentNumber) !== null) {
       // stupid javascript.. even regex match is simpler than json array that has or not has a key of whatever.
       console.log('\ncourse_instance_helper found')
@@ -69,8 +67,6 @@ function findByUserStudentInstance(req, res) {
   const Op = Sequelize.Op
 
   const errors = []
-  console.log('\ncourse_intance_helper, searching by studentInstance...')
-  console.log('\n***REQ BODY***: ', req.body)
 
   application_helpers.controller_before_auth_check_action(req, res)
   if (Number.isInteger(req.decoded.id)) {

labtool2.0/src/store.js

@@ -44,6 +44,8 @@ const reducer = combineReducers({
   redirect: redirect
 })
 
-const store = createStore(reducer, composeWithDevTools(applyMiddleware(thunk, handleRequest)))
+const compose = process.env.NODE_ENV === 'production' ? (store) => store : (store) => composeWithDevTools(store)
+
+const store = createStore(reducer, compose(applyMiddleware(thunk, handleRequest)))
 
 export default store