Don't fetch enrollments with state other than ENROLLED or REJECTED (

#4292)

Rejected enrollments are only used in Programme courses / By semester and Language center view

services/backend/src/services/completedCoursesSearch.ts

@@ -15,7 +15,6 @@ interface StudentCredit {
 interface StudentEnrollment {
   date: Date
   courseCode: string
-  state: EnrollmentState
   substitution: string | null
 }
 
@@ -95,9 +94,9 @@ const getCredits = async (
 }
 
 const getEnrollments = async (courses: Courses, fullCourseCodes: string[], studentNumbers: string[]) => {
-  const enrollments: Array<Pick<Enrollment, 'course_code' | 'enrollment_date_time' | 'studentnumber' | 'state'>> =
+  const enrollments: Array<Pick<Enrollment, 'course_code' | 'enrollment_date_time' | 'studentnumber'>> =
     await Enrollment.findAll({
-      attributes: ['course_code', 'enrollment_date_time', 'studentnumber', 'state'],
+      attributes: ['course_code', 'enrollment_date_time', 'studentnumber'],
       where: {
         course_code: {
           [Op.in]: fullCourseCodes,
@@ -117,7 +116,6 @@ const getEnrollments = async (courses: Courses, fullCourseCodes: string[], stude
       substitution: originalCode ? enrollment.course_code : null,
       studentNumber: enrollment.studentnumber,
       date: enrollment.enrollment_date_time,
-      state: enrollment.state,
     }
   })
   return formattedEnrollments
@@ -201,7 +199,6 @@ export const getCompletedCourses = async (studentNumbers: string[], courseCodes:
     studentCredits[enrollment.studentNumber].enrollments.push({
       date: enrollment.date,
       courseCode: enrollment.courseCode,
-      state: enrollment.state,
       substitution: enrollment.substitution,
     })
   })

services/backend/src/services/courses/index.ts

@@ -2,7 +2,7 @@ import crypto from 'crypto'
 import { Op } from 'sequelize'
 
 import { Course, Credit, Enrollment, Organization, SISStudyRightElement } from '../../models'
-import { Name, Unification } from '../../types'
+import { EnrollmentState, Name, Unification } from '../../types'
 import { isOpenUniCourseCode } from '../../util'
 import { getSortRank } from '../../util/sortRank'
 import { CourseYearlyStatsCounter } from './courseYearlyStatsCounter'
@@ -317,7 +317,12 @@ export const getCourseYearlyStats = async (
   })
   const enrollments = await Enrollment.findAll({
     attributes: ['studentnumber'],
-    where: { course_code: { [Op.in]: courseCodes } },
+    where: {
+      course_code: {
+        [Op.in]: courseCodes,
+      },
+      state: EnrollmentState.ENROLLED,
+    },
   })
 
   const studentNumbers = {}

services/backend/src/services/openUni/openUniSearches.ts

@@ -2,7 +2,7 @@ import { InferAttributes, Op, WhereOptions } from 'sequelize'
 
 import { Course, Credit, Enrollment, Student, SISStudyRight } from '../../models'
 import { OpenUniPopulationSearch } from '../../models/kone'
-import { ExtentCode } from '../../types'
+import { EnrollmentState, ExtentCode } from '../../types'
 import { formatCourseInfo, formatOpenCredits, formatOpenEnrollments, formatStudentInfo } from './format'
 
 export const getCredits = async (courseCodes: string[], startdate: Date) =>
@@ -47,6 +47,7 @@ export const getEnrollments = async (courseCodes: string[], startDate: Date, end
             [Op.gte]: startDate,
           },
         },
+        state: EnrollmentState.ENROLLED,
       },
     })
   ).map(formatOpenEnrollments)

services/backend/src/services/populations/bottlenecksOf.ts

@@ -11,7 +11,8 @@ import {
   parseCreditInfo,
   parseQueryParams,
   Query,
-  QueryResult,
+  CoursesQueryResult,
+  EnrollmentsQueryResult,
 } from './shared'
 import { getStudentNumbersWithAllStudyRightElements } from './studentNumbersWithAllElements'
 
