Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/ood…

…ikone into trunk

services/backend/updater_writer/updater/database_updater.js

@@ -10,36 +10,54 @@ const {
 } = require('../models/index')
 const { updateAttainmentDates } = require('./update_attainment_dates')
 
-const updateAttainments = (studyAttainments, transaction) => studyAttainments.map(async ({ credit, creditTeachers, teachers, course }) => {
-  await Course.upsert(course, { transaction })
-  await Credit.upsert(credit, { transaction })
-  const { disciplines, providers, courseproviders } = course
-  disciplines && disciplines.length > 0 && await Promise.all(disciplines.map(courseDiscipline => CourseDisciplines.upsert(courseDiscipline, { transaction })))
-  providers.length > 0 && await Promise.all(providers.map(provider => Provider.upsert(provider, { transaction })))
-  courseproviders.length > 0 && await Promise.all(courseproviders.map(courseProvider => CourseProvider.upsert(courseProvider, { transaction })))
-  teachers && teachers.length > 0 && await Promise.all(teachers.map(teacher => Teacher.upsert(teacher, { transaction })))
-  creditTeachers.length > 0 && await Promise.all(creditTeachers.map(cT => CreditTeacher.upsert(cT, { transaction })))
-})
+const updateAttainments = async (studyAttainments, transaction) => {
+  for ({ course } of studyAttainments) {
+    await Course.upsert(course, { transaction })
+  }
+  for ({ course } of studyAttainments) {
+    const { disciplines } = course
+    disciplines && disciplines.length > 0 && await Promise.all(disciplines.map(courseDiscipline => CourseDisciplines.upsert(courseDiscipline, { transaction })))
+  }
+  for ({ course } of studyAttainments) {
+    const { providers } = course
+    providers.length > 0 && await Promise.all(providers.map(provider => Provider.upsert(provider, { transaction })))
+  }
+  for ({ course } of studyAttainments) {
+    const { courseproviders } = course
+    courseproviders.length > 0 && await Promise.all(courseproviders.map(courseProvider => CourseProvider.upsert(courseProvider, { transaction })))
+  }
+  for ({ credit } of studyAttainments) {
+    await Credit.upsert(credit, { transaction })
+  }
+  for ({ creditTeachers } of studyAttainments) {
+    creditTeachers.length > 0 && await Promise.all(creditTeachers.map(cT => CreditTeacher.upsert(cT, { transaction })))
+  }
+  for ({ teachers } of studyAttainments) {
+    teachers && teachers.length > 0 && await Promise.all(teachers.map(teacher => Teacher.upsert(teacher, { transaction })))
+  }
+}
 
-const updateStudyRights = (studyRights, transaction) => studyRights.map(async ({ studyRightExtent, studyright, elementDetails, studyRightElements, transfers }) => {
-  await StudyrightExtent.upsert(studyRightExtent, { transaction })
-  // this needs to be done because Oodi just deletes deprecated studyrights from students ( big yikes )
-  await Studyright.destroy({
-    where: {
-      student_studentnumber: studentnumber
-    }
-  }, { transaction })
-  await Studyright.create(studyright, { transaction })
-  await Promise.all(elementDetails.map(elementdetails => ElementDetails.upsert(elementdetails, { transaction })))
-  // this needs to be done because Oodi just deletes deprecated studyrights from students ( big yikes )
-  await StudyrightElement.destroy({
-    where: {
-      studentnumber
-    }
-  }, { transaction })
-  await Promise.all(studyRightElements.map(StudyRightElement => StudyrightElement.create(StudyRightElement, { transaction })))
-  await Promise.all(transfers.map(transfer => Transfers.upsert(transfer, { transaction })))
-})
+const updateStudyRights = async (studyRights, transaction) => {
+  for ({ studyRightExtent } of studyRights) {
+    await StudyrightExtent.upsert(studyRightExtent, { transaction })
+  }
+  for ({ studyright } of studyRights) {
+    // this needs to be done because Oodi just deletes deprecated studyrights from students ( big yikes )
+    await Studyright.destroy({ where: { student_studentnumber: studentnumber } }, { transaction })
+    await Studyright.create(studyright, { transaction })
+  }
+  for ({ elementDetails } of studyRights) {
+    await Promise.all(elementDetails.map(elementdetails => ElementDetails.upsert(elementdetails, { transaction })))
+  }
+  for ({ studyRightElements } of studyRights) {
+    // this needs to be done because Oodi just deletes deprecated studyrights from students ( big yikes )
+    await StudyrightElement.destroy({ where: { studentnumber } }, { transaction })
+    await Promise.all(studyRightElements.map(StudyRightElement => StudyrightElement.create(StudyRightElement, { transaction })))
+  }
+  for ({ transfers } of studyRights) {
+    await Promise.all(transfers.map(transfer => Transfers.upsert(transfer, { transaction })))
+  }
+}
 
 const updateStudent = async (student, stan) => {
   const { studentInfo, studyAttainments, semesterEnrollments, studyRights } = student

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

@@ -12,7 +12,7 @@ import moment from 'moment'
 
 import { getPopulationStatistics, clearPopulations } from '../../redux/populations'
 import { getPopulationCourses } from '../../redux/populationCourses'
-import { getPopulationFilters, setPopulationFilter } from '../../redux/populationFilters'
+import { getPopulationFilters, setPopulationFilter, clearPopulationFilters } from '../../redux/populationFilters'
 import { getMandatoryCourses } from '../../redux/populationMandatoryCourses'
 import { getSemesters } from '../../redux/semesters'
 import { transferTo } from '../../populationFilters'
@@ -37,6 +37,7 @@ class PopulationSearchForm extends Component {
     getPopulationCourses: func.isRequired,
     getMandatoryCourses: func.isRequired,
     getPopulationFilters: func.isRequired,
+    clearPopulationFilters: func.isRequired,
     setPopulationFilter: func.isRequired,
     clearPopulations: func.isRequired,
     queries: shape({}).isRequired,
@@ -158,6 +159,8 @@ class PopulationSearchForm extends Component {
     ]).then(() => {
       if (queryCodes[0] === 'KH50_001') {
         this.props.setPopulationFilter(transferTo(false))
+      } else {
+        this.props.clearPopulationFilters()
       }
       this.setState({ isLoading: false })
       // not a good solution FIX
@@ -763,6 +766,7 @@ export default withRouter(connect(mapStateToProps, {
   getPopulationFilters,
   getMandatoryCourses,
   setPopulationFilter,
+  clearPopulationFilters,
   getDegreesAndProgrammes,
   clearPopulations,
   setLoading,