Merge pull request #935 from UniversityOfHelsinkiCS/trunk

Fix student graph

docker-compose.lateste2e.production.yml

@@ -96,6 +96,7 @@ services:
     depends_on:
       - db
       - redis
+      - nats
 
   frontend:
     image: toska/oodikone2-frontend:latest

docker-compose.lateste2e.yml

@@ -98,6 +98,7 @@ services:
     depends_on:
       - db
       - redis
+      - nats
 
   frontend:
     image: toska/oodikone2-frontend:staging

services/backend/updater_writer/updater/database_updater.js

@@ -38,7 +38,7 @@ const updateAttainments = (studyAttainments, transaction) => studyAttainments.ma
       creditTeachers.length > 0 && Promise.all(creditTeachers.map(cT => CreditTeacher.upsert(cT, { transaction })))
     ])
   } catch (e) {
-    console.log(e)
+    console.log('attainment update failed', e)
   }
 })
 
@@ -61,12 +61,9 @@ const updateStudent = async (student) => {
     await deleteStudentStudyrights(studentInfo.studentnumber, transaction) // this needs to be done because Oodi just deletes deprecated studyrights from students ( big yikes )
 
     await Student.upsert(studentInfo, { transaction })
-    try {
     await Promise.all(semesterEnrollments.map(SE =>
       SemesterEnrollment.upsert(SE, { transaction })))
-    } catch(e) {
-      console.log(e)
-    }
+
     if (studyAttainments) await Promise.all(updateAttainments(studyAttainments, transaction))
 
     if (studyRights) await Promise.all(updateStudyRights(studyRights, transaction))

services/oodikone2-frontend/src/components/CreditAccumulationGraph/index.jsx

@@ -126,7 +126,7 @@ class CreditAccumulationGraph extends Component {
       .filter(c => moment(c.date).isSameOrAfter(moment(startDate)))
 
     let totalCredits = 0
-    return filteredCourses.map((c) => {
+    return _.orderBy(filteredCourses, ['date'], ['asc']).map((c) => {
       const {
         course, date, credits, grade, passed, isStudyModuleCredit
       } = c

services/updater_api/doo_api_database_updater/oodi_interface.js

@@ -36,7 +36,7 @@ const attemptGetFor = async (url, attempts = 5) => {
     attempt += 1
     try {
       response = await getUrl(url)
-      logger.info('requested url', { url, status: response.status })
+      logger.info('requested url', { url, success: response.status === 200 })
       return response
     } catch (error) {
       if (attempt === attempts) {
@@ -63,7 +63,7 @@ console.log(process.env.NODE_ENV)
 const getStudent = async studentNumber => {
   const url = `${base_url}/students/${studentNumber}/info`
   try {
-    const response = await getUrl(url)
+    const response = await attemptGetFor(url)
     const data = response.data.data
     return data
   } catch (e) {

services/updater_api/logger.js

@@ -16,8 +16,6 @@ if (process.env.NODE_ENV !== 'test') {
   transports.push(new winston.transports.File({ filename: 'debug.log' }))
 }
 
-transports.push(new winston.transports.Console({ level: 'debug' }))
-
 
 const logger = winston.createLogger({ transports })