@@ -20,7 +21,7 @@ const getStudentsAndCourses = async (
   selectedStudents: string[] | undefined,
   studentNumbers: string[] | null,
   courseCodes: string[] | undefined
-) => {
+): Promise<[number, CoursesQueryResult, EnrollmentsQueryResult]> => {
   if (!studentNumbers) {
     const { months, studyRights, startDate, endDate, exchangeStudents, nondegreeStudents, transferredStudents } = params
     const studentnumbers =
@@ -89,10 +90,10 @@ export const bottlenecksOf = async (query: Query, studentNumbers: string[] | nul
 
   // To fix failed and enrolled, no grade filter options some not so clean and nice solutions were added
   // Get the data with actual 1. courses and filtered students. 2. all students by year, if provided.
-  const [[allStudents, courses, courseEnrollements], [, allCourses]] = (await Promise.all([
+  const [[allStudents, courses, courseEnrollements], [, allCourses]] = await Promise.all([
     getStudentsAndCourses(params, query.selectedStudents, studentNumbers, query.courses),
     getStudentsAndCourses(params, allStudentsByYears, null, query.courses),
-  ])) as [[number, QueryResult, QueryResult], [number, QueryResult]]
+  ])
 
   // Get the substitution codes for the fetch data by selected students
   const substitutionCodes = Object.entries(courses).reduce(
@@ -112,7 +113,8 @@ export const bottlenecksOf = async (query: Query, studentNumbers: string[] | nul
 
   const stats = {} as Record<string, CourseStatsCounter>
   const startYear = parseInt(query.year, 10)
-  let coursesToLoop = courses.concat(substitutionCourses)
+  let coursesToLoop: Array<EnrollmentsQueryResult[number] | CoursesQueryResult[number]> =
+    courses.concat(substitutionCourses)
   const courseCodes = coursesToLoop.map(course => course.code)
 
   // This fixes a problem when "Enrolled, no grade" is chosen. The SQL query for fetching
@@ -146,7 +148,7 @@ export const bottlenecksOf = async (query: Query, studentNumbers: string[] | nul
         }
       })
     }
-    if (course.credits) {
+    if ('credits' in course) {
       course.credits.forEach(credit => {
         const { studentnumber, passingGrade, improvedGrade, failingGrade, grade, date } = parseCreditInfo(credit)
         if ((query?.selectedStudents && query?.selectedStudents.includes(studentnumber)) || !query?.selectedStudents) {

services/backend/src/services/populations/getStudentsIncludeCoursesBetween.ts

@@ -85,7 +85,7 @@ const getEnrollments = async (studentNumbers: string[], attainmentDateFrom: mome
       studentnumber: {
         [Op.in]: studentNumbers,
       },
-      state: [EnrollmentState.ENROLLED, EnrollmentState.CONFIRMED],
+      state: EnrollmentState.ENROLLED,
     },
     raw: true,
   })

services/backend/src/services/populations/shared.ts

@@ -6,7 +6,7 @@ import { Op, QueryTypes } from 'sequelize'
 import { dbConnections } from '../../database/connection'
 import { Course, Credit, Enrollment, SISStudyRight, SISStudyRightElement, Student, Studyplan } from '../../models'
 import { Tag, TagStudent } from '../../models/kone'
-import { Criteria, DegreeProgrammeType, Name, ParsedCourse } from '../../types'
+import { Criteria, DegreeProgrammeType, EnrollmentState, Name, ParsedCourse } from '../../types'
 import { SemesterStart } from '../../util/semester'
 import { hasTransferredFromOrToProgramme } from '../studyProgramme/studyProgrammeHelpers'
 
@@ -480,21 +480,26 @@ const getSubstitutions = async (codes: string[]) => {
   return substitutions
 }
 
-export type QueryResult = Array<{
+export type EnrollmentsQueryResult = Array<{
   code: string
   name: Name
-  coursetypecode: string
   substitutions: string[]
   main_course_code: string
-  course_type: Name
-  credits: Array<Pick<Credit, 'grade' | 'student_studentnumber' | 'attainment_date' | 'credittypecode' | 'course_code'>>
   enrollments: Array<Pick<Enrollment, 'studentnumber' | 'state' | 'enrollment_date_time'>> | null
 }>
 
+type CreditPick = Pick<Credit, 'grade' | 'student_studentnumber' | 'attainment_date' | 'credittypecode' | 'course_code'>
+
+export type CoursesQueryResult = Array<
+  EnrollmentsQueryResult[number] & {
+    credits: Array<CreditPick>
+  }
+>
+
 // This duplicate code is added here to ensure that we get the enrollments in cases no credits found for the selected students
 export const findCourseEnrollments = async (studentNumbers: string[], beforeDate: Date, courses: string[] = []) => {
   const courseCodes = courses.length === 0 ? ['DUMMY'] : await getSubstitutions(courses)
-  const result: QueryResult = await sequelize.query(
+  const result: EnrollmentsQueryResult = await sequelize.query(
     `
       SELECT DISTINCT ON (course.id)
         course.code,
@@ -512,7 +517,7 @@ export const findCourseEnrollments = async (studentNumbers: string[], beforeDate
             'enrollment_date_time', enrollment_date_time
           )) AS data
         FROM enrollment
-        WHERE enrollment.studentnumber IN (:studentnumbers) AND enrollment.enrollment_date_time < :beforeDate
+        WHERE enrollment.studentnumber IN (:studentnumbers) AND enrollment.enrollment_date_time < :beforeDate AND enrollment.state = :enrollmentState
         GROUP BY enrollment.course_id
       ) enrollment ON enrollment.course_id = course.id 
       WHERE :skipCourseCodeFilter OR course.code IN (:courseCodes)
@@ -523,6 +528,7 @@ export const findCourseEnrollments = async (studentNumbers: string[], beforeDate
         beforeDate,
         courseCodes,
         skipCourseCodeFilter: courses.length === 0,
+        enrollmentState: EnrollmentState.ENROLLED,
       },
       type: QueryTypes.SELECT,
     }
@@ -532,7 +538,7 @@ export const findCourseEnrollments = async (studentNumbers: string[], beforeDate
 
 export const findCourses = async (studentNumbers: string[], beforeDate: Date, courses: string[] = []) => {
   const courseCodes = courses.length === 0 ? ['DUMMY'] : await getSubstitutions(courses)
-  const result: QueryResult = await sequelize.query(
+  const result: CoursesQueryResult = await sequelize.query(
     `
       SELECT DISTINCT ON (course.id)
         course.code,
@@ -565,7 +571,7 @@ export const findCourses = async (studentNumbers: string[], beforeDate: Date, co
             'enrollment_date_time', enrollment_date_time
           )) AS data
         FROM enrollment
-        WHERE enrollment.studentnumber IN (:studentnumbers) AND enrollment.enrollment_date_time < :beforeDate
+        WHERE enrollment.studentnumber IN (:studentnumbers) AND enrollment.enrollment_date_time < :beforeDate AND enrollment.state = :enrollmentState
         GROUP BY enrollment.course_id
       ) enrollment ON enrollment.course_id = course.id 
       WHERE :skipCourseCodeFilter OR course.code IN (:courseCodes)
@@ -576,16 +582,15 @@ export const findCourses = async (studentNumbers: string[], beforeDate: Date, co
         beforeDate,
         courseCodes,
         skipCourseCodeFilter: courses.length === 0,
+        enrollmentState: EnrollmentState.ENROLLED,
       },
       type: QueryTypes.SELECT,
     }
   )
   return result
 }
 
-export const parseCreditInfo = (
-  credit: Pick<Credit, 'grade' | 'student_studentnumber' | 'attainment_date' | 'credittypecode' | 'course_code'>
-) => {
+export const parseCreditInfo = (credit: CreditPick) => {
   return {
     studentnumber: credit.student_studentnumber,
     grade: credit.grade,

services/backend/src/services/students.ts

@@ -12,7 +12,7 @@ import {
   SISStudyRightElement,
 } from '../models'
 import { Tag, TagStudent } from '../models/kone'
-import { UnifyStatus } from '../types'
+import { EnrollmentState, UnifyStatus } from '../types'
 import { splitByEmptySpace } from '../util'
 import logger from '../util/logger'
 
@@ -182,11 +182,17 @@ export const findByCourseAndSemesters = async (
           AND e.course_code IN (:coursecodes)
           AND e.semestercode BETWEEN ${fromSemester} AND ${toSemester}
           AND e.enrollment_date_time >= '2021-05-31'
-          AND e.state IN ('ENROLLED', 'CONFIRMED')
+          AND e.state = :enrollmentState
       );
     `,
     {
-      replacements: { coursecodes, minYearCode: from, maxYearCode: to, isOpen: unifyStatus },
+      replacements: {
+        coursecodes,
+        minYearCode: from,
+        maxYearCode: to,
+        isOpen: unifyStatus,
+        enrollmentState: EnrollmentState.ENROLLED,
+      },
       type: QueryTypes.SELECT,
       raw: true,
     }

services/backend/src/types/enrollmentState.ts

@@ -1,10 +1,4 @@
 export enum EnrollmentState {
-  ABORTED_BY_STUDENT = 'ABORTED_BY_STUDENT',
-  ABORTED_BY_TEACHER = 'ABORTED_BY_TEACHER',
-  CONFIRMED = 'CONFIRMED', // ? Does this state actually exist anymore?
   ENROLLED = 'ENROLLED',
-  INVALID = 'INVALID',
-  NOT_ENROLLED = 'NOT_ENROLLED',
-  PROCESSING = 'PROCESSING',
   REJECTED = 'REJECTED',
 }

services/frontend/src/components/PopulationStudents/StudentTable/CoursesTab/index.jsx

@@ -229,7 +229,7 @@ const CoursesTable = ({ curriculum, includeSubstitutions, populationCourses, stu
       if (!student.enrollments) {
         return false
       }
-      return student.enrollments.some(enrollment => enrollment.course_code === code && enrollment.state === 'ENROLLED')
+      return student.enrollments.some(enrollment => enrollment.course_code === code)
     }
 
     const getCompletionDate = (student, code) => {
@@ -238,9 +238,7 @@ const CoursesTable = ({ curriculum, includeSubstitutions, populationCourses, stu
     }
 
     const getEnrollmentDate = (student, code) => {
-      const enrollment = student.enrollments.find(
-        enrollment => enrollment.course_code === code && enrollment.state === 'ENROLLED'
-      )
+      const enrollment = student.enrollments.find(enrollment => enrollment.course_code === code)
       return enrollment.enrollment_date_time
     }