[Faculties] Fix background colors in 'Students of the faculty' table

Update all non-major dependencies

.codeclimate.yml

@@ -0,0 +1,82 @@
+version: '2'
+
+checks:
+  argument-count:
+    enabled: true
+    config:
+      threshold: 4
+  complex-logic:
+    enabled: true
+    config:
+      threshold: 4
+  file-lines:
+    enabled: true
+    config:
+      threshold: 250
+  method-complexity:
+    enabled: true
+    config:
+      threshold: 10
+  method-count:
+    enabled: true
+    config:
+      threshold: 20
+  method-lines:
+    enabled: true
+    config:
+      threshold: 25
+  nested-control-flow:
+    enabled: true
+    config:
+      threshold: 4
+  return-statements:
+    enabled: false
+  similar-code:
+    enabled: true
+    config:
+      threshold: # Language-specific defaults. Overrides affect all languages.
+  identical-code:
+    enabled: true
+    config:
+      threshold: # Language-specific defaults. Overrides affect all languages.
+
+exclude_patterns:
+  - '.github/'
+  - '.husky/'
+  - '.vscode/'
+  - 'adminer-plugins/'
+  - 'anonyymioodi/'
+  - 'cypress/'
+  - 'documentation/'
+  - 'scripts/'
+  - 'services/backend/src/database/migrations_kone/'
+  - 'services/backend/src/database/migrations_user/'
+  - 'services/backend/src/models/'
+  - 'updater/sis-updater-worker/src/db/migrations/'
+  - 'updater/sis-updater-worker/src/db/models/'
+  - '.codeclimate.yml'
+  - '.env.template'
+  - '.lintstagedrc.js'
+  - '.nycrc'
+  - '.prettierrc'
+  - '.stylelintrc'
+  - 'cypress.config.js'
+  - 'LICENSE'
+  - 'nginx.conf'
+  - 'nyc-config.js'
+  - '**/.dockerignore'
+  - '**/.eslintrc.json'
+  - '**/.gitignore'
+  - '**/dev.Dockerfile'
+  - '**/Dockerfile'
+  - '**/*.css'
+  - '**/*.csv'
+  - '**/*.html'
+  - '**/*.json'
+  - '**/*.md'
+  - '**/*.png'
+  - '**/*.sh'
+  - '**/*.sql'
+  - '**/*.svg'
+  - '**/*.txt'
+  - '**/*.yml'

.eslintrc.json

@@ -8,12 +8,104 @@
     "ecmaVersion": "latest",
     "sourceType": "commonjs"
   },
-  "extends": ["eslint:recommended", "plugin:prettier/recommended", "plugin:cypress/recommended"],
+  "extends": [
+    "eslint:recommended",
+    "airbnb",
+    "plugin:cypress/recommended",
+    "plugin:import/recommended",
+    "plugin:prettier/recommended"
+  ],
+  "overrides": [
+    {
+      "files": ["**/*.ts"],
+      "env": {
+        "es2021": true,
+        "node": true
+      },
+      "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+        "airbnb-typescript",
+        "plugin:prettier/recommended"
+      ],
+      "parser": "@typescript-eslint/parser",
+      "parserOptions": {
+        "ecmaVersion": 2021,
+        "sourceType": "module",
+        "project": true
+      },
+      "rules": {
+        "import/prefer-default-export": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/return-await": "off",
+        "@typescript-eslint/no-shadow": "off"
+      }
+    }
+  ],
   "rules": {
-    "no-console": "error",
-    "no-async-promise-executor": "off",
-    "prettier/prettier": "error",
+    "camelcase": "off",
+    "consistent-return": "off",
     "cypress/no-assigning-return-values": "off",
-    "cypress/unsafe-to-chain-command": "off"
-  }
+    "cypress/unsafe-to-chain-command": "off",
+    "default-param-last": "off",
+    "import/extensions": ["error", "never"],
+    "import/order": [
+      "error",
+      {
+        "alphabetize": { "order": "asc", "caseInsensitive": true },
+        "groups": [["builtin", "external"], ["internal"], ["parent"], ["sibling", "index"]],
+        "pathGroups": [
+          {
+            "pattern": "../../../**",
+            "group": "internal",
+            "position": "before"
+          },
+          {
+            "pattern": "../../**",
+            "group": "internal",
+            "position": "after"
+          },
+          {
+            "pattern": "../**",
+            "group": "parent",
+            "position": "before"
+          },
+          {
+            "pattern": "./**",
+            "group": "sibling",
+            "position": "before"
+          }
+        ],
+        "pathGroupsExcludedImportTypes": ["builtin", "external"]
+      }
+    ],
+    "no-async-promise-executor": "off",
+    "no-await-in-loop": "off",
+    "no-console": "error",
+    "no-continue": "off",
+    "no-param-reassign": "off",
+    "no-plusplus": "off",
+    "no-promise-executor-return": "off",
+    "no-restricted-syntax": [
+      "error",
+      {
+        "selector": "ForInStatement",
+        "message": "for..in loops iterate over the entire prototype chain, which is virtually never what you want. Use Object.{keys,values,entries}, and iterate over the resulting array."
+      },
+      "LabeledStatement",
+      "WithStatement"
+    ],
+    "no-return-await": "off",
+    "no-shadow": "off",
+    "prettier/prettier": "error",
+    "quotes": ["error", "single", { "avoidEscape": true }]
+  },
+  "settings": {
+    "import/resolver": {
+      "node": {
+        "extensions": [".js", ".jsx", ".ts", ".tsx"]
+      }
+    }
+  },
+  "ignorePatterns": ["build/", "dist/", "instrumented/", "node_modules/", "**/*migrations*/**"]
 }

.github/actions/run-tests/action.yaml

@@ -24,7 +24,7 @@ runs:
 
     - name: 'Run services, pull rest of the needed images'
       shell: bash
-      run: docker-compose --file docker-compose.ci.yml up --detach
+      run: docker compose --file docker-compose.ci.yml up --detach --quiet-pull
 
     - name: 'Run cypress'
       uses: cypress-io/github-action@v6
@@ -44,4 +44,4 @@ runs:
     - name: 'Print logs on failure'
       shell: bash
       if: failure()
-      run: docker-compose --file docker-compose.ci.yml logs
+      run: docker compose --file docker-compose.ci.yml logs

.github/dependabot.yml

@@ -1,78 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: npm
-    directory: '/'
-    schedule:
-      interval: weekly
-      time: '03:00'
-    labels:
-      - 'dependencies'
-      - 'infra'
-    allow:
-      - dependency-type: 'production'
-    ignore:
-      - dependency-name: '*'
-        update-types: ['version-update:semver-major']
-
-  - package-ecosystem: npm
-    directory: '/updater/sis-updater-scheduler'
-    schedule:
-      interval: weekly
-      time: '03:00'
-    labels:
-      - 'dependencies'
-      - 'updater'
-    allow:
-      - dependency-type: 'production'
-    ignore:
-      - dependency-name: '*'
-        update-types: ['version-update:semver-major']
-
-  - package-ecosystem: npm
-    directory: '/updater/sis-updater-worker'
-    schedule:
-      interval: weekly
-      time: '03:00'
-    labels:
-      - 'dependencies'
-      - 'updater'
-    allow:
-      - dependency-type: 'production'
-    ignore:
-      - dependency-name: '*'
-        update-types: ['version-update:semver-major']
-
-  - package-ecosystem: npm
-    directory: '/services/backend'
-    schedule:
-      interval: weekly
-      time: '03:00'
-    labels:
-      - 'dependencies'
-      - 'back'
-    allow:
-      - dependency-type: 'production'
-    ignore:
-      - dependency-name: '*'
-        update-types: ['version-update:semver-major']
-
-  - package-ecosystem: npm
-    directory: '/services/frontend'
-    schedule:
-      interval: weekly
-      time: '03:00'
-    labels:
-      - 'dependencies'
-      - 'front'
-    allow:
-      - dependency-type: 'production'
-    ignore:
-      - dependency-name: '*'
-        update-types: ['version-update:semver-major']
-
-  - package-ecosystem: 'github-actions'
-    directory: '/'
-    schedule:
-      interval: weekly
-      time: '03:00'
-    open-pull-requests-limit: 10

.github/workflows/production.yaml

@@ -33,6 +33,7 @@ jobs:
             BUILT_AT=${{ steps.get_current_time.outputs.NOW }}
             SENTRY_RELEASE=${{ steps.extract_version.outputs.VERSION }}
             SENTRY_ENVIRONMENT=production
+            SENTRY_DSN=${{ secrets.OODIKONE_SENTRY_DSN }}
 
       - name: Push to quay.io
         uses: redhat-actions/push-to-registry@v2
@@ -81,6 +82,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - release_frontend
+      - release_backend
 
     steps:
       - uses: actions/checkout@v4
@@ -89,12 +91,18 @@ jobs:
         id: extract_version
         run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
-      - name: Pull image and create a container
+      - name: Pull frontend image and create a container
         run: docker create --name frontend quay.io/toska/oodikone-frontend:production
 
-      - name: Copy assets from the container
+      - name: Pull backend image and create a container
+        run: docker create --name backend quay.io/toska/oodikone-backend:production
+
+      - name: Copy assets from the frontend container
         run: docker cp frontend:/opt/app-root/src/build ./build
 
+      - name: Copy assets from the backend container
+        run: docker cp backend:/opt/app-root/src/dist ./dist
+
       - name: Create Sentry release
         uses: getsentry/action-release@v1
         env:
@@ -105,7 +113,7 @@ jobs:
         with:
           environment: production
           set_commits: 'skip'
-          sourcemaps: './build/assets'
+          sourcemaps: './build/assets ./dist'
           url_prefix: '~/assets'
           version: ${{ steps.extract_version.outputs.VERSION }}
 
@@ -122,7 +130,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: 'Send notification to slack'
-        uses: UniversityOfHelsinkiCS/slackbot-action@v1.4.2
+        uses: UniversityOfHelsinkiCS/slackbot-action@v1.5
         with:
           webhook-url: ${{ secrets.WEBHOOK_URL }}
           message-type: deployment
@@ -142,7 +150,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: 'Send notification to slack'
-        uses: UniversityOfHelsinkiCS/slackbot-action@v1.4.2
+        uses: UniversityOfHelsinkiCS/slackbot-action@v1.5
         with:
           webhook-url: ${{ secrets.WEBHOOK_URL }}
           message-type: deployment-failure

.github/workflows/pull_request.yaml

@@ -0,0 +1,73 @@
+name: 'Run tests'
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths:
+      - 'cypress/**'
+      - 'cypress.config.json'
+      - 'services/**'
+      - '!services/backend/src/rapodiff/**'
+      - 'docker-compose.ci.yml'
+      - 'package*.json'
+
+jobs:
+  lint_backend_and_frontend:
+    name: 'Lint backend and frontend'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+      - name: 'Install dependencies'
+        run: npm ci && cd services/frontend && npm ci && cd ../backend && npm ci
+      - name: 'Run Stylelint for CSS files'
+        run: npm run stylelint "services/frontend/src/**/*.css"
+      - name: 'Run ESLint for JS files'
+        run: npm run eslint -- --ext .jsx,.js services --report-unused-disable-directives
+
+  test_end_to_end:
+    runs-on: ubuntu-latest
+    needs:
+      - lint_backend_and_frontend
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: 'Test course statistics'
+            spec: cypress/e2e/Course_statistics.js
+          - name: 'Test custom population'
+            spec: cypress/e2e/Custom_population.js
+          - name: 'Test population statistics'
+            spec: cypress/e2e/Population_statistics.js
+          - name: 'Test filters'
+            spec: cypress/e2e/Filters.js
+          - name: 'Test students'
+            spec: cypress/e2e/Students.js
+          - name: 'Test completed courses'
+            spec: cypress/e2e/Completed_courses.js
+          - name: 'Test studyprogramme overview'
+            spec: cypress/e2e/Studyprogramme_overview.js
+          - name: 'Test teachers and users'
+            spec: |
+              cypress/e2e/Teachers.js
+              cypress/e2e/Users.js
+          - name: 'Test faculty statistics'
+            spec: cypress/e2e/Faculty_statistics.js
+          - name: 'Test open uni search'
+            spec: cypress/e2e/Openuni.js
+          - name: 'Test language center view'
+            spec: cypress/e2e/Language_center.js
+          - name: 'Test study guidance groups'
+            spec: cypress/e2e/Study_guidance_groups.js
+    name: ${{ matrix.name }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: 'Run tests'
+        uses: ./.github/actions/run-tests
+        with:
+          username: ${{ secrets.TOSKAREGISTRY_USERNAME }}
+          password: ${{ secrets.TOSKAREGISTRY_PASSWORD }}
+          spec: ${{ matrix.spec }}

.github/workflows/test.yaml

@@ -12,8 +12,8 @@ on:
 
 jobs:
   # === Static tests / linting ===
-  lint_backend:
-    name: 'Lint backend'
+  lint_backend_and_frontend:
+    name: 'Lint backend and frontend'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -21,24 +21,11 @@ jobs:
         with:
           node-version: 18
       - name: 'Install dependencies'
-        run: npm ci && cd services/backend && npm ci
-      - name: 'Run backend linter'
-        run: npm run eslint services/backend
-
-  lint_frontend:
-    name: 'Lint frontend'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-      - name: 'Install dependencies'
-        run: npm ci && cd services/frontend && npm ci
-      - name: 'Run frontend linter'
-        run: npm run concurrently \
-          'eslint --ext .jsx,.js services/frontend/src --report-unused-disable-directives' \
-          'stylelint services/frontend/src/**/*.css'
+        run: npm ci && cd services/frontend && npm ci && cd ../backend && npm ci
+      - name: 'Run Stylelint for CSS files'
+        run: npm run stylelint "services/frontend/src/**/*.css"
+      - name: 'Run ESLint for JS and TS files'
+        run: npm run eslint -- --ext .js,.jsx,.ts,.tsx services --report-unused-disable-directives
 
   # === Build database images ===
   build_backend:
@@ -83,7 +70,7 @@ jobs:
       - name: 'Let sis-updater-worker run migrations, then push new version of image to toska hub'
         if: steps.check_migrations.outputs.migrations == 'true'
         run: |
-          docker-compose --file docker-compose.ci.yml up --detach sis-updater-worker
+          docker compose --file docker-compose.ci.yml up --detach sis-updater-worker
           sleep 30 # wait for sis-updater-worker to start and run migrations
           ./anonyymioodi/commit_and_push_to_toska_hub.sh sis-db
 
@@ -116,7 +103,7 @@ jobs:
       - name: 'Let backend run migrations, then push new version of image to toska hub'
         if: steps.check_migrations.outputs.migrations == 'true'
         run: |
-          docker-compose --file docker-compose.ci.yml up --detach backend
+          docker compose --file docker-compose.ci.yml up --detach backend
           sleep 30 # wait for sis-updater-worker to start and run migrations
           ./anonyymioodi/commit_and_push_to_toska_hub.sh kone-db
 
@@ -149,7 +136,7 @@ jobs:
       - name: 'Let backend run migrations, then push new version of image to toska hub'
         if: steps.check_migrations.outputs.migrations == 'true'
         run: |
-          docker-compose --file docker-compose.ci.yml up --detach backend
+          docker compose --file docker-compose.ci.yml up --detach backend
           sleep 30 # wait for sis-updater-worker to start and run migrations
           ./anonyymioodi/commit_and_push_to_toska_hub.sh user-db
 
@@ -218,7 +205,7 @@ jobs:
           password: ${{ secrets.password }}
 
       - name: 'Run services, pull rest of the needed images'
-        run: docker-compose --file docker-compose.ci.yml up --detach
+        run: docker compose --file docker-compose.ci.yml up --detach --quiet-pull
 
       - name: 'Check that exit statuses are not errors'
         run: |
@@ -230,4 +217,4 @@ jobs:
 
       - name: 'Print logs on failure'
         if: failure()
-        run: docker-compose --file docker-compose.ci.yml logs
+        run: docker compose --file docker-compose.ci.yml logs

.github/workflows/updater.yaml

@@ -1,4 +1,4 @@
-name: 'Test and release Updater'
+name: 'Test (and release) Updater'
 
 on:
   push:
@@ -8,8 +8,27 @@ on:
       - '.github/workflows/updater.yaml'
       - 'updater/sis-updater-worker/**'
       - 'updater/sis-updater-scheduler/**'
+  pull_request:
+    branches:
+      - master
+    paths:
+      - 'updater/sis-updater-worker/**'
+      - 'updater/sis-updater-scheduler/**'
 
 jobs:
+  lint_scheduler_and_worker:
+    name: 'Lint scheduler and worker'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+      - name: 'Install dependencies'
+        run: npm ci && cd updater/sis-updater-scheduler && npm ci && cd ../sis-updater-worker && npm ci
+      - name: 'Run linter'
+        run: npm run eslint updater -- --report-unused-disable-directives
+
   build_worker:
     name: 'Build Updater worker'
     runs-on: ubuntu-latest
@@ -50,6 +69,7 @@ jobs:
     name: 'Test Updater'
     runs-on: ubuntu-latest
     needs:
+      - lint_scheduler_and_worker
       - build_worker
       - build_scheduler
     steps:
@@ -69,24 +89,24 @@ jobs:
       - name: 'Load scheduler image'
         run: docker load --input /tmp/artifact/scheduler.tar
       - name: 'Start worker'
-        run: docker-compose --file docker-compose.ci.yml up --detach --no-recreate sis-updater-worker
+        run: docker compose --file docker-compose.ci.yml up --detach --no-recreate sis-updater-worker
       - name: 'Run hourly jobs'
-        run: docker-compose --file docker-compose.ci.yml run sis-updater-scheduler npm start
+        run: docker compose --file docker-compose.ci.yml run sis-updater-scheduler npm start
         env:
           SCHEDULE_IMMEDIATE: hourly
           EXIT_AFTER_IMMEDIATES: yes
       - name: 'Run weekly jobs'
-        run: docker-compose --file docker-compose.ci.yml run sis-updater-scheduler npm start
+        run: docker compose --file docker-compose.ci.yml run sis-updater-scheduler npm start
         env:
           SCHEDULE_IMMEDIATE: weekly
           EXIT_AFTER_IMMEDIATES: yes
       - name: 'Run prepurge'
-        run: docker-compose --file docker-compose.ci.yml run sis-updater-scheduler npm start
+        run: docker compose --file docker-compose.ci.yml run sis-updater-scheduler npm start
         env:
           SCHEDULE_IMMEDIATE: prepurge
           EXIT_AFTER_IMMEDIATES: yes
       - name: 'Run purge'
-        run: docker-compose --file docker-compose.ci.yml run sis-updater-scheduler npm start
+        run: docker compose --file docker-compose.ci.yml run sis-updater-scheduler npm start
         env:
           SCHEDULE_IMMEDIATE: purge
           EXIT_AFTER_IMMEDIATES: yes
@@ -95,6 +115,7 @@ jobs:
     name: 'Build and release Updater worker'
     runs-on: ubuntu-latest
     needs: test_updater
+    if: github.event_name == 'push'
     steps:
       - uses: actions/checkout@v4
 
@@ -121,7 +142,7 @@ jobs:
     name: 'Build and release Updater scheduler'
     runs-on: ubuntu-latest
     needs: test_updater
-
+    if: github.event_name == 'push'
     steps:
       - uses: actions/checkout@v4
 

.gitignore

@@ -16,16 +16,12 @@ pids
 *.seed
 *.pid.lock
 
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
+# Production
+dist/
 
 # Dependency directories
-node_modules/
 jspm_packages/
+node_modules/
 
 # Optional npm cache directory
 .npm
@@ -39,10 +35,29 @@ jspm_packages/
 # Output of 'npm pack'
 *.tgz
 
-# dotenv environment variables file
+# Misc
+*.sqz
+
+# Environment variable files
 .env
 .env.test
 .env.production
 
 # Oodikone related stuff
-.databasedumps
+.databasedumps/
+
+# Cypress
+cypress/downloads/
+cypress/screenshots/
+cypress/videos/
+
+# Code coverage
+.nyc_output/
+coverage/
+instrumented/
+
+# pycharm 
+.idea
+
+# fd specific
+environments/

.husky/.gitignore

@@ -1 +0,0 @@
-_

.husky/pre-commit

@@ -1,6 +1,3 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx lint-staged
 
 if git grep -qE --cached "(it|describe)\.only" $(git diff --cached --name-only) ./cypress; then

.lintstagedrc.js

@@ -4,8 +4,9 @@ const dockerCmdBase = `docker run --rm --volume ${cwd}:/oodikone --workdir /oodi
 const relativeFilePaths = files => [...files.map(file => path.relative(cwd, file))].join(' ')
 
 module.exports = {
-  '{services,updater}/**/*.{js,jsx}': files => `eslint --fix ${files.join(' ')} --report-unused-disable-directives`,
-  '*.{js,json,md,yml,yaml,html,css}': files => `prettier --write ${files.join(' ')}`,
+  '{services,updater}/**/*.{js,jsx,ts,tsx}': files =>
+    `eslint --fix ${files.join(' ')} --report-unused-disable-directives`,
+  '*.{js,jsx,ts,tsx,json,md,yml,yaml,html,css}': files => `prettier --write ${files.join(' ')}`,
   '*.css': files => `stylelint --fix ${files.join(' ')}`,
   Dockerfile: files =>
     `${dockerCmdBase} hadolint/hadolint:v2.12.0 hadolint --ignore DL3006 ${relativeFilePaths(files)}`,

.nycrc

@@ -0,0 +1,5 @@
+{
+  "all": true,
+  "include": ["services/frontend/src/**/*.js", "services/frontend/src/**/*.jsx"],
+  "extends": "./nyc-config.js"
+}

README.md

@@ -6,21 +6,23 @@ An application for analyzing university data, running at [https://oodikone.helsi
 
 To run Oodikone locally, you will need the following:
 
-1. Applications:
-   - [Docker](https://docs.docker.com/install/) (version 20.10+),
-   - [Docker Compose](https://docs.docker.com/compose/install/) (version 1.29+) and
-   - [npm](https://docs.npmjs.com/cli/v7) (version 7+)
-2. Access to Toska Docker Hub,
-3. For real data setup, access to Toskas production servers.
-4. For some features to work, access to Toskas service tokens
+1. Applications
+   - [Docker](https://docs.docker.com/install/) (version `20.10+`),
+   - [Docker Compose](https://docs.docker.com/compose/install/) (version `1.29+`)
+   - [npm](https://docs.npmjs.com/cli/v7) (version `7+`)
+2. Access to Toska Docker Hub
+3. For real data setup, access to Toska's production servers
+4. For some features to work, access to Toska's service tokens
 
 ## 🚀 Installation
 
 Pre-installation steps:
 
 - Clone this repo
-- Login to toskas docker hub (see Toskas Gitlab for more information)
-- Populate `.env.template` file with correct tokens and rename it to `.env`
+  - `git@github.com:UniversityOfHelsinkiCS/oodikone.git`
+- Login to Toska's Docker Hub (see Toska's GitLab for more information)
+- Copy the `.env.template` file to `.env` and populate with correct tokens
+  - `cp .env.template .env`
 
 Then launch the CLI and follow the instructions:
 
@@ -32,23 +34,26 @@ _Please use a terminal at least 80 characters wide, the CLI is a bit rudimentary
 
 What different CLI options do:
 
-1. Set up oodikone from scratch:
+1. Set up Oodikone from scratch
    - Cleans up any previous installations
    - Installs all needed npm packages locally
-   - Sets up pre-commit linting hooks.
-   - Pulls and builds all needed Docker images and sets up dockerized development environment.
-   - Setup happens with anonymized data, which developers should use by default.
-   - **Note:** Running this option cleans up all real data too, so please don't run option 2 before this.
-2. Reset all real data:
+   - Sets up pre-commit linting hooks
+   - Pulls and builds all needed Docker images and sets up dockerized development environment
+   - Setup happens with anonymized data, which developers should use by default
+   - **Note:** Running this option cleans up all real data too, so please don' run option 2 before this.
+2. Reset all real data
    - Cleans up any previous real data databases
    - Downloads needed database dumps from production servers.
    - Creates real data databases and populates them with downloaded dumps.
-3. Reset single database
-   - Like option 2, but only for single database. Leaves other databases untouched.
+3. Reset a single database
+   - Like option 2, but only for single database
+   - Leaves other databases untouched
 4. Restore data from dumps
-   - Like option 2, but skips downloading, and simply restores databases from the dumps downloaded earlier.
+   - Like option 2, but skips downloading, and simply restores databases from the dumps downloaded earlier
 5. Docker system prune
-   - Runs `docker system prune -a && docker volume prune -a`. This will remove all your docker data, also related to any other applications than oodikone! It is sometimes necessary after strange errors due to caching.
+   - Runs `docker system prune -a && docker volume prune -a`
+   - This will remove all your Docker data, also related to any other applications than Oodikone!
+   - Sometimes necessary after strange errors due to caching
 
 ## ⌨️ Development
 
@@ -94,56 +99,68 @@ graph TB
     end
 ```
 
-In development, backend and updater use the same redis, but in production they are separate.
+In development, backend and updater use the same Redis, but in production they are separate.
 
-See also [older graph](documentation/Oodikone.png), which presents more information.
+See also the [older graph](documentation/img/oodikone.png) for more information.
+
+To read a bit more details about what updater-scheduler and updater-worker do, see their own READMEs:
+
+- [updater-scheduler's README](./updater/sis-updater-scheduler/README.md)
+- [updater-worker's README](./updater/sis-updater-worker/README.md)
 
 ### Documentation
 
-Folder `documentation` currently contains some notes on sis-db schema and is meant as a place for storing useful information on Oodikone to make life easier for future developers. Feel free to add anything relevant!
+The `documentation` directory contains some notes on the sis-db schema and is meant as a place for storing useful information on Oodikone to make life easier for future developers. Feel free to add anything relevant!
+
+For internal meeting notes and sensitive information, see Toska GitLab.
+
+[SortableTable documentation](./services/frontend/src/components/SortableTable/README.md)
 
 ### Basics
 
-The development environment is entirely configured in the `docker-compose.yml` file located in this repository. The file defines the services for oodikone's two main components: **oodikone** and **updater**.
+The development environment is entirely configured in the `docker-compose.yml` file located in this repository. The file defines the services for Oodikone's two main components: **oodikone** and **updater**.
 
-Running oodikone with real data requires separated databases and redis, which are defined in `docker-compose.real.yml` file. Otherwise real data development environment uses the configuration as anonymized data development environment.
+Running Oodikone with real data requires separated databases and redis, which are defined in `docker-compose.real.yml` file. Otherwise real data development environment uses the configuration as anonymized data development environment.
 
 Some useful commands are defined in `package.json` and can be run with `npm run <command>` as follows:
 
-- `npm run oodikone`: starts oodikone with anonymized data
-- `npm run oodikone:real`: starts oodikone with real data
+- `npm run oodikone`: starts Oodikone with anonymized data
+- `npm run oodikone:real`: starts Oodikone with real data
 - `npm run updater`: starts updater with anonymized data
-- `npm run updater:real`: starts oodikone with real data
-- `npm run both`: starts oodikone and updater with anonymized data
-- `npm run both:real`: starts oodikone and updater with real data
+- `npm run updater:real`: starts updater with real data
+- `npm run both`: starts Oodikone and updater with anonymized data
+- `npm run both:real`: starts Oodikone and updater with real data
 - `npm run docker:down`: stops the whole environment
 - `npm run testupdater`: runs tests for updater
-- `npm run flushredis`: Clears redis, which forces big calculations to be redone in e.g. studyprogramme overview and faculty views.
+- `npm run flushredis`: clears Redis, which forces big calculations to be redone in e.g. studyprogramme overview and faculty views
 - `npm run rapodiff`: runs [Rapodiff](./services/backend/src/rapodiff/)
+- `npm run install:local`: installs `node_modules` for each package (backend, frontend, sis-updater-scheduler and sis-updater-worker) locally
+- `npm run install:docker`: installs `node_modules` for each package inside containers
+- `npm run install:both`: runs both `npm run install:local` and `npm run install:docker`
 
-Once you have ran setup for oodikone , you can just execute the first one (`npm run oodikone`). After starting and waiting for a while for containers to compile, oodikone can be accessed at [http://localhost:3000/](http://localhost:3000/) and Adminer (database investigation tool) at [http://localhost:5050/](http://localhost:5050/). Adminer requires you to login with username `postgres` and with any password you choose (for example `p`).
+Once you have ran setup for Oodikone , you can just execute the first one (`npm run oodikone`). After starting and waiting for a while for containers to compile, Oodikone can be accessed at [http://localhost:3000](http://localhost:3000/) and Adminer (database investigation tool) at [http://localhost:5050](http://localhost:5050/). Adminer requires you to login with username `postgres` and with any password you choose (for example `p`).
 
 ### Run.sh script
 
-As said, the development environment runs entirely inside docker containers. To keep `package.json` clean and not filled with predefined scripts, we have created a simple helper script called `./run.sh`. The script allows you to use docker-compose commands without the need to write long list of parameters. Try to run `./run.sh` in the root of the project and see what happens!
+As said, the development environment runs entirely inside Docker containers. To keep `package.json` clean and not filled with predefined scripts, we have created a simple helper script called `./run.sh`. The script allows you to use docker-compose commands without the need to write long list of parameters. Try to run `./run.sh` in the root of the project and see what happens!
 
-`./run.sh` is simply a wrapper script to run oodikone, updater or both services in either anon or real mode. If you take a look at `package.json`, you can see that most of the predefined scripts above use `./run.sh` under the hood.
+`./run.sh` is simply a wrapper script to run Oodikone, updater or both services in either anon or real mode. If you take a look at `package.json`, you can see that most of the predefined scripts above use `./run.sh` under the hood.
 
 It is recommended to spend some time to become familiar with `docker` and `docker compose` cli commands. You can then use them directly or with `./run.sh` wrapper. Here is some examples for day-to-day development situations:
 
-- `./run.sh oodikone anon pull`: Pull all images related to oodikone development
-- `./run.sh updater real up --build --force-recreate --detach`: Start updater detached (=in the background) in real data mode, but build new images before starting
+- `./run.sh oodikone anon pull`: pull all images related to Oodikone development
+- `./run.sh updater real up --build --force-recreate --detach`: start updater detached (in the background) in real data mode, but build new images before starting
 - `docker compose ps`: view the containers in the running environment
 - `docker compose logs frontend`: print logs for just frontend
 - `docker compose logs --follow --tail 100 backend`: print last hundred rows of backend logs and begin to follow them in your terminal window
 - `docker exec -it backend sh`: open bash terminal inside backend container
-- `docker exec -it sis-db psql -U postgres sis-db-real`: open psql client to investigate sis real data database.
+- `docker exec -it sis-db psql -U postgres sis-db-real`: open psql client to investigate sis real data database
 
 ### User types for development
 
-By default, you're login as `mluukkai` dev user when running oodikone in development mode. If you want to debug with certain type of user, you can use mocking: go to "Users" -page, click on "edit" on user you want to use and then click icon on the right corner of user card. Another way is to mock user headers - see frontend's api configuration for how this is done.
+By default, you're login as `mluukkai` dev user when running Oodikone in development mode. If you want to debug with certain type of user, you can use mocking: go to the "Users" page, click "edit" on the user you want to use and then click the icon on the right corner of user card. Another way is to mock user headers - see frontend's API configuration for how this is done.
 
-Anon data contains some preset user types, corresponding to most usual user types in real data. These are used in testing too (see "Testing" below for more info).
+Anonymous data contains some preset user types, corresponding to most usual user types in real data. These are used in testing too (see "Testing" below for more info).
 
 ### Linting
 
@@ -169,8 +186,8 @@ Continuous integration (CI) works with Github actions and is defined in workflow
 
 - Oodikone setup for cypress and other tests in CI is defined in `docker-compose.ci.yml`. Take a look at this too if debugging github action workflows.
 - Tests are run on every push
-- After a successful test run, oodikone is deployed to staging
-- After creating a release, oodikone is deployed to production
+- After a successful test run, Oodikone is deployed to staging
+- After creating a release, Oodikone is deployed to production
 - Updater is deployed to production when pushed if tests pass
 - Test databases can be updated, instructions in [anonyymioodi README](anonyymioodi/README.md)
 
@@ -180,7 +197,7 @@ Continuous integration (CI) works with Github actions and is defined in workflow
 
 ### Modules are missing after updating package.json
 
-You should always install the dependencies **inside** the container to have the application **inside** the container access them. Module might be missing for example when someone else installs a new library and you only pull the changes in package.json. Use `docker exec <service> npm ci` to install modules inside the container.
+You should always install the dependencies **inside** the container to have the application **inside** the container access them. Module might be missing for example when someone else installs a new library and you only pull the changes in package.json. Use `docker exec <service> npm ci` to install modules inside the container or `npm run install:docker` to install modules inside all packages (backend, frontend, sis-updater-scheduler and sis-updater-worker).
 
 ### Studyguidance groups don't work on my machine
 
@@ -190,14 +207,12 @@ Make sure you have your VPN on.
 
 First: Try `npm run cli` option 1: _Set up oodikone from scratch_ and then option 2 to download and restore databases (or option 4 to skip downloading, if you've done it recently).
 
-If that does not help, try option 5: _Docker system prune_. Notice that this clears up **all docker data**, including data related to other projects. If this is not ok, you'll need to identify the oodikone-specific docker volumes yourself and caches and clear those invididually.
+If that does not help, try option 5: _Docker system prune_. Notice that this clears up **all Docker data**, including data related to other projects. If this is not ok, you'll need to identify the Oodikone-specific Docker volumes yourself and caches and clear those invididually.
 
 ## ✌🏼 Maintainers and contribution
 
-[Toska](https://toska.dev) of course.
+[Toska](https://toska.dev) - University of Helsinki
 
-University of Helsinki
+## 🛡️ Tietosuoja / data protection
 
-## Tietosuoja / data protection
-
-See [tietosuoja.md](tietosuoja.md).
+See [tietosuoja.md](./documentation/tietosuoja.md).

anonyymioodi/.gitignore

@@ -1,2 +0,0 @@
-*.sqz
-

anonyymioodi/docker-compose.yml

@@ -9,7 +9,7 @@ services:
       PGDATA: /data
       POSTGRES_DB: kone-db
       POSTGRES_HOST_AUTH_METHOD: trust
-    image: postgres:15.3
+    image: postgres:15.7
     profiles:
       - oodikone
 
@@ -20,7 +20,7 @@ services:
       PGDATA: /data
       POSTGRES_DB: sis-db
       POSTGRES_HOST_AUTH_METHOD: trust
-    image: postgres:15.3
+    image: postgres:15.7
     shm_size: 2gb
 
   sis-importer-db:
@@ -30,7 +30,7 @@ services:
       PGDATA: /data
       POSTGRES_DB: sis-importer-db
       POSTGRES_HOST_AUTH_METHOD: trust
-    image: postgres:15.3
+    image: postgres:15.7
     profiles:
       - updater
 
@@ -41,6 +41,6 @@ services:
       PGDATA: /data
       POSTGRES_DB: user-db
       POSTGRES_HOST_AUTH_METHOD: trust
-    image: postgres:15.3
+    image: postgres:15.7
     profiles:
       - oodikone

cli.sh

@@ -22,7 +22,7 @@ trap cleanup SIGINT SIGTERM ERR EXIT
 cleanup() {
   trap - SIGINT SIGTERM ERR EXIT
   warningmsg "Trying to run docker-compose down and remove orphans"
-  docker-compose down --remove-orphans
+  docker-compose --profile oodikone --profile updater down --remove-orphans
 }
 
 # === CLI ===

cypress.config.js

@@ -1,3 +1,7 @@
+/* eslint-disable global-require */
+/* eslint-disable import/extensions */
+/* eslint-disable import/no-extraneous-dependencies */
+
 const { defineConfig } = require('cypress')
 
 module.exports = defineConfig({
@@ -11,7 +15,9 @@ module.exports = defineConfig({
     // We've imported your old cypress plugins here.
     // You may want to clean this up later by importing these.
     setupNodeEvents(on, config) {
-      return require('./cypress/plugins/index.js')(on, config)
+      require('@cypress/code-coverage/task')(on, config)
+      require('./cypress/plugins/index.js')(on, config)
+      return config
     },
     baseUrl: 'http://localhost:3000',
     specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',

cypress/.gitignore

@@ -1,2 +0,0 @@
-screenshots
-videos

cypress/e2e/Completed_courses.js

@@ -4,6 +4,13 @@ const openCompletedCoursesModal = () => {
   cy.get('button').contains('Search completed courses of students').click()
 }
 
+const hasLanded = () => {
+  cy.contains('Search completed courses')
+  cy.contains(
+    'Here you can search by a list of student and course numbers to see whether students have completed certain courses yet'
+  )
+}
+
 const openSearch = () => {
   cy.init('/completedcoursessearch')
   hasLanded()
@@ -12,13 +19,6 @@ const selectSavedCourselist = name => {
   cy.get('[data-cy="history-search"]').children().eq(0).type(name).type('{enter}')
 }
 
-const hasLanded = () => {
-  cy.contains('Search completed courses')
-  cy.contains(
-    'Here you can search by a list of student and course numbers to see whether students have completed certain courses yet'
-  )
-}
-
 const deleteAllSearches = () => {
   cy.contains('Saved courselists')
     .get('.dropdown')
@@ -67,7 +67,7 @@ describe('When search modal is opened', () => {
       )
       cy.get('[data-cy="rights-notification"]').should('contain.text', '1')
       cy.get('[data-cy="completed-courses-table-div"]').should('contain.text', 'Completed courses search')
-      cy.get('[data-cy="completed-courses-table-div"]').should('contain.text', 'Student Number')
+      cy.get('[data-cy="completed-courses-table-div"]').should('contain.text', 'Student number')
       cy.get('[data-cy="completed-courses-table-div"]').should('not.contain', '1')
     })
   })
@@ -143,11 +143,11 @@ describe('Courselist saving-related functions work', () => {
     openSearch()
     openCompletedCoursesModal()
     selectSavedCourselist(courseListNames[0])
-    cy.get('[data-cy="course-list-input"]').type(`,TKT10001`)
+    cy.get('[data-cy="course-list-input"]').type(',TKT10001')
     cy.get('button').contains('Save').click()
     openSearch()
     openCompletedCoursesModal()
     selectSavedCourselist(courseListNames[0])
-    cy.get('[data-cy="course-list-input"]').contains(`TKT10001`)
+    cy.get('[data-cy="course-list-input"]').contains('TKT10001')
   })
 })

cypress/e2e/Custom_population.js

@@ -1,15 +1,13 @@
 /// <reference types="Cypress" />
 
 const openCustomPopupForm = () => {
-  cy.get('button').contains('Custom population').click()
+  cy.get('[data-cy="custom-pop-search-button"]').click()
 }
 
 const fillName = () => {
   const name = `TEST-${new Date().getTime()}`
   cy.contains('Insert name for this custom population if you wish to save it')
-    .siblings()
-    .get('input[placeholder=name]')
-    .type(name)
+  cy.get('[data-cy="custom-population-name-input"]').type(name)
   return name
 }
 
@@ -40,20 +38,17 @@ const deleteAllSearches = () => {
     })
 }
 
-const fillForm = content => {
-  cy.contains('Insert student numbers you wish to use for population here')
-    .siblings()
-    .get('textarea')
-    .type(content.join('\n'))
+const fillForm = (content, separator) => {
+  cy.get('[data-cy="student-number-input"]').type(content.join(separator))
 }
 
 const search = () => {
-  cy.get('button').contains('Search population').click()
+  cy.get('[data-cy="search-button"]').click()
 }
 
-const searchFor = studentnumbers => {
+const searchFor = (studentnumbers, separator) => {
   openCustomPopupForm()
-  fillForm(studentnumbers)
+  fillForm(studentnumbers, separator)
   search()
 }
 
@@ -74,8 +69,19 @@ const containsSpecificStudents = (studentnumbers = []) => {
   studentnumbers.forEach(s => cy.contains(s))
 }
 
+const checkRightsNotification = studentNumbers => {
+  cy.get('[data-cy="rights-notification"]').within(() => {
+    cy.contains(
+      'The following students information could not be displayed. This could be either because they do not exist, or you do not have the right to view their information.'
+    )
+    cy.get('ul').within(() => {
+      studentNumbers.forEach(number => cy.get('li').contains(number))
+    })
+  })
+}
+
 describe('Custom population tests', () => {
-  const nonExistentStudentNumbers = ['123', 'X', '-', ' ']
+  const nonExistentStudentNumbers = ['123', 'X', '-']
   beforeEach(() => {
     cy.init('/custompopulation')
     cy.url().should('include', '/custompopulation')
@@ -83,7 +89,7 @@ describe('Custom population tests', () => {
   })
 
   after(() => {
-    cy.visit(`${Cypress.config().baseUrl}/custompopulation`)
+    cy.visit('/custompopulation')
     cy.url().should('include', '/custompopulation')
     cy.contains('Custom population')
     cy.get('button').contains('Custom population').click()
@@ -92,9 +98,8 @@ describe('Custom population tests', () => {
 
   describe('Custom population searching', () => {
     it('Finds a proper population', () => {
-      cy.fixture('customPopulations').then(({ studentNumbersForCSStudentsSet1 }) => {
-        const students = studentNumbersForCSStudentsSet1
-        searchFor(students)
+      cy.fixture('customPopulations').then(({ studentNumbersForCSStudentsSet1: students }) => {
+        searchFor(students, '\n')
         hasLanded()
         containsAmountOfStudents(students.length)
         containsSpecificStudents(students)
@@ -102,17 +107,18 @@ describe('Custom population tests', () => {
     })
 
     it("Doesn't return non-existing students", () => {
-      cy.fixture('customPopulations').then(({ studentNumbersForCSStudentsSet1 }) => {
-        const students = [...studentNumbersForCSStudentsSet1, ...nonExistentStudentNumbers]
-        searchFor(students)
+      cy.fixture('customPopulations').then(({ studentNumbersForCSStudentsSet1: students }) => {
+        searchFor([...students, ...nonExistentStudentNumbers], ' ')
         hasLanded()
-        containsAmountOfStudents(studentNumbersForCSStudentsSet1.length)
-        containsSpecificStudents(studentNumbersForCSStudentsSet1)
+        containsAmountOfStudents(students.length)
+        containsSpecificStudents(students)
+        checkRightsNotification(nonExistentStudentNumbers)
       })
     })
 
     it("Doesn't find empty custom population", () => {
-      searchFor(nonExistentStudentNumbers)
+      searchFor(nonExistentStudentNumbers, ',')
+      checkRightsNotification(nonExistentStudentNumbers)
       cy.contains('Credit accumulation').should('not.exist')
       cy.contains('Programme distribution').should('not.exist')
       cy.contains('Courses of population').should('not.exist')
@@ -120,10 +126,11 @@ describe('Custom population tests', () => {
     })
 
     it("Doesn't return students user has no right to", () => {
-      // TODO: check that this doesn't create false positives, since this test goes
-      // through even if following students are not in anon sis-db.
+      // These students exist in the database, but the user doesn't have the right to view them
       const studentsForEduBachStudents = ['014990067', '013069465', '014853890']
-      searchFor(studentsForEduBachStudents)
+      // Two semicolons on purpose, the page should be able to handle it
+      searchFor(studentsForEduBachStudents, ';;')
+      checkRightsNotification(studentsForEduBachStudents)
       cy.contains('Credit accumulation').should('not.exist')
       cy.contains('Programme distribution').should('not.exist')
       cy.contains('Courses of population').should('not.exist')
@@ -132,12 +139,15 @@ describe('Custom population tests', () => {
   })
 
   describe('Custom population search saving', () => {
-    it('Saves a custom population search', () => {
-      cy.fixture('customPopulations').then(({ studentNumbersForCSStudentsSet1 }) => {
-        const students = studentNumbersForCSStudentsSet1
+    it('Saves a custom population search', { retries: 2 }, () => {
+      cy.fixture('customPopulations').then(({ studentNumbersForCSStudentsSet1: students }) => {
         openCustomPopupForm()
+        cy.contains(
+          'Insert student numbers you wish to use for population. Separate each number with a comma, semicolon, space, or newline.'
+        )
         const name = fillName()
-        fillForm(students)
+        // A comma and a newline on purpose, the page should be able to handle it
+        fillForm(students, ',\n')
         save()
 
         // Round 1
@@ -148,10 +158,9 @@ describe('Custom population tests', () => {
         containsSpecificStudents(students)
 
         // Round 2
-        cy.visit(`${Cypress.config().baseUrl}/custompopulation`)
-        cy.url().should('include', '/custompopulation')
+        cy.visit('/custompopulation')
         cy.contains('Custom population')
-        cy.get('button').contains('Custom population').click()
+        openCustomPopupForm()
         selectSavedPopulation(name)
         search()
         cy.contains(`Custom population "${name}"`)
@@ -161,35 +170,34 @@ describe('Custom population tests', () => {
     })
 
     it('Updates a custom population search', () => {
-      cy.fixture('customPopulations').then(({ studentNumbersForCSStudentsSet1, studentNumbersForCSStudentsSet2 }) => {
-        const students1 = studentNumbersForCSStudentsSet1
-        const students2 = studentNumbersForCSStudentsSet2
-        openCustomPopupForm()
-        const name = fillName()
-        fillForm(students1)
-        save()
+      cy.fixture('customPopulations').then(
+        ({ studentNumbersForCSStudentsSet1: students1, studentNumbersForCSStudentsSet2: students2 }) => {
+          openCustomPopupForm()
+          const name = fillName()
+          fillForm(students1, ' ')
+          save()
 
-        selectSavedPopulation(name)
-        search()
-        cy.contains(`Custom population "${name}"`)
-        containsAmountOfStudents(students1.length)
-        containsSpecificStudents(students1)
-        cy.contains('Custom population')
-        cy.get('button').contains('Custom population').click()
-        selectSavedPopulation(name)
-        fillForm([...students1, ...students2])
-        save()
+          selectSavedPopulation(name)
+          search()
+          cy.contains(`Custom population "${name}"`)
+          containsAmountOfStudents(students1.length)
+          containsSpecificStudents(students1)
+          cy.contains('Custom population')
+          openCustomPopupForm()
+          selectSavedPopulation(name)
+          fillForm(['\n', ...students2], ', ')
+          save()
 
-        cy.visit(`${Cypress.config().baseUrl}/custompopulation`)
-        cy.url().should('include', '/custompopulation')
-        cy.contains('Custom population')
-        cy.get('button').contains('Custom population').click()
-        selectSavedPopulation(name)
-        search()
-        cy.contains(`Custom population "${name}"`)
-        containsAmountOfStudents(students1.length + students2.length)
-        containsSpecificStudents([...students1, ...students2])
-      })
+          cy.visit('/custompopulation')
+          cy.contains('Custom population')
+          openCustomPopupForm()
+          selectSavedPopulation(name)
+          search()
+          cy.contains(`Custom population "${name}"`)
+          containsAmountOfStudents(students1.length + students2.length)
+          containsSpecificStudents([...students1, ...students2])
+        }
+      )
     })
   })
 })

cypress/e2e/Faculty_statistics.js

@@ -1,21 +1,27 @@
 /// <reference types="Cypress" />
 
+const path = require('path')
+
+const timestamp = new Date().toISOString().split('T')[0] // YYYY-MM-DD
+const downloadsFolder = Cypress.config('downloadsFolder')
+
 describe('Faculty overview', () => {
   describe('Faculty can be selected', () => {
     it('Faculties are listed and one can be chosen', () => {
       cy.init('/faculties')
-      cy.get('[data-cy=select-faculty]').contains('td', 'H10')
-      cy.contains('td', 'H99').should('not.exist')
-      cy.contains('td', 'H90').click()
-      cy.contains('.header', 'Eläinlääketieteellinen tiedekunta')
+      cy.get('[data-cy=select-faculty]').contains('a', 'Teologinen tiedekunta')
+      cy.contains('a', 'H99').should('not.exist')
+      cy.contains('a', 'Teologinen tiedekunta').click()
+      cy.contains('.header', 'Teologinen tiedekunta')
     })
   })
 
-  describe('Faculty basic information: admin user', () => {
+  describe('Basic information: admin user', () => {
     beforeEach(() => {
       cy.init('/faculties', 'admin')
-      cy.contains('td', 'H90').click()
+      cy.contains('a', 'Eläinlääketieteellinen tiedekunta').click()
     })
+
     it('Credits produced by faculty are shown', () => {
       cy.get('[data-cy="Section-CreditsProducedByTheFaculty"]').should('be.visible')
       cy.get('[data-cy="Graph-CreditsProducedByTheFaculty"]').should('be.visible')
@@ -26,11 +32,12 @@ describe('Faculty overview', () => {
     })
   })
 
-  describe('Faculty basic information: basic user', () => {
+  describe('Basic information: basic user', () => {
     beforeEach(() => {
       cy.init('/faculties')
-      cy.contains('td', 'H80').click()
+      cy.contains('a', 'Maatalous-metsätieteellinen tiedekunta').click()
     })
+
     it('Basic information tab show all graphs and tables', () => {
       cy.get('[data-cy="Table-CreditsProducedByTheFaculty"]').should('be.visible')
       cy.get('[data-cy="Graph-CreditsProducedByTheFaculty"]').should('be.visible')
@@ -74,12 +81,29 @@ describe('Faculty overview', () => {
       cy.get('[data-cy="StudentsOfTheFaculty-close-info"]').click()
       cy.get('[data-cy="StudentsOfTheFaculty-info-content"]').should('not.exist')
     })
+
+    it('Data can be exported to Excel files', () => {
+      const sections = [
+        'StudentsOfTheFaculty',
+        'GraduatedOfTheFaculty',
+        'ThesisWritersOfTheFaculty',
+        'CreditsProducedByTheFaculty',
+      ]
+      sections.forEach(section => {
+        cy.get(`[data-cy="Graph-${section}"]`).within(() => {
+          cy.get('[aria-label="View chart menu, Chart"]').click()
+          cy.contains('li.highcharts-menu-item', 'Download XLS').click()
+          const downloadedFile = `oodikone_${section}_H80_${timestamp}.xls`
+          cy.readFile(path.join(downloadsFolder, downloadedFile))
+        })
+      })
+    })
   })
 
   describe('Study programme information: users with access', () => {
     beforeEach(() => {
       cy.init('/faculties')
-      cy.contains('td', 'H80').click()
+      cy.contains('a', 'Maatalous-metsätieteellinen tiedekunta').click()
     })
 
     it('Study programme credit information is not visible in the beginning', () => {
@@ -131,7 +155,7 @@ describe('Faculty overview', () => {
   describe('Average graduation times', () => {
     beforeEach(() => {
       cy.init('/faculties')
-      cy.contains('td', 'H60').click()
+      cy.contains('a', 'Kasvatustieteellinen tiedekunta').click()
       cy.contains('Graduation times').click()
     })
 
@@ -140,7 +164,7 @@ describe('Faculty overview', () => {
       cy.get('[data-cy="Section-bachelor"]').should('be.visible')
       cy.get('[data-cy="Section-master"]').should('be.visible')
       cy.get('[data-cy="Section-master"]').within(() => {
-        cy.contains('Graduation year').should('be.visible')
+        cy.contains('text.highcharts-axis-title', 'Graduation year')
         cy.contains('.message', "Click a bar to view that year's programme level breakdown").should('be.visible')
       })
     })
@@ -166,7 +190,7 @@ describe('Faculty overview', () => {
         cy.get('div[class="programmes-graph"]').should('be.visible')
         cy.get('div[class="programmes-graph"]').within(() => {
           cy.contains('EDUK')
-          cy.contains('1 graduated').trigger('mouseover')
+          cy.get('[aria-label="EDUK, 40."]').trigger('mouseover')
           cy.contains('Kasvatustieteiden kandiohjelma')
           cy.contains('KH60_001')
         })
@@ -187,7 +211,7 @@ describe('Faculty overview', () => {
         cy.get('div[class="programmes-graph"]').should('be.visible')
         cy.get('div[class="programmes-graph"]').within(() => {
           cy.contains('EDUM')
-          cy.contains('24 graduated').trigger('mouseover')
+          cy.get('[aria-label="EDUM, 22."]').trigger('mouseover')
           cy.contains('Kasvatustieteiden maisteriohjelma')
           cy.contains('MH60_001')
         })
@@ -209,23 +233,29 @@ describe('Faculty overview', () => {
 
       cy.get('[data-cy="GraduationTimeToggle"]').click()
       cy.get('[data-cy="Section-master"]').within(() => {
-        cy.contains('16').click()
+        cy.get('[aria-label="2018, 16. On time."]').click()
         cy.get('div[class="programmes-breakdown-graph"]').should('be.visible')
         cy.get('div[class="programmes-breakdown-graph"]').within(() => {
           cy.contains('Year 2018 by start year')
           cy.contains('EDUM')
-          cy.contains('16').trigger('mouseover')
+          cy.get('[aria-label="EDUM, 3. Max. year overtime."]').trigger('mouseover')
           cy.contains('Kasvatustieteiden maisteriohjelma')
           cy.contains('MH60_001')
         })
       })
     })
+
+    it('Data can be exported to an Excel file', () => {
+      cy.get('[data-cy="DownloadButton-AverageGraduationTimes"]').click()
+      const downloadedFile = `oodikone_H60_graduation_times_${timestamp}.xlsx`
+      cy.readFile(path.join(downloadsFolder, downloadedFile))
+    })
   })
 
-  describe('Faculty Progress and student population -tab', () => {
+  describe('Faculty Progress and student population tab', () => {
     beforeEach(() => {
       cy.init('/faculties')
-      cy.contains('td', 'H50').click()
+      cy.contains('a', 'Matemaattis-luonnontieteellinen tiedekunta').click()
       cy.contains('Programmes and student populations').click()
     })
 
@@ -233,6 +263,7 @@ describe('Faculty overview', () => {
       cy.get('[data-cy="FacultyStudentStatsTable"]').should('be.visible')
       cy.get('[data-cy="FacultyStudentStatsTable"]').should('not.contain', '0 %')
     })
+
     it('User can view studentdata table with %', () => {
       cy.get('[data-cy="FacultyStudentStatsTable"]').should('be.visible')
       cy.get('[data-cy="HidePercentagesToggle"]').click()
@@ -245,8 +276,7 @@ describe('Faculty overview', () => {
       cy.get('[data-cy="Graph-FacultyMastersProgress"]').should('be.visible')
       cy.get('[data-cy="Graph-FacultyBachelorsProgress"]').should('be.visible')
     })
-    // Following two tests just test that nothing goes broken after toggling
-    // No data for testing that data actual change as supposed
+
     it('Graduations can be excluded', () => {
       cy.get('[data-cy="FacultyStudentStatsTable"]').should('be.visible')
       cy.get('[data-cy="StudentToggle"]').click()

cypress/e2e/Filters.js

@@ -83,9 +83,9 @@ describe('Population Statistics with CS master', () => {
     })
   })
 
-  describe('Studyright Type filter', () => {
+  describe('Studyright type filter', () => {
     it('is visible', () => {
-      cy.contains('Studyright Type')
+      cy.contains('Studyright type')
     })
 
     it('is set to all by default', () => {
@@ -129,7 +129,7 @@ describe('Population Statistics', () => {
     })
   })
 
-  it('Graduation filter works', { retries: 2 }, () => {
+  it('Graduation filter works', { retries: 3 }, () => {
     runTestStepWithPreAndPostParts('GraduatedFromProgramme', () => {
       const getCard = () => cy.cs('GraduatedFromProgramme-filter-card')
 
@@ -162,13 +162,13 @@ describe('Population Statistics', () => {
     })
   })
 
-  it('Credit filter works', () => {
+  it('Credit filter works', { retries: 3 }, () => {
     runTestStepWithPreAndPostParts('CreditsEarned', () => {
       testRangeFilter('CreditsEarned-filter-card', 50, 150, 118)
     })
   })
 
-  it('Age filter works', () => {
+  it('Age filter works', { retries: 3 }, () => {
     cy.clock(MOCKED_DATE, ['Date'])
     runTestStepWithPreAndPostParts('Age', () => {
       testRangeFilter('Age-filter-card', 20, 40, 47)
@@ -241,7 +241,7 @@ describe('Population Statistics', () => {
     })
   })
 
-  it('"Reset All Filters" button works', () => {
+  it('"Reset All Filters" button works', { retries: 3 }, () => {
     cy.cs('Gender-header').click()
     cy.cs('genderFilter-dropdown').selectFromDropdown(0)
     checkFilteringResult(42)
@@ -252,8 +252,8 @@ describe('Population Statistics', () => {
     checkFilteringResult(defaultAmountOfStudents)
   })
 
-  it('Studyright Type filter is not visible', () => {
-    cy.contains('Studyright Type').should('not.exist')
+  it('Studyright type filter is not visible', () => {
+    cy.contains('Studyright type').should('not.exist')
   })
 })
 
@@ -346,7 +346,7 @@ describe('Custom Population Statistics', () => {
     cy.fixture('customPopulations').then(({ studentNumbersForCSStudentsSet1, studentNumbersForCSStudentsSet2 }) => {
       const students = [...studentNumbersForCSStudentsSet1, ...studentNumbersForCSStudentsSet2]
       runTestStepWithPreAndPostParts = createRunTestStepWithPreAndPostPartsFunction(students.length)
-      cy.cs('student-no-input').click().type(students.join('\n'))
+      cy.cs('student-number-input').click().type(students.join('\n'))
     })
     cy.cs('search-button').click()
   })

cypress/e2e/Language_center.js

@@ -57,7 +57,7 @@ describe('When language center is opened', () => {
     it('"Access denied" is shown', () => {
       cy.init('/languagecenterview', 'norights')
       cy.contains('Access denied')
-      cy.contains("You're currently not allowed to see this page.")
+      cy.contains("You don't currently have permission to view this page.")
       cy.contains('Special populations').click()
       cy.contains('Language center view').should('not.exist')
     })

cypress/e2e/Population_statistics.js

@@ -1,7 +1,5 @@
 /// <reference types="Cypress" />
 // Now "Class statistics" in UI
-const moment = require('moment')
-const _ = require('lodash')
 
 describe('Population Statistics tests', () => {
   const pathToCSBach2017 =
@@ -91,7 +89,7 @@ describe('Population Statistics tests', () => {
       cy.contains('Courses of class').click()
       cy.get('Opiskelijan digitaidot - Kumpula').should('not.exist')
       cy.get('[data-cy=curriculum-picker]').click()
-      cy.contains('2020 - 2022').click()
+      cy.contains('2020 - 2026').click()
       cy.contains('Opiskelijan digitaidot - Kumpula')
     })
 
@@ -102,11 +100,13 @@ describe('Population Statistics tests', () => {
         .then($parentDiv => {
           if (!$parentDiv.hasClass('active')) cy.contains('Students (170)').click()
         })
-      cy.get('[data-cy=student-table-tabs]').contains('Tags').click()
+      cy.get('[data-cy=student-table-tabs]').within(() => {
+        cy.contains('Tags').click()
+      })
       cy.contains('No tags defined. You can define them here.').find('a').click()
       cy.contains('Tags').click()
       cy.contains('Tietojenkäsittelytieteen kandiohjelma')
-      cy.contains('Create new tag')
+      cy.contains('Create a new tag')
     })
 
     // This test sometimes fails on headless mode. It seems that the click on the
@@ -132,21 +132,17 @@ describe('Population Statistics tests', () => {
       cy.contains('Credit accumulation (for 170 students)')
     })
 
-    it('Credit Statistics, Credits Gained tab works', () => {
+    it('Credit Statistics, Credits gained tab works', () => {
       cy.selectStudyProgramme('Tietojenkäsittelytieteen kandiohjelma')
       cy.contains('Credit statistics')
         .parent()
         .then($parentDiv => {
           if (!$parentDiv.hasClass('active')) cy.contains('Credit statistics').click()
         })
-      cy.contains('Credits Gained').click()
+      cy.contains('Credits gained').click()
       cy.get("[data-cy='credits-gained-main-table']").should('contain', 'All students of the class')
-      const today = moment().endOf('month')
-      const months = Math.round(moment.duration(moment(today).diff(moment('2017-08-01'))).asMonths())
-      // Months are capped to goal time of the degree, 36 months is the goal time for bachelor's degree
-      const monthsForLimits = Math.min(36, months)
-      const limits = [1, ..._.range(1, 5).map(p => Math.ceil(monthsForLimits * ((p * 15) / 12))), null]
-      const ranges = _.range(1, limits.length).map(i => _.slice(limits, i - 1, i + 1))
+      const limits = [45, 90, 135, 180, null]
+      const ranges = limits.map((limit, i) => (i === 0 ? [1, limit] : [limits[i - 1], limit]))
 
       cy.get('.credits-gained-table').should('contain', '(n = 170)')
 
@@ -165,14 +161,14 @@ describe('Population Statistics tests', () => {
       }
 
       cy.get("[data-cy='credits-gained-table-body'] td:nth-child(3)").then($els => {
-        const sum = [...$els].map($el => parseInt($el.innerText)).reduce((a, b) => a + b, 0)
+        const sum = [...$els].map($el => parseInt($el.innerText, 10)).reduce((a, b) => a + b, 0)
         expect(sum).to.equal(170)
       })
 
       cy.get("[data-cy='credits-gained-table-Ei valintatapaa']").should('not.exist')
     })
 
-    it('Credit Statistics, Credits Gained tab shows stats by admissions', () => {
+    it('Credit Statistics, Credits gained tab shows stats by admissions', () => {
       cy.visit(pathToCSMaster2019)
       cy.cs('filtered-students')
       cy.contains('Credit statistics')
@@ -181,8 +177,7 @@ describe('Population Statistics tests', () => {
         .then($parentDiv => {
           if (!$parentDiv.hasClass('active')) cy.get("[data-cy='Credit statistics']").click()
         })
-      cy.contains('Credits Gained').click()
-      cy.get('.credits-gained-divider').click()
+      cy.contains('Credits gained').click()
       cy.get("[data-cy='credits-gained-table-Avoin väylä']").should('exist')
       cy.get("[data-cy='credits-gained-table-Yhteispisteet']").should('exist')
       cy.get("[data-cy='credits-gained-table-Muu']").should('exist')
@@ -198,8 +193,9 @@ describe('Population Statistics tests', () => {
         })
       cy.get("[data-cy='credit-stats-tab'] > .menu > :nth-child(2)").click()
 
-      cy.get("[data-cy='credit-stats-table-name-header']").should('contain', 'Statistic for n = 170 Students')
-      cy.get("[data-cy='credit-stats-mean']").should('contain', '114.74')
+      cy.get("[data-cy='credit-stats-population-size']").should('contain', 'n = 170')
+      cy.get("[data-cy='credit-stats-average']").should('contain', '114.74')
+      cy.get("[data-cy='credit-stats-median']").should('contain', '109.00')
       cy.get("[data-cy='credit-stats-stdev']").should('contain', '65.53')
       cy.get("[data-cy='credit-stats-min']").should('contain', '5')
       cy.get("[data-cy='credit-stats-max']").should('contain', '314')
@@ -221,16 +217,16 @@ describe('Population Statistics tests', () => {
         })
       cy.contains(existing)
       cy.contains(nonExisting).should('not.exist')
-      cy.contains('button', 'Check studentnumbers').click()
-      cy.contains('Check for studentnumbers')
+      cy.contains('button', 'Check student numbers').click()
+      cy.contains('Check for student numbers')
       cy.get('textarea').type(existing).type('{enter}').type(nonExisting)
-      cy.contains('button', 'check students').click()
+      cy.contains('button', 'Check students').click()
       cy.contains('#checkstudentsresults', 'Results').within(() => {
-        cy.contains('Student numbers in list and in oodi').click()
+        cy.contains('Student numbers in list and in Sisu').click()
         cy.contains('#found', existing)
-        cy.contains('Student numbers in list but not in oodi').click()
+        cy.contains('Student numbers in list but not in Sisu').click()
         cy.contains('#notfound', nonExisting)
-        cy.contains('Student numbers in oodi but not in list').click()
+        cy.contains('Student numbers in Sisu but not in list').click()
         cy.contains('#notsearched', '010614509')
       })
     })

cypress/e2e/Students.js

@@ -39,7 +39,7 @@ describe('Students tests', () => {
     cy.url().should('include', '/students')
     cy.get('.prompt').type(student.studentnumber)
     cy.contains('td a', student.studentnumber).click()
-    cy.contains('Tietojenkäsittelytieteen kandiohjelma (01.08.2017 - 31.07.2025')
+    cy.contains('Tietojenkäsittelytieteen kandiohjelma (01.08.2017–31.07.2025')
     cy.contains(student.lastname).should('not.exist')
     cy.contains(student.firstnames).should('not.exist')
 
@@ -64,6 +64,7 @@ describe('Students tests', () => {
     cy.get('.prompt').type(student.studentnumber)
     cy.contains('td a', student.studentnumber).click()
     cy.contains('Introduction to Machine Learning (DATA11002)')
+      .parent()
       .siblings()
       .last()
       .within(() => {
@@ -81,6 +82,14 @@ describe('Students tests', () => {
       .and('include', 'https://sisu.helsinki.fi/tutor/role/staff/student/hy-hlo-84830887/basic/basic-info')
   })
 
+  it('Bachelor Honours section is shown', () => {
+    cy.get('.prompt').type(student.studentnumber)
+    cy.contains('td a', student.studentnumber).click()
+    cy.contains('h4', 'Bachelor Honours')
+    cy.contains('.tag.label', 'Not qualified for Honours')
+    cy.contains('.tag.label', 'Has not graduated')
+  })
+
   it('Searching with bad inputs doesnt yield results', () => {
     cy.get('.prompt').type('SWAG LITTINEN')
     cy.contains('Student number').should('not.exist')
@@ -92,7 +101,9 @@ describe('Students tests', () => {
   it('Can jump to population page', () => {
     cy.get('.prompt').type(student.studentnumber)
     cy.contains('td a', student.studentnumber).click()
-    cy.get('i.level.up.alternate.icon').eq(0).click()
+    cy.contains('.ui.table', 'Completed').within(() => {
+      cy.get('i.level.up.alternate.icon').click()
+    })
     cy.contains('Tietojenkäsittelytieteen kandiohjelma')
     cy.contains('class size')
   })

cypress/e2e/Study_guidance_groups.js

@@ -15,7 +15,7 @@ describe('Study guidance group tests', () => {
         cy.init('/studyguidancegroups')
         cy.contains('Access denied')
         cy.contains(
-          "You're currently not allowed to see this page. Please contant oodikone@helsinki.fi, if this is a mistake."
+          "You don't currently have permission to view this page. If you believe this is a mistake, please contact oodikone@helsinki.fi."
         )
       })
     })
@@ -79,14 +79,7 @@ describe('Study guidance group tests', () => {
       })
 
       it('general tab of the students table has the correct columns', () => {
-        const firstRowHeadings = [
-          'Phone number',
-          'Student number',
-          'Credits',
-          'Start year at uni',
-          'Study programmes',
-          'Tags',
-        ]
+        const firstRowHeadings = ['Student number', 'Credits', 'Start year at uni', 'Study programmes', 'Tags']
         const secondRowHeadings = ['All', 'Since 1.1.1970']
         cy.cs('Students (2)').click()
         cy.get('[data-cy="student-table-tabs"] table thead tr').then($tr => {
@@ -137,7 +130,6 @@ describe('Study guidance group tests', () => {
 
       it('general tab of the students table has the correct columns', () => {
         const firstRowHeadings = [
-          'Phone number',
           'Student number',
           'Credits',
           'Start of studyright',
@@ -146,7 +138,11 @@ describe('Study guidance group tests', () => {
           'Graduation date',
           'Start year at uni',
           'Other programmes',
-          'Semesters present amount',
+          'Transferred from',
+          'Gender',
+          'Citizenship',
+          'Curriculum period',
+          'Latest attainment date',
           'Tags',
         ]
         const secondRowHeadings = ['All', 'HOPS', 'Since 1.8.2018']
@@ -154,7 +150,9 @@ describe('Study guidance group tests', () => {
         cy.get('[data-cy="student-table-tabs"] table thead tr').then($tr => {
           const firstRowTexts = Array.from($tr[0].children).map(elem => elem.innerText.replace('\n', ' '))
           expect(firstRowTexts).to.deep.equal(firstRowHeadings)
-          const secondRowTexts = Array.from($tr[1].children).map(elem => elem.innerText)
+          const secondRowTexts = Array.from($tr[1].children)
+            .filter(elem => elem.style.display !== 'none')
+            .map(elem => elem.innerText)
           expect(secondRowTexts).to.deep.equal(secondRowHeadings)
         })
       })

cypress/e2e/Studyprogramme_overview.js

@@ -23,7 +23,7 @@ const getEmptyYears = isAcademicYear => {
 }
 
 describe('Studyprogramme overview', () => {
-  /* Basic information overview -tests*/
+  /* Basic information overview -tests */
   describe('Basic information -view works for basic user', () => {
     beforeEach(() => {
       cy.init('/study-programme')
@@ -42,24 +42,27 @@ describe('Studyprogramme overview', () => {
     it('Basic information contains correct students', () => {
       const years = getEmptyYears()
       const tableContents = [
-        // [Year, Started, Graduated, Transferred Away, Transferred to]
-        ...years.map(year => [year, 0, 0, 0, 0]),
-        [2021, 0, 0, 1, 0],
-        [2020, 10, 35, 2, 2],
-        [2019, 86, 17, 1, 1],
-        [2018, 161, 1, 0, 0],
-        [2017, 171, 0, 0, 0],
+        // [Year, Started studying, Accepted, Graduated, Transferred Away, Transferred to]
+        ...years.map(year => [year, 0, 0, 0, 0, 0]),
+        [2021, 0, 0, 0, 1, 0],
+        [2020, 10, 10, 35, 2, 2],
+        [2019, 83, 86, 17, 1, 1],
+        [2018, 150, 161, 1, 0, 0],
+        [2017, 158, 171, 0, 0, 0],
       ]
 
       cy.checkTableStats(tableContents, 'StudentsOfTheStudyprogramme')
     })
 
     it('Basic information contains correct credits', () => {
+      const years = getEmptyYears()
       const tableContents = [
-        [2020, 4511, 4511, 0, 0, 167],
-        [2019, 7097, 7097, 0, 0, 349],
-        [2018, 5742, 5742, 0, 0, 272],
-        [2017, 1910, 1910, 0, 0, 388],
+        ...years.map(year => [year, 0, 0]),
+        [2021, 0, 0, 0, 0, 0],
+        [2020, 4511, 4511, 0, 0, 406],
+        [2019, 7117, 7097, 0, 0, 434],
+        [2018, 5742, 5737, 0, 0, 150],
+        [2017, 1887, 1882, 0, 0, 186],
       ]
 
       cy.checkTableStats(tableContents, 'CreditsProducedByTheStudyprogramme')
@@ -84,22 +87,24 @@ describe('Studyprogramme overview', () => {
       cy.get('[data-cy=StudentToggle]').click()
       const years = getEmptyYears()
       const studentTableContents = [
-        // [Year, Started, Graduated]
-        ...years.map(year => [year, 0, 0]),
-        [2021, 0, 0],
-        [2020, 10, 35],
-        [2019, 86, 17],
-        [2018, 161, 1],
-        [2017, 171, 0],
+        // [Year, Started studying, Accepted, Graduated]
+        ...years.map(year => [year, 0, 0, 0]),
+        [2021, 0, 0, 0],
+        [2020, 10, 10, 35],
+        [2019, 83, 86, 17],
+        [2018, 150, 161, 1],
+        [2017, 158, 171, 0],
       ]
 
       cy.checkTableStats(studentTableContents, 'StudentsOfTheStudyprogramme')
 
       const creditTableContents = [
-        [2020, 4511, 4511, 0, 0, 167],
-        [2019, 7097, 7097, 0, 0, 349],
-        [2018, 5742, 5742, 0, 0, 272],
-        [2017, 1910, 1910, 0, 0, 388],
+        ...years.map(year => [year, 0, 0]),
+        [2021, 0, 0, 0, 0, 0],
+        [2020, 4511, 4511, 0, 0, 406],
+        [2019, 7117, 7097, 0, 0, 434],
+        [2018, 5742, 5737, 0, 0, 150],
+        [2017, 1887, 1882, 0, 0, 186],
       ]
 
       cy.checkTableStats(creditTableContents, 'CreditsProducedByTheStudyprogramme')
@@ -123,22 +128,23 @@ describe('Studyprogramme overview', () => {
       const isAcademicYear = true
       const years = getEmptyYears(isAcademicYear)
       const studentTableContents = [
-        // [Year, Started, Graduated, Transferred away, Transferred to]
-        ...years.map(year => [year, 0, 0, 0, 0]),
-        ['2021 - 2022', 0, 0, 0, 0],
-        ['2020 - 2021', 10, 6, 3, 2],
-        ['2019 - 2020', 86, 38, 1, 0],
-        ['2018 - 2019', 161, 8, 0, 1],
-        ['2017 - 2018', 171, 1, 0, 0],
+        // [Year, Started studying, Accepted, Graduated, Transferred away, Transferred to]
+        ...years.map(year => [year, 0, 0, 0, 0, 0]),
+        ['2021 - 2022', 0, 0, 0, 0, 0],
+        ['2020 - 2021', 10, 10, 6, 1, 2],
+        ['2019 - 2020', 83, 86, 38, 3, 0],
+        ['2018 - 2019', 150, 161, 8, 0, 1],
+        ['2017 - 2018', 158, 171, 1, 0, 0],
       ]
       cy.checkTableStats(studentTableContents, 'StudentsOfTheStudyprogramme')
 
       const creditTableContents = [
-        // Credit table doesnt show (later) years without data
-        ['2020 - 2021', 352, 352, 0, 0, 60],
-        ['2019 - 2020', 6966, 6966, 0, 0, 193],
-        ['2018 - 2019', 7777, 7777, 0, 0, 328],
-        ['2017 - 2018', 4165, 4165, 0, 0, 344],
+        ...years.map(year => [year, 0, 0]),
+        ['2021 - 2022', 0, 0, 0, 0, 0],
+        ['2020 - 2021', 352, 352, 0, 0, 296],
+        ['2019 - 2020', 6966, 6966, 0, 0, 430],
+        ['2018 - 2019', 7797, 7777, 0, 0, 259],
+        ['2017 - 2018', 4142, 4132, 0, 0, 191],
       ]
 
       cy.checkTableStats(creditTableContents, 'CreditsProducedByTheStudyprogramme')
@@ -147,15 +153,17 @@ describe('Studyprogramme overview', () => {
 
     it('Basic information graphs render', () => {
       cy.get('[data-cy=Graph-StudentsOfTheStudyprogramme')
-        .should('contain', 'Started')
+        .should('contain', 'Started studying')
+        .should('contain', 'Accepted')
         .should('contain', 'Graduated')
         .should('contain', 'Transferred away')
+        .should('contain', 'Transferred to')
 
       cy.get('[data-cy=Graph-CreditsProducedByTheStudyprogramme')
         .should('contain', 'Degree students')
         .should('contain', 'Transferred')
-        .should('contain', 388)
         .should('contain', 7097)
+        .should('contain', 434)
 
       cy.get('[data-cy=Graph-GraduatedAndThesisWritersOfTheProgramme')
         .should('contain', 'Graduated students')
@@ -170,11 +178,11 @@ describe('Studyprogramme overview', () => {
       cy.get('[data-cy=GraduationTimeToggle]').click()
       cy.get('[data-cy=graduation-times-graphBachelor]').within(() => {
         cy.contains('Graduation year')
-        cy.contains('2019')
-        cy.contains('17 graduated').trigger('mouseover')
-        cy.contains('study time: 23 months')
-        cy.contains('17 graduated on time')
-        cy.contains('0 graduated max year overtime')
+        cy.contains('2020')
+        cy.contains('35 graduated').trigger('mouseover')
+        cy.contains('median study time: 34 months')
+        cy.contains('30 graduated on time')
+        cy.contains('5 graduated max year overtime')
       })
 
       cy.get('[data-cy=Graph-ProgrammesBeforeOrAfter')
@@ -200,9 +208,9 @@ describe('Studyprogramme overview', () => {
         cy.contains('Graduation year')
         cy.contains('2020')
         cy.contains('24 graduated').trigger('mouseover')
-        cy.contains('study time: 22 months')
-        cy.contains('20 graduated on time')
-        cy.contains('4 graduated max year overtime')
+        cy.contains('study time: 22.5 months')
+        cy.contains('19 graduated on time')
+        cy.contains('5 graduated max year overtime')
       })
 
       cy.get('[data-cy=graduation-times-graphBachelor]').within(() => {
@@ -215,7 +223,7 @@ describe('Studyprogramme overview', () => {
     })
   })
 
-  /* Studytrack overview -tests*/
+  /* Studytrack overview -tests */
   describe('Studytrack overview works for basic user', () => {
     beforeEach(() => {
       cy.init('/study-programme')
@@ -232,27 +240,28 @@ describe('Studyprogramme overview', () => {
 
     it('Students of the studyprogramme are shown correctly', () => {
       const tableContents = [
-        // [Year, All, Started studying, Currently enrolled, Absent, Inactive, Graduated, Men, Women, other/unknown Finnish, other]
+        // [Year, All, Started studying, Present, Absent, Inactive, Graduated, Men, Women, Other/Unknown, Finland, Other]
         ['2020 - 2021', 12, 10, 0, 0, 12, 0, 10, 2, 0, 12, 0],
-        ['2019 - 2020', 86, 86, 0, 0, 85, 1, 65, 21, 0, 86, 0],
-        ['2018 - 2019', 162, 161, 0, 0, 151, 11, 118, 44, 0, 161, 1],
-        ['2017 - 2018', 171, 171, 0, 0, 129, 42, 135, 36, 0, 166, 5],
-        ['Total', 431, 428, 0, 0, 377, 54, 328, 103, 0, 425, 6],
+        ['2019 - 2020', 86, 83, 0, 0, 85, 1, 65, 21, 0, 86, 0],
+        ['2018 - 2019', 162, 150, 0, 0, 151, 11, 118, 44, 0, 161, 1],
+        ['2017 - 2018', 171, 158, 0, 0, 130, 41, 135, 36, 0, 166, 5],
+        ['Total', 431, 401, 0, 0, 378, 53, 328, 103, 0, 425, 6],
       ]
 
       cy.checkTableStats(tableContents, 'StudytrackOverview')
     })
 
     it('Student progress data is shown correctly', () => {
+      const years = getEmptyYears(true)
       const tableContents = [
-        ['2023 - 2024', 0, 0, 0, 0, 0, 0, 0, 0],
-        ['2022 - 2023', 0, 0, 0, 0, 0, 0, 0, 0],
+        // [Year, All, < 30 credits, 30–60 credits, 60–90 credits, 90–120 credits, 120–150 credits, 150–180 credits, ≥ 180 credits]
+        ...years.map(year => [year, 0, 0, 0, 0, 0, 0, 0, 0]),
         ['2021 - 2022', 0, 0, 0, 0, 0, 0, 0, 0],
         ['2020 - 2021', 12, 12, 0, 0, 0, 0, 0, 0],
         ['2019 - 2020', 86, 26, 34, 21, 5, 0, 0, 0],
-        ['2018 - 2019', 162, 10, 27, 47, 36, 26, 12, 4],
+        ['2018 - 2019', 162, 10, 28, 47, 35, 26, 12, 4],
         ['2017 - 2018', 171, 20, 21, 26, 22, 22, 33, 27],
-        ['Total', 431, 68, 82, 94, 63, 48, 45, 31],
+        ['Total', 431, 68, 83, 94, 62, 48, 45, 31],
       ]
 
       cy.checkTableStats(tableContents, 'StudytrackProgress')
@@ -270,15 +279,15 @@ describe('Studyprogramme overview', () => {
 
       cy.get('[data-cy=graduation-times-graphBachelor]').within(() => {
         cy.contains('Start year')
-        cy.contains('2019 - 2020')
-        cy.contains('42 graduated').trigger('mouseover')
-        cy.contains('study time: 31.5 months')
-        cy.contains('39 graduated on time')
+        cy.contains('2017 - 2018')
+        cy.contains('41 graduated').trigger('mouseover')
+        cy.contains('study time: 31 months')
+        cy.contains('36 graduated on time')
       })
     })
   })
 
-  /* Programme courses -tests*/
+  /* Programme courses -tests */
   describe('Programme courses works for basic user', () => {
     beforeEach(() => {
       cy.init('/study-programme')
@@ -347,7 +356,7 @@ describe('Studyprogramme overview', () => {
     })
   })
 
-  /* Tag-tests*/
+  /* Tag-tests */
   describe('Basic information -view works for basic user', () => {
     beforeEach(() => {
       cy.init('/study-programme')
@@ -359,7 +368,7 @@ describe('Studyprogramme overview', () => {
       const name = `tag-${new Date().getTime()}`
       cy.get('.tagNameSelectInput > .ui > input').type(name)
       cy.get('.yearSelectInput').type('2018')
-      cy.contains('Create new tag').click()
+      cy.contains('Create a new tag').click()
       cy.contains(name)
       cy.contains('2018')
       deleteTag(name)
@@ -371,7 +380,7 @@ describe('Studyprogramme overview', () => {
       cy.get('.yearSelectInput').type('2018')
 
       cy.get('.ui > label').click()
-      cy.contains('Create new tag').click()
+      cy.contains('Create a new tag').click()
       cy.contains(name)
       deleteTag(name)
     })
@@ -382,16 +391,18 @@ describe('Studyprogramme overview', () => {
       const student = '010113437'
       cy.get('.tagNameSelectInput > .ui > input').type(name)
       cy.get('.yearSelectInput').type('2018')
-      cy.contains('Create new tag').click()
+      cy.contains('Create a new tag').click()
       cy.contains(name)
 
-      cy.contains('Add tags to students').click()
+      cy.contains('Add a tag to students').click()
       cy.get('.form > .field > .dropdown').click().get('.ui > input.search').type(name).click()
 
       cy.get('.form > .field > .dropdown > .visible').contains(name).click()
 
       cy.get('textarea').type('010113437')
-      cy.get('.positive').click()
+      cy.contains('Add tags').click()
+
+      cy.contains('Successfully added tags to students.')
 
       cy.contains('Students').click()
       cy.get('.prompt').type(student)

cypress/e2e/Teachers.js

@@ -11,7 +11,7 @@ describe('Teachers page tests', () => {
 
   it('Check Statistics', () => {
     cy.get(':nth-child(1) > .ui > .search').click()
-    cy.contains('Autumn 2020').click()
+    cy.contains('Syksy 2020').click()
     cy.cs('course-providers').click()
     cy.contains('Tietojenkäsittelytieteen kandiohjelma').click()
     cy.cs('course-providers').children('.icon').click()
@@ -25,15 +25,21 @@ describe('Teachers page tests', () => {
     cy.url().should('include', '/teachers')
     cy.get('.borderless > :nth-child(3)').click()
     cy.get('.prompt').type(teacher1.split()[0])
-    cy.contains(teacher1)
+    cy.contains('td', teacher1)
   })
 
   it('Can check teacher page', () => {
-    cy.url().should('include', '/teachers')
-    cy.get('.borderless > :nth-child(3)').click()
-    cy.get('.prompt').type(teacher1.split()[0])
-    cy.contains('td', teacher1).click()
-    cy.contains('Aineopintojen harjoitustyö: Tietokantasovellus')
+    cy.visit('/teachers/hy-hlo-51367956')
+    cy.contains('Landgraf Leo')
+    cy.get('.ok-sortable-table tbody tr')
+      .first()
+      .within(() => {
+        cy.contains('td:nth-child(1)', 'TKT20011')
+        cy.contains('td:nth-child(2)', 'Aineopintojen harjoitustyö: Tietokantasovellus')
+        cy.contains('td:nth-child(3)', '96')
+        cy.contains('td:nth-child(4)', '0')
+        cy.contains('td:nth-child(5)', '88.89%')
+      })
   })
 
   it('Check leaderboad works', () => {

cypress/support/e2e.js

@@ -13,6 +13,8 @@
 // https://on.cypress.io/configuration
 // ***********************************************************
 
+// eslint-disable-next-line import/no-extraneous-dependencies
+require('@cypress/code-coverage/support')
 require('./commands')
 
 // This error is benign and seems to be only present in Cypress

docker-compose.ci.yml

@@ -44,7 +44,7 @@ services:
     <<: *defaults
     command: >
       sh -c 'redis-server --appendonly yes && redis-cli flushall'
-    image: redis:6.2.13
+    image: redis:6.2.14
     ports:
       - 6379:6379
 
@@ -81,7 +81,7 @@ services:
 
   jami-db:
     <<: *defaults
-    image: postgres:13.2
+    image: postgres:15.7
     environment:
       - PGDATA=/data
       - POSTGRES_PASSWORD=postgres
@@ -161,6 +161,6 @@ services:
     <<: *defaults
     command: '-cid sis-updater-nats -m 8222 -p 4222 --max_channels 1000 --max_age 2h --hb_fail_count 2 --hb_timeout 10s --hb_interval 10s --auth dev --file_slice_max_bytes 0 --file_slice_max_age 60s --max_msgs 0 -store file -dir datastore'
     container_name: sis-updater-nats
-    image: nats-streaming:0.16.2
+    image: nats-streaming:0.25.6
     profiles:
       - updater

docker-compose.fd.yml

@@ -0,0 +1,185 @@
+x-defaults: &defaults
+  restart: unless-stopped
+
+x-build_defaults: &build_defaults
+  dockerfile: dev.Dockerfile
+
+services:
+  adminer:
+    <<: *defaults
+    container_name: adminer
+    environment:
+      ADMINER_DESIGN: pepa-linha
+    image: adminer:4.8.1
+    ports:
+      - 5050:8080
+    volumes:
+      - ./adminer-plugins:/var/www/html/plugins-enabled
+
+  backend:
+    <<: *defaults
+    build:
+      <<: *build_defaults
+      context: services/backend
+    depends_on:
+      - kone-db
+      - redis
+      - sis-db
+      - user-db
+    env_file:
+      - .env
+    environment:
+      DB_URL_KONE: postgres://postgres@kone-db:5432/kone-db
+      DB_URL_USER: postgres://postgres@user-db:5432/user-db
+      FRONT_URL: http://localhost:3000
+      REDIS: redis
+      SECRET_TOKEN: dev
+      SIS_DB_URL: postgres://postgres@sis-db:5432/sis-db
+      SIS_UPDATER_URL: http://sis-updater-scheduler:8082
+      IMPORTER_DB_API_URL: 'https://localhost:3005'
+      JAMI_URL: 'http://jami:3003/'
+      SERVICE_PROVIDER: 'Fd'
+      SIS_HOST: ${SIS_HOST}
+      SIS_GRAPHQL_APPLICATION_ACCOUNT: ${SIS_GRAPHQL_APPLICATION_ACCOUNT}
+      SIS_GRAPHQL_APPLICATION_KEY: ${SIS_GRAPHQL_APPLICATION_KEY}
+    ports:
+      - 8080:8080
+    volumes:
+      - ./environments/ha:/opt/app-root/src/src/environment
+      - ./services/backend/src:/opt/app-root/src/src
+  frontend:
+    <<: *defaults
+    build:
+      <<: *build_defaults
+      context: services/frontend
+    container_name: frontend
+    ports:
+      - 3000:3000
+    environment:
+      REACT_APP_SERVICE_PROVIDER: 'Fd'
+    volumes:
+      - ./services/frontend/src/:/opt/app-root/src/src
+
+  kone-db:
+    <<: *defaults
+    container_name: kone-db
+    environment:
+      PGDATA: /data
+      POSTGRES_DB: kone-db
+      POSTGRES_HOST_AUTH_METHOD: trust
+    image: postgres:15.7
+    ports:
+      - 12349:5432
+    volumes:
+      - kone-db-data:/data
+
+  redis:
+    <<: *defaults
+    command: 'redis-server --appendonly yes'
+    container_name: redis
+    image: redis:6.2.14
+    ports:
+      - '6379:6379'
+    volumes:
+      - redis-data:/data
+
+  sis-db:
+    <<: *defaults
+    container_name: sis-db
+    environment:
+      PGDATA: /data
+      POSTGRES_DB: sis-db
+      POSTGRES_HOST_AUTH_METHOD: trust
+    image: postgres:15.7
+    volumes:
+      - sis-db-data:/data
+    shm_size: 2gb
+    ports:
+      - 12345:5432
+
+  sis-updater-nats:
+    <<: *defaults
+    command: '-cid sis-updater-nats -m 8222 -p 4222 --max_channels 1000 --max_age 2h --hb_fail_count 2 --hb_timeout 10s --hb_interval 10s --auth dev --file_slice_max_bytes 0 --file_slice_max_age 60s --max_msgs 0 -store file -dir datastore'
+    container_name: sis-updater-nats
+    image: nats-streaming:0.25.6
+
+  sis-updater-scheduler:
+    <<: *defaults
+    build:
+      <<: *build_defaults
+      context: updater/sis-updater-scheduler
+    container_name: sis-updater-scheduler
+    extra_hosts:
+      - 'host.docker.internal:host-gateway'
+    depends_on:
+      - redis
+      - sis-updater-nats
+    environment:
+      REDIS_URI: //redis:6379
+      SECRET_TOKEN: dev
+      SIS_IMPORTER_HOST: ${SIS_IMPORTER_DB_HOST:-host.docker.internal}
+      SIS_IMPORTER_PORT: ${SIS_IMPORTER_DB_PORT:-15234}
+      SIS_IMPORTER_DATABASE: importer-db
+      SIS_IMPORTER_PASSWORD: dev
+      SIS_IMPORTER_USER: dev
+      SIS_NATS_TOKEN: dev
+      SIS_NATS_URI: sis-updater-nats://sis-updater-nats:4222
+    ports:
+      - 8082:8082
+    volumes:
+      - ./updater/sis-updater-scheduler/:/opt/app-root/src
+
+  sis-updater-worker:
+    <<: *defaults
+    deploy:
+      replicas: 2
+      mode: replicated
+    build:
+      <<: *build_defaults
+      context: updater/sis-updater-worker
+    depends_on:
+      - redis
+      - sis-db
+      - sis-updater-nats
+    extra_hosts:
+      - 'host.docker.internal:host-gateway'
+    environment:
+      DB_URL: postgres://postgres@sis-db:5432/sis-db
+      REDIS_URI: //redis:6379
+      SIS_IMPORTER_HOST: ${SIS_IMPORTER_DB_HOST:-host.docker.internal}
+      SIS_IMPORTER_PORT: ${SIS_IMPORTER_DB_PORT:-15234}
+      SIS_IMPORTER_DATABASE: importer-db
+      SIS_IMPORTER_PASSWORD: dev
+      SIS_IMPORTER_USER: dev
+      SIS_PASSWORD: postgres
+      SIS_NATS_TOKEN: dev
+      SIS_NATS_URI: sis-updater-nats://sis-updater-nats:4222
+      ROOT_ORG_ID: ${ROOT_ORG_ID}
+    volumes:
+      - ./updater/sis-updater-worker/:/opt/app-root/src
+
+  user-db:
+    <<: *defaults
+    container_name: user-db
+    environment:
+      PGDATA: /data
+      POSTGRES_DB: user-db
+      POSTGRES_HOST_AUTH_METHOD: trust
+    image: postgres:15.7
+    volumes:
+      - user-db-data:/data
+    ports:
+      - 12347:5432
+
+volumes:
+  kone-db-data:
+  redis-data:
+  sis-db-data:
+  user-db-data:
+
+networks:
+  default:
+    name: oodikone
+  importer:
+    name: importer_network
+    external: true

docker-compose.test.yml

@@ -0,0 +1,5 @@
+services:
+  frontend:
+    volumes:
+      - frontend-nodemod:/opt/app-root/src/node_modules
+      - ./services/frontend/instrumented:/opt/app-root/src/src

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '2.1'
-
 x-defaults: &defaults
   restart: unless-stopped
 
@@ -12,7 +10,7 @@ services:
     container_name: adminer
     environment:
       ADMINER_DESIGN: pepa-linha
-    image: adminer:4.8.0
+    image: adminer:4.8.1
     ports:
       - 5050:8080
     volumes:
@@ -30,6 +28,7 @@ services:
       - user-db
     env_file:
       - .env
+    tty: true
     environment:
       DB_URL_KONE: postgres://postgres@kone-db:5432/kone-db
       DB_URL_USER: postgres://postgres@user-db:5432/user-db
@@ -75,7 +74,7 @@ services:
     <<: *defaults
     command: 'redis-server --appendonly yes'
     container_name: redis
-    image: redis:6.2.13
+    image: redis:6.2.14
     ports:
       - '6379:6379'
     volumes:
@@ -106,7 +105,7 @@ services:
     <<: *defaults
     command: '-cid sis-updater-nats -m 8222 -p 4222 --max_channels 1000 --max_age 2h --hb_fail_count 2 --hb_timeout 10s --hb_interval 10s --auth dev --file_slice_max_bytes 0 --file_slice_max_age 60s --max_msgs 0 -store file -dir datastore'
     container_name: sis-updater-nats
-    image: nats-streaming:0.16.2
+    image: nats-streaming:0.25.6
     profiles:
       - updater
 
@@ -175,6 +174,8 @@ services:
   jami:
     <<: *defaults
     image: quay.io/toska/jami:production
+    env_file:
+      - .env
     environment:
       - npm_config_cache=/tmp
       - PORT=3003
@@ -186,7 +187,7 @@ services:
 
   jami-db:
     <<: *defaults
-    image: postgres:13.2
+    image: postgres:15.7
     environment:
       - PGDATA=/data
       - POSTGRES_PASSWORD=postgres

documentation/README.md

@@ -0,0 +1,3 @@
+# Documentation
+
+Oodikone public documentation. For internal documentation, see Toska GitLab.

documentation/combined_programme.md

@@ -25,7 +25,7 @@ Basic rule of thumb is that for the master/licentiate programme I used names `co
 
 All things listed below should work automatically, if new combinations are done.
 
-- Credits produced byt the studyprogramme
+- Credits produced by the studyprogramme
   - credits are computed for both programmes separately
 - Average graduation times
   - For bachelor + master/licentiate studyright the time is the whole study time starting from bachelor
@@ -50,7 +50,7 @@ All things listed below should work automatically, if new combinations are done.
 
 - Possibility to add criteria for whole bachelor-master study time
 - For eläinlääkis this criteria is saved by bachelor programme code. Other cases may need other approaches.
-  In eläinklääkis this done by adding the criteria for 6 years -> the whole study time criteria is saved with the bachelor programme code. That is, same criteria is found, if bachelor or combined programme view is shown. This approach might need extra thinking for different programmes.
+  In eläinlääkis this done by adding the criteria for 6 years -> the whole study time criteria is saved with the bachelor programme code. That is, same criteria is found, if bachelor or combined programme view is shown. This approach might need extra thinking for different programmes.
 - Show own tables for both programmes
   - To fetch data **needs manual work** here `services/backend/src/services/studyprogrammeHelpers.js` in the constant `combinedStudyprogrammes`.
 
@@ -93,4 +93,4 @@ All things listed below should work automatically, if new combinations are done.
 
 - Backend: student data is fetched by bachelor study programme code in `/v3/populationstatisticsbystudentnumbers`. Separation from code 'KHxx_xxx+MHxx_xxx' is done in backend.
 - Frontend: things are done in the same way as with class stats.
-- **Need manual work**: `./oodikone/services/frontend/src/redux/elementdetails.js` add combined programme codes (both bachelor and master) to `combinedProgrammeCodes` and modify `combinedOptions` list accordinly in `useFilterAndFormattedElementDetails()` function.
+- **Need manual work**: `./oodikone/services/frontend/src/redux/elementdetails.js` add combined programme codes (both bachelor and master) to `combinedProgrammeCodes` and modify `combinedOptions` list accordingly in `useFilterAndFormattedElementDetails()` function.

documentation/databases.md

@@ -0,0 +1,37 @@
+# Databases
+
+Oodikone uses three separate databases, each for different purposes. This document contains a simplified overview of each database and the relations between models.
+
+Use Adminer or refer to the actual database for a detailed view of each model and their attributes.
+
+## sis-db
+
+The `sis-db` database contains information originating from Sisu.
+
+_To be documented._
+
+## kone-db
+
+The `kone-db` database contains information used in various features of Oodikone. This functionality is native to Oodikone and not necessarily directly related to Sisu.
+
+```mermaid
+erDiagram
+  custom_population_searches
+  excluded_courses
+  open_uni_population_searches
+  progress_criteria
+  study_guidance_group_tags
+  study_programme_pins
+  tag ||--o{ tag_student : "belongs to"
+  tag
+  tag_student
+```
+
+## user-db
+
+The `user-db` database contains information about users of Oodikone.
+
+```mermaid
+erDiagram
+  users
+```

documentation/numeric_types.md

@@ -1,48 +1,105 @@
-# Mystery numbers
+# Numeric types
 
-Sis data uses some numeric classifiers that are not self-explanatory and (most) previously needed to be deciphered from existing code.
-Some mystery numbers are gathered here for convenience. Feel free to add anything that could be useful. Remember to use the spelling used in code to enable project wide search.
+Data used in Oodikone contains some numeric types (or _magic numbers_) that are not self-explanatory. The values of the numeric types are gathered here for convenience and quick reference.
 
-## extentcode
+## Extent code
 
-(from **studyright**)
+Appears in model Studyright (db: `studyright`) as _extentcode_ (db: `extentcode`) and in model SISStudyRight (db: `sis_study_rights`) as _extentCode_ (db: `extent_code`). Values are defined in the database table `studyright_extents`.
 
-These are actually defined in db table studyright_extents. Tells studyright level or type, eg. bachelor's degree or non-degree studies.
+| value | meaning                                             |
+| ----: | :-------------------------------------------------- |
+|     1 | Bachelor's degree                                   |
+|     2 | Master's degree                                     |
+|     3 | Licentiate                                          |
+|     4 | Doctor                                              |
+|     5 | Bachelor's and Master's degree                      |
+|     6 | Continuing education                                |
+|     7 | Exchange studies                                    |
+|     9 | Open University studies                             |
+|    13 | Non-degree pedagogical studies for teachers         |
+|    14 | Contract training                                   |
+|    16 | Studies for secondary school students               |
+|    18 | Specialisation studies                              |
+|    22 | Non-degree programme for special education teachers |
+|    23 | Specialist training in medicine and dentistry       |
+|    31 | Summer and winter school                            |
+|    34 | Exchange studies (postgraduate studies)             |
+|    99 | Non-Degree studies                                  |
 
-## prioritycode
+## Priority code
 
-(from **studyright**)
+> [!WARNING]  
+> Obsolete, to be deprecated
 
-1: Primary
+Appears in model Studyright (db: `studyright`) as _prioritycode_ (db: `prioritycode`).
 
-2: Secondary
+| value | meaning   | notes                                                                                       |
+| ----: | :-------- | :------------------------------------------------------------------------------------------ |
+|     1 | Primary   |                                                                                             |
+|     2 | Secondary |                                                                                             |
+|     5 | Rescinded | seemingly not in use anymore                                                                |
+|     6 | Option    | Ba+Ma students can add a master programme to their study plan before graduating as bachelor |
+|    30 | Graduated |                                                                                             |
 
-5: Rescinded (Seemingly not in use anymore)
+## Type
 
-6: Option (Bachelor+master studyright students can add a master programme to their study plan before graduation in bachelor programme: marked as option in Oodikone)
+> [!WARNING]  
+> Obsolete, to be deprecated
 
-30: Graduated
+Appears in model ElementDetails (db: `element_details`) as _type_ (db: `type`).
 
-## type
+| value | meaning                                          |
+| ----: | :----------------------------------------------- |
+|    20 | study programme                                  |
+|    30 | module, studytrack or kokonaisuus e.g. neurology |
 
-(from **element_details**)
+## Phase
 
-20: A study programme
+Appears in model SISStudyRightElement (db: `sis_study_right_elements`) as _phase_ (db: `phase`).
 
-30: Module/Studytrack/kokonaisuus? Eg. Neurology
+In Finland it is common for new students to be awarded the study right to both a bachelor's and a master's programme when they are admitted to the university. In Oodikone these two-phase study rights are marked with the [extent code](#extent-code) 5. In the study right elements of these study rights, phase 2 marks the second phase of the study right.
 
-## enrollmenttype
+For example: Student is awarded the study right in the bachelor's programme in computer science with the extent code 5. The study right element for study right in the bachelor's programme is marked with phase 1. After graduating from the bachelor's programme, the student continues their studies in the master's programme in computer science. The new study right element for the study right in the master's programme is marked with phase 2.
 
-(from **semester_enrollments**)
+All study right elements for other study rights (extent code other than 5) are marked with phase 1.
 
-1: Present
+The level of the programme (bachelor's, master's etc.) of the study right can be directly checked from degreeProgrammeType (db: `degree_programme_type`) in model SISStudyRightElement (db: `sis_study_right_elements`).
 
-2: Absent
+| value | meaning  |
+| ----: | :------- |
+|     1 | any      |
+|     2 | master's |
 
-3: Inactive (neither 1 or 2 has been declared)
+## Enrollment type
 
-## credittypecode
+Appears in model SemesterEnrollment (db: `semester_enrollments`) as _enrollmenttype_ (db: `enrollmenttype`).
 
-(from **credit**)
+| value | meaning  | notes                            |
+| ----: | :------- | :------------------------------- |
+|     1 | Present  |                                  |
+|     2 | Absent   |                                  |
+|     3 | Inactive | neither 1 or 2 has been declared |
 
-Defined in credit_types db table. Completed/Improved/Transferred/Failed
+## Credit type code
+
+Appears in model Credit (db: `credit`) as _credittypecode_ (db: `credittypecode`). Values are defined in the database table `credit_types`.
+
+Completed/Improved/Transferred/Failed
+
+| value | meaning          |
+| ----: | :--------------- |
+|     4 | Completed        |
+|     7 | Improved (grade) |
+|     9 | Transferred      |
+|    10 | Failed           |
+
+## Gender code
+
+Appears in model Student (db: `student`) as _gender_code_ (db: `gender_code`).
+
+| value | meaning |
+| ----: | :------ |
+|     0 | Unknown |
+|     1 | Male    |
+|     2 | Female  |
+|     3 | Other   |

documentation/resources.md

@@ -0,0 +1,50 @@
+# Resources
+
+A collection of useful resources and documentation.
+
+## AI tools
+
+- [ChatGPT](https://chatgpt.com)
+- [CurreChat](https://curre.helsinki.fi/chat)
+- [GitHub Copilot](https://github.com/features/copilot)
+  - Free for students!
+- [Microsoft Copilot](https://copilot.microsoft.com)
+
+## Code style and maintainability
+
+- [CodeClimate documentation](https://docs.codeclimate.com/docs)
+  - [Advanced configuration](https://docs.codeclimate.com/docs/advanced-configuration)
+- [ESLint documentation](https://eslint.org/docs/v8.x)
+- [Prettier documentation](https://prettier.io/docs/en)
+
+## Database
+
+- [Postgres documentation](https://www.postgresql.org/docs/15/index.html)
+- [Sequelize documentation](https://sequelize.org/docs/v6/)
+
+## GitHub
+
+- [GitHub documentation](https://docs.github.com/en)
+  - [GitHub Actions](https://docs.github.com/en/actions)
+- [GitHub Education](https://github.com/education/students)
+  - Free benefits for students!
+- [Mermaid.js documentation](https://mermaid.js.org/intro/syntax-reference.html)
+
+## TypeScript
+
+- [TypeScript documentation](https://www.typescriptlang.org/docs)
+  - [`tsconfig` reference](https://www.typescriptlang.org/tsconfig)
+- [TypeScript instructions for Sequelize](https://sequelize.org/docs/v6/other-topics/typescript)
+  - [`sequelize-typescript` instructions](https://github.com/sequelize/sequelize-typescript?tab=readme-ov-file#readme)
+
+## User interface
+
+- [Semantic UI React documentation](https://react.semantic-ui.com)
+
+## Visual Studio Code
+
+_Todo: add relevant plugins_
+
+## Web technologies
+
+- [MDN Web Docs](https://developer.mozilla.org/en-US/)

documentation/tietosuoja.md

@@ -0,0 +1,3 @@
+# Tietosuoja
+
+Oodikoneessa noudatetaan Helsingin yliopiston [yleistä linjausta](https://www.helsinki.fi/fi/tutustu-meihin/tietosuoja#opiskelijoiden-henkil-tietojen-k-sittely--title) opiskelijoiden henkilötietojen käsittelystä.

nyc-config.js

@@ -0,0 +1,7 @@
+/* eslint-disable import/no-extraneous-dependencies */
+const { parserPlugins } = require('@istanbuljs/schema').defaults.nyc
+
+module.exports = {
+  cache: false,
+  parserPlugins: parserPlugins.concat('typescript', 'jsx'),
+}

package.json

@@ -3,14 +3,18 @@
   "description": "An application for analyzing university data.",
   "scripts": {
     "cypress": "cypress",
-    "concurrently": "concurrently",
+    "cypress:open": "cypress open",
+    "cypress:run": "cypress run --browser chrome",
+    "instrument": "./scripts/instrument.sh",
     "eslint": "eslint",
+    "lint:all": "eslint --ext .js,.jsx,.ts,.tsx services/ updater/ --report-unused-disable-directives",
     "stylelint": "stylelint",
     "actionlint": "node-actionlint",
     "prettier": "prettier",
     "cli": "./cli.sh",
     "oodikone": "./run.sh oodikone anon up --detach",
     "oodikone:real": "./run.sh oodikone real up --detach",
+    "oodikone:test": "./run.sh oodikone test up --detach",
     "updater": "./run.sh updater anon up --detach",
     "updater:real": "./run.sh updater real up --detach",
     "both": "./run.sh both anon up --detach",
@@ -18,8 +22,11 @@
     "docker:down": "./run.sh both anon down --remove-orphans; ./run.sh both real down --remove-orphans",
     "testupdater": "docker-compose --file docker-compose.ci.yml up --detach --no-recreate sis-updater-worker && SCHEDULE_IMMEDIATE=weekly EXIT_AFTER_IMMEDIATES=yes docker-compose --file docker-compose.ci.yml run sis-updater-scheduler npm start",
     "flushredis": "docker exec -it redis redis-cli flushall",
-    "prepare": "husky install",
-    "rapodiff": "docker exec oodikone_backend_1 node /opt/app-root/src/src/rapodiff/rapodiff.js"
+    "prepare": "husky",
+    "rapodiff": "docker exec oodikone_backend_1 node /opt/app-root/src/src/rapodiff/rapodiff.js",
+    "install:local": "npm i && cd services/frontend && npm i && cd ../backend && npm i && cd ../../updater/sis-updater-scheduler && npm i && cd ../sis-updater-worker && npm i && cd ../..",
+    "install:docker": "docker exec frontend npm i && docker exec oodikone_backend_1 npm i && docker exec sis-updater-scheduler npm i && docker exec oodikone_sis-updater-worker_1 npm i",
+    "install:both": "npm run install:local && npm run install:docker"
   },
   "repository": {
     "type": "git",
@@ -31,27 +38,32 @@
   },
   "homepage": "https://github.com/UniversityOfHelsinkiCS/oodikone#readme",
   "devDependencies": {
-    "concurrently": "^7.4.0",
+    "@cypress/code-coverage": "^3.12.39",
+    "@istanbuljs/schema": "^0.1.3",
+    "@typescript-eslint/eslint-plugin": "^7.16.1",
+    "@typescript-eslint/parser": "^7.16.1",
     "cypress": "^13.2.0",
     "eslint": "^8.56.0",
     "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-airbnb-typescript": "^18.0.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-custom-alias": "^1.3.2",
-    "eslint-plugin-cypress": "^2.15.1",
+    "eslint-plugin-cypress": "^3.0.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jsx-a11y": "^6.8.0",
-    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
+    "husky": "^9.0.0",
+    "lint-staged": "^15.0.0",
     "node-actionlint": "^1.2.2",
-    "prettier": "3.2.5",
+    "nyc": "^17.0.0",
+    "prettier": "3.3.3",
     "stylelint": "^16.2.1",
     "stylelint-config-standard": "^36.0.0"
   },
   "dependencies": {
     "lodash": "^4.17.21",
-    "moment": "^2.29.4"
+    "moment": "^2.30.1"
   }
 }

renovate.json

@@ -0,0 +1,22 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:recommended"],
+  "packageRules": [
+    {
+      "groupName": "all non-major dependencies",
+      "groupSlug": "all-minor-patch",
+      "matchPackagePatterns": ["*"],
+      "matchUpdateTypes": ["minor", "patch"]
+    },
+    {
+      "matchDatasources": ["docker"],
+      "matchPackageNames": ["node"],
+      "versionCompatibility": "^(?<version>[^-]+)(?<compatibility>-.*)?$",
+      "versioning": "node"
+    }
+  ],
+  "rebaseWhen": "never",
+  "vulnerabilityAlerts": {
+    "labels": ["security"]
+  }
+}

run.sh

@@ -47,7 +47,7 @@ parse_params() {
     compose_command=${args[*]:1}
   else
     version=${args[1]}
-    [[ "$version" != "anon" && "$version" != "real" ]] && usage && \
+    [[ "$version" != "anon" && "$version" != "real" && "$version" != "test" ]] && usage && \
       die "Wrong version $version"
     compose_command=${args[*]:2}
   fi
@@ -70,6 +70,9 @@ parse_env() {
   if [[ "$version" == "real" ]]; then
     env="--file docker-compose.yml --file docker-compose.real.yml"
   fi
+  if [[ "$version" == "test" ]]; then
+    env="--file docker-compose.yml --file docker-compose.test.yml"
+  fi
   return 0
 }
 

scripts/functions_for_setup.sh

@@ -204,7 +204,6 @@ set_up_oodikone_from_scratch() {
   infomsg "Cleaning up docker setup and node_modules from possible previous installations"
   local compose_down_args="--remove-orphans --volumes --rmi all"
   "$PROJECT_ROOT"/run.sh both down "$compose_down_args" || infomsg "Cleaning errored, but will continue"
-  docker-compose --file "$PROJECT_ROOT"/docker-compose.test.yml "$compose_down_args" || infomsg "Cleaning errored, but will continue"
   docker-compose --file "$PROJECT_ROOT"/docker-compose.ci.yml "$compose_down_args" || infomsg "Cleaning errored, but will continue"
   for folder in "${folders_to_set_up[@]}"; do
     cd "$folder" || die "Couldn't change directory to folder $folder"

scripts/instrument.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+# This script is used for instrumenting the frontend code
+# Counters are added for calculating the code coverage
+# Instrumented code is used for generating code coverage reports
+
+# Ensure the script exits if any command fails
+set -euo pipefail
+
+# Define the directories
+SOURCE_DIR="services/frontend/src"
+INSTRU_DIR="services/frontend/instrumented"
+
+# Print status
+echo -n "Instrumenting frontend code... "
+
+# Create the instrumented directory if it does not exist
+mkdir -p $INSTRU_DIR
+
+# Instrument the code
+nyc instrument --all --compact=false $SOURCE_DIR $INSTRU_DIR
+
+# Copy remaining files without overwriting instrumented files
+# 
+# Images, CSS and other static files are not instrumended
+# but they are still needed to run the application
+rsync -av --quiet --ignore-existing $SOURCE_DIR/ $INSTRU_DIR/
+
+# Print status
+echo "Done!"

services/backend/Dockerfile

@@ -1,4 +1,35 @@
-FROM registry.access.redhat.com/ubi9/nodejs-18-minimal
+FROM registry.access.redhat.com/ubi9/nodejs-20-minimal as build
+
+ENV TZ="Europe/Helsinki"
+
+WORKDIR /opt/app-root/src
+
+ENV NODE_ENV=production
+ENV NODE_OPTIONS=--max-old-space-size=4096
+
+ARG BASE_PATH
+ENV PUBLIC_URL=$BASE_PATH
+
+ARG STAGING
+ENV REACT_APP_STAGING=$STAGING
+
+ARG SENTRY_ENVIRONMENT
+ENV SENTRY_ENVIRONMENT=$SENTRY_ENVIRONMENT
+
+ARG SENTRY_RELEASE
+ENV SENTRY_RELEASE=$SENTRY_RELEASE
+
+COPY ./package*.json ./
+
+RUN npm ci --include=dev
+
+COPY . .
+
+RUN npm run build
+
+
+
+FROM registry.access.redhat.com/ubi9/nodejs-20-minimal
 
 ENV TZ="Europe/Helsinki"
 
@@ -21,8 +52,9 @@ ENV SENTRY_ENVIRONMENT=$SENTRY_ENVIRONMENT
 ARG SENTRY_RELEASE
 ENV SENTRY_RELEASE=$SENTRY_RELEASE
 
-COPY ./package* ./
-RUN npm ci --omit-dev
-COPY . .
+COPY --from=build /opt/app-root/src/package*.json ./
+COPY --from=build /opt/app-root/src/dist ./dist
 
-CMD ["node", "index.js"]
+RUN npm ci
+
+CMD ["node", "dist/index.js"]

services/backend/config/programmeCodes.js

@@ -1,141 +0,0 @@
-// Map programme codes to "letter indentifier"
-
-const codes = {
-  KH10_001: 'tuk',
-  MH10_001: 'tum',
-  KH20_001: 'on',
-  MH20_001: 'otm',
-  MH20_002: 'ibl',
-  MH20_003: 'ggl',
-  KH30_001: 'psyk',
-  MH30_004: 'psym',
-  KH30_002: 'logk',
-  MH30_005: 'logm',
-  MH30_001: 'll',
-  MH30_002: 'tmed',
-  MH30_003: 'hll',
-  MH30_006: 'terv',
-  KH40_001: 'filk',
-  KH40_002: 'ttk',
-  KH40_003: 'kik',
-  KH40_004: 'kok',
-  KH40_005: 'kuka',
-  KH40_006: 'hisk',
-  MH40_001: 'ttm',
-  MH40_002: 'kim',
-  MH40_003: 'eng',
-  MH40_004: 'rus',
-  MH40_005: 'lingdig',
-  MH40_006: 'tra',
-  MH40_007: 'suku',
-  MH40_008: 'nor',
-  MH40_009: 'kir',
-  MH40_010: 'kuma',
-  MH40_011: 'ice',
-  MH40_012: 'alku',
-  MH40_014: 'spt',
-  MH40_015: 'hism',
-  KH50_001: 'mat',
-  KH50_002: 'fys',
-  KH50_003: 'kemk',
-  KH50_004: 'mfkk',
-  KH50_005: 'tkt',
-  KH50_006: 'geok',
-  KH50_007: 'maa',
-  KH50_008: 'bsc',
-  MH50_001: 'mast',
-  MH50_002: 'lsi',
-  MH50_003: 'tcm',
-  MH50_004: 'paras',
-  MH50_005: 'matres',
-  MH50_006: 'atm',
-  MH50_007: 'kem',
-  MH50_008: 'mfkm',
-  MH50_009: 'csm',
-  MH50_010: 'data',
-  MH50_011: 'geom',
-  MH50_012: 'geog',
-  MH50_013: 'usp',
-  KH55_001: 'farm',
-  MH55_001: 'prov',
-  MH55_002: 'mpharm',
-  KH57_001: 'bio',
-  KH57_002: 'mole',
-  KH57_003: 'env',
-  MH57_001: 'eeb',
-  MH57_002: 'ips',
-  MH57_003: 'gmb',
-  MH57_004: 'neuro',
-  MH57_005: 'ecgs',
-  KH60_001: 'eduk',
-  MH60_001: 'edum',
-  MH60_002: 'ce',
-  KH70_001: 'pvk',
-  KH70_002: 'yk',
-  KH70_003: 'sosk',
-  KH70_004: 'ecok',
-  MH70_001: 'film',
-  MH70_002: 'pvm',
-  MH70_003: 'gpc',
-  MH70_004: 'ym',
-  MH70_005: 'cos',
-  MH70_006: 'ens',
-  MH70_007: 'msv',
-  MH70_008: 'sosm',
-  MH70_009: 'econ',
-  MH70_011: 'sote',
-  KH74_001: 'ksv',
-  KH80_001: 'maatk',
-  KH80_002: 'metsak',
-  KH80_003: 'etk',
-  KH80_004: 'yet',
-  MH80_001: 'agri',
-  MH80_002: 'agere',
-  MH80_003: 'for',
-  MH80_004: 'food',
-  MH80_005: 'hnfb',
-  MH80_006: 'ekm',
-  MH80_007: 'mmb',
-  MH80_008: 'emplant',
-  KH90_001: 'elk',
-  MH90_001: 'ell',
-  T920101: 'dptheol',
-  T920102: 'dplaw',
-  T920111: 'philartsoc',
-  T920103: 'dphistcult',
-  T920104: 'dplang',
-  T920105: 'sky',
-  T920106: 'dpsocs',
-  T920107: 'pyam',
-  T920108: 'dpe',
-  T920109: 'seduce',
-  T920110: 'clic',
-  T921101: 'dpbm',
-  T921102: 'klto',
-  T921103: 'docpop',
-  T921104: 'findos',
-  T921105: 'dpdr',
-  T921106: 'ils',
-  T921107: 'bandm',
-  T921108: 'cvm',
-  T921109: 'dphub',
-  T922101: 'luova',
-  T922102: 'dpps',
-  T922103: 'denvi',
-  T922104: 'agforee',
-  T922105: 'mbdp',
-  T922106: 'foodhealth',
-  T923101: 'papu',
-  T923102: 'geodoc',
-  T923103: 'atm-dp',
-  T923104: 'chems',
-  T923105: 'domast',
-  T923106: 'matrena',
-  T923107: 'docs',
-  // manually added programs with no IAM, either abolished, or special co-operation programmes
-  MH50_014: 'ech',
-  MH40_013: 'mkk',
-  MH70_010: 'imes',
-}
-
-module.exports = { codes }

services/backend/dev.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-alpine
+FROM node:20-alpine
 
 ENV TZ="Europe/Helsinki"
 
@@ -13,4 +13,4 @@ COPY ./package* ./
 RUN npm ci
 COPY . .
 
-CMD ["node_modules/.bin/nodemon", "index.js"]
+CMD ["node_modules/.bin/tsx", "watch", "--clear-screen=false", "index.js"]

services/backend/index.js

@@ -4,3 +4,6 @@ const logger = require('./src/util/logger')
 process.on('unhandledRejection', reason => {
   logger.error({ message: 'unhandledRejection: ', meta: reason })
 })
+
+process.on('SIGTERM', () => process.exit())
+process.on('SIGINT', () => process.exit())

services/backend/package.json

@@ -2,36 +2,45 @@
   "name": "backend",
   "private": true,
   "scripts": {
-    "start": "node --max_old_space_size=4096 index.js",
-    "dev": "nodemon --max_old_space_size=4096 index.js",
+    "build": "tsc",
     "rapodiff": "node /opt/app-root/src/src/rapodiff.js"
   },
   "dependencies": {
     "@sentry/node": "^5.30.0",
     "@sentry/tracing": "^6.18.2",
-    "axios": "^0.21.4",
+    "axios": "^0.28.1",
     "bluebird": "^3.7.2",
     "bullmq": "^4.14.2",
+    "compression": "^1.7.4",
     "cors": "^2.8.5",
     "cron": "^1.8.2",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
     "express-async-errors": "^3.1.1",
     "lodash": "^4.17.21",
-    "lru-cache": "^5.1.1",
-    "moment": "^2.29.1",
+    "lru-cache": "^10.2.2",
+    "moment": "^2.30.1",
     "moment-timezone": "^0.5.37",
     "morgan": "^1.10.0",
     "papaparse": "^5.4.1",
-    "pg": "^8.8.0",
+    "pg": "^8.11.5",
     "redis": "^3.1.2",
-    "sequelize": "^6.24.0",
+    "reflect-metadata": "^0.2.2",
+    "sequelize": "^6.37.3",
+    "sequelize-typescript": "^2.1.6",
     "umzug": "^2.3.0",
     "unfuck-utf8-headers-middleware": "^1.0.1",
     "winston": "^3.8.2",
     "winston-gelf-transporter": "^1.0.2"
   },
   "devDependencies": {
-    "nodemon": "^3.0.3"
+    "@types/express": "^4.17.21",
+    "@types/lodash": "^4.17.6",
+    "@types/morgan": "^1.9.9",
+    "@types/node": "^20.14.2",
+    "@types/umzug": "^2.3.7",
+    "@types/validator": "^13.12.0",
+    "tsx": "^4.16.2",
+    "typescript": "^5.5.3"
   },
   "overrides": {
     "winston-gelf-transporter": {

services/backend/src/app.js

@@ -1,9 +1,10 @@
 require('express-async-errors')
 const express = require('express')
-const { baseUrl, backendPort } = require('./conf-backend')
-const routes = require('./routes')
-const { startCron } = require('./events')
+
+const { baseUrl, backendPort } = require('./config')
 const { initializeDatabaseConnection, dbConnections } = require('./database/connection')
+const { startCron } = require('./events')
+const routes = require('./routes')
 const logger = require('./util/logger')
 require('./worker/worker')
 
@@ -30,7 +31,7 @@ initializeDatabaseConnection()
       })
     })
   })
-  .catch(e => {
+  .catch(error => {
     process.exitCode = 1
-    logger.error(e)
+    logger.error(error)
   })

services/backend/src/config/index.js

@@ -6,6 +6,7 @@ const isProduction = !isStaging && process.env.NODE_ENV === 'production'
 // Sentry
 const sentryRelease = process.env.SENTRY_RELEASE || ''
 const sentryEnvironment = process.env.SENTRY_ENVIRONMENT || ''
+const sentryDSN = process.env.SENTRY_DSN || ''
 const runningInCI = process.env.CI === 'true'
 
 // IAM group
@@ -23,17 +24,27 @@ const jamiUrl = process.env.JAMI_URL || ''
 const importerUrl = process.env.IMPORTER_DB_API_URL || ''
 const importerToken = process.env.IMPORTER_DB_API_TOKEN || ''
 
+// Sisu
+const sisUrl = process.env.SIS_HOST
+const sisGrapqlAppAccount = process.env.SIS_GRAPHQL_APPLICATION_ACCOUNT
+const sisGrapqlAppKey = process.env.SIS_GRAPHQL_APPLICATION_KEY
+
 // Networking: Urls & ports
 const baseUrl = isDev ? '/api' : ''
 const frontUrl = process.env.FRONT_URL
 const backendPort = 8080
 
+// System run in whose environment
+const serviceProvider = process.env.SERVICE_PROVIDER || 'Toska'
+
+// Optional logout-url configuration
+const configLogoutUrl = serviceProvider === 'Toska' ? undefined : process.env.LOGOUT_URL
+
 // Other stuff
-const DB_URL_KONE = process.env.DB_URL_KONE
-const DB_URL_USER = process.env.DB_URL_USER
+const { DB_URL_KONE, DB_URL_USER, SECRET_TOKEN, SIS_DB_URL, SIS_UPDATER_URL, CRYPT_KEY } = process.env
 
 let DB_MAX_CONNECTIONS = parseInt(process.env.DB_MAX_CONNECTIONS, 10)
-if (isNaN(DB_MAX_CONNECTIONS)) {
+if (Number.isNaN(DB_MAX_CONNECTIONS)) {
   DB_MAX_CONNECTIONS = 5 // sequelize's default
 }
 let DB_MAX_CRON_CONNECTIONS = DB_MAX_CONNECTIONS - 5
@@ -42,16 +53,12 @@ if (DB_MAX_CRON_CONNECTIONS < 1) {
 }
 
 const redis = process.env.REDIS
-const SECRET_TOKEN = process.env.SECRET_TOKEN
 const DB_SCHEMA_KONE = process.env.DB_SCHEMA_KONE || 'public'
-const SIS_UPDATER_URL = process.env.SIS_UPDATER_URL
 
 const KONE_PASSWORD = process.env.KONE_PASSWORD || 'postgres'
 const USER_PASSWORD = process.env.USER_PASSWORD || 'postgres'
 const SIS_PASSWORD = process.env.SIS_PASSWORD || 'postgres'
 
-const CRYPT_KEY = process.env.CRYPT_KEY
-
 module.exports = {
   DB_URL_USER,
   CRYPT_KEY,
@@ -65,10 +72,12 @@ module.exports = {
   USER_PASSWORD,
   SIS_PASSWORD,
   requiredGroup,
+  SIS_DB_URL,
   SIS_UPDATER_URL,
   runningInCI,
   sentryRelease,
   sentryEnvironment,
+  sentryDSN,
   isProduction,
   pateToken,
   jamiUrl,
@@ -78,4 +87,10 @@ module.exports = {
   importerUrl,
   importerToken,
   isDev,
+  isStaging,
+  serviceProvider,
+  configLogoutUrl,
+  sisUrl,
+  sisGrapqlAppAccount,
+  sisGrapqlAppKey,
 }

services/backend/src/config/organizationConstants.ts

@@ -0,0 +1,4 @@
+// Linter was not having any of this so neeeded to add resolveJsonModule:true to tsconfig
+// export const { facultyCodes, ignoredFacultyCodes, magicFacultyCode } = require('../environment/organizationConfig.json')
+
+export { facultyCodes, ignoredFacultyCodes, magicFacultyCode } from '../environment/organizationConfig.json'

services/backend/src/config/programmeCodes.ts

@@ -0,0 +1,138 @@
+// Map programme codes to "letter indentifier"
+
+export const programmeCodes = {
+  KH10_001: 'TUK',
+  MH10_001: 'TUM',
+  KH20_001: 'ON',
+  MH20_001: 'OTM',
+  MH20_002: 'IBL',
+  MH20_003: 'GGL',
+  KH30_001: 'PSYKK',
+  KH30_002: 'LOGOK',
+  KH30_003: 'SPK',
+  MH30_001: 'LL',
+  MH30_002: 'TMED',
+  MH30_003: 'HLL',
+  MH30_004: 'PSYK',
+  MH30_005: 'LOGO',
+  MH30_006: 'TERV',
+  KH40_001: 'FILK',
+  KH40_002: 'TTK',
+  KH40_003: 'KIK',
+  KH40_004: 'KOK',
+  KH40_005: 'KUKA',
+  KH40_006: 'HISK',
+  MH40_001: 'TTM',
+  MH40_002: 'KIM',
+  MH40_003: 'ENG',
+  MH40_004: 'MAREEES',
+  MH40_005: 'LingDig',
+  MH40_006: 'TRA',
+  MH40_007: 'SUKU',
+  MH40_008: 'NOR',
+  MH40_009: 'KIR',
+  MH40_010: 'KUMA',
+  MH40_011: 'ICE',
+  MH40_012: 'ALKU',
+  MH40_014: 'SPT',
+  MH40_015: 'HISM',
+  KH50_001: 'MAT',
+  KH50_002: 'FYS',
+  KH50_003: 'KEMK',
+  KH50_004: 'MFKK',
+  KH50_005: 'TKT',
+  KH50_006: 'GEOK',
+  KH50_007: 'MAA',
+  KH50_008: 'BSC',
+  MH50_001: 'MAST',
+  MH50_002: 'LSI',
+  MH50_003: 'TCM',
+  MH50_004: 'PARAS',
+  MH50_005: 'MATRES',
+  MH50_006: 'ATM',
+  MH50_007: 'KEM',
+  MH50_008: 'MFKM',
+  MH50_009: 'CSM',
+  MH50_010: 'DATA',
+  MH50_011: 'GEOM',
+  MH50_012: 'GEOG',
+  MH50_013: 'USP',
+  MH50_014: 'EnCHiL',
+  KH55_001: 'FARM',
+  MH55_001: 'PROV',
+  MH55_002: 'MPHARM',
+  KH57_001: 'BIO',
+  KH57_002: 'MOLE',
+  KH57_003: 'ENV',
+  MH57_001: 'EEB',
+  MH57_002: 'IPS',
+  MH57_003: 'GMB',
+  MH57_004: 'NEURO',
+  MH57_005: 'ECGS',
+  KH60_001: 'EDUK',
+  MH60_001: 'EDUM',
+  MH60_002: 'CE',
+  KH70_001: 'PVK',
+  KH70_002: 'YK',
+  KH70_003: 'SOSK',
+  KH70_004: 'ECOK',
+  MH70_001: 'FILM',
+  MH70_002: 'PVM',
+  MH70_003: 'GPC',
+  MH70_004: 'YM',
+  MH70_005: 'COS',
+  MH70_006: 'ENS',
+  MH70_007: 'MSV',
+  MH70_008: 'SOSM',
+  MH70_009: 'ECON',
+  MH70_010: 'IMESS',
+  MH70_011: 'SOTE',
+  KH74_001: 'KSV',
+  KH80_001: 'MAATK',
+  KH80_002: 'METSAK',
+  KH80_003: 'ETK',
+  KH80_004: 'YET',
+  MH80_001: 'AGRI',
+  MH80_002: 'AGERE',
+  MH80_003: 'FOR',
+  MH80_004: 'FOOD',
+  MH80_005: 'HNFB',
+  MH80_006: 'EKM',
+  MH80_007: 'MMB',
+  MH80_008: 'emPlant',
+  KH90_001: 'ELK',
+  MH90_001: 'ELL',
+  T920101: 'DPTHEOL',
+  T920102: 'DPLAW',
+  T920103: 'DPHISTCULT',
+  T920104: 'DPLANG',
+  T920105: 'SKY',
+  T920106: 'DPSOCS',
+  T920107: 'PYAM',
+  T920108: 'DPE',
+  T920109: 'SEDUCE',
+  T920110: 'CLIC',
+  T920111: 'PHILARTSOC',
+  T921101: 'DPBM',
+  T921102: 'KLTO',
+  T921103: 'DocPop',
+  T921104: 'FINDOS',
+  T921105: 'DPDR',
+  T921106: 'ILS',
+  T921107: 'BM',
+  T921108: 'CVM',
+  T921109: 'DPHUB',
+  T922101: 'LUOVA',
+  T922102: 'DPPS',
+  T922103: 'DENVI',
+  T922104: 'AGFOREE',
+  T922105: 'MBDP',
+  T922106: 'FoodHealth',
+  T923101: 'PAPU',
+  T923102: 'GeoDoc',
+  T923103: 'ATM-DP',
+  T923104: 'CHEMS',
+  T923105: 'DOMAST',
+  T923106: 'MATRENA',
+  T923107: 'DOCS',
+} as const

services/backend/src/config/roles.ts

@@ -0,0 +1,10 @@
+export const roles = [
+  'admin',
+  'courseStatistics',
+  'facultyStatistics',
+  'fullSisuAccess',
+  'katselmusViewer',
+  'openUniSearch',
+  'studyGuidanceGroups',
+  'teachers',
+] as const

services/backend/src/database/connection.js

@@ -1,114 +0,0 @@
-const Sequelize = require('sequelize')
-const EventEmitter = require('events')
-const Umzug = require('umzug')
-const conf = require('../conf-backend')
-const { SIS_DB_URL } = process.env
-const logger = require('../util/logger')
-
-class DbConnection extends EventEmitter {
-  constructor() {
-    super()
-    this.RETRY_ATTEMPTS = 15
-    this.established = false
-
-    this.sequelize = new Sequelize(SIS_DB_URL, {
-      dialect: 'postgres',
-      pool: {
-        max: 25,
-        min: 0,
-        acquire: 30000,
-        idle: 300000000,
-      },
-      logging: false,
-      password: conf.SIS_PASSWORD,
-    })
-  }
-
-  async connect(attempt = 1) {
-    try {
-      await this.sequelize.authenticate()
-      this.emit('connect')
-      this.established = true
-    } catch (e) {
-      if (attempt > this.RETRY_ATTEMPTS) {
-        this.emit('error', e)
-        return
-      }
-      logger.error({ message: `Sis database connection failed! Attempt ${attempt}/${this.RETRY_ATTEMPTS}`, meta: e })
-      setTimeout(() => this.connect(attempt + 1), 1000 * attempt)
-    }
-  }
-}
-
-// Old-style kone + user db connections
-const sequelizeKone = new Sequelize(conf.DB_URL_KONE, {
-  schema: conf.DB_SCHEMA_KONE,
-  searchPath: conf.DB_SCHEMA_KONE,
-  logging: false,
-  password: conf.KONE_PASSWORD,
-})
-
-sequelizeKone.query(`SET SESSION search_path to ${conf.DB_SCHEMA_KONE}`)
-
-const sequelizeUser = new Sequelize(conf.DB_URL_USER, {
-  logging: false,
-  password: conf.USER_PASSWORD,
-})
-
-const initializeDatabaseConnection = async () => {
-  const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
-  const rounds = 60
-
-  for (const [seq, dbName] of [
-    [sequelizeKone, 'kone-db'],
-    [sequelizeUser, 'user-db'],
-  ]) {
-    logger.info(`Connecting to ${dbName}...`)
-    for (let round = 1; round <= rounds; round++) {
-      try {
-        await seq.authenticate()
-        break
-      } catch (error) {
-        if (round === rounds) {
-          logger.error(`${dbName} database connection failed!`)
-          throw error
-        }
-        await sleep(1000)
-      }
-    }
-    logger.info(`${dbName} database connection established`)
-
-    const schema = dbName === 'kone-db' ? conf.DB_SCHEMA_KONE : undefined
-    const migrationsFolder = dbName === 'kone-db' ? 'migrations_kone' : 'migrations_user'
-    const migrator = new Umzug({
-      storage: 'sequelize',
-      storageOptions: {
-        sequelize: seq,
-        tableName: 'migrations',
-        schema,
-      },
-      migrations: {
-        params: [seq.getQueryInterface(), Sequelize],
-        path: `${process.cwd()}/src/database/${migrationsFolder}`,
-        pattern: /\.js$/,
-        schema,
-      },
-    })
-    try {
-      const migrations = await migrator.up()
-      logger.info({ message: `${dbName} migrations up to date: `, meta: migrations.map(m => m.file) })
-    } catch (error) {
-      logger.error({ message: `${dbName} migrations failed`, meta: error })
-      throw error
-    }
-  }
-}
-
-const dbConnections = new DbConnection()
-
-module.exports = {
-  dbConnections,
-  sequelizeKone,
-  sequelizeUser,
-  initializeDatabaseConnection,
-}

services/backend/src/database/connection.ts

@@ -0,0 +1,187 @@
+import EventEmitter from 'events'
+import { Sequelize } from 'sequelize-typescript'
+import Umzug from 'umzug'
+
+import conf from '../config'
+import {
+  Course,
+  CourseProvider,
+  CourseType,
+  Credit,
+  CreditTeacher,
+  CreditType,
+  ElementDetail,
+  Enrollment,
+  Organization,
+  ProgrammeModule,
+  ProgrammeModuleChild,
+  Semester,
+  SemesterEnrollment,
+  SISStudyRight,
+  SISStudyRightElement,
+  Student,
+  Studyplan,
+  Studyright,
+  StudyrightElement,
+  StudyrightExtent,
+  Teacher,
+  Transfer,
+} from '../models'
+import {
+  CustomPopulationSearch,
+  ExcludedCourse,
+  OpenUniPopulationSearch,
+  ProgressCriteria,
+  StudyGuidanceGroupTag,
+  StudyProgrammePin,
+  Tag,
+  TagStudent,
+} from '../models/kone'
+import { User } from '../models/user'
+
+import logger from '../util/logger'
+
+class DbConnection extends EventEmitter {
+  sequelize: Sequelize
+
+  RETRY_ATTEMPTS: number
+
+  established: boolean
+
+  constructor() {
+    super()
+    this.RETRY_ATTEMPTS = 15
+    this.established = false
+
+    this.sequelize = new Sequelize(conf.SIS_DB_URL!, {
+      dialect: 'postgres',
+      pool: {
+        max: 25,
+        min: 0,
+        acquire: 30000,
+        idle: 300000000,
+      },
+      logging: false,
+      password: conf.SIS_PASSWORD,
+      models: [
+        Course,
+        CourseProvider,
+        CourseType,
+        Credit,
+        CreditTeacher,
+        CreditType,
+        ElementDetail,
+        Enrollment,
+        Organization,
+        ProgrammeModule,
+        ProgrammeModuleChild,
+        Semester,
+        SemesterEnrollment,
+        SISStudyRight,
+        SISStudyRightElement,
+        Student,
+        Studyplan,
+        Studyright,
+        StudyrightElement,
+        StudyrightExtent,
+        Teacher,
+        Transfer,
+      ],
+    })
+  }
+
+  async connect(attempt = 1) {
+    try {
+      await this.sequelize.authenticate()
+      this.emit('connect')
+      this.established = true
+    } catch (error) {
+      if (attempt > this.RETRY_ATTEMPTS) {
+        this.emit('error', error)
+        return
+      }
+      logger.error({
+        message: `Sis database connection failed! Attempt ${attempt}/${this.RETRY_ATTEMPTS}`,
+        meta: error,
+      })
+      setTimeout(() => this.connect(attempt + 1), 1000 * attempt)
+    }
+  }
+}
+
+// Old-style kone + user db connections
+const sequelizeKone = new Sequelize(conf.DB_URL_KONE!, {
+  schema: conf.DB_SCHEMA_KONE,
+  logging: false,
+  password: conf.KONE_PASSWORD,
+  models: [
+    CustomPopulationSearch,
+    ExcludedCourse,
+    OpenUniPopulationSearch,
+    ProgressCriteria,
+    StudyGuidanceGroupTag,
+    StudyProgrammePin,
+    Tag,
+    TagStudent,
+  ],
+})
+
+sequelizeKone.query(`SET SESSION search_path to ${conf.DB_SCHEMA_KONE}`)
+
+const sequelizeUser = new Sequelize(conf.DB_URL_USER!, {
+  logging: false,
+  password: conf.USER_PASSWORD,
+  models: [User],
+})
+
+const initializeDatabaseConnection = async () => {
+  const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms))
+  const rounds = 60
+
+  for (const [seq, dbName] of [
+    [sequelizeKone, 'kone-db'],
+    [sequelizeUser, 'user-db'],
+  ] as const) {
+    logger.info(`Connecting to ${dbName}...`)
+    for (let round = 1; round <= rounds; round++) {
+      try {
+        await seq.authenticate()
+        break
+      } catch (error) {
+        if (round === rounds) {
+          logger.error(`${dbName} database connection failed!`)
+          throw error
+        }
+        await sleep(1000)
+      }
+    }
+    logger.info(`${dbName} database connection established`)
+
+    const schema = dbName === 'kone-db' ? conf.DB_SCHEMA_KONE : undefined
+    const migrationsFolder = dbName === 'kone-db' ? 'migrations_kone' : 'migrations_user'
+    const migrator = new Umzug({
+      storage: 'sequelize',
+      storageOptions: {
+        sequelize: seq,
+        tableName: 'migrations',
+        schema,
+      },
+      migrations: {
+        params: [seq.getQueryInterface(), Sequelize],
+        path: `${process.cwd()}${conf.isProduction || conf.isStaging ? '/dist' : ''}/src/database/${migrationsFolder}`,
+        pattern: /\.js$/,
+      },
+    })
+    try {
+      const migrations = await migrator.up()
+      logger.info({ message: `${dbName} migrations up to date: `, meta: migrations.map(migration => migration.file) })
+    } catch (error) {
+      logger.error({ message: `${dbName} migrations failed`, meta: error })
+      throw error
+    }
+  }
+}
+
+const dbConnections = new DbConnection()
+
+export { dbConnections, sequelizeKone, sequelizeUser, initializeDatabaseConnection }

services/backend/src/database/migrations_kone/20190821_00_tag_student_foreignkeys_and_primarykeys_refactor.js

@@ -1,13 +1,12 @@
 module.exports = {
   up: async queryInterface => {
     return queryInterface.sequelize.transaction(async transaction => {
-      await queryInterface.sequelize.query('ALTER TABLE tag_student DROP CONSTRAINT "tag_student_tag_id_fkey"', {
-        transaction,
-      })
+      await queryInterface.removeConstraint('tag_student', 'tag_student_tag_id_fkey', { transaction })
       await queryInterface.sequelize.query('DELETE FROM tag_student WHERE tag_id IS NULL', { transaction })
       await queryInterface.removeConstraint('tag', 'tag_tag_id_key', { transaction })
-      await queryInterface.addConstraint('tag', ['tag_id'], {
+      await queryInterface.addConstraint('tag', {
         type: 'primary key',
+        fields: ['tag_id'],
         transaction,
       })
       await queryInterface.sequelize.query(
@@ -15,8 +14,9 @@ module.exports = {
         { transaction }
       )
       await queryInterface.removeColumn('tag_student', 'id', { transaction })
-      await queryInterface.addConstraint('tag_student', ['studentnumber', 'tag_id'], {
+      await queryInterface.addConstraint('tag_student', {
         type: 'primary key',
+        fields: ['studentnumber', 'tag_id'],
         transaction,
       })
     })

services/backend/src/database/migrations_kone/20240503_00_add_study_programme_pins.js

@@ -0,0 +1,18 @@
+const Sequelize = require('sequelize')
+
+module.exports = {
+  up: async queryInterface => {
+    await queryInterface.createTable('study_programme_pins', {
+      user_id: {
+        primaryKey: true,
+        type: Sequelize.INTEGER,
+      },
+      study_programmes: {
+        type: Sequelize.ARRAY(Sequelize.STRING),
+      },
+    })
+  },
+  down: async queryInterface => {
+    await queryInterface.dropTable('study_programme_pins')
+  },
+}

services/backend/src/database/migrations_user/20190925_01_init_db_schema.js

@@ -29,7 +29,6 @@ CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
 -- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: 
 --
 
-COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
 
 
 SET search_path = public, pg_catalog;
@@ -52,7 +51,6 @@ CREATE TABLE access_groups (
 );
 
 
-ALTER TABLE access_groups OWNER TO postgres;
 
 --
 -- Name: access_groups_id_seq; Type: SEQUENCE; Schema: public; Owner: postgres
@@ -66,7 +64,6 @@ CREATE SEQUENCE access_groups_id_seq
     CACHE 1;
 
 
-ALTER TABLE access_groups_id_seq OWNER TO postgres;
 
 --
 -- Name: access_groups_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres
@@ -87,7 +84,6 @@ CREATE TABLE affiliations (
 );
 
 
-ALTER TABLE affiliations OWNER TO postgres;
 
 --
 -- Name: affiliations_id_seq; Type: SEQUENCE; Schema: public; Owner: postgres
@@ -101,7 +97,6 @@ CREATE SEQUENCE affiliations_id_seq
     CACHE 1;
 
 
-ALTER TABLE affiliations_id_seq OWNER TO postgres;
 
 --
 -- Name: affiliations_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres
@@ -122,7 +117,6 @@ CREATE TABLE faculty_programmes (
 );
 
 
-ALTER TABLE faculty_programmes OWNER TO postgres;
 
 --
 -- Name: hibernate_sequence; Type: SEQUENCE; Schema: public; Owner: postgres
@@ -136,7 +130,6 @@ CREATE SEQUENCE hibernate_sequence
     CACHE 1;
 
 
-ALTER TABLE hibernate_sequence OWNER TO postgres;
 
 --
 -- Name: hy_groups; Type: TABLE; Schema: public; Owner: postgres
@@ -150,7 +143,6 @@ CREATE TABLE hy_groups (
 );
 
 
-ALTER TABLE hy_groups OWNER TO postgres;
 
 --
 -- Name: hy_groups_id_seq; Type: SEQUENCE; Schema: public; Owner: postgres
@@ -164,7 +156,6 @@ CREATE SEQUENCE hy_groups_id_seq
     CACHE 1;
 
 
-ALTER TABLE hy_groups_id_seq OWNER TO postgres;
 
 --
 -- Name: hy_groups_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres
@@ -183,7 +174,6 @@ CREATE TABLE sequence (
 );
 
 
-ALTER TABLE sequence OWNER TO postgres;
 
 --
 -- Name: user_accessgroup; Type: TABLE; Schema: public; Owner: postgres
@@ -198,7 +188,6 @@ CREATE TABLE user_accessgroup (
 );
 
 
-ALTER TABLE user_accessgroup OWNER TO postgres;
 
 --
 -- Name: user_accessgroup_id_seq; Type: SEQUENCE; Schema: public; Owner: postgres
@@ -212,7 +201,6 @@ CREATE SEQUENCE user_accessgroup_id_seq
     CACHE 1;
 
 
-ALTER TABLE user_accessgroup_id_seq OWNER TO postgres;
 
 --
 -- Name: user_accessgroup_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres
@@ -234,7 +222,6 @@ CREATE TABLE user_affiliation (
 );
 
 
-ALTER TABLE user_affiliation OWNER TO postgres;
 
 --
 -- Name: user_affiliation_id_seq; Type: SEQUENCE; Schema: public; Owner: postgres
@@ -248,7 +235,6 @@ CREATE SEQUENCE user_affiliation_id_seq
     CACHE 1;
 
 
-ALTER TABLE user_affiliation_id_seq OWNER TO postgres;
 
 --
 -- Name: user_affiliation_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres
@@ -269,7 +255,6 @@ CREATE TABLE user_elementdetails (
 );
 
 
-ALTER TABLE user_elementdetails OWNER TO postgres;
 
 --
 -- Name: user_faculties; Type: TABLE; Schema: public; Owner: postgres
@@ -283,7 +268,6 @@ CREATE TABLE user_faculties (
 );
 
 
-ALTER TABLE user_faculties OWNER TO postgres;
 
 --
 -- Name: user_hy_group; Type: TABLE; Schema: public; Owner: postgres
@@ -298,7 +282,6 @@ CREATE TABLE user_hy_group (
 );
 
 
-ALTER TABLE user_hy_group OWNER TO postgres;
 
 --
 -- Name: user_hy_group_id_seq; Type: SEQUENCE; Schema: public; Owner: postgres
@@ -312,7 +295,6 @@ CREATE SEQUENCE user_hy_group_id_seq
     CACHE 1;
 
 
-ALTER TABLE user_hy_group_id_seq OWNER TO postgres;
 
 --
 -- Name: user_hy_group_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres
@@ -332,7 +314,6 @@ CREATE TABLE user_unit (
 );
 
 
-ALTER TABLE user_unit OWNER TO postgres;
 
 --
 -- Name: user_unit_id_seq; Type: SEQUENCE; Schema: public; Owner: postgres
@@ -346,7 +327,6 @@ CREATE SEQUENCE user_unit_id_seq
     CACHE 1;
 
 
-ALTER TABLE user_unit_id_seq OWNER TO postgres;
 
 --
 -- Name: user_unit_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres
@@ -368,7 +348,6 @@ CREATE TABLE users (
 );
 
 
-ALTER TABLE users OWNER TO postgres;
 
 --
 -- Name: users_id_seq; Type: SEQUENCE; Schema: public; Owner: postgres
@@ -382,7 +361,6 @@ CREATE SEQUENCE users_id_seq
     CACHE 1;
 
 
-ALTER TABLE users_id_seq OWNER TO postgres;
 
 --
 -- Name: users_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: postgres

services/backend/src/database/migrations_user/20240523_00_add_roles_and_programme_rights_to_users.js

@@ -0,0 +1,41 @@
+const { ARRAY, STRING } = require('sequelize')
+
+module.exports = {
+  up: async queryInterface => {
+    await queryInterface.addColumn('users', 'roles', {
+      type: ARRAY(STRING),
+      allowNull: false,
+      defaultValue: [],
+    })
+    await queryInterface.sequelize.query(`
+      UPDATE users
+      SET roles = COALESCE(subquery.roles, '{}')
+      FROM (
+        SELECT uag."userId" AS "userId", ARRAY_AGG(ag.group_code) AS roles
+        FROM user_accessgroup uag
+        JOIN access_groups ag ON uag."accessGroupId" = ag.id
+        GROUP BY uag."userId"
+      ) AS subquery
+      WHERE users.id = subquery."userId"
+    `)
+    await queryInterface.addColumn('users', 'programme_rights', {
+      type: ARRAY(STRING),
+      allowNull: false,
+      defaultValue: [],
+    })
+    await queryInterface.sequelize.query(`
+      UPDATE users
+      SET programme_rights = subquery.programme_rights
+      FROM (
+        SELECT "userId", ARRAY_AGG("elementDetailCode") AS programme_rights
+        FROM "user_elementdetails"
+        GROUP BY "userId"
+      ) AS subquery
+      WHERE users.id = subquery."userId"
+    `)
+  },
+  down: async queryInterface => {
+    await queryInterface.removeColumn('users', 'roles')
+    await queryInterface.removeColumn('users', 'programme_rights')
+  },
+}

services/backend/src/database/migrations_user/20240524_00_drop_user_faculties.js

@@ -0,0 +1,6 @@
+module.exports = {
+  up: async queryInterface => {
+    await queryInterface.dropTable('user_faculties')
+  },
+  down: async () => {},
+}

services/backend/src/database/migrations_user/20240524_01_drop_user_elementdetails.js

@@ -0,0 +1,6 @@
+module.exports = {
+  up: async queryInterface => {
+    await queryInterface.dropTable('user_elementdetails')
+  },
+  down: async () => {},
+}

services/backend/src/database/migrations_user/20240524_02_drop_user_accessgroup.js

@@ -0,0 +1,6 @@
+module.exports = {
+  up: async queryInterface => {
+    await queryInterface.dropTable('user_accessgroup')
+  },
+  down: async () => {},
+}

services/backend/src/database/migrations_user/20240524_03_drop_access_groups.js

@@ -0,0 +1,6 @@
+module.exports = {
+  up: async queryInterface => {
+    await queryInterface.dropTable('access_groups')
+  },
+  down: async () => {},
+}

services/backend/src/database/migrations_user/20240524_04_remove_iam_groups_from_users.js

@@ -0,0 +1,6 @@
+module.exports = {
+  up: async queryInterface => {
+    await queryInterface.removeColumn('users', 'iam_groups')
+  },
+  down: async () => {},
+}

services/backend/src/database/migrations_user/20240524_05_drop_sessions.js

@@ -0,0 +1,6 @@
+module.exports = {
+  up: async queryInterface => {
+    await queryInterface.dropTable('"Sessions"')
+  },
+  down: async () => {},
+}

services/backend/src/environment/organizationConfig.json

@@ -0,0 +1,23 @@
+{
+  "facultyCodes": [
+    "H10",
+    "H20",
+    "H30",
+    "H40",
+    "H50",
+    "H55",
+    "H57",
+    "H60",
+    "H70",
+    "H74",
+    "H80",
+    "H90",
+    "H92",
+    "H930",
+    "H99",
+    "Y",
+    "Y01"
+  ],
+  "magicFacultyCode": "H50",
+  "ignoredFacultyCodes": ["Y", "H99", "Y01", "H92", "H930"]
+}

services/backend/src/events.js

@@ -1,17 +1,21 @@
 const { CronJob } = require('cron')
-const { refreshAssociationsInRedis } = require('./services/studyrights')
-const { getAllProgrammes } = require('./services/studyrights')
-const { updateBasicView, updateStudytrackView } = require('./services/studyprogramme/studyprogrammeUpdates')
-const { findAndSaveTeachers } = require('./services/topteachers')
-const { faculties } = require('./services/organisations')
-const { combinedStudyprogrammes } = require('./services/studyprogramme/studyprogrammeHelpers')
+
+const { isProduction, runningInCI } = require('./config')
+const { getFaculties } = require('./services/faculty/facultyHelpers')
 const { updateFacultyOverview, updateFacultyProgressOverview } = require('./services/faculty/facultyUpdates')
-const { isProduction, runningInCI } = require('./conf-backend')
-const { getCurrentSemester } = require('./services/semesters')
-const logger = require('./util/logger')
-const { getAssociations } = require('./services/studyrights')
-const { redisClient } = require('./services/redis')
 const { computeLanguageCenterData, LANGUAGE_CENTER_REDIS_KEY } = require('./services/languageCenterData')
+const {
+  findStudentsCloseToGraduation,
+  CLOSE_TO_GRADUATION_REDIS_KEY,
+} = require('./services/populations/closeToGraduation')
+const { redisClient } = require('./services/redis')
+const { getCurrentSemester } = require('./services/semesters')
+const { combinedStudyprogrammes, isRelevantProgramme } = require('./services/studyProgramme/studyProgrammeHelpers')
+const { updateBasicView, updateStudytrackView } = require('./services/studyProgramme/studyProgrammeUpdates')
+const { getAssociations, getProgrammesFromStudyRights, refreshAssociationsInRedis } = require('./services/studyrights')
+const { findAndSaveTeachers } = require('./services/topteachers')
+const { deleteOutdatedUsers } = require('./services/userService')
+const logger = require('./util/logger')
 const { jobMaker } = require('./worker/queue')
 
 const schedule = (cronTime, func) => new CronJob({ cronTime, onTick: func, start: true, timeZone: 'Europe/Helsinki' })
@@ -23,37 +27,22 @@ const refreshStudyrightAssociations = async () => {
 
 const refreshFaculties = async () => {
   logger.info('Adding jobs to refresh all faculties')
-  const facultyList = (await faculties()).filter(f => !['Y', 'H99', 'Y01', 'H92', 'H930'].includes(f.code))
-  for (const faculty of facultyList) {
+  const faculties = await getFaculties()
+  for (const faculty of faculties) {
     jobMaker.faculty(faculty.code)
   }
 }
 
 const refreshFaculty = async code => {
-  logger.info('Started updating faculty')
-  const start = new Date().getTime()
-  try {
-    await updateFacultyOverview(code, 'ALL')
-    await updateFacultyProgressOverview(code)
-    const time = new Date().getTime() - start
-    logger.info(`Updated faculty ${code} (took ${(time / 1000 / 60).toFixed(2)} minutes)`)
-  } catch (e) {
-    logger.error({ message: `Failed to update stats for faculty ${code} with type ALL`, meta: `${e}` })
-  }
+  await updateFacultyOverview(code, 'ALL')
+  await updateFacultyProgressOverview(code)
 }
 
 const refreshProgrammes = async () => {
   logger.info('Refreshing studyprogramme and studytrack overview statistics for all programmes')
-  // Filters out old programmes and special ones like Fitech studies. Filters also out the programmes starting with
-  // 2_ or ending with _2. Those programmes are mapped to correct programme (studentProgrammeModuleFixer.js)
-  const codes = (await getAllProgrammes())
-    .map(p => p.code)
-    .filter(
-      code =>
-        (code.includes('KH') && !code.startsWith('2_KH') && !code.endsWith('_2')) ||
-        (code.includes('MH') && !code.startsWith('2_MH') && !code.endsWith('_2')) ||
-        /^(T)[0-9]{6}$/.test(code)
-    )
+
+  const programmes = await getProgrammesFromStudyRights()
+  const codes = programmes.map(programme => programme.code).filter(code => isRelevantProgramme(code))
 
   // Ensure that studyright associations are refreshed before launching jobs, otherwise each job will do it
   await getAssociations()
@@ -64,13 +53,12 @@ const refreshProgrammes = async () => {
 }
 
 const refreshProgramme = async code => {
-  const associations = await getAssociations()
   await updateBasicView(code, '')
-  await updateStudytrackView(code, '', associations)
+  await updateStudytrackView(code, '')
 
-  let combinedProgramme = combinedStudyprogrammes[code] || ''
+  const combinedProgramme = combinedStudyprogrammes[code] || ''
   await updateBasicView(code, combinedProgramme)
-  await updateStudytrackView(code, combinedProgramme, associations)
+  await updateStudytrackView(code, combinedProgramme)
 }
 
 const refreshTeacherLeaderboard = async () => {
@@ -95,11 +83,22 @@ const refreshLanguageCenterData = async () => {
   logger.info('Language center data refreshed!')
 }
 
-const dailyJobs = () => {
-  refreshFaculties()
-  refreshProgrammes()
-  jobMaker.languagecenter()
-  jobMaker.statistics()
+const refreshCloseToGraduating = async () => {
+  logger.info('Updating students close to graduating...')
+  const updatedData = await findStudentsCloseToGraduation()
+  await redisClient.setAsync(CLOSE_TO_GRADUATION_REDIS_KEY, JSON.stringify(updatedData))
+  logger.info('Students close to graduating updated!')
+}
+
+const dailyJobs = async () => {
+  try {
+    await refreshProgrammes()
+    await refreshFaculties()
+    jobMaker.languagecenter()
+    jobMaker.statistics()
+  } catch (error) {
+    logger.error('Daily jobs failed', error)
+  }
 }
 
 const startCron = () => {
@@ -107,13 +106,22 @@ const startCron = () => {
     logger.info('Cronjob for refreshing stats started: runs daily at 23:00.')
     schedule('0 23 * * *', async () => {
       logger.info('Running daily jobs from cron')
-      dailyJobs()
+      await dailyJobs()
     })
-    schedule('0 19 * * 1', async () => {
+    // This needs to be its own job because refreshing study right associations in `refreshStatistics` causes some study right info to be not available, causing this job to fail
+    schedule('0 3 * * *', () => {
+      jobMaker.closeToGraduation()
+    })
+    schedule('0 4 * * 3', async () => {
+      logger.info("Deleting users who haven't logged in for 18 months")
+      const [, result] = await deleteOutdatedUsers()
+      logger.info(`Deleted ${result.rowCount} users.`)
+    })
+    schedule('0 19 * * 1', () => {
       logger.info('Updating students whose studyplans have not been updated recently')
       jobMaker.studyplansUpdate(4)
     })
-    schedule('0 10 * * 2', async () => {
+    schedule('0 10 * * 2', () => {
       logger.info('Updating students whose studyplans have not been updated recently')
       jobMaker.studyplansUpdate(5)
     })
@@ -128,4 +136,5 @@ module.exports = {
   refreshProgramme,
   refreshProgrammes,
   refreshLanguageCenterData,
+  refreshCloseToGraduating,
 }

services/backend/src/middleware/accessLogger.js

@@ -1,40 +0,0 @@
-const morgan = require('morgan')
-const logger = require('../util/logger')
-const _ = require('lodash')
-
-// So this appears to be a hack to get neatly formatted stats like response-time etc. from morgan
-// without actually using morgan what it's used for (LOGGING REQUESTS!).
-// Return undefined from here so that stuff isn't printed to console
-// so don't e.g. make it into an async function or it'll print [object Promise] on every request
-const accessLogger = morgan((tokens, req, res) => {
-  const fields = ['method', 'url', 'status', 'response-time', 'remote-addr', 'remote-user', 'user-agent', 'referrer']
-  const { user } = req
-  const meta = { ...user }
-  fields.forEach(field => (meta[field] = tokens[field](req, res)))
-  meta['time'] = tokens['date'](req, res, 'iso')
-  if (req.route) {
-    meta['req-route'] = req.route.path
-  }
-
-  const message = [
-    `${user.mockedBy ? '(mocking) ' : ''}${user.name}`,
-    `${(tokens['response-time'](req, res) || '0').split('.')[0]} ms`.padEnd(8, ' '),
-    tokens['status'](req, res),
-    tokens['method'](req, res),
-    tokens['url'](req, res),
-  ].join(' ')
-
-  const usingIamRights = user.iamRights.some(programmeCode => tokens['url'](req, res).includes(programmeCode))
-  const onlyIamRights = !user.isAdmin && user.rights.length === 0
-
-  logger.info(message, {
-    // don't log student list which might be huge
-    ..._.omit(meta, ['studentsUserCanAccess']),
-    // pass this as a custom field so we can filter by it in graylog
-    isUsageStats: true,
-    // needed for Grafana IAM users panel
-    isIamRights: onlyIamRights || usingIamRights,
-  })
-})
-
-module.exports = accessLogger

services/backend/src/middleware/accessLogger.ts

@@ -0,0 +1,61 @@
+import { Response } from 'express'
+import { omit } from 'lodash'
+import morgan from 'morgan'
+
+import { FormattedUser, OodikoneRequest } from '../types'
+import { getFullStudyProgrammeRights } from '../util'
+import logger from '../util/logger'
+
+interface Meta extends FormattedUser {
+  method?: string
+  url?: string
+  status?: string
+  'response-time'?: string
+  'remote-addr'?: string
+  'remote-user'?: string | undefined
+  'user-agent'?: string
+  referrer?: string
+  time?: string
+  'req-route'?: string
+}
+
+// So this appears to be a hack to get neatly formatted stats like response-time etc. from morgan
+// without actually using morgan what it's used for (LOGGING REQUESTS!).
+// Return undefined from here so that stuff isn't printed to console
+// so don't e.g. make it into an async function or it'll print [object Promise] on every request
+const accessLogger = morgan((tokens, req: OodikoneRequest, res: Response): undefined => {
+  const fields = ['method', 'url', 'status', 'response-time', 'remote-addr', 'remote-user', 'user-agent', 'referrer']
+  const { user } = req
+  if (!user) {
+    return
+  }
+  const meta: Meta = { ...user }
+  fields.forEach(field => {
+    meta[field] = tokens[field](req, res)
+  })
+  meta.time = tokens.date(req, res, 'iso')
+  if (req.route) {
+    meta['req-route'] = req.route.path
+  }
+
+  const message = [
+    `${user.mockedBy ? '(mocking) ' : ''}${user.name}`,
+    `${(tokens['response-time'](req, res) || '0').split('.')[0]} ms`.padEnd(8, ' '),
+    tokens.status(req, res),
+    tokens.method(req, res),
+    decodeURIComponent(tokens.url(req, res) as string),
+  ].join(' ')
+
+  const fullStudyProgrammeRights = getFullStudyProgrammeRights(user.programmeRights)
+  const iamBasedRights = user.programmeRights.filter(right => right.isIamBased)
+  const usingIamRights = iamBasedRights.some(right => (tokens.url(req, res) as string).includes(right.code))
+  const onlyIamRights = !user.isAdmin && fullStudyProgrammeRights.length === 0
+
+  logger.info(message, {
+    ...omit(meta, ['studentsUserCanAccess']), // Don't log student list which might be huge
+    isUsageStats: true, // Pass this as a custom field so we can filter by it in Graylog
+    isIamRights: onlyIamRights || usingIamRights, // Needed for Grafana IAM users panel
+  })
+})
+
+export default accessLogger

services/backend/src/middleware/auth.js

@@ -1,17 +0,0 @@
-const roles = requiredRoles => async (req, res, next) => {
-  if (req.user) {
-    const {
-      user: { roles },
-    } = req
-
-    if (requiredRoles.some(r => roles.includes(r)) || roles.includes('admin')) {
-      return next()
-    }
-  }
-
-  res.status(403).json({ error: 'missing required roles' })
-}
-
-module.exports = {
-  roles,
-}

services/backend/src/middleware/auth.ts

@@ -0,0 +1,14 @@
+import { NextFunction, Response } from 'express'
+
+import { OodikoneRequest, Role } from '../types'
+
+export const roles = (requiredRoles: Role[]) => async (req: OodikoneRequest, res: Response, next: NextFunction) => {
+  if (req.user) {
+    const { roles } = req.user
+    if (requiredRoles.some(role => roles.includes(role)) || roles.includes('admin')) {
+      return next()
+    }
+  }
+
+  res.status(403).json({ error: 'Missing required roles' })
+}

services/backend/src/middleware/currentUser.ts

@@ -0,0 +1,144 @@
+import * as Sentry from '@sentry/node'
+import { NextFunction, Response } from 'express'
+import { intersection } from 'lodash'
+
+import { configLogoutUrl, isDev, requiredGroup, serviceProvider } from '../config'
+import { getMockedUser, getMockedUserFd, getOrganizationAccess, getUserFd, getUserToska } from '../services/userService'
+import { FormattedUser, IamAccess, OodikoneRequest } from '../types'
+import { ApplicationError } from '../util/customErrors'
+import logger from '../util/logger'
+
+const parseIamGroups = (iamGroups: string) => iamGroups?.split(';') ?? []
+
+const hasRequiredIamGroup = (iamGroups: string[], iamRights: string[]) => {
+  return intersection(iamGroups, requiredGroup).length > 0 || iamRights.length > 0
+}
+
+const getUser = async (
+  showAsUser: string | undefined,
+  username: string,
+  name: string,
+  email: string,
+  iamGroups: string[],
+  specialGroup: Record<string, boolean>,
+  sisId: string,
+  iamAccess: IamAccess
+) => {
+  if (showAsUser && specialGroup?.superAdmin) {
+    return await getMockedUser({ userToMock: showAsUser as string, mockedBy: username as string })
+  }
+  return await getUserToska({
+    username: username as string,
+    name: name as string,
+    email: email as string,
+    iamGroups,
+    specialGroup,
+    sisId: sisId as string,
+    iamAccess,
+  })
+}
+
+type Headers = {
+  host?: string
+  'user-agent'?: string
+  accept?: string
+  'accept-language'?: string
+  'accept-encoding'?: string
+  referer?: string
+  displayname?: string
+  hygroupcn?: string
+  hypersonsisuid?: string
+  mail?: string
+  remote_user?: string
+  'shib-session-id'?: string
+  shib_logout_url?: string
+  uid?: string
+  'x-show-as-user'?: string
+  connection?: string
+  cookie?: string
+  'sec-fetch-dest'?: string
+  'sec-fetch-mode'?: string
+  'sec-fetch-site'?: string
+  'if-none-match'?: string
+  priority?: string
+}
+
+const toskaUserMiddleware = async (req: OodikoneRequest, _res: Response, next: NextFunction) => {
+  const {
+    'shib-session-id': sessionId,
+    'x-show-as-user': showAsUser,
+    displayname: name,
+    hygroupcn,
+    hypersonsisuid: sisId,
+    mail: email,
+    shib_logout_url: logoutUrl,
+    uid: username,
+  } = req.headers as Headers
+
+  const missingHeaders: string[] = []
+  if (!sessionId) missingHeaders.push('shib-session-id')
+  if (!username) missingHeaders.push('uid')
+
+  if (missingHeaders.length > 0) {
+    throw new ApplicationError(
+      `Not enough data in request headers, the following headers were missing: ${missingHeaders.join(', ')}`,
+      403,
+      { logoutUrl }
+    )
+  }
+
+  const iamGroups = parseIamGroups(hygroupcn as string)
+  const { iamAccess = {}, specialGroup = {} } = await getOrganizationAccess(sisId as string, iamGroups)
+  const iamRights = Object.keys(iamAccess)
+
+  if (!hasRequiredIamGroup(iamGroups, iamRights)) {
+    logger.error({
+      message: 'User does not have required iam group',
+      meta: { username, name, email, iamGroups, iamRights },
+    })
+    throw new ApplicationError(`User '${username}' does not have required iam group`, 403, { logoutUrl })
+  }
+
+  const user = await getUser(showAsUser, username!, name!, email!, iamGroups, specialGroup, sisId!, iamAccess)
+  if (!user) {
+    throw new ApplicationError(`Username ${username} not found.`, 403, { logoutUrl })
+  }
+
+  Sentry.setUser({ username: user.mockedBy ?? username! })
+
+  req.user = user
+  req.logoutUrl = logoutUrl as string
+
+  next()
+}
+
+const fdUserMiddleware = async (req: OodikoneRequest, _res: Response, next: NextFunction) => {
+  const { remote_user: remoteUser, 'x-show-as-user': showAsUser } = req.headers
+
+  if (!remoteUser) {
+    throw new ApplicationError('Not enough data in request headers, remote_user was missing', 403, { configLogoutUrl })
+  }
+
+  let user: FormattedUser | null
+
+  // getMockedUser in production requires the superAdmin role, which is only available
+  // via iamGroups, so it's now only implemented for the dev environment
+  if (showAsUser && isDev) {
+    user = await getMockedUserFd({ userToMock: showAsUser as string, mockedBy: remoteUser as string })
+  } else {
+    user = await getUserFd({ username: remoteUser as string })
+  }
+
+  if (!user) {
+    throw new ApplicationError(`Could not grant access with the eppn ${remoteUser}.`, 403, { configLogoutUrl })
+  }
+
+  req.user = user
+  req.logoutUrl = configLogoutUrl
+
+  next()
+}
+
+const currentUserMiddleware = serviceProvider === 'Toska' ? toskaUserMiddleware : fdUserMiddleware
+
+export default currentUserMiddleware

services/backend/src/middleware/currentUserMiddleware.js

@@ -1,69 +0,0 @@
-const Sentry = require('@sentry/node')
-const { ApplicationError } = require('../util/customErrors')
-const { getUser, getMockedUser, getOrganizationAccess } = require('../services/userService')
-const { requiredGroup } = require('../conf-backend')
-const _ = require('lodash')
-const logger = require('../util/logger')
-
-const parseIamGroups = iamGroups => iamGroups?.split(';').filter(Boolean) ?? []
-
-const hasRequiredIamGroup = (iamGroups, iamRights) =>
-  _.intersection(iamGroups, requiredGroup).length > 0 || iamRights.length > 0
-
-const currentUserMiddleware = async (req, _res, next) => {
-  const {
-    'shib-session-id': sessionId,
-    'x-show-as-user': showAsUser,
-    displayname: name,
-    hygroupcn,
-    hypersonsisuid: sisId,
-    mail: email,
-    shib_logout_url: logoutUrl,
-    uid: username,
-  } = req.headers
-
-  const missingHeaders = []
-
-  if (!sessionId) missingHeaders.push('shib-session-id')
-  if (!username) missingHeaders.push('uid')
-
-  if (missingHeaders.length > 0) {
-    throw new ApplicationError(
-      `Not enough data in request headers, the following headers were missing: ${missingHeaders.join(', ')}`,
-      403,
-      { logoutUrl }
-    )
-  }
-
-  const iamGroups = parseIamGroups(hygroupcn)
-  const { access = {}, specialGroup = {} } = await getOrganizationAccess({ id: sisId, iamGroups })
-  const iamRights = Object.keys(access)
-
-  if (!hasRequiredIamGroup(iamGroups, iamRights)) {
-    logger.error({ message: 'User does not have required iam group', meta: { iamGroups, iamRights } })
-    throw new ApplicationError('User does not have required iam group', 403, { logoutUrl })
-  }
-
-  let user = await getUser({
-    username,
-    name,
-    email,
-    iamGroups,
-    iamRights,
-    specialGroup,
-    sisId,
-  })
-
-  if (showAsUser && user.isAdmin) {
-    user = await getMockedUser({ userToMock: showAsUser, mockedBy: username })
-  }
-
-  Sentry.setUser({ username: user.mockedBy ?? username })
-
-  req.user = user
-  req.logoutUrl = logoutUrl
-
-  next()
-}
-
-module.exports = currentUserMiddleware

services/backend/src/middleware/errorHandler.ts

@@ -0,0 +1,21 @@
+import * as Sentry from '@sentry/node'
+import { NextFunction, Response } from 'express'
+
+import { OodikoneRequest } from '../types'
+import { ApplicationError } from '../util/customErrors'
+import logger from '../util/logger'
+
+const errorHandler = (error: any, _req: OodikoneRequest, res: Response, next: NextFunction) => {
+  logger.error(error.message, { error })
+  Sentry.captureException(error)
+
+  if (res.headersSent) {
+    return next(error)
+  }
+
+  const normalizedError = error instanceof ApplicationError ? error : new ApplicationError(error.message)
+
+  return res.status(normalizedError.status).json(normalizedError)
+}
+
+export default errorHandler

services/backend/src/middleware/errorMiddleware.js

@@ -1,19 +0,0 @@
-const Sentry = require('@sentry/node')
-const { ApplicationError } = require('../util/customErrors')
-const logger = require('../util/logger')
-
-const errorHandler = (error, req, res, next) => {
-  logger.error(`${error.message} ${error.name} ${error.stack}`)
-
-  Sentry.captureException(error)
-
-  if (res.headersSent) {
-    return next(error)
-  }
-
-  const normalizedError = error instanceof ApplicationError ? error : new ApplicationError(error.message)
-
-  return res.status(normalizedError.status).json(normalizedError)
-}
-
-module.exports = errorHandler

services/backend/src/middleware/headers.ts

@@ -0,0 +1,10 @@
+import headersMiddleware from 'unfuck-utf8-headers-middleware'
+
+import { serviceProvider } from '../config'
+
+const headersToska = ['uid', 'displayName', 'shib-session-id', 'hyGroupCn', 'mail', 'hyPersonSisuId']
+const headersOther = ['remote_user']
+
+const headers = serviceProvider === 'Toska' ? headersToska : headersOther
+
+export default headersMiddleware(headers)

services/backend/src/middleware/shibbolethCharsetMiddleware.js

@@ -1,5 +0,0 @@
-const headersMiddleware = require('unfuck-utf8-headers-middleware')
-
-const headers = ['uid', 'displayName', 'shib-session-id', 'hyGroupCn', 'mail', 'hyPersonSisuId']
-
-module.exports = headersMiddleware(headers)

services/backend/src/models/SISStudyRight.ts

@@ -0,0 +1,87 @@
+/* eslint-disable import/no-cycle */
+import { InferAttributes } from 'sequelize'
+import {
+  BelongsTo,
+  Column,
+  CreatedAt,
+  DataType,
+  ForeignKey,
+  HasMany,
+  Model,
+  PrimaryKey,
+  Table,
+  UpdatedAt,
+} from 'sequelize-typescript'
+
+import { EnrollmentType, ExtentCode } from '../types'
+import { Organization } from './organization'
+import { SISStudyRightElement } from './SISStudyRightElement'
+import { Student } from './student'
+import { Studyplan } from './studyplan'
+import { StudyrightExtent } from './studyrightExtent'
+
+export type SemesterEnrollment = {
+  type: EnrollmentType
+  semester: number
+  statutoryAbsence?: boolean
+}
+
+@Table({
+  underscored: true,
+  tableName: 'sis_study_rights',
+})
+export class SISStudyRight extends Model<InferAttributes<SISStudyRight>> {
+  @PrimaryKey
+  @Column(DataType.STRING)
+  id!: string
+
+  @ForeignKey(() => Organization)
+  @Column(DataType.STRING)
+  facultyCode!: string
+
+  @BelongsTo(() => Organization, { foreignKey: 'facultyCode', targetKey: 'code' })
+  organization!: Organization
+
+  @HasMany(() => Studyplan)
+  studyPlans!: Studyplan[]
+
+  @HasMany(() => SISStudyRightElement, { foreignKey: 'studyRightId' })
+  studyRightElements!: SISStudyRightElement[]
+
+  @Column(DataType.DATE)
+  startDate!: Date
+
+  @Column(DataType.DATE)
+  endDate!: Date
+
+  @Column(DataType.DATE)
+  studyStartDate!: Date
+
+  @Column(DataType.BOOLEAN)
+  cancelled!: boolean
+
+  @ForeignKey(() => Student)
+  @Column(DataType.STRING)
+  studentNumber!: string
+
+  @BelongsTo(() => Student)
+  student!: Student
+
+  @ForeignKey(() => StudyrightExtent)
+  @Column(DataType.INTEGER)
+  extentCode!: ExtentCode
+
+  @Column(DataType.STRING)
+  admissionType!: string
+
+  @Column(DataType.JSONB)
+  semesterEnrollments!: SemesterEnrollment[] | null
+
+  @CreatedAt
+  @Column(DataType.DATE)
+  createdAt!: Date
+
+  @UpdatedAt
+  @Column(DataType.DATE)
+  updatedAt!: Date
+}

services/backend/src/models/SISStudyRightElement.ts

@@ -0,0 +1,65 @@
+/* eslint-disable import/no-cycle */
+import { InferAttributes } from 'sequelize'
+import {
+  BelongsTo,
+  Column,
+  CreatedAt,
+  DataType,
+  ForeignKey,
+  Model,
+  PrimaryKey,
+  Table,
+  UpdatedAt,
+} from 'sequelize-typescript'
+
+import { Name, Phase, StudyTrack } from '../types'
+import { SISStudyRight } from './SISStudyRight'
+
+@Table({
+  underscored: true,
+  tableName: 'sis_study_right_elements',
+})
+export class SISStudyRightElement extends Model<InferAttributes<SISStudyRightElement>> {
+  @PrimaryKey
+  @Column(DataType.STRING)
+  id!: string
+
+  @Column(DataType.DATE)
+  startDate!: Date
+
+  @Column(DataType.DATE)
+  endDate!: Date
+
+  @Column(DataType.BOOLEAN)
+  graduated!: boolean
+
+  @Column(DataType.INTEGER)
+  phase!: Phase
+
+  @ForeignKey(() => SISStudyRight)
+  @Column(DataType.STRING)
+  studyRightId!: string
+
+  @BelongsTo(() => SISStudyRight, { foreignKey: 'studyRightId' })
+  studyRight!: SISStudyRight
+
+  @Column(DataType.STRING)
+  code!: string
+
+  @Column(DataType.JSONB)
+  name!: Name
+
+  @Column(DataType.JSONB)
+  studyTrack!: StudyTrack | null
+
+  @Column(DataType.STRING)
+  degreeProgrammeType!: string
+
+  @CreatedAt
+  @Column(DataType.DATE)
+  createdAt!: Date
+
+  @UpdatedAt
+  @Column(DataType.DATE)
+  updatedAt!: Date
+}

services/backend/src/models/course.js

@@ -1,66 +0,0 @@
-const { Model, STRING, DATE, JSONB, BOOLEAN } = require('sequelize')
-const { dbConnections } = require('../database/connection')
-
-class Course extends Model {}
-
-Course.init(
-  {
-    id: {
-      type: STRING,
-      primaryKey: true,
-    },
-    code: {
-      type: STRING,
-    },
-    name: {
-      type: JSONB,
-    },
-    latest_instance_date: {
-      type: DATE,
-    },
-    is_study_module: {
-      type: BOOLEAN,
-    },
-    coursetypecode: {
-      type: STRING,
-    },
-    startdate: {
-      type: DATE,
-    },
-    enddate: {
-      type: DATE,
-    },
-    max_attainment_date: {
-      type: DATE,
-    },
-    min_attainment_date: {
-      type: DATE,
-    },
-    createdAt: {
-      field: 'created_at',
-      type: DATE,
-    },
-    updatedAt: {
-      field: 'updated_at',
-      type: DATE,
-    },
-    substitutions: {
-      type: JSONB,
-    },
-    course_unit_type: {
-      type: STRING,
-    },
-    mainCourseCode: {
-      field: 'main_course_code',
-      type: STRING,
-    },
-  },
-  {
-    underscored: false,
-    sequelize: dbConnections.sequelize,
-    modelName: 'course',
-    tableName: 'course',
-  }
-)
-
-module.exports = Course

services/backend/src/models/course.ts

@@ -0,0 +1,100 @@
+/* eslint-disable import/no-cycle */
+import { InferAttributes } from 'sequelize'
+import {
+  BelongsTo,
+  BelongsToMany,
+  Column,
+  CreatedAt,
+  DataType,
+  ForeignKey,
+  HasMany,
+  Model,
+  PrimaryKey,
+  Table,
+  UpdatedAt,
+} from 'sequelize-typescript'
+
+import { Name } from '../types'
+import { CourseProvider } from './courseProvider'
+import { CourseType } from './courseType'
+import { Credit } from './credit'
+import { Enrollment } from './enrollment'
+import { Organization } from './organization'
+
+@Table({
+  underscored: false,
+  modelName: 'course',
+  tableName: 'course',
+})
+export class Course extends Model<InferAttributes<Course>> {
+  @PrimaryKey
+  @Column(DataType.STRING)
+  id!: string
+
+  @ForeignKey(() => Course)
+  @Column(DataType.STRING)
+  code!: string
+
+  @ForeignKey(() => CourseType)
+  @Column(DataType.STRING)
+  coursetypecode!: string
+
+  @BelongsTo(() => CourseType, { foreignKey: 'coursetypecode', targetKey: 'coursetypecode' })
+  courseType!: CourseType
+
+  @HasMany(() => Credit, { foreignKey: 'course_id', sourceKey: 'id' })
+  credits!: Credit[]
+
+  @HasMany(() => Enrollment, { foreignKey: 'course_id' })
+  enrollments!: Enrollment[]
+
+  @BelongsToMany(() => Organization, () => CourseProvider, 'coursecode')
+  organizations!: Organization[]
+
+  @Column(DataType.BOOLEAN)
+  is_study_module!: boolean
+
+  @Column(DataType.JSONB)
+  name!: Name
+
+  @Column(DataType.DATE)
+  latest_instance_date!: Date
+
+  @Column(DataType.DATE)
+  startdate!: Date
+
+  @Column(DataType.DATE)
+  enddate!: Date
+
+  @Column(DataType.DATE)
+  max_attainment_date!: Date
+
+  @Column(DataType.DATE)
+  min_attainment_date!: Date
+
+  @CreatedAt
+  @Column({
+    field: 'created_at',
+    type: DataType.DATE,
+  })
+  createdAt!: Date
+
+  @UpdatedAt
+  @Column({
+    field: 'updated_at',
+    type: DataType.DATE,
+  })
+  updatedAt!: Date
+
+  @Column(DataType.JSONB)
+  substitutions!: string[]
+
+  @Column(DataType.STRING)
+  course_unit_type!: string
+
+  @Column({
+    field: 'main_course_code',
+    type: DataType.STRING,
+  })
+  mainCourseCode!: string
+}

services/backend/src/models/courseProvider.js

@@ -1,54 +0,0 @@
-const { Model, STRING, DATE, JSONB } = require('sequelize')
-const { dbConnections } = require('../database/connection')
-
-class CourseProvider extends Model {}
-
-CourseProvider.init(
-  {
-    composite: {
-      type: STRING,
-      unique: true,
-    },
-    coursecode: {
-      type: STRING,
-      references: {
-        model: 'course',
-        key: 'id',
-      },
-      onUpdate: 'cascade',
-      onDelete: 'cascade',
-    },
-    shares: {
-      type: JSONB,
-    },
-    organizationcode: {
-      type: STRING,
-      references: {
-        model: 'organization',
-        key: 'id',
-      },
-      onUpdate: 'cascade',
-      onDelete: 'cascade',
-    },
-    createdAt: {
-      type: DATE,
-    },
-    updatedAt: {
-      type: DATE,
-    },
-  },
-  {
-    underscored: true,
-    sequelize: dbConnections.sequelize,
-    modelName: 'course_provider',
-    tableName: 'course_providers',
-    indexes: [
-      {
-        unique: true,
-        fields: ['coursecode', 'organizationcode'],
-      },
-    ],
-  }
-)
-
-module.exports = CourseProvider

services/backend/src/models/courseProvider.ts

@@ -0,0 +1,42 @@
+/* eslint-disable import/no-cycle */
+import { InferAttributes } from 'sequelize'
+import { Column, CreatedAt, DataType, ForeignKey, Model, PrimaryKey, Table, UpdatedAt } from 'sequelize-typescript'
+
+import { Course } from './course'
+import { Organization } from './organization'
+
+@Table({
+  underscored: true,
+  modelName: 'course_provider',
+  tableName: 'course_providers',
+  indexes: [
+    {
+      unique: true,
+      fields: ['coursecode', 'organizationcode'],
+    },
+  ],
+})
+export class CourseProvider extends Model<InferAttributes<CourseProvider>> {
+  @PrimaryKey
+  @Column(DataType.STRING)
+  composite!: string
+
+  @ForeignKey(() => Course)
+  @Column(DataType.STRING)
+  coursecode!: string
+
+  @Column(DataType.JSONB)
+  shares!: Array<{ share: number; startDate?: string; endDate?: string }> | null
+
+  @ForeignKey(() => Organization)
+  @Column(DataType.STRING)
+  organizationcode!: string
+
+  @CreatedAt
+  @Column(DataType.DATE)
+  createdAt!: Date
+
+  @UpdatedAt
+  @Column(DataType.DATE)
+  updatedAt!: Date
+}

services/backend/src/models/courseType.js

@@ -1,30 +0,0 @@
-const { Model, STRING, DATE, JSONB } = require('sequelize')
-const { dbConnections } = require('../database/connection')
-
-class CourseType extends Model {}
-
-CourseType.init(
-  {
-    coursetypecode: {
-      type: STRING,
-      primaryKey: true,
-    },
-    name: {
-      type: JSONB,
-    },
-    createdAt: {
-      type: DATE,
-    },
-    updatedAt: {
-      type: DATE,
-    },
-  },
-  {
-    underscored: true,
-    sequelize: dbConnections.sequelize,
-    modelName: 'course_type',
-    tableName: 'course_types',
-  }
-)
-
-module.exports = CourseType

services/backend/src/models/courseType.ts

@@ -0,0 +1,31 @@
+/* eslint-disable import/no-cycle */
+import { InferAttributes } from 'sequelize'
+import { Column, CreatedAt, DataType, HasMany, Model, PrimaryKey, Table, UpdatedAt } from 'sequelize-typescript'
+
+import { Name } from '../types'
+import { Course } from './course'
+
+@Table({
+  underscored: true,
+  modelName: 'course_type',
+  tableName: 'course_types',
+})
+export class CourseType extends Model<InferAttributes<CourseType>> {
+  @PrimaryKey
+  @Column(DataType.STRING)
+  coursetypecode!: string
+
+  @HasMany(() => Course)
+  courses!: Course[]
+
+  @Column(DataType.JSONB)
+  name!: Required<Name>
+
+  @CreatedAt
+  @Column(DataType.DATE)
+  createdAt!: Date
+
+  @UpdatedAt
+  @Column(DataType.DATE)
+  updatedAt!: Date
+}

services/backend/src/models/credit.js

@@ -1,101 +0,0 @@
-const { Model, DATE, INTEGER, STRING, DOUBLE, BOOLEAN } = require('sequelize')
-const { dbConnections } = require('../database/connection')
-
-class Credit extends Model {}
-
-Credit.init(
-  {
-    id: {
-      primaryKey: true,
-      type: STRING,
-    },
-    grade: {
-      type: STRING,
-    },
-    student_studentnumber: {
-      type: STRING,
-      references: {
-        model: 'student',
-        key: 'studentnumber',
-      },
-      onUpdate: 'cascade',
-      onDelete: 'cascade',
-    },
-    credits: {
-      type: DOUBLE,
-    },
-    createdate: {
-      type: DATE,
-    },
-    credittypecode: {
-      type: INTEGER,
-      references: {
-        model: 'credit_types',
-        key: 'credittypecode',
-      },
-      onUpdate: 'cascade',
-      onDelete: 'cascade',
-    },
-    attainment_date: {
-      type: DATE,
-    },
-    course_code: {
-      type: STRING,
-    },
-    course_id: {
-      type: STRING,
-      references: {
-        model: 'course',
-        key: 'id',
-      },
-      onUpdate: 'cascade',
-      onDelete: 'cascade',
-    },
-    semester_composite: {
-      type: STRING,
-      references: {
-        model: 'semesters',
-        key: 'composite',
-      },
-      onUpdate: 'cascade',
-      onDelete: 'cascade',
-    },
-    semestercode: {
-      type: INTEGER,
-    },
-    isStudyModule: {
-      type: BOOLEAN,
-    },
-    org: {
-      type: STRING,
-    },
-    createdAt: {
-      type: DATE,
-    },
-    updatedAt: {
-      type: DATE,
-    },
-    language: {
-      type: STRING,
-    },
-    is_open: {
-      type: BOOLEAN,
-    },
-    studyright_id: {
-      type: STRING,
-      allowNull: true,
-      references: {
-        model: 'studyright',
-        key: 'studyrightid',
-      },
-    },
-  },
-  {
-    underscored: false,
-    sequelize: dbConnections.sequelize,
-    modelName: 'credit',
-    tableName: 'credit',
-  }
-)
-
-module.exports = Credit

services/backend/src/models/credit.ts

@@ -0,0 +1,117 @@
+/* eslint-disable import/no-cycle */
+import { InferAttributes } from 'sequelize'
+import {
+  BelongsTo,
+  BelongsToMany,
+  Column,
+  CreatedAt,
+  DataType,
+  ForeignKey,
+  Model,
+  PrimaryKey,
+  Table,
+  UpdatedAt,
+} from 'sequelize-typescript'
+
+import { CreditTypeCode } from '../types'
+import { Course } from './course'
+import { CreditTeacher } from './creditTeacher'
+import { CreditType } from './creditType'
+import { Semester } from './semester'
+import { Student } from './student'
+import { Studyright } from './studyright'
+import { Teacher } from './teacher'
+
+@Table({
+  underscored: false,
+  modelName: 'credit',
+  tableName: 'credit',
+})
+export class Credit extends Model<InferAttributes<Credit>> {
+  @PrimaryKey
+  @Column(DataType.STRING)
+  id!: string
+
+  @Column(DataType.STRING)
+  grade!: string
+
+  @ForeignKey(() => Student)
+  @Column(DataType.STRING)
+  student_studentnumber!: string
+
+  @BelongsTo(() => Student, { foreignKey: 'student_studentnumber', targetKey: 'studentnumber' })
+  student!: Student
+
+  @BelongsTo(() => Semester, { foreignKey: 'semester_composite' })
+  semester!: Semester
+
+  @Column(DataType.DOUBLE)
+  credits!: number
+
+  @ForeignKey(() => CreditType)
+  @Column(DataType.INTEGER)
+  credittypecode!: CreditTypeCode
+
+  @BelongsTo(() => CreditType, { foreignKey: 'credittypecode', targetKey: 'credittypecode' })
+  creditType!: CreditType
+
+  @Column(DataType.DATE)
+  createdate!: Date
+
+  @Column(DataType.DATE)
+  attainment_date!: Date
+
+  @BelongsToMany(() => Teacher, () => CreditTeacher, 'credit_id')
+  teachers!: Teacher[]
+
+  @Column(DataType.STRING)
+  course_code!: string
+
+  @BelongsTo(() => Course, { foreignKey: 'course_id' })
+  course!: Course
+
+  @ForeignKey(() => Course)
+  @Column(DataType.STRING)
+  course_id!: string
+
+  @Column(DataType.STRING)
+  semester_composite!: string
+
+  @Column(DataType.INTEGER)
+  semestercode!: number
+
+  @Column(DataType.BOOLEAN)
+  isStudyModule!: boolean
+
+  @Column(DataType.STRING)
+  org!: string
+
+  @Column(DataType.STRING)
+  language!: string
+
+  @Column(DataType.BOOLEAN)
+  is_open!: boolean
+
+  @ForeignKey(() => Studyright)
+  @Column(DataType.STRING)
+  studyright_id!: string
+
+  @BelongsTo(() => Studyright)
+  studyright!: Studyright
+
+  @CreatedAt
+  @Column(DataType.DATE)
+  createdAt!: Date
+
+  @UpdatedAt
+  @Column(DataType.DATE)
+  updatedAt!: Date
+
+  static passed: ({ credittypecode }: { credittypecode: CreditTypeCode }) => boolean
+
+  static failed: ({ credittypecode }: { credittypecode: CreditTypeCode }) => boolean
+
+  static improved: ({ credittypecode }: { credittypecode: CreditTypeCode }) => boolean
+
+  static notUnnecessary: ({ credits }: { credits: number }) => boolean
+}

services/backend/src/models/creditTeacher.js

@@ -1,45 +0,0 @@
-const { Model, STRING, DATE } = require('sequelize')
-const { dbConnections } = require('../database/connection')
-
-class CreditTeacher extends Model {}
-
-CreditTeacher.init(
-  {
-    composite: {
-      type: STRING,
-      unique: true,
-    },
-    credit_id: {
-      type: STRING,
-      references: {
-        model: 'credit',
-        key: 'id',
-      },
-      onUpdate: 'cascade',
-      onDelete: 'cascade',
-    },
-    teacher_id: {
-      type: STRING,
-      references: {
-        model: 'teacher',
-        key: 'id',
-      },
-      onUpdate: 'cascade',
-      onDelete: 'cascade',
-    },
-    createdAt: {
-      type: DATE,
-    },
-    updatedAt: {
-      type: DATE,
-    },
-  },
-  {
-    underscored: false,
-    sequelize: dbConnections.sequelize,
-    modelName: 'credit_teacher',
-    tableName: 'credit_teachers',
-  }
-)
-
-module.exports = CreditTeacher

services/backend/src/models/creditTeacher.ts

@@ -0,0 +1,44 @@
+/* eslint-disable import/no-cycle */
+import { InferAttributes } from 'sequelize'
+import {
+  Column,
+  CreatedAt,
+  DataType,
+  ForeignKey,
+  Model,
+  PrimaryKey,
+  Table,
+  Unique,
+  UpdatedAt,
+} from 'sequelize-typescript'
+
+import { Credit } from './credit'
+import { Teacher } from './teacher'
+
+@Table({
+  underscored: false,
+  modelName: 'credit_teacher',
+  tableName: 'credit_teachers',
+})
+export class CreditTeacher extends Model<InferAttributes<CreditTeacher>> {
+  @PrimaryKey
+  @Unique
+  @Column(DataType.STRING)
+  composite!: string
+
+  @ForeignKey(() => Credit)
+  @Column(DataType.STRING)
+  credit_id!: string
+
+  @ForeignKey(() => Teacher)
+  @Column(DataType.STRING)
+  teacher_id!: string
+
+  @CreatedAt
+  @Column(DataType.DATE)
+  createdAt!: Date
+
+  @UpdatedAt
+  @Column(DataType.DATE)
+  updatedAt!: Date
+}

services/backend/src/models/creditType.js

@@ -1,30 +0,0 @@
-const { Model, INTEGER, DATE, JSONB } = require('sequelize')
-const { dbConnections } = require('../database/connection')
-
-class CreditType extends Model {}
-
-CreditType.init(
-  {
-    credittypecode: {
-      primaryKey: true,
-      type: INTEGER,
-    },
-    name: {
-      type: JSONB,
-    },
-    createdAt: {
-      type: DATE,
-    },
-    updatedAt: {
-      type: DATE,
-    },
-  },
-  {
-    underscored: true,
-    sequelize: dbConnections.sequelize,
-    modelName: 'credit_type',
-    tableName: 'credit_types',
-  }
-)
-
-module.exports = CreditType

services/backend/src/models/creditType.ts

@@ -0,0 +1,26 @@
+import { InferAttributes } from 'sequelize'
+import { Column, CreatedAt, DataType, Model, PrimaryKey, Table, UpdatedAt } from 'sequelize-typescript'
+
+import { CreditTypeCode, Name } from '../types'
+
+@Table({
+  underscored: true,
+  modelName: 'credit_type',
+  tableName: 'credit_types',
+})
+export class CreditType extends Model<InferAttributes<CreditType>> {
+  @PrimaryKey
+  @Column(DataType.INTEGER)
+  credittypecode!: CreditTypeCode
+
+  @Column(DataType.JSONB)
+  name!: Required<Name>
+
+  @CreatedAt
+  @Column(DataType.DATE)
+  createdAt!: Date
+
+  @UpdatedAt
+  @Column(DataType.DATE)
+  updatedAt!: Date
+}