[Backend][Updater] Add way to flush redis completely in prod

Vastuuvapauslauseke: käyttö omalla vastuulla
[CompletedCoursesSearch] Refactor substitutions => substitution_groups
2026-10-13 03:13:40 +03:00 · 2026-06-08 16:10:51 +03:00 · 2026-06-06 13:41:42 +03:00 · 2026-06-05 12:08:05 +03:00 · 2026-06-04 14:57:39 +03:00 · 2026-06-04 14:50:48 +03:00
736 changed files with 28701 additions and 29365 deletions
@@ -4,9 +4,9 @@ description: 'Runs ESLint and Stylelint for frontend and backend'
 runs:
  using: composite
  steps:
-    - uses: actions/setup-node@v5
+    - uses: actions/setup-node@v6
      with:
-        node-version: 22
+        node-version: 24
    - name: 'Install dependencies'
      shell: bash
      run: npm ci && npm ci --prefix services/shared && npm ci --prefix services/frontend && npm ci --prefix services/backend
@@ -19,7 +19,7 @@ runs:
  using: composite
  steps:
    - name: 'Login to toska Docker registry'
-      uses: docker/login-action@v3
+      uses: docker/login-action@v4
      with:
        registry: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi
        username: ${{ inputs.username }}
@@ -27,10 +27,10 @@ runs:

    - name: 'Run services, pull rest of the needed images'
      shell: bash
-      run: docker compose --file docker-compose.ci.yml up --detach --quiet-pull
+      run: docker compose --file docker-compose.ci.yml --profile oodikone up --detach --quiet-pull

    - name: 'Run cypress'
-      uses: cypress-io/github-action@v6
+      uses: cypress-io/github-action@v7
      with:
        browser: chrome
        spec: ${{ inputs.spec }}
@@ -38,7 +38,7 @@ runs:
        CYPRESS_baseUrl: http://localhost:1337

    - name: 'Upload video if tests fail'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
      if: failure()
      with:
        name: 'Cypress videos - ${{ inputs.test_name }}'
@@ -47,4 +47,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 --profile oodikone logs && sleep 15
@@ -10,7 +10,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6

      - name: 'Get current time'
        id: get_current_time
@@ -49,7 +49,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6

      - name: Extract release version
        id: extract_version
@@ -85,7 +85,7 @@ jobs:
      - release_backend

    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6

      - name: Extract release version
        id: extract_version
@@ -100,9 +100,9 @@ jobs:
      - name: Create Sentry release
        uses: getsentry/action-release@v3
        env:
-          SENTRY_URL: https://toska.cs.helsinki.fi/
+          SENTRY_URL: https://toska.it.helsinki.fi/
          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_TOKEN }}
-          SENTRY_ORG: toska
+          SENTRY_ORG: sentry
          SENTRY_PROJECT: oodikone-frontend
        with:
          environment: production
@@ -119,7 +119,7 @@ jobs:
      - release_backend

    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6

      - name: Extract release version
        id: extract_version
@@ -134,9 +134,9 @@ jobs:
      - name: Create Sentry release
        uses: getsentry/action-release@v3
        env:
-          SENTRY_URL: https://toska.cs.helsinki.fi/
+          SENTRY_URL: https://toska.it.helsinki.fi/
          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_TOKEN }}
-          SENTRY_ORG: toska
+          SENTRY_ORG: sentry
          SENTRY_PROJECT: oodikone-backend
        with:
          environment: production
@@ -157,13 +157,13 @@ jobs:
    if: success()

    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
      - name: 'Send notification to Slack'
        uses: UniversityOfHelsinkiCS/slackbot-action@v1.5
        with:
          webhook-url: ${{ secrets.WEBHOOK_URL }}
          message-type: deployment
-          softa-url: https://oodikone.cs.helsinki.fi/
+          softa-url: https://oodikone.helsinki.fi/
          deployment-target: production

  report_failure:
@@ -178,7 +178,7 @@ jobs:
    if: failure()

    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
      - name: 'Send notification to Slack'
        uses: UniversityOfHelsinkiCS/slackbot-action@v1.5
        with:
@@ -8,7 +8,6 @@ on:
      - 'cypress/**'
      - 'cypress.config.json'
      - 'services/**'
-      - '!services/backend/src/rapodiff/**'
      - 'docker-compose.ci.yml'
      - 'package*.json'

@@ -17,14 +16,43 @@ jobs:
    name: 'Lint packages'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
      - name: Lint backend, frontend and shared
        uses: ./.github/actions/lint

+  test_api:
+    needs:
+      - lint_packages
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Install node-24 for cypress
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
+      - name: 'Login to toska docker registry'
+        uses: docker/login-action@v4
+        with:
+          registry: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi
+          username: ${{ secrets.TOSKAREGISTRY_USERNAME }}
+          password: ${{ secrets.TOSKAREGISTRY_PASSWORD }}
+
+      - name: Start oodikone detached
+        run: npm run oodikone:ci:setup
+
+      - name: Run api-tests
+        run: npm run oodikone:ci:api
+
  test_end_to_end:
    runs-on: ubuntu-latest
    needs:
      - lint_packages
+      - test_api
    strategy:
      fail-fast: false
      matrix:
@@ -41,16 +69,14 @@ jobs:
            spec: cypress/e2e/Students.js
          - name: 'Test completed courses'
            spec: cypress/e2e/Completed_courses.js
-          - name: 'Test study programme overview'
-            spec: cypress/e2e/Study_programme_overview.js
+          - name: 'Test degree programme overview'
+            spec: cypress/e2e/Degree_programme_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'
@@ -59,7 +85,7 @@ jobs:
            spec: cypress/e2e/University.js
    name: ${{ matrix.name }}
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
      - name: 'Run tests'
        uses: ./.github/actions/run-tests
        with:
@@ -11,14 +11,13 @@ on:
      - 'cypress/**'
      - 'cypress.config.json'
      - 'services/**'
-      - '!services/backend/src/rapodiff/**'
      - 'updater/sis-updater-worker/src/db/migrations/**'
      - 'docker-compose.ci.yml'
      - 'package*.json'

 jobs:
  test:
-    uses: ./.github/workflows/test.yaml
+    uses: UniversityOfHelsinkiCS/oodikone/.github/workflows/test.yaml@master
    secrets:
      username: ${{ secrets.TOSKAREGISTRY_USERNAME }}
      password: ${{ secrets.TOSKAREGISTRY_PASSWORD }}
@@ -29,7 +28,7 @@ jobs:
    needs: test

    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6

      - name: Get current time
        id: get_current_time
@@ -64,7 +63,7 @@ jobs:
    needs: test

    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6

      - name: Build backend image
        id: build-image
@@ -99,7 +98,7 @@ jobs:
    if: success()

    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
      - name: 'Send notification to Slack'
        uses: UniversityOfHelsinkiCS/slackbot-action@v1.5
        with:
@@ -118,7 +117,7 @@ jobs:
    if: failure()

    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
      - name: 'Send notification to Slack'
        uses: UniversityOfHelsinkiCS/slackbot-action@v1.5
        with:
@@ -16,7 +16,7 @@ jobs:
    name: 'Lint packages'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
      - name: Lint backend, frontend and shared
        uses: ./.github/actions/lint

@@ -25,10 +25,10 @@ jobs:
    name: 'Build backend'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v5
-      - uses: docker/setup-buildx-action@v3
+      - uses: actions/checkout@v6
+      - uses: docker/setup-buildx-action@v4
      - name: 'Build image and export it'
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
        with:
          build-args: |
            SENTRY_RELEASE=${{ github.sha }}
@@ -40,9 +40,11 @@ jobs:
          outputs: type=docker,dest=/tmp/backend.tar
        env:
          DOCKER_BUILD_SUMMARY: false
+
      - name: 'Upload image for other jobs'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
+          if-no-files-found: error
          name: backend-image
          path: /tmp/backend.tar

@@ -50,24 +52,70 @@ jobs:
    name: 'Build frontend'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
+      - uses: docker/setup-buildx-action@v4
+
      - name: Get current time
        id: get_current_time
        run: echo "NOW=$(date --iso-8601=seconds)" >> $GITHUB_OUTPUT
+
      - name: Build frontend image
-        id: build-image
-        uses: redhat-actions/buildah-build@v2
+        uses: docker/build-push-action@v7
        with:
-          image: oodikone-frontend
-          tags: staging ${{ github.sha }}
-          context: services
-          containerfiles: |
-            services/frontend/Dockerfile
          build-args: |
            BUILT_AT=${{ steps.get_current_time.outputs.NOW }}
            BASE_PATH=/oodikone
            STAGING=true
+          context: services
+          file: services/frontend/Dockerfile
+          push: false
+          tags: oodikone-frontend:staging
+          outputs: type=docker,dest=/tmp/frontend.tar
+        env:
+          DOCKER_BUILD_SUMMARY: false

+      # - name: 'Upload image for other jobs'
+      #   uses: actions/upload-artifact@v7
+      #   with:
+      #     if-no-files-found: error
+      #     name: frontend-image
+      #     path: /tmp/frontend.tar
+
+  pull_docker_images:
+    name: 'Pull all needed docker images and cache them'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - name: 'Login to toska docker registry'
+        uses: docker/login-action@v4
+        with:
+          registry: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi
+          username: ${{ secrets.username }}
+          password: ${{ secrets.password }}
+
+      - name: 'Pull required images'
+        run: docker compose --file docker-compose.ci.yml --profile oodikone --profile updater pull --ignore-buildable --quiet
+
+      - name: 'Save Docker images for downstream jobs'
+        run: |
+          docker save \
+            registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/kone-db \
+            registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/sis-db \
+            registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi/user-db \
+            redis:7.2.6 \
+            postgres:15.10 \
+            "quay.io/toska/jami:production" \
+            nginx:latest \
+          | zstd -T0 -3 -o /tmp/docker-images.tar.zst
+
+      - name: 'Upload Docker images artifact'
+        uses: actions/upload-artifact@v7
+        with:
+          name: docker-images
+          path: /tmp/docker-images.tar.zst
+          retention-days: 1
+
+  # === Update databases ===
  check_migration_files:
    name: Check if new migrations have been added
    runs-on: ubuntu-latest
@@ -76,7 +124,7 @@ jobs:
      user_db_migrations: ${{ steps.check_migrations.outputs.user_db_migrations }}
      sis_db_migrations: ${{ steps.check_migrations.outputs.sis_db_migrations }}
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
      - name: Check if new migrations have been added
        id: check_migrations
        uses: dorny/paths-filter@v3
@@ -94,45 +142,69 @@ jobs:

  build_and_push_anon_sis_db:
    name: 'Build anon sis-db and push to toska hub if new migrations have been added'
-    needs: check_migration_files
+    needs:
+      - pull_docker_images
+      - check_migration_files
    runs-on: ubuntu-latest
    if: needs.check_migration_files.outputs.sis_db_migrations == 'true'
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
      - name: 'Login to toska docker registry'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
        with:
          registry: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi
          username: ${{ secrets.username }}
          password: ${{ secrets.password }}
+
+      - name: 'Download Docker images'
+        uses: actions/download-artifact@v8
+        with:
+          name: docker-images
+          path: /tmp
+
+      - name: 'Load Docker images'
+        run: zstd -d /tmp/docker-images.tar.zst --stdout | docker load
+
      - name: 'Let sis-updater-worker run migrations, then push new version of image to toska hub'
        run: |
-          docker compose --file docker-compose.ci.yml up --detach sis-updater-worker
+          docker compose --file docker-compose.ci.yml up --detach --quiet-pull 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

  build_and_push_anon_kone_db:
    name: 'Build anon kone-db and push to toska hub if new migrations have been added'
    needs:
+      - pull_docker_images
      - build_backend
      - build_frontend
      - check_migration_files
    runs-on: ubuntu-latest
    if: needs.check_migration_files.outputs.kone_db_migrations == 'true'
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
+
+      - name: 'Download Docker images'
+        uses: actions/download-artifact@v8
+        with:
+          name: docker-images
+          path: /tmp
      - name: 'Download backend image'
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
        with:
          name: backend-image
+
+      - name: 'Load Docker images'
+        run: zstd -d /tmp/docker-images.tar.zst --stdout | docker load
      - name: 'Load built backend image'
        run: docker load --input backend.tar
+
      - name: 'Login to toska docker registry'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
        with:
          registry: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi
          username: ${{ secrets.username }}
          password: ${{ secrets.password }}
+
      - name: 'Let backend run migrations, then push new version of image to toska hub'
        run: |
          docker compose --file docker-compose.ci.yml up --detach backend
@@ -142,13 +214,14 @@ jobs:
  build_and_push_anon_user_db:
    name: 'Build anon user-db and push to toska hub if new migrations have been added'
    needs:
+      - pull_docker_images
      - build_backend
      - build_frontend
      - check_migration_files
    runs-on: ubuntu-latest
    if: needs.check_migration_files.outputs.user_db_migrations == 'true'
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
      - uses: dorny/paths-filter@v3
        id: check_migrations
        with:
@@ -156,33 +229,87 @@ jobs:
            migrations:
              - 'services/backend/src/database/migrations_user/**'
              - '.github/workflows/test.yaml'
+
+      - name: 'Download Docker images'
+        uses: actions/download-artifact@v8
+        with:
+          name: docker-images
+          path: /tmp
      - name: 'Download backend image'
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
        with:
          name: backend-image
+
+      - name: 'Load Docker images'
+        run: zstd -d /tmp/docker-images.tar.zst --stdout | docker load
      - name: 'Load built backend image'
        run: docker load --input backend.tar
+
      - name: 'Login to toska docker registry'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
        with:
          registry: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi
          username: ${{ secrets.username }}
          password: ${{ secrets.password }}
+
      - name: 'Let backend run migrations, then push new version of image to toska hub'
        run: |
          docker compose --file docker-compose.ci.yml up --detach backend
          sleep 30 # wait for backend to start and run migrations
          ./anonyymioodi/commit_and_push_to_toska_hub.sh user-db

-  # === End-to-end tests ===
-  test_end_to_end:
-    runs-on: ubuntu-latest
+  # === Backend api-tests ===
+  test_api:
    needs:
+      - pull_docker_images
      - build_and_push_anon_sis_db
      - build_and_push_anon_kone_db
      - build_and_push_anon_user_db
-    # Always run the tests, even if some of the needed jobs failed or were skipped
-    if: always()
+      - lint_packages
+    if: always() && !cancelled() && needs.lint_packages.result == 'success'
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Install node-24
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
+      - name: 'Download Docker images'
+        uses: actions/download-artifact@v8
+        with:
+          name: docker-images
+          path: /tmp
+
+      - name: 'Load Docker images'
+        run: zstd -d /tmp/docker-images.tar.zst --stdout | docker load
+
+      - name: 'Login to toska docker registry'
+        uses: docker/login-action@v4
+        with:
+          registry: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi
+          username: ${{ secrets.username }}
+          password: ${{ secrets.password }}
+
+      - name: Start oodikone (without frontend and backend)
+        run: npm run oodikone:ci:setup -- --quiet-pull
+
+      - name: Run api-tests
+        run: npm run oodikone:ci:api
+
+  # === End-to-end tests ===
+  test_end_to_end:
+    needs:
+      - pull_docker_images
+      - build_and_push_anon_sis_db
+      - build_and_push_anon_kone_db
+      - build_and_push_anon_user_db
+      - lint_packages
+    if: always() && !cancelled() && needs.lint_packages.result == 'success'
    strategy:
      fail-fast: false
      matrix:
@@ -199,25 +326,53 @@ jobs:
            spec: cypress/e2e/Students.js
          - name: 'Test completed courses'
            spec: cypress/e2e/Completed_courses.js
-          - name: 'Test study programme overview'
-            spec: cypress/e2e/Study_programme_overview.js
+          - name: 'Test degree programme overview'
+            spec: cypress/e2e/Degree_programme_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: 'Test university'
            spec: cypress/e2e/University.js
+
    name: ${{ matrix.name }}
+    runs-on: ubuntu-24.04
    steps:
-      - uses: actions/checkout@v5
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Install node-24 for cypress
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
+      - name: 'Download Docker images'
+        uses: actions/download-artifact@v8
+        with:
+          name: docker-images
+          path: /tmp
+      - name: 'Download backend image'
+        uses: actions/download-artifact@v8
+        with:
+          name: backend-image
+      # - name: 'Download frontend image'
+      #   uses: actions/download-artifact@v8
+      #   with:
+      #     name: frontend-image
+
+      - name: 'Load Docker images'
+        run: zstd -d /tmp/docker-images.tar.zst --stdout | docker load
+      - name: 'Load built backend image'
+        run: docker load --input backend.tar
+      # - name: 'Load built frontend image'
+      #   run: docker load --input frontend.tar
+
      - name: 'Run tests'
        uses: ./.github/actions/run-tests
        with:
@@ -230,22 +385,45 @@ jobs:
  test_service_exit_statuses:
    name: 'Check services run correctly'
    needs:
+      - pull_docker_images
      - build_and_push_anon_sis_db
      - build_and_push_anon_kone_db
      - build_and_push_anon_user_db
-    if: always()
+      - lint_packages
+    if: always() && !cancelled() && needs.lint_packages.result == 'success'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
      - name: 'Login to toska docker registry'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
        with:
          registry: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi
          username: ${{ secrets.username }}
          password: ${{ secrets.password }}

-      - name: 'Run services, pull rest of the needed images'
-        run: docker compose --file docker-compose.ci.yml up --detach --quiet-pull
+      - name: 'Download Docker images'
+        uses: actions/download-artifact@v8
+        with:
+          name: docker-images
+          path: /tmp
+      - name: 'Download backend image'
+        uses: actions/download-artifact@v8
+        with:
+          name: backend-image
+      # - name: 'Download frontend image'
+      #   uses: actions/download-artifact@v8
+      #   with:
+      #     name: frontend-image
+
+      - name: 'Load Docker images'
+        run: zstd -d /tmp/docker-images.tar.zst --stdout | docker load
+      - name: 'Load built backend image'
+        run: docker load --input backend.tar
+      # - name: 'Load built frontend image'
+      #   run: docker load --input frontend.tar
+
+      - name: 'Run services, build rest of the needed images'
+        run: docker compose --file docker-compose.ci.yml --profile oodikone up --detach --quiet-pull

      - name: 'Check that exit statuses are not errors'
        run: |
@@ -257,4 +435,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 --profile oodikone logs && sleep 15
@@ -1,29 +1,26 @@
 name: 'Test (and release) Updater'

 on:
-  push:
-    branches:
-      - master
+  release:
+    types: [published]
    paths:
      - '.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@v5
-      - uses: actions/setup-node@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
        with:
-          node-version: 22
+          node-version: 24
+
+      - name: Install safe-chain
+        run: set -o pipefail && curl -fsSL https://github.com/AikidoSec/safe-chain/releases/latest/download/install-safe-chain.sh | sh -s -- --ci
+
      - name: 'Install dependencies'
        run: npm ci && npm ci --prefix updater/sis-updater-scheduler && npm ci --prefix updater/sis-updater-worker
      - name: 'Run linter'
@@ -33,10 +30,10 @@ jobs:
    name: 'Build Updater worker'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v5
-      - uses: docker/setup-buildx-action@v3
+      - uses: actions/checkout@v6
+      - uses: docker/setup-buildx-action@v4
      - name: 'Build the image'
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
        with:
          context: updater/sis-updater-worker/
          push: false
@@ -45,7 +42,7 @@ jobs:
        env:
          DOCKER_BUILD_SUMMARY: false
      - name: 'Upload image for other jobs'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
          name: updater-worker-image
          path: /tmp/worker.tar
@@ -54,10 +51,10 @@ jobs:
    name: 'Build Updater scheduler'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v5
-      - uses: docker/setup-buildx-action@v3
+      - uses: actions/checkout@v6
+      - uses: docker/setup-buildx-action@v4
      - name: 'Build the image'
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
        with:
          context: updater/sis-updater-scheduler/
          push: false
@@ -66,7 +63,7 @@ jobs:
        env:
          DOCKER_BUILD_SUMMARY: false
      - name: 'Upload image for other jobs'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
          name: updater-scheduler-image
          path: /tmp/scheduler.tar
@@ -79,15 +76,15 @@ jobs:
      - build_worker
      - build_scheduler
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
      - name: 'Login to toska docker registry'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
        with:
          registry: registry-toska.ext.ocp-prod-0.k8s.it.helsinki.fi
          username: ${{ secrets.TOSKAREGISTRY_USERNAME }}
          password: ${{ secrets.TOSKAREGISTRY_PASSWORD }}
      - name: 'Download built images'
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
        with:
          pattern: 'updater-{worker,scheduler}-image'
          merge-multiple: true
@@ -122,9 +119,8 @@ jobs:
    name: 'Build and release Updater worker'
    runs-on: ubuntu-latest
    needs: test_updater
-    if: github.event_name == 'push'
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6

      - name: Build worker image
        id: build-image
@@ -152,9 +148,8 @@ jobs:
    name: 'Build and release Updater scheduler'
    runs-on: ubuntu-latest
    needs: test_updater
-    if: github.event_name == 'push'
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6

      - name: Build scheduler image
        id: build-image
@@ -65,9 +65,6 @@ instrumented/
 .vscode/launch.json
 .vscode/terminals.json

-# Funidata specific
-environments/
-
 # Target of shared symlink
 services/**/src/shared

@@ -14,7 +14,6 @@ export default {
  Dockerfile: files =>
    `${dockerCmdBase} hadolint/hadolint:v2.12.0 hadolint --ignore DL3006 ${relativeFilePaths(files)}`,
  '*.sh': files => `${dockerCmdBase} koalaman/shellcheck:v0.7.2 ${relativeFilePaths(files)} -x`,
-  '.github/{workflows,actions}/*': files => `npm run actionlint ${relativeFilePaths(files)}`,
  'docker-compose*': files => {
    const composeFiles = file => {
      if (['docker-compose.ci.yml', 'docker-compose.test.yml'].some(f => file.includes(f))) {
@@ -0,0 +1,3 @@
+ignore-scripts=true  
+min-release-age=7  
+save-prefix=  
@@ -1,5 +0,0 @@
-{
-  "all": true,
-  "include": ["services/frontend/src/**/*.js", "services/frontend/src/**/*.jsx"],
-  "extends": "./nyc-config.js"
-}
@@ -1,6 +1,6 @@
 {
  "extends": ["stylelint-config-standard"],
  "rules": {
-    "selector-class-pattern": "^[a-z][a-zA-Z-]*$"
+    "selector-class-pattern": "^(?:[a-z][a-zA-Z-]*|Mui[A-Za-z-]+)$"
  }
 }
@@ -1,4 +1,5 @@
 # Oodikone
+
 [![Maintainability](https://qlty.sh/gh/UniversityOfHelsinkiCS/projects/oodikone/maintainability.svg)](https://qlty.sh/gh/UniversityOfHelsinkiCS/projects/oodikone)

 An application for analyzing university data, running at [https://oodikone.helsinki.fi/](https://oodikone.helsinki.fi/).
@@ -112,8 +113,6 @@ The `documentation` directory contains some notes on the sis-db schema and is me

 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**.
@@ -131,7 +130,6 @@ Some useful commands are defined in `package.json` and can be run with `npm run
 - `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 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`
@@ -189,8 +187,6 @@ Continuous integration (CI) works with Github actions and is defined in workflow
 - Updater is deployed to production when pushed if tests pass
 - Test databases can be updated, instructions in [anonyymioodi README](anonyymioodi/README.md)

-[Rapodiff](./services/backend/src/rapodiff/) can be used to check differences between Rapo and Oodikone data.
-
 ## ❓FAQ

 ### Modules are missing after updating package.json
@@ -6,14 +6,14 @@ The quick guide should be enough for most purposes: updating schema, data, or th

 ## Quick guide to updating a test database

-1. Ensure you have the latest test-db. Just pulling images might not replace your existing volume, so you may need to remove it manually. This command might work: `docker volume rm oodikone_sis-db-data` (replace `oodikone_sis-db-data` with the correct volume name). The new image, including data, should be pulled the next time you launch Oodikone normally.
+1. Ensure you have the latest test-db. Just pulling images might not replace your existing volume, so you may need to remove it manually. This command might work: `docker volume rm oodikone-sis-db-data` (replace `oodikone-sis-db-data` with the correct volume name). The new image, including data, should be pulled the next time you launch Oodikone normally.

 2. Do your dev work as usual with the test database, for example, using `npm run both`. Edit data as needed, (for example, run the updater via the frontend), and then run tests to see if they pass (follow the instructions in the [README](../README.md) to run the tests more quickly).

 3. If you're updating `sis-db`:

   - Modify the scheduler limit in [config.js](../updater/sis-updater-scheduler/src/config.js) by setting `module.exports.DEV_SCHEDULE_COUNT = null`.
-   - Follow the `sis-updater-worker` logs to ensure everything is running smoothly (`docker logs --follow oodikone_sis-updater-worker_1`).
+   - Follow the `sis-updater-worker` logs to ensure everything is running smoothly (`docker logs --follow oodikone-sis-updater-worker`).

 4. When you're satisfied with the database, create a dump:

@@ -67,6 +67,6 @@ The quick guide should be enough for most purposes: updating schema, data, or th

 5. Navigate to <http://localhost:3000/updater> and click the three buttons (Update meta, Update students, Update curriculums) one by one. This will populate `sis-db` with data from the new `sis-importer-db`. You might want to do each update a couple of times, as the database tables affect each other, and not all necessary data might be generated on the first try.

-6. Follow the `sis-updater-worker` logs to ensure everything is running smoothly (`docker logs --follow oodikone_sis-updater-worker_1`). If you see any errors, try clicking the buttons again.
+6. Follow the `sis-updater-worker` logs to ensure everything is running smoothly (`docker logs --follow oodikone-sis-updater-worker`). If you see any errors, try clicking the buttons again.

 7. Run all the tests to ensure everything is working as expected (follow the instructions in the [README](../README.md) to run the tests more quickly). If any tests fail, update the test files accordingly.
@@ -0,0 +1,103 @@
+#!/usr/bin/env bash
+
+# This script will first make db dumps of the test environment and upload the dumps to staging
+
+
+. ../scripts/utils.sh
+set -euo pipefail
+
+main() {
+  declare -r db_names="sis-db kone-db user-db"
+  declare -A db_url_names
+  db_url_names["sis-db"]="SIS_DB_URL"
+  db_url_names["kone-db"]="DB_URL_KONE"
+  db_url_names["user-db"]="DB_URL_USER"
+
+  declare -r dump_directory="dumps"
+
+  # Takes the first db-tools pod
+  check_oc_logged_staging
+  db_tools_name=$(oc get pods -l app=db-tools --output jsonpath='{.items[0].metadata.name}')
+  readonly db_tools_name
+
+
+  create_dumps
+  upload_and_migrate_dumps
+}
+
+
+
+function create_dumps() {
+  echo "Starting test/anon containers..."
+  (npm run docker:down && npm run both) || die "Failed to start containers"
+  echo
+  echo "Waiting for containers to start..."
+  sleep 10 # wait for containers to start
+
+  # Create dumps for all dbs
+  echo
+  echo "Creating dumps for $db_names"
+  echo
+
+  # Create dir if not exists
+  if [ ! -d $dump_directory ]; then mkdir -p $dump_directory; fi
+
+  for db in $db_names
+  do
+    create_dump_from_db "$db"
+    if [ ! -f "$dump_directory/$db.sqz" ]; then die "Db dump not created"; fi
+  done
+
+  echo "Dumps can be found in $PWD/\*.sqz"
+}
+
+
+# $1 db-name
+function create_dump_from_db() {
+  echo "Dumping db $1..."
+
+  docker exec "$1" pg_dump -Fc -U postgres "$1" > "$dump_directory/$1.sqz" || die "Failed to dump db $1"
+}
+
+
+function check_oc_logged_staging() {
+  echo -n "Checking if oc is logged into toska staging..."
+  [[ $(oc config current-context) == "toska/api-ocp-test-0-k8s-it-helsinki-fi"* ]] || die "\nNot logged in to toska staging environment: $(oc config current-context)"
+  echo " OK"
+}
+
+
+function upload_and_migrate_dumps() {
+
+  local target_dump_directory="$db_tools_name:/tmp/oodikone-staging-dumps"
+  echo -n "Dumping $dump_directory/ to $target_dump_directory..."
+  oc rsync "$dump_directory/" "$target_dump_directory" 1> /dev/null # show errors
+  echo " OK"
+  echo
+
+  for db in $db_names
+  do
+    migrate_dumps "$db"
+  done
+}
+
+
+function migrate_dumps() {
+  local db_url_b64
+  local db_url_raw
+  local db_url
+
+  db_url_b64=$(oc get secrets -l app.kubernetes.io/instance=oodikone --output jsonpath="{.items[0].data.${db_url_names[$1]}}")
+  db_url_raw=$(echo "$db_url_b64" | base64 --decode)
+  db_url="${db_url_raw%\?*}"
+
+  [[ $db_url != *"oodikone_*_test"* ]] || die "Trying to use non-test database: $db_url"
+
+  echo "Migrating $1 to url: $db_url"
+
+  oc exec "$db_tools_name" -- pg_restore --clean --no-owner -d "$db_url" "/tmp/oodikone-staging-dumps/$1.sqz"
+}
+
+
+# Run script
+main
@@ -3,7 +3,6 @@
 const { defineConfig } = require('cypress')

 module.exports = defineConfig({
-  experimentalStudio: process.env.NODE_ENV === 'development',
  projectId: 'c3jsph',
  defaultCommandTimeout: 30000,
  requestTimeout: 30000,
@@ -14,7 +13,6 @@ 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) {
-      require('@cypress/code-coverage/task')(on, config)
      require('./cypress/plugins/index.js')(on, config)
      return config
    },
@@ -17,32 +17,32 @@ const openSearch = () => {
 }

 const selectSavedCourselist = name => {
-  cy.get('[data-cy=history-search]').click()
-  cy.get('[data-cy=history-search]').type(name)
-  cy.get('[data-cy=history-search]').type('{downarrow}')
-  cy.get('[data-cy=history-search]').type('{enter}')
+  cy.cs('history-search').click()
+  cy.cs('history-search').type(name)
+  cy.cs('history-search').type('{downarrow}')
+  cy.cs('history-search').type('{enter}')
 }

 const createCourseList = (courseCodes, courseListName) => {
  openSearch()
  openCompletedCoursesModal()
-  cy.get('[data-cy=course-list-input]').type(courseCodes.join('\n'))
-  cy.get('[data-cy=search-name]').type(courseListName)
-  cy.get('[data-cy=save-courselist]').click()
+  cy.cs('course-list-input').type(courseCodes.join('\n'))
+  cy.cs('search-name').type(courseListName)
+  cy.cs('save-courselist').click()
 }

 const generateCourseListName = () => `TEST-course-list-${new Date().getTime()}`

 const deleteAllPreviousSearches = () => {
-  cy.get('[data-cy=history-search]').click()
+  cy.cs('history-search').click()

  cy.get('.MuiAutocomplete-popper li').then($options => {
    if ($options.length > 0) {
      cy.wrap($options).each(($option, index, $list) => {
        cy.wrap($option).click()
-        cy.get('[data-cy=delete-courselist]').click()
+        cy.cs('delete-courselist').click()
        if (index < $list.length - 1) {
-          cy.get('[data-cy=history-search]').click()
+          cy.cs('history-search').click()
        }
      })
    } else {
@@ -57,7 +57,7 @@ describe('When search modal is opened', () => {
    hasLanded()
    cy.url().should('include', '/completedcoursessearch')
    cy.contains('Search completed courses of students')
-    cy.get('[data-cy=open-completed-courses-modal-button]').click()
+    cy.cs('open-completed-courses-modal-button').click()
  })

  it('Modal opens correctly', () => {
@@ -74,8 +74,8 @@ describe('When search modal is opened', () => {
    cy.init('/completedcoursessearch?courseList=TKT10001&courseList=TKT10002&studentList=433237&studentList=457144')
    hasLanded()
    openCompletedCoursesModal()
-    cy.contains('[data-cy=student-no-input]', '433237, 457144')
-    cy.contains('[data-cy=course-list-input]', 'TKT10001, TKT10002')
+    cy.cs('student-no-input').contains('433237, 457144')
+    cy.cs('course-list-input').contains('TKT10001, TKT10002')
  })

  describe('When a search is executed with invalid input', () => {
@@ -83,16 +83,16 @@ describe('When search modal is opened', () => {
      cy.init('/completedcoursessearch')
      hasLanded()
      openCompletedCoursesModal()
-      cy.get('[data-cy=student-no-input]').type('1')
-      cy.get('[data-cy=course-list-input]').type('1')
-      cy.get('[data-cy=completed-courses-search-button]').click()
-      cy.get('[data-cy=rights-notification]').should(
+      cy.cs('student-no-input').type('1')
+      cy.cs('course-list-input').type('1')
+      cy.cs('completed-courses-search-button').click()
+      cy.cs('rights-notification').should(
        'contain.text',
        'The information for the following students could not be displayed'
      )
-      cy.contains('[data-cy=rights-notification]', '1')
-      cy.contains('[data-cy=completed-courses-table-div]', 'Student number')
-      cy.contains('[data-cy=completed-courses-table-div]', '1').should('not.exist')
+      cy.cs('rights-notification').contains('1')
+      cy.cs('completed-courses-table-div').contains('Student number')
+      cy.cs('completed-courses-table-div').contains('1').should('not.exist')
    })
  })

@@ -102,9 +102,9 @@ describe('When search modal is opened', () => {
      hasLanded()
      openCompletedCoursesModal()
      cy.fixture('completedCoursesData').then(({ studentSet1, coursesSet1 }) => {
-        cy.get('[data-cy=student-no-input]').type(studentSet1.join('\n'))
-        cy.get('[data-cy=course-list-input]').type(coursesSet1.join('\n'))
-        cy.get('[data-cy=completed-courses-search-button]').click()
+        cy.cs('student-no-input').type(studentSet1.join('\n'))
+        cy.cs('course-list-input').type(coursesSet1.join('\n'))
+        cy.cs('completed-courses-search-button').click()
      })
    })

@@ -120,10 +120,10 @@ describe('When search modal is opened', () => {
    it('Finds correct students and courses', () => {
      cy.fixture('completedCoursesData').then(({ studentSet1, coursesSet1 }) => {
        for (const studentNumber of studentSet1) {
-          cy.contains('[data-cy=completed-courses-table-div]', studentNumber)
+          cy.cs('completed-courses-table-div').contains(studentNumber)
        }
        for (const courseCode of coursesSet1) {
-          cy.contains('[data-cy=completed-courses-table-div]', courseCode)
+          cy.cs('completed-courses-table-div').contains(courseCode)
        }
      })
    })
@@ -150,7 +150,7 @@ describe('Courselist saving-related functions work', () => {
    openSearch()
    openCompletedCoursesModal()
    selectSavedCourselist(courseList)
-    cy.contains('[data-cy=course-list-input]', courses.join(', '))
+    cy.cs('course-list-input').contains(courses.join(', '))
  })

  it('Course list can be deleted', () => {
@@ -159,7 +159,7 @@ describe('Courselist saving-related functions work', () => {
    openSearch()
    openCompletedCoursesModal()
    selectSavedCourselist(courseList)
-    cy.get('[data-cy=delete-courselist]').click()
+    cy.cs('delete-courselist').click()
    cy.contains('You have no previous searches.')
  })

@@ -169,11 +169,11 @@ describe('Courselist saving-related functions work', () => {
    openSearch()
    openCompletedCoursesModal()
    selectSavedCourselist(courseList)
-    cy.get('[data-cy=course-list-input]').type(',TKT10001')
-    cy.get('[data-cy=save-courselist]').click()
+    cy.cs('course-list-input').type(',TKT10001')
+    cy.cs('save-courselist').click()
    openSearch()
    openCompletedCoursesModal()
    selectSavedCourselist(courseList)
-    cy.contains('[data-cy=course-list-input]', 'CSM14204, TKT10004, TKT10001')
+    cy.cs('course-list-input').contains('CSM14204, TKT10004, TKT10001')
  })
 })
@@ -1,13 +1,9 @@
 /// <reference types="cypress" />

-const openCustomPopupForm = () => {
-  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')
-  cy.get('[data-cy="custom-population-name-input"]').type(name)
+  cy.contains('Insert a name for this custom population if you wish to save it')
+  cy.cs('custom-population-name-input').type(name)
  return name
 }

@@ -16,38 +12,33 @@ const save = () => {
 }

 const selectSavedPopulation = name => {
-  cy.get('[data-cy="history-search"]').children().eq(0).type(`${name}{enter}`)
+  cy.cs('history-search').type(`${name}{enter}`)
 }

 const deleteAllSearches = () => {
-  cy.get('[data-cy="history-search"]').children().eq(0).click()
-  cy.contains('Saved populations')
-    .parent()
-    .parent()
-    .parent()
-    .parent()
-    .get('.dropdown')
-    .then(dropdown => {
-      const searchItems = dropdown.find('div[role=option] > span[class=text]')
-      for (let i = 0; i < searchItems.length; i++) {
-        if (searchItems[i].textContent.includes('TEST-')) {
-          cy.get('[data-cy="history-search"]').children().eq(0).type(`${searchItems[i].textContent}{enter}`)
-          cy.get('button').contains('Delete').click()
-        }
-      }
+  cy.cs('history-search').click()
+  cy.get('.MuiAutocomplete-popper > .MuiPaper-root')
+    .find('li[role=option]')
+    .then($lis => {
+      const labels = [...$lis].map(li => li.textContent?.trim() || '')
+
+      labels.forEach((label, index) => {
+        if (index !== 0) cy.cs('history-search').click()
+        cy.contains('.MuiAutocomplete-popper li[role=option]', label).click()
+        cy.contains('button', 'Delete').click()
+      })
    })
 }

 const fillForm = (content, separator) => {
-  cy.get('[data-cy="student-number-input"]').type(content.join(separator))
+  cy.cs('student-number-input').type(content.join(separator))
 }

 const search = () => {
-  cy.get('[data-cy="search-button"]').click()
+  cy.cs('search-button').click()
 }

 const searchFor = (studentnumbers, separator) => {
-  openCustomPopupForm()
  fillForm(studentnumbers, separator)
  search()
 }
@@ -74,7 +65,7 @@ const containsSpecificStudents = (studentnumbers = []) => {
 }

 const checkRightsNotification = studentNumbers => {
-  cy.get('[data-cy="rights-notification"]').within(() => {
+  cy.cs('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.'
    )
@@ -96,7 +87,6 @@ describe('Custom population tests', () => {
    cy.visit('/custompopulation')
    cy.url().should('include', '/custompopulation')
    cy.contains('Custom population')
-    cy.get('button').contains('Custom population').click()
    deleteAllSearches()
  })

@@ -126,7 +116,7 @@ describe('Custom population tests', () => {
      cy.contains('Credit accumulation').should('not.exist')
      cy.contains('Programme distribution').should('not.exist')
      cy.contains('Courses of population').should('not.exist')
-      cy.get('button').contains('Custom population')
+      cy.get('button').contains('Back to search form')
    })

    it("Doesn't return students user has no right to", () => {
@@ -138,16 +128,15 @@ describe('Custom population tests', () => {
      cy.contains('Credit accumulation').should('not.exist')
      cy.contains('Programme distribution').should('not.exist')
      cy.contains('Courses of population').should('not.exist')
-      cy.get('button').contains('Custom population')
+      cy.get('button').contains('Back to search form')
    })
  })

  describe('Custom population search saving', () => {
    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.'
+          'Insert student numbers to use for the population. Each student number needs to be separated with a comma, a semicolon, a space, or a line break.'
        )
        const name = fillName()
        // A comma and a newline on purpose, the page should be able to handle it
@@ -157,17 +146,16 @@ describe('Custom population tests', () => {
        // Round 1
        selectSavedPopulation(name)
        search()
-        cy.contains(`Custom population "${name}"`)
+        cy.contains(`Custom population: ${name}`)
        containsAmountOfStudents(students.length)
        containsSpecificStudents(students)

        // Round 2
        cy.visit('/custompopulation')
        cy.contains('Custom population')
-        openCustomPopupForm()
        selectSavedPopulation(name)
        search()
-        cy.contains(`Custom population "${name}"`)
+        cy.contains(`Custom population: ${name}`)
        containsAmountOfStudents(students.length)
        containsSpecificStudents(students)
      })
@@ -176,28 +164,25 @@ describe('Custom population tests', () => {
    it('Updates a custom population search', () => {
      cy.fixture('customPopulations').then(
        ({ studentNumbersForCSStudentsSet1: students1, studentNumbersForCSStudentsSet2: students2 }) => {
-          openCustomPopupForm()
          const name = fillName()
          fillForm(students1, ' ')
          save()

          selectSavedPopulation(name)
          search()
-          cy.contains(`Custom population "${name}"`)
+          cy.contains(`Custom population: ${name}`)
          containsAmountOfStudents(students1.length)
          containsSpecificStudents(students1)
-          cy.contains('Custom population')
-          openCustomPopupForm()
+          cy.contains('Back to search form').click()
          selectSavedPopulation(name)
          fillForm(['\n', ...students2], ', ')
          save()

          cy.visit('/custompopulation')
          cy.contains('Custom population')
-          openCustomPopupForm()
          selectSavedPopulation(name)
          search()
-          cy.contains(`Custom population "${name}"`)
+          cy.contains(`Custom population: ${name}`)
          containsAmountOfStudents(students1.length + students2.length)
          containsSpecificStudents([...students1, ...students2])
        }
@@ -30,8 +30,8 @@ const deleteTag = tagName => {
  cy.cs('confirm-delete-tag-button').click()
 }

-describe('Study programme overview', () => {
-  describe('Study programme selector', () => {
+describe('Degree programme overview', () => {
+  describe('Degree programme selector', () => {
    beforeEach(() => {
      cy.init('/study-programme', 'admin')
    })
@@ -43,7 +43,7 @@ describe('Study programme overview', () => {
      cy.contains('Doctoral programmes')
    })

-    it('Study programme search filter', () => {
+    it('Degree programme search filter', () => {
      cy.contains('Tietojenkäsittelytieteen kandiohjelma').should('exist')
      cy.contains('Matemaattisten tieteiden kandiohjelma').should('exist')
      cy.cs('study-programme-filter').type('Tietojenkäsittelytieteen')
@@ -93,31 +93,14 @@ describe('Study programme overview', () => {
    it('Basic information contains correct credits', () => {
      const years = getEmptyYears()
      const tableContents = [
-        ...years.map(year => [year, 0, 0, 0, 0, 0]),
-        [2023, 1519, 1519, 0, 0, 222],
-        [2022, 3235, 3205, 0, 30, 209],
-        [2021, 5133, 5108, 0, 25, 428],
-        [2020, 5801, 5796, 0, 5, 94],
-        [2019, 5305, 5305, 0, 0, 162],
-        [2018, 3442, 3432, 0, 10, 21],
-        [2017, 1211, 1211, 0, 0, 189],
-      ]
-
-      cy.checkTableStats(tableContents, 'credits-produced-by-the-study-programme')
-    })
-
-    it("Toggling 'Show special categories' on displays additional information", () => {
-      cy.cs('special-categories-toggle').click()
-      const years = getEmptyYears()
-      const tableContents = [
-        ...years.map(year => [year, 0, 0, 0, 0, 0, 0, 0]),
-        [2023, 1519, 1519, 0, 0, 0, 0, 222],
-        [2022, 3235, 3205, 0, 30, 0, 0, 209],
-        [2021, 5133, 5108, 0, 25, 0, 0, 428],
-        [2020, 5801, 5796, 0, 5, 0, 0, 94],
-        [2019, 5305, 5305, 0, 0, 0, 0, 162],
-        [2018, 3442, 3432, 0, 10, 0, 0, 21],
-        [2017, 1211, 1211, 0, 0, 0, 0, 189],
+        ...years.map(year => [year, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
+        [2023, 1519, 1519, 0, 0, 0, 0, 0, 222, 0],
+        [2022, 3235, 3205, 0, 0, 30, 0, 0, 209, 0],
+        [2021, 5133, 5108, 0, 0, 25, 0, 0, 428, 25],
+        [2020, 5801, 5796, 0, 0, 5, 0, 0, 94, 0],
+        [2019, 5305, 5305, 0, 0, 0, 0, 0, 162, 0],
+        [2018, 3442, 3432, 0, 0, 10, 0, 0, 21, 0],
+        [2017, 1211, 1211, 0, 0, 0, 0, 0, 189, 0],
      ]

      cy.checkTableStats(tableContents, 'credits-produced-by-the-study-programme')
@@ -190,14 +173,14 @@ describe('Study programme overview', () => {
      cy.checkTableStats(studentTableContents, 'students-of-the-study-programme')

      const creditTableContents = [
-        ...years.map(year => [year, 0, 0, 0, 0, 0]),
-        ['2023 - 2024', 160, 160, 0, 0, 67],
-        ['2022 - 2023', 2725, 2720, 0, 5, 337],
-        ['2021 - 2022', 4092, 4042, 0, 50, 198],
-        ['2020 - 2021', 5420, 5415, 0, 5, 321],
-        ['2019 - 2020', 6043, 6043, 0, 0, 101],
-        ['2018 - 2019', 4856, 4851, 0, 5, 107],
-        ['2017 - 2018', 2350, 2345, 0, 5, 26],
+        ...years.map(year => [year, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
+        ['2023 - 2024', 160, 160, 0, 0, 0, 0, 0, 67, 0],
+        ['2022 - 2023', 2725, 2720, 0, 0, 5, 0, 0, 337, 0],
+        ['2021 - 2022', 4092, 4042, 0, 0, 50, 0, 0, 198, 0],
+        ['2020 - 2021', 5420, 5415, 0, 0, 5, 0, 0, 321, 25],
+        ['2019 - 2020', 6043, 6043, 0, 0, 0, 0, 0, 101, 0],
+        ['2018 - 2019', 4856, 4851, 0, 0, 5, 0, 0, 107, 0],
+        ['2017 - 2018', 2350, 2345, 0, 0, 5, 0, 0, 26, 0],
      ]

      cy.checkTableStats(creditTableContents, 'credits-produced-by-the-study-programme')
@@ -224,19 +207,20 @@ describe('Study programme overview', () => {
        .should('contain', 47)
        .should('contain', 76)

-      cy.cs('bachelor-breakdown-bar-chart-section')
+      cy.cs('unset-breakdown-bar-chart')
      cy.cs('graduation-time-toggle').click()
-      cy.cs('bachelor-median-time-bar-chart-section').within(() => {
-        cy.contains('Graduation year')
-        cy.contains('2022')
-        cy.contains('48 graduated').trigger('mouseover')
-        cy.contains('48 students graduated in year 2022')
-        cy.contains('median study time: 44.5 months')
-        cy.contains('22 graduated on time')
-        cy.contains('12 graduated max year overtime')
-        cy.contains('14 graduated over year late')
+      cy.cs('unset-median-bar-chart').within(() => {
+        cy.contains('48 graduated').should('be.visible')
+        cy.contains('48 graduated').hover()
      })

+      cy.get('.grad-vals').contains('48 students graduated in year 2022').should('be.visible')
+
+      cy.contains('median study time: 6.5 semesters')
+      cy.contains('24 graduated on time')
+      cy.contains('12 graduated max year overtime')
+      cy.contains('12 graduated over year late')
+
      cy.cs('programmes-before-or-after-stacked-bar-chart-section')
        .should('contain', 'Tietojenkäsittelytieteen maisteriohjelma')
        .should('contain', 'Datatieteen maisteriohjelma')
@@ -252,33 +236,37 @@ describe('Study programme overview', () => {
      cy.init('/study-programme')
      cy.contains('a', 'Matematiikan ja tilastotieteen maisteriohjelma').click({ force: true })

-      cy.cs('bachelor-breakdown-bar-chart-section')
-      cy.cs('master-breakdown-bar-chart-section')
+      cy.cs('unset-breakdown-bar-chart')
+      cy.cs('unset-breakdown-bar-chart')

      cy.cs('graduation-time-toggle').click()
-      cy.cs('master-median-time-bar-chart-section').within(() => {
-        cy.contains('Master study right')
-        cy.contains('Graduation year')
-        cy.contains('2021')
-        cy.contains('2 graduated').trigger('mouseover')
-        cy.contains('2 students graduated in year 2021')
-        cy.contains('median study time: 25 months')
-        cy.contains('1 graduated on time')
-        cy.contains('1 graduated max year overtime')
-        cy.contains('0 graduated over year late')
-      })
+      cy.cs('unset-graduation-times-section')
+        .eq(1)
+        .within(() => {
+          cy.contains('Master study right')
+          cy.contains('2 graduated').should('be.visible')
+          cy.contains('2 graduated').hover()
+        })

-      cy.cs('bachelor-median-time-bar-chart-section').within(() => {
-        cy.contains('Bachelor + master study right')
-        cy.contains('Graduation year')
-        cy.contains('2023')
-        cy.contains('11 graduated').trigger('mouseover')
-        cy.contains('11 students graduated in year 2023')
-        cy.contains('median study time: 69 months')
-        cy.contains('3 graduated on time')
-        cy.contains('7 graduated max year overtime')
-        cy.contains('1 graduated over year late')
-      })
+      cy.get('.grad-vals').contains('2 students graduated in year 2021').should('be.visible')
+      cy.contains('median study time: 4.5 semesters')
+      cy.contains('1 graduated on time')
+      cy.contains('1 graduated max year overtime')
+      cy.contains('0 graduated over year late')
+
+      cy.cs('unset-graduation-times-section')
+        .eq(0)
+        .within(() => {
+          cy.contains('Bachelor + master study right')
+          cy.contains('11 graduated').should('be.visible')
+          cy.contains('11 graduated').hover()
+        })
+
+      cy.get('.grad-vals').contains('11 students graduated in year 2023').should('be.visible')
+      cy.contains('median study time: 12 semesters')
+      cy.contains('4 graduated on time')
+      cy.contains('6 graduated max year overtime')
+      cy.contains('1 graduated over year late')
    })
  })

@@ -286,11 +274,11 @@ describe('Study programme overview', () => {
    beforeEach(() => {
      cy.intercept(
        'GET',
-        'api/v2/studyprogrammes/KH50_001/studytrackstats?graduated=GRADUATED_INCLUDED&special_groups=SPECIAL_INCLUDED&combined_programme='
+        'api/studyprogrammes/KH50_001/studytrackstats?special_groups=SPECIAL_INCLUDED&combined_programme='
      ).as('stQuery')
      cy.init('/study-programme')
      cy.contains('a', 'Matemaattisten tieteiden kandiohjelma').click()
-      cy.cs('study-tracks-and-class-statistics-tab').click()
+      cy.cs('StudyTracksAndClassStatisticsTab').click()
    })

    describe('Info boxes', () => {
@@ -317,9 +305,9 @@ describe('Study programme overview', () => {
      cy.cs('average-graduation-times-section')
    })

-    it('Students of the study programme are shown correctly', () => {
+    it('Students of the degree programme are shown correctly', () => {
      const tableContents = [
-        // [Year, All, Started studying, Present, Absent, Inactive, Graduated, Men, Women, Other/Unknown, Finland, Other]
+        // [Year, All, Started studying, Present, Absent, Passive, Graduated, Men, Women, Other/Unknown, Finland, Other]
        ['2023 - 2024', 8, 8, 0, 0, 8, 0, 5, 3, 0, 8, 1],
        ['2022 - 2023', 26, 25, 0, 0, 24, 2, 19, 7, 0, 25, 1],
        ['2021 - 2022', 38, 29, 0, 0, 33, 5, 29, 9, 0, 36, 4],
@@ -372,14 +360,14 @@ describe('Study programme overview', () => {
    describe('Population link button works for', () => {
      it('a single year', () => {
        cy.cs('2023-population-link-button').first().click()
-        cy.contains('Matemaattisten tieteiden kandiohjelma 2023 - 2024')
-        cy.contains('Class size 8 students')
+        cy.contains('Matemaattisten tieteiden kandiohjelma')
+        cy.contains('Class of 2023 - 2024, 8 students')
      })

      it('total', () => {
        cy.cs('total-population-link-button').click()
        cy.contains('Matemaattisten tieteiden kandiohjelma')
-        cy.contains('Class size 227 students')
+        cy.contains('Class of 2017 - 2026, 227 students')
      })

      it('Links to class statistics page with study track info included work', () => {
@@ -388,9 +376,9 @@ describe('Study programme overview', () => {
          cy.get('a').click()
        })

-        cy.contains('Matemaattisten tieteiden kandiohjelma 2022 - 2023')
+        cy.contains('Matemaattisten tieteiden kandiohjelma')
        cy.contains('Studytrack MAT-MAT')
-        cy.contains('Class size 26 students')
+        cy.contains('Class of 2022 - 2023, 26 students')
        cy.contains('Showing 3 out of 26 students')
      })
    })
@@ -398,55 +386,68 @@ describe('Study programme overview', () => {
    it('Student progress data is shown correctly', () => {
      const years = getEmptyYears(true)
      const tableContents = [
-        // [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]),
-        ['2023 - 2024', 8, 8, 0, 0, 0, 0, 0, 0],
-        ['2022 - 2023', 26, 9, 9, 4, 3, 0, 1, 0],
-        ['2021 - 2022', 38, 8, 6, 11, 8, 5, 0, 0],
-        ['2020 - 2021', 30, 2, 1, 3, 7, 4, 4, 9],
-        ['2019 - 2020', 35, 1, 0, 2, 1, 0, 4, 27],
-        ['2018 - 2019', 45, 0, 1, 1, 2, 0, 3, 38],
-        ['2017 - 2018', 47, 0, 1, 3, 0, 1, 2, 40],
-        ['Total', 229, 28, 18, 24, 21, 10, 14, 114],
+        // [Year, All, < 30 credits, 30–60 credits, 60–90 credits, 90–120 credits, 120–150 credits, 150–180 credits, ≥ 180 credits, Graduated]
+        ...years.map(year => [year, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
+        ['2023 - 2024', 8, 8, 0, 0, 0, 0, 0, 0, 0],
+        ['2022 - 2023', 26, 9, 8, 4, 3, 0, 0, 0, 2],
+        ['2021 - 2022', 38, 8, 4, 9, 8, 4, 0, 0, 5],
+        ['2020 - 2021', 30, 2, 1, 2, 5, 0, 0, 1, 19],
+        ['2019 - 2020', 35, 1, 0, 2, 1, 0, 0, 4, 27],
+        ['2018 - 2019', 45, 0, 1, 1, 2, 0, 0, 2, 39],
+        ['2017 - 2018', 47, 0, 1, 3, 0, 0, 1, 0, 42],
+        ['Total', 229, 28, 15, 21, 19, 4, 1, 7, 134],
      ]

      cy.checkTableStats(tableContents, 'study-programme-progress')
    })

    it('Progress section', () => {
+      cy.cs('programme-progress-bar-chart-section').scrollIntoView()
+
      cy.cs('programme-progress-bar-chart-section')
        .should('contain', 'Less than 30 credits')
        .should('contain', '30–60 credits')
        .should('contain', 'At least 180 credits')
-        .should('contain', '49.8%') // The percentage for total, at least 180 credits, to check that the graph renders
+        .should('contain', '58.5%') // The percentage for total graduated, to check that the graph renders

-      cy.cs('programme-progress-bar-chart-section').contains('49.8%').trigger('mouseover', { force: true })
-      cy.contains('At least 180 credits: 114')
+      cy.cs('programme-progress-bar-chart-section').contains('58.5%').hover()
+      cy.contains('Graduated: 134')
    })

-    it('Average graduation times section', () => {
+    // CI contains different data than locally
+    it.skip('Average graduation times section', () => {
+      cy.cs('average-graduation-times-section').scrollIntoView()
+
      cy.cs('average-graduation-times-section').within(() => {
-        cy.contains('2020 - 2021')
-        cy.get('[aria-label="2020 - 2021, 15. On time."]').trigger('mouseover')
-        cy.contains('On time: 15')
-        cy.contains("Click a bar to view that year's study track level breakdown")
-        cy.get('[aria-label="2019 - 2020, 22. On time."]').click()
+        cy.cs('unset-graduation-times-section').within(() => {
+          cy.contains('2020 - 2021')
+        })
+
+        cy.get('text').contains('16').hover()
+        cy.contains('On time: 16')
+
+        cy.cs('unset-graduation-times-section').within(() => {
+          cy.contains("Click a bar to view that year's study track level breakdown")
+          cy.get('text').contains('22').click()
+        })
+
        cy.contains('Year 2019 - 2020 by start year')
-        cy.get('[aria-label="MAT-MAT, 14. On time."]').trigger('mouseover')
+
+        cy.get('text').contains('13').hover()
        cy.contains('Matematiikka')
        cy.contains('MAT-MAT')
-        cy.contains('On time: 14')
+        cy.contains('On time: 13')
      })

      cy.cs('graduation-time-toggle').click()

      cy.cs('average-graduation-times-section').within(() => {
        cy.contains('2020 - 2021')
-        cy.contains('19 graduated').trigger('mouseover')
+        cy.contains('19 graduated').hover()
        cy.contains('From class of 2020 - 2021, 19/30 students have graduated')
-        cy.contains('median study time: 33 months')
-        cy.contains('15 graduated on time')
-        cy.contains('3 graduated max year overtime')
+        cy.contains('median study time: 6 semesters')
+        cy.contains('16 graduated on time')
+        cy.contains('2 graduated max year overtime')
        cy.contains('1 graduated over year late')
      })
    })
@@ -465,7 +466,7 @@ describe('Study programme overview', () => {
      it('Students of the study track are shown correctly', () => {
        cy.cs('study-track-overview-section').contains('Students of the study track MAT-MAT by starting year')
        const tableContents = [
-          // [Year, All, Started studying, Present, Absent, Inactive, Graduated, Men, Women, Other/Unknown, Finland, Other]
+          // [Year, All, Started studying, Present, Absent, Passive, Graduated, Men, Women, Other/Unknown, Finland, Other]
          ['2022 - 2023', 3, 3, 0, 0, 1, 2, 2, 1, 0, 3, 0],
          ['2021 - 2022', 5, 1, 0, 0, 1, 4, 3, 2, 0, 5, 0],
          ['2020 - 2021', 13, 10, 0, 0, 1, 12, 7, 6, 0, 12, 3],
@@ -480,15 +481,16 @@ describe('Study programme overview', () => {
      it('Links to class statistics page with study track info included work', () => {
        cy.cs('2020-population-link-button').first().click()

-        cy.contains('Matemaattisten tieteiden kandiohjelma 2020 - 2021')
+        cy.contains('Matemaattisten tieteiden kandiohjelma')
        cy.contains('Studytrack MAT-MAT')
-        cy.contains('Class size 30 students')
+        cy.contains('Class of 2020 - 2021, 30 students')
        cy.contains('Showing 10 out of 30 students')
      })

-      it('Info message about missing progress stats is displayed', () => {
+      // FIXME: This feature was implemented. The data is no-good, so maybe reimplement this when it's clean.
+      it.skip('Info message about missing progress stats is displayed', () => {
        cy.contains('Progress of students of the study track MAT-MAT by starting year')
-        cy.contains('Progress data is currently only available for all students of the study programme.')
+        cy.contains('Progress data is currently only available for all students of the degree programme.')
      })

      it.skip('Average graduation times are displayed correctly', () => {
@@ -496,7 +498,7 @@ describe('Study programme overview', () => {
        cy.get("[data-cy='graduation-times-graph-breakdownBachelor']").within(() => {
          cy.contains('Start year')
          cy.contains('2020 - 2021')
-          cy.get('[aria-label="2020 - 2021, 9. On time."]').trigger('mouseover')
+          cy.get('[aria-label="2020 - 2021, 9. On time."]').hover()
          cy.contains('Graduated On time: 9 students')
        })

@@ -504,7 +506,7 @@ describe('Study programme overview', () => {
        cy.cs('bachelor-median-time-bar-chart').within(() => {
          cy.contains('Start year')
          cy.contains('2020 - 2021')
-          cy.contains('12 graduated').trigger('mouseover')
+          cy.contains('12 graduated').hover()
          cy.contains('From class of 2020 - 2021, 12/13 students have graduated')
          cy.contains('median study time: 34 months')
          cy.contains('9 graduated on time')
@@ -519,7 +521,7 @@ describe('Study programme overview', () => {
    beforeEach(() => {
      cy.init('/study-programme')
      cy.contains('a', 'Matemaattisten tieteiden kandiohjelma').click()
-      cy.cs('programme-courses-tab').click()
+      cy.cs('ProgrammeCoursesTab').click()

      cy.cs('by-credit-type-section')
      cy.cs('by-credit-type-tab')
@@ -528,14 +530,21 @@ describe('Study programme overview', () => {

    describe('By credit type tab', () => {
      beforeEach(() => {
-        cy.get('tbody').within(() => {
+        cy.get('thead').within(() => {
          cy.get('tr')
            .eq(0)
+            .within(() => {
+              cy.get('th').eq(3).click()
+            })
+        })
+        cy.get('tbody').within(() => {
+          cy.get('tr')
+            .eq(8)
            .within(() => {
              cy.get('td').eq(0).contains('Course')
-              cy.get('td').eq(1).contains('MAT21001')
-              cy.get('td').eq(2).contains('Lineaarialgebra ja matriisilaskenta II')
-              cy.get('td').eq(3).contains('341')
+              cy.get('td').eq(1).contains('MAT11004')
+              cy.get('td').eq(2).contains('Differentiaalilaskenta')
+              cy.get('td').eq(3).contains('1170')
            })
        })
      })
@@ -548,12 +557,12 @@ describe('Study programme overview', () => {

        cy.get('tbody').within(() => {
          cy.get('tr')
-            .eq(0)
+            .eq(9)
            .within(() => {
              cy.get('td').eq(0).contains('Course')
-              cy.get('td').eq(1).contains('MAT21001')
-              cy.get('td').eq(2).contains('Lineaarialgebra ja matriisilaskenta II')
-              cy.get('td').eq(3).contains('121')
+              cy.get('td').eq(1).contains('MAT21009')
+              cy.get('td').eq(2).contains('Kandidaatintutkielma')
+              cy.get('td').eq(3).contains('414')
            })
        })
      })
@@ -568,12 +577,12 @@ describe('Study programme overview', () => {

        cy.get('tbody').within(() => {
          cy.get('tr')
-            .eq(0)
+            .eq(5)
            .within(() => {
              cy.get('td').eq(0).contains('Course')
-              cy.get('td').eq(1).contains('MAT21001')
-              cy.get('td').eq(2).contains('Lineaarialgebra ja matriisilaskenta II')
-              cy.get('td').eq(3).contains('311')
+              cy.get('td').eq(1).contains('MAT11001')
+              cy.get('td').eq(2).contains('Johdatus yliopistomatematiikkaan')
+              cy.get('td').eq(3).contains('1220')
            })
        })
      })
@@ -632,31 +641,67 @@ describe('Study programme overview', () => {
      })

      it("'Show credits/Show students' toggle works", () => {
-        cy.get('thead tr').within(() => {
-          cy.get('th').should('have.length', 8)
-          const headers = ['Type', 'Code', 'Name', 'Total', 'Major', 'Non-major', 'Non-degree', 'Transferred']
-          headers.forEach((header, index) => {
-            cy.get('th').eq(index).contains(header)
+        cy.get('thead tr')
+          .eq(0)
+          .within(() => {
+            cy.get('th').should('have.length', 6)
+            const headers = ['Type', 'Code', 'Name', 'Total credits', 'Credits produced by', 'Transferred credits']
+            headers.forEach((header, index) => {
+              cy.get('th').eq(index).contains(header)
+            })
+          })
+        cy.get('thead tr')
+          .eq(1)
+          .within(() => {
+            cy.get('th').should('have.length', 7)
+            const headers = [
+              'Degree students',
+              'Open university (hetu)',
+              'Open university (no hetu)',
+              'Exchange students',
+              'Other universities',
+              'Separate studies',
+              'Other',
+            ]
+            headers.forEach((header, index) => {
+              cy.get('th').eq(index).contains(header)
+            })
          })
-        })

        cy.cs('show-credits-students-toggle').click()

+        cy.get('thead tr')
+          .eq(0)
+          .within(() => {
+            cy.get('th').should('have.length', 7)
+            const headers = [
+              'Type',
+              'Code',
+              'Name',
+              'Total students',
+              'Breakdown of total',
+              'Breakdown of passed',
+              'Not included in total or passed',
+            ]
+            headers.forEach((header, index) => {
+              cy.get('th').eq(index).contains(header)
+            })
+          })
        cy.get('thead tr')
          .eq(1)
          .within(() => {
            cy.get('th').should('have.length', 10)
            const headers = [
-              'Type',
-              'Code',
-              'Name',
-              'Total',
              'Passed',
-              'Not',
-              'Major',
-              'Non-major',
-              'Non-degree',
-              'Transferred',
+              'Not completed',
+              'Degree students',
+              'Open university students (with hetu)',
+              'Open university students (without hetu)',
+              'Exchange students',
+              'Other university students',
+              'Separate studies',
+              'Other students',
+              'Students with transferred credits',
            ]
            headers.forEach((header, index) => {
              cy.get('th').eq(index).contains(header)
@@ -665,12 +710,12 @@ describe('Study programme overview', () => {

        cy.get('tbody').within(() => {
          cy.get('tr')
-            .eq(0)
+            .eq(5)
            .within(() => {
              cy.get('td').eq(0).contains('Course')
-              cy.get('td').eq(1).contains('MAT21001')
-              cy.get('td').eq(2).contains('Lineaarialgebra ja matriisilaskenta II')
-              cy.get('td').eq(3).contains('341')
+              cy.get('td').eq(1).contains('MAT11001')
+              cy.get('td').eq(2).contains('Johdatus yliopistomatematiikkaan')
+              cy.get('td').eq(3).contains('375')
            })
        })
      })
@@ -682,7 +727,7 @@ describe('Study programme overview', () => {
      })

      // FIXME: Flaky
-      it('test', () => {
+      it.skip('test', () => {
        // TODO: Implement some real tests for this tab
        cy.contains('From')
      })
@@ -693,7 +738,7 @@ describe('Study programme overview', () => {
    beforeEach(() => {
      cy.init('/study-programme')
      cy.contains('a', 'Matemaattisten tieteiden kandiohjelma').click()
-      cy.cs('degree-courses-tab').click()
+      cy.cs('DegreeCoursesTab').click()
    })

    it('Curriculum section', () => {
@@ -729,7 +774,7 @@ describe('Study programme overview', () => {
    beforeEach(() => {
      cy.init('/study-programme')
      cy.contains('a', 'Matemaattisten tieteiden kandiohjelma').click({ force: true })
-      cy.cs('tags-tab').click()
+      cy.cs('TagsTab').click()
    })

    it('info box', () => {
@@ -739,13 +784,13 @@ describe('Study programme overview', () => {

    describe('Adding tags to populations and removing them works', () => {
      beforeEach(() => {
-        cy.contains('This study programme does not have any tags yet')
+        cy.contains('This degree programme does not have any tags yet')
        cy.cs('tag-name-text-field').type(tagName)
      })

      afterEach(() => {
        deleteTag(tagName)
-        cy.contains('This study programme does not have any tags yet')
+        cy.contains('This degree programme does not have any tags yet')
      })

      it('can create and delete tags without start year', () => {
@@ -797,7 +842,8 @@ describe('Study programme overview', () => {
        cy.contains('Students added to tag')

        cy.cs('population-link-button').click()
-        cy.contains('Matemaattisten tieteiden kandiohjelma 2022 - 2023')
+        cy.contains('Matemaattisten tieteiden kandiohjelma')
+        cy.contains('Class of 2022 - 2023')
        cy.contains(`Tagged with: ${tagName}`)
        cy.contains('Students (5)')
          .parent()
@@ -856,7 +902,7 @@ describe('Study programme overview', () => {
    })

    it('can access basic information', () => {
-      cy.cs('basic-information-tab').click()
+      cy.cs('BasicInformationTab').click()

      cy.cs('students-of-the-study-programme-section')
      cy.cs('credits-produced-by-the-study-programme-section')
@@ -866,7 +912,7 @@ describe('Study programme overview', () => {
    })

    it('can access study tracks', () => {
-      cy.cs('study-tracks-and-class-statistics-tab').click()
+      cy.cs('StudyTracksAndClassStatisticsTab').click()

      cy.cs('study-track-overview-section')
      cy.cs('progress-of-students-section')
@@ -874,9 +920,9 @@ describe('Study programme overview', () => {
    })

    it("doesn't see other tabs", () => {
-      cy.cs('degree-courses-tab').should('not.exist')
-      cy.cs('tags-tab').should('not.exist')
-      cy.cs('update-statistics-tab').should('not.exist')
+      cy.cs('DegreeCoursesTab').should('not.exist')
+      cy.cs('TagsTab').should('not.exist')
+      cy.cs('UpdateStatisticsTab').should('not.exist')
    })
  })
 })
@@ -273,7 +273,7 @@ describe('Faculty statistics', () => {
      // TODO: Implement
    })

-    it.skip('Study programme toggle', () => {
+    it.skip('Degree programme toggle', () => {
      // TODO: Implement
    })

@@ -179,12 +179,12 @@ describe.skip('Population Statistics', { testIsolation: false }, () => {
    ]

    cy.cs('courseFilter-header').click()
-    cy.selectFromDropdown('courseFilter', `${courses[0].code} - ${courses[0].name}`)
+    cy.selectFromAutocomplete('courseFilter', `${courses[0].code} - ${courses[0].name}`)
    checkFilteredStudentCount(9)
    cy.selectFromDropdown(`courseFilter-${courses[0].code}`, 1)
    checkFilteredStudentCount(7)
-    cy.selectFromDropdown('courseFilter', `${courses[1].code} - ${courses[1].name}`)
-    checkFilteredStudentCount(5)
+    cy.selectFromAutocomplete('courseFilter', `${courses[1].code} - ${courses[1].name}`)
+    checkFilteredStudentCount(6)
    cy.selectFromDropdown(`courseFilter-${courses[1].code}`, 1)
    checkFilteredStudentCount(4)

@@ -273,12 +273,12 @@ describe('Population Statistics with Bachelor + Master', { testIsolation: false
    checkFilteredStudentCount(0)

    // Non-Bachelor
-    cy.get('input[name="studyRightStatusFilter"][value="Inactive Bachelor study right"]').click()
-    cy.get('input[name="studyRightStatusFilter"][value="Inactive Bachelor study right"]').should('be.checked')
+    cy.get('input[name="studyRightStatusFilter"][value="Passive Bachelor study right"]').click()
+    cy.get('input[name="studyRightStatusFilter"][value="Passive Bachelor study right"]').should('be.checked')
    checkFilteredStudentCount(5)
    // Non-Master (combined)
-    cy.get('input[name="studyRightStatusFilter"][value="Inactive Master study right"]').click()
-    cy.get('input[name="studyRightStatusFilter"][value="Inactive Master study right"]').should('be.checked')
+    cy.get('input[name="studyRightStatusFilter"][value="Passive Master study right"]').click()
+    cy.get('input[name="studyRightStatusFilter"][value="Passive Master study right"]').should('be.checked')
    checkFilteredStudentCount(24)

    cy.cs('studyRightStatusFilter-clear').click()
@@ -385,7 +385,6 @@ describe('Custom Population Statistics', { testIsolation: false }, () => {

  before(() => {
    cy.init('/custompopulation')
-    cy.cs('custom-pop-search-button').click()
    cy.fixture('customPopulations').then(({ studentNumbersForCSStudentsSet1, studentNumbersForCSStudentsSet2 }) => {
      const students = [...studentNumbersForCSStudentsSet1, ...studentNumbersForCSStudentsSet2]
      defaultAmountOfStudents = students.length
@@ -449,14 +448,14 @@ describe('Custom Population Statistics', { testIsolation: false }, () => {
    ]

    cy.cs('courseFilter-header').click()
-    cy.selectFromDropdown('courseFilter', `${courses[0].code} - ${courses[0].name}`)
+    cy.selectFromAutocomplete('courseFilter', `${courses[0].code} - ${courses[0].name}`)
    checkFilteredStudentCount(7)
    cy.selectFromDropdown(`courseFilter-${courses[0].code}`, 1)
    checkFilteredStudentCount(6)
-    cy.selectFromDropdown('courseFilter', `${courses[1].code} - ${courses[1].name}`)
-    checkFilteredStudentCount(5)
+    cy.selectFromAutocomplete('courseFilter', `${courses[1].code} - ${courses[1].name}`)
+    checkFilteredStudentCount(6)
    cy.selectFromDropdown(`courseFilter-${courses[1].code}`, 3)
-    checkFilteredStudentCount(2)
+    checkFilteredStudentCount(6)

    cy.cs(`courseFilter-${courses[1].code}-clear`).click()
    checkFilteredStudentCount(6)
@@ -1,42 +1,23 @@
 /// <reference types="cypress" />

-const hasLanded = () => {
-  cy.contains('This view displays amounts')
-  cy.contains('Show number of')
-}
-
 const chooseSemester = (semester, fromOrTo) => {
-  cy.get(`[data-cy="semester-${fromOrTo}"]`).click()
-  cy.get(`[data-cy="semester-${fromOrTo}"]`).within(() => {
-    cy.get('div.visible.menu.transition').within(() => {
-      cy.contains('div.item', semester).click()
-    })
-    cy.get('div.menu.transition').should('not.have.class', 'visible')
-  })
+  cy.cs(`semester-${fromOrTo}`).click()
+  cy.cs(`select-opt-${semester}`).click()
+  cy.cs(`select-opt-${semester}`).should('not.have.class', 'visible')
 }

 const checkNumbers = (numbers, numberOfColumns, mode) => {
-  const offset = mode === 'semesters' ? 2 : 1
-  cy.get('table > tbody > tr:first').within(() => {
-    cy.get('td').should('have.length', numberOfColumns)
-    cy.get('td').eq(0).contains('All courses total')
-    numbers.forEach((number, index) => {
-      cy.get('td')
-        .eq(index + offset)
-        .contains(number)
-    })
-  })
-}
+  const offset = 1 // skip first col with codes / names
+  cy.cs(`ooditable-${mode}`).find('table').find('tbody').as('tbody')
+  cy.get('@tbody').find('tr').first().as('totalRow')
+  cy.get('@totalRow').find('td').should('have.length', numberOfColumns)
+  cy.get('@totalRow').find('td').eq(0).should('contain', 'All courses total')

-const checkStyle = (styles, numberOfColumns) => {
-  cy.get('table > tbody > tr:first').within(() => {
-    cy.get('td').should('have.length', numberOfColumns)
-    styles.forEach((style, index) => {
-      cy.get('td')
-        .eq(index + 2)
-        .should('have.attr', 'style')
-        .and('include', style)
-    })
+  numbers.forEach((number, index) => {
+    cy.get('@totalRow')
+      .find('td')
+      .eq(index + offset)
+      .should('contain', number)
  })
 }

@@ -44,8 +25,7 @@ describe('When language center is opened', () => {
  describe('as an admin user', () => {
    beforeEach(() => {
      cy.init('/languagecenterview', 'admin')
-      cy.get('[data-cy="completions-button"]').click()
-      hasLanded()
+      cy.cs('completions-button').click()
    })

    describe('Faculties tab', () => {
@@ -64,7 +44,7 @@ describe('When language center is opened', () => {
        cy.get('table > tbody > tr:first').within(() => {
          cy.get('td').should('have.length', 15)
          cy.get('td').eq(0).contains('All courses total')
-          const numbers = [36, 9, 33, 756, 15, 40, 6, 48, 1, 24, 1059, 49, 0, 2076]
+          const numbers = [2076, 36, 9, 33, 757, 15, 40, 6, 48, 1, 24, 1059, 48, 0]
          numbers.forEach((number, index) => {
            cy.get('td')
              .eq(index + 1)
@@ -73,16 +53,14 @@ describe('When language center is opened', () => {
        })
      })

-      // FIXME: Flaky
      it('Faculties tab "exceeding" button works', () => {
-        cy.get('[data-cy="difference-button"]').click()
-        checkNumbers([...new Array(12).fill(0), 1, 221], 15)
+        cy.cs('difference-button').click()
+        checkNumbers([63, 2, 0, 3, 13, 0, 1, 1, 2, 0, 0, 30, 10, 1], 15, 'faculties')
      })

-      // FIXME: Flaky
      it('Faculties tab semester selector changes numbers', () => {
        chooseSemester('Syksy 2020', 'from')
-        checkNumbers([28, 6, 27, 496, 4, 10, 2, 33, 0, 9, 535, 34, 0, 1184], 15)
+        checkNumbers([1184, 28, 6, 27, 497, 4, 10, 2, 33, 0, 9, 535, 33, 0], 15, 'faculties')
      })
    })

@@ -93,23 +71,8 @@ describe('When language center is opened', () => {
        chooseSemester('Kevät 2024', 'to')
      })

-      // FIXME: Flaky
      it('Semester tab shows numbers', () => {
-        checkNumbers([69, 26, 298, 58, 343, 98, 438, 138, 310, 90, 123, 74, 10, 1, 2076], 17, 'semesters')
-      })
-
-      // FIXME: Flaky
-      it('Coloring mode works on semester tab', () => {
-        cy.contains('Compare to average of course').click()
-        const expectedAlphas = [0.04, 0.016, 0.17, 0.03, 0.192, 0.055, 0.247, 0.08, 0.173, 0.05, 0.07, 0.043, 0.004, 0]
-
-        checkStyle(
-          expectedAlphas.map(alpha => `background-color: rgba(0, 170, 0, ${alpha})`),
-          17
-        )
-        cy.get('table > tbody > tr:first').within(() => {
-          cy.get('td').eq(16).should('have.attr', 'style').and('not.include', 'background-color')
-        })
+        checkNumbers([2076, 69, 26, 298, 58, 343, 98, 438, 138, 310, 90, 123, 74, 10, 1], 16, 'semesters')
      })
    })
  })
@@ -1,124 +0,0 @@
-/// <reference types="cypress" />
-
-const deleteAllSearches = () => {
-  cy.cs('open-uni-search-button').click()
-  cy.contains('Saved populations').parent().parent().parent().parent().get('.search').as('search')
-
-  cy.get('@search').then($el => {
-    const searchItems = $el.find('div[role=option] > span[class=text]')
-    for (let i = searchItems.length - 1; 0 <= i; i--) {
-      if (searchItems[i].textContent.includes('TEST-')) {
-        cy.get('[data-cy="history-search"]').children().eq(0).type(`${searchItems[i].textContent}{enter}`)
-        cy.get('button').contains('Delete').click()
-      }
-    }
-  })
-}
-
-describe('Open uni population tests', () => {
-  describe('Open uni form can be used', () => {
-    // When openUniUser is created, change it here
-    beforeEach(() => {
-      cy.init('/openunipopulation', 'admin')
-    })
-    after(() => {
-      cy.init('/openunipopulation', 'admin')
-      cy.contains('Open uni student population')
-      deleteAllSearches()
-    })
-
-    // TODO: Rewrite the whole component
-    it.skip('Finds a proper population', () => {
-      cy.fixture('openUniPopulation').then(({ courseCodesSet1 }) => {
-        cy.get('[data-cy="open-uni-search-button"]').click()
-        cy.contains('Insert course code(s)').siblings().get('textarea').as('textarea')
-        cy.get('@textarea').type(courseCodesSet1.join('\n'))
-        cy.cs('begin-of-search').click()
-        cy.cs('begin-of-search').clear()
-        cy.cs('begin-of-search').type('01.01.2015')
-        cy.cs('end-of-search').click()
-        cy.cs('end-of-search').clear()
-        cy.cs('end-of-search').type('01.01.2020')
-        cy.get('button').contains('Search population').click()
-        cy.contains('Beginning of the search for all fields:')
-        cy.contains('01.01.2015')
-        cy.contains('End of the search for enrollments:')
-        cy.contains('01.01.2020')
-        cy.location('pathname').should('eq', '/openunipopulation')
-        cy.location('search').then(search => {
-          const params = new URLSearchParams(search)
-
-          const courseCodes = params.getAll('courseCode')
-          expect(courseCodes).to.include.members(['TKT10001', 'TKT10002'])
-
-          expect(params.get('startdate')).to.eq('01-01-2015')
-          expect(params.get('enddate')).to.eq('01-01-2020')
-        })
-        cy.get('[data-cy="open-uni-table-div"]').should('contain.text', courseCodesSet1[0])
-        cy.get('[data-cy="open-uni-table-div"]').should('contain.text', courseCodesSet1[1])
-      })
-    })
-
-    it('Textarea can handle different kinds of input', () => {
-      cy.get('[data-cy="open-uni-search-button"]').click()
-      cy.contains('Insert course code(s)')
-        .siblings()
-        .get('textarea')
-        .type('tkt10001    tkt10002,tkt10003\n TKT10004,,TKt10005\nTKT-1234')
-      cy.get('button').contains('Search population').click()
-      cy.get('[data-cy="open-uni-table-div"]').should('contain.text', 'TKT10001')
-      cy.get('[data-cy="open-uni-table-div"]').should('contain.text', 'TKT10002')
-      cy.get('[data-cy="open-uni-table-div"]').should('contain.text', 'TKT10003')
-      cy.get('[data-cy="open-uni-table-div"]').should('contain.text', 'TKT10004')
-      cy.get('[data-cy="open-uni-table-div"]').should('contain.text', 'TKT10005')
-      cy.get('[data-cy="open-uni-table-div"]').should('not.contain', 'TKT-1234')
-    })
-
-    it('Saves a custom population search', () => {
-      cy.fixture('openUniPopulation').then(({ courseCodesSet1 }) => {
-        cy.get('[data-cy="open-uni-search-button"]').click()
-        cy.get('[data-cy="search-name"]').type('TEST-Avoimen-populaatio')
-        cy.contains('Insert course code(s)').siblings().get('textarea').type(courseCodesSet1.join('\n'))
-        cy.get('[data-cy="save-search"]').click()
-        cy.get('[data-cy="history-search"]').children().eq(0).type('TEST-Avoimen-populaatio{enter}')
-        cy.contains('TEST-Avoimen-populaatio')
-        cy.get('button').contains('Search population').as('btn')
-        cy.get('@btn').click()
-        cy.get('[data-cy="open-uni-table-div"]').should('contain.text', courseCodesSet1[0])
-        cy.get('[data-cy="open-uni-table-div"]').should('contain.text', courseCodesSet1[1])
-      })
-    })
-
-    it('Updates a custom population search', () => {
-      cy.fixture('openUniPopulation').then(({ courseCodesSet1, courseCodesSet2 }) => {
-        cy.get('[data-cy="open-uni-search-button"]').click()
-        cy.get('[data-cy="search-name"]').type('TEST-Avoimen-populaatio')
-        cy.contains('Insert course code(s)').siblings().get('textarea').type(courseCodesSet1.join('\n'))
-        cy.get('[data-cy="save-search"]').click()
-        cy.get('button').contains('Search population').click()
-        cy.get('[data-cy="open-uni-table-div"]').should('contain.text', courseCodesSet1[0])
-        cy.get('[data-cy="open-uni-table-div"]').should('contain.text', courseCodesSet1[1])
-
-        cy.get('[data-cy="open-uni-search-button"]').click()
-        cy.get('[data-cy="history-search"]').children().eq(0).type('TEST-Avoimen-populaatio{enter}')
-        cy.contains('Insert course code(s)').siblings().get('textarea').should('contain', courseCodesSet1.join(', '))
-        cy.contains('Insert course code(s)').siblings().get('textarea').type('\n')
-        cy.contains('Insert course code(s)').siblings().get('textarea').type(courseCodesSet2.join('\n'))
-        cy.get('[data-cy="save-search"]').click()
-        cy.get('button').contains('Search population').click()
-        cy.get('[data-cy="open-uni-table-div"]').should('contain.text', courseCodesSet1[0])
-        cy.get('[data-cy="open-uni-table-div"]').should('contain.text', courseCodesSet1[1])
-        cy.get('[data-cy="open-uni-table-div"]').should('contain.text', courseCodesSet2[0])
-        cy.get('[data-cy="open-uni-table-div"]').should('contain.text', courseCodesSet2[1])
-        cy.get('[data-cy="open-uni-table-div"]').should('contain.text', courseCodesSet2[2])
-      })
-    })
-
-    it('View does not crash with non-existing courses', () => {
-      cy.get('[data-cy="open-uni-search-button"]').click()
-      cy.contains('Insert course code(s)').siblings().get('textarea').type('cypress-fun')
-      cy.get('button').contains('Search population').click()
-      cy.get('[data-cy="open-uni-table-div"]').should('not.contain', 'cypress-fun')
-    })
-  })
-})
@@ -27,14 +27,14 @@ describe('Population statistics tests', () => {
  describe('When using basic user', () => {
    beforeEach(() => {
      cy.init('/populations')
-      cy.intercept('/api/v3/populationstatistics/studyprogrammes').as('studyprogrammes')
-      cy.intercept('/api/v2/studyprogrammes/**/studytracks').as('studytracks')
+      cy.intercept('/api/populationstatistics/studyprogrammes').as('studyprogrammes')
+      cy.intercept('/api/studyprogrammes/**/studytracks').as('studytracks')
    })

    describe('Population search', () => {
      it('Info box works', () => {
        cy.cs('PopulationSearch-info-box-content').should('not.exist')
-        cy.cs('PopulationSearch-info-box-button').trigger('mouseover')
+        cy.cs('PopulationSearch-info-box-button').hover()
        cy.cs('PopulationSearch-info-box-content').should('be.visible')
        cy.cs('PopulationSearch-info-box-content').contains('Tässä osiossa voi tarkastella')
        cy.cs('PopulationSearch-info-box-button').trigger('mouseout')
@@ -74,8 +74,8 @@ describe('Population statistics tests', () => {
          selectStudyProgramme('Matemaattisten tieteiden kandiohjelma')
          cy.wait('@studytracks').its('response.statusCode').should('be.oneOf', [200, 304])
          cy.contains('See class').click()
-          cy.contains('Matemaattisten tieteiden kandiohjelma 2017 - 2018')
-          cy.contains('Class size 47 students')
+          cy.contains('Matemaattisten tieteiden kandiohjelma')
+          cy.contains('Class of 2017 - 2018, 47 students')
        })

        // TODO: Delete MUI
@@ -95,7 +95,7 @@ describe('Population statistics tests', () => {
      cy.visit(pathToMathBSc2020)
      cy.cs('filtered-students')
      cy.contains('Matemaattisten tieteiden kandiohjelma')
-      cy.contains('Class size 30 students')
+      cy.contains('Class of 2020 - 2021, 30 students')
      cy.contains('Excludes exchange students')
      cy.contains('Excludes students with non-degree study right')
      cy.contains('Excludes students who have transferred out of this programme')
@@ -251,15 +251,15 @@ describe('Population statistics tests', () => {
      it('Is displayed and link to individual course stats page works', () => {
        cy.visit(pathToMathBSc2020)
        cy.contains('Courses of class').click()
-        cy.intercept('/api/v3/courseyearlystats**').as('coursePage')
-        cy.get('[data-cy=toggle-group-module-MAT110]').click()
-        cy.contains('td', 'MAT11001').siblings().find('i.level.up').click()
+        cy.intercept('/api/courseyearlystats**').as('coursePage')
+        cy.cs('toggle-group-module-MAT110').click()
+        cy.contains('td', 'MAT11001').siblings().find('[data-testid="NorthEastIcon"]').click()
        cy.wait('@coursePage')
        cy.url().should('include', '/coursestatistics')
-        cy.contains('MAT11001 • Johdatus yliopistomatematiikkaan')
-        cy.contains('AYMAT11001 • Avoin yo: Johdatus yliopistomatematiikkaan')
-        cy.contains('57033 • Johdatus yliopistomatematiikkaan')
-        cy.contains('A57033 • Avoin yo: Johdatus yliopistomatematiikkaan')
+        cy.contains('MAT11001') // Johdatus yliopistomatematiikkaan
+        cy.contains('AYMAT11001') // Avoin yo: Johdatus yliopistomatematiikkaan
+        cy.contains('57033') // Johdatus yliopistomatematiikkaan
+        cy.contains('A57033') // Avoin yo: Johdatus yliopistomatematiikkaan
      })

      it('Curriculum selection works', () => {
@@ -319,7 +319,7 @@ describe('Population statistics tests', () => {
      })

      it("'General tab' is usable", () => {
-        cy.cs('student-table-tabs').within(() => {
+        cy.cs('ooditable-general').within(() => {
          cy.contains('522142')
          cy.contains('Tilastotiede')
          cy.contains('Matematiikka')
@@ -330,18 +330,19 @@ describe('Population statistics tests', () => {
        })
      })

-      // FIXME: Flaky
      it("'Courses tab' is usable", () => {
        cy.cs('student-table-tabs').within(() => {
          cy.contains('Courses').click()
+        })
+        cy.cs('ooditable-courses').within(() => {
          cy.contains('MAT12001')
          cy.contains('MAT21001')
        })
      })

      it("'Modules tab' Displays correct modules based on the selected programme", () => {
-        cy.cs('student-table-tabs').within(() => {
-          cy.contains('Modules').click()
+        cy.cs('student-table-tabs').contains('Modules').click()
+        cy.cs('ooditable-modules').within(() => {
          cy.contains('MAT011')
          cy.contains('MAT110')
        })
@@ -349,18 +350,17 @@ describe('Population statistics tests', () => {
        cy.cs('curriculum-picker').click()
        cy.contains('2023–2026').click()
        cy.contains('Courses of class').click()
-        cy.cs('student-table-tabs').within(() => {
+        cy.cs('ooditable-modules').within(() => {
          cy.contains('MAT011').should('not.exist')
          cy.contains('MAT110')
        })
      })

-      it.skip("Empty 'tags' tab has a link to the page where tags can be created", () => {
-        // TODO: This fails in the pipeline, but works locally. Investigate.
+      it("Empty 'tags' tab has a link to the page where tags can be created", () => {
        cy.cs('student-table-tabs').within(() => {
          cy.contains('Tags').click()
-          cy.contains('No tags defined. You can define them here.').find('a').click()
        })
+        cy.contains('No tags defined. You can define them here.').find('a').click()
        cy.url().should('include', '/study-programme/KH50_001?tab=4')
        cy.contains('Matemaattisten tieteiden kandiohjelma')
        cy.contains('Create new tag')
@@ -383,17 +383,15 @@ describe('Population statistics tests', () => {
      cy.contains(nonExisting).should('not.exist')
      cy.contains('button', 'Check student numbers').click()
      cy.contains('Check for student numbers')
-      cy.get('textarea').type(existing)
-      cy.get('textarea').type('{enter}')
-      cy.get('textarea').type(nonExisting)
+      cy.cs('check-student-numbers').type(`${existing}{enter}${nonExisting}`)
      cy.contains('button', 'Check students').click()
-      cy.contains('#checkstudentsresults', 'Results').within(() => {
-        cy.contains('Student numbers in list and in Sisu').click()
-        cy.contains('#found', existing)
-        cy.contains('Student numbers in list but not in Sisu').click()
-        cy.contains('#notfound', nonExisting)
-        cy.contains('Student numbers in Sisu but not in list').click()
-        cy.contains('#notsearched', '457144')
+      cy.get('#checkstudentsresults').within(() => {
+        cy.cs('found-title').click()
+        cy.cs('found-data').contains(existing)
+        cy.cs('not-found-title').click()
+        cy.cs('not-found-data').contains(nonExisting)
+        cy.cs('not-searched-title').click()
+        cy.cs('not-searched-data').contains('457144')
      })
      cy.contains('button', 'Close').click()
      cy.contains('Student numbers in list and in Sisu').should('not.exist')
@@ -403,8 +401,8 @@ describe('Population statistics tests', () => {
  describe('When using IAM user', () => {
    beforeEach(() => {
      cy.init(pathToMathBSc2020, 'onlyiamrights')
-      cy.contains('Matemaattisten tieteiden kandiohjelma 2020 - 2021')
-      cy.contains('Class size 30 students')
+      cy.contains('Matemaattisten tieteiden kandiohjelma')
+      cy.contains('Class of 2020 - 2021, 30 students')
    })

    it('Population statistics is visible', () => {
@@ -114,9 +114,9 @@ describe('Students tests', () => {
          cy.get('a').click()
        })
      cy.url().should('include', '/coursestatistics')
-      cy.contains('MAT12004 • Tilastollinen päättely I')
-      cy.contains('AYMAT12004 • Avoin yo: Tilastollinen päättely I')
-      cy.contains('57046 • Johdatus tilastolliseen päättelyyn')
+      cy.contains('MAT12004') // Tilastollinen päättely I
+      cy.contains('AYMAT12004') // Avoin yo: Tilastollinen päättely I
+      cy.contains('57046') // Johdatus tilastolliseen päättelyyn
    })

    it('Has correct Sisu link', () => {
@@ -162,8 +162,8 @@ describe('Students tests', () => {
          .parent()
          .within(() => cy.get('a').click())
      })
-      cy.contains('Matemaattisten tieteiden kandiohjelma 2020 - 2021')
-      cy.contains('Class size 30 students')
+      cy.contains('Matemaattisten tieteiden kandiohjelma')
+      cy.contains('Class of 2020 - 2021, 30 students')
    })

    it('Grade graph works in all three different modes', () => {
@@ -174,18 +174,13 @@ describe('Students tests', () => {
        cy.contains('label', 'Group size')
        cy.get('input').should('have.value', '5')
      })
-      cy.contains('.highcharts-container text', "Nov '22")
-      cy.contains('.highcharts-container text', "Jul '22").should('not.exist')
      cy.cs('group-size-input').within(() => {
        cy.contains('label', 'Group size')
        cy.get('input').clear()
        cy.get('input').type('10')
        cy.get('input').should('have.value', '10')
      })
-      cy.contains('.highcharts-container text', "Jul '22")
-      cy.contains('.highcharts-container text', "Nov '22").should('not.exist')
      cy.contains('button', 'Show semester mean').click()
-      cy.contains('.highcharts-container text', "Jan '22")
    })

    describe('Bachelor Honours section', () => {
@@ -277,13 +272,9 @@ describe('Students tests', () => {
    it('When a study plan is selected, the time frame of the credit graph is updated', () => {
      cy.clock(new Date('2024-08-30').getTime(), ['Date'])
      cy.visit('/students/550789')
-      cy.contains('.highcharts-container text', '1 Aug 2020')
-      cy.contains('.highcharts-container text', '30 Aug 2024')
      cy.contains('table tbody tr', 'Kulttuurien tutkimuksen kandiohjelma (01.08.2020–30.06.2023)').within(() => {
        cy.get('td').eq(0).click()
      })
-      cy.contains('.highcharts-container text', '1 Aug 2020')
-      cy.contains('.highcharts-container text', '19 Aug 2023')
    })

    it("If there's a study plan corresponding to the degree programme, completed credits are displayed", () => {
@@ -31,7 +31,7 @@ describe('Study guidance group tests', () => {

        const studyGuidanceGroupsTableContent = [
          ['MAT kandit 2020', 3, 'Matemaattisten tieteiden kandiohjelma', '2020 - 2021'],
-          ['Oma ohjausryhmä', 2, 'Add study programme', 'Add year'],
+          ['Oma ohjausryhmä', 2, 'Add degree programme', 'Add starting year'],
        ]

        cy.checkTableStats(studyGuidanceGroupsTableContent, 'study-guidance-group-overview')
@@ -52,11 +52,11 @@ describe('Study guidance group tests', () => {
    it('has a working back button', () => {
      cy.init('/studyguidancegroups/sgg-cypress-1', 'onlystudyguidancegroups')

-      cy.get('button.ui.button').contains('Back').click()
+      cy.get('button').contains('Back to groups').click()
      cy.url().should('eq', `${Cypress.config().baseUrl}/studyguidancegroups`)
    })

-    describe('without associated study programme and year', () => {
+    describe('without associated degree programme and year', () => {
      beforeEach(() => {
        cy.init('/studyguidancegroups/sgg-cypress-2', 'onlystudyguidancegroups')
      })
@@ -84,7 +84,7 @@ describe('Study guidance group tests', () => {
          'All credits',
          'Credits since 1.1.1970',
          'Start year at uni',
-          'Study programmes',
+          'Degree programmes',
          'Tags',
        ]
        cy.contains('Students (2)').click()
@@ -94,15 +94,15 @@ describe('Study guidance group tests', () => {
      })
    })

-    describe('with associated study programme and year', () => {
+    describe('with associated degree programme and year', () => {
      beforeEach(() => {
        cy.init('/studyguidancegroups/sgg-cypress-1', 'onlystudyguidancegroups')
      })

      it('shows the correct labels', () => {
-        cy.get('.ui.medium.header').contains('MAT kandit 2020')
-        cy.get('.ui.blue.tag.label:first').contains('Matemaattisten tieteiden kandiohjelma')
-        cy.get('.ui.blue.tag.label:last').contains('2020 - 2021')
+        cy.get('h4').contains('MAT kandit 2020')
+        cy.get('.MuiChip-root:first').contains('Matemaattisten tieteiden kandiohjelma')
+        cy.get('.MuiChip-root:last').contains('2020 - 2021')
      })

      it('shows the correct panes', () => {
@@ -113,17 +113,17 @@ describe('Study guidance group tests', () => {
        cy.contains('Students (3)')
      })

-      it("clicking the 'Show starting from associated year' button activates the 'Date of Course Credits' filter", () => {
-        cy.get('[data-cy="CreditDate-filter-card"][data-active="false"]')
+      it("clicking the 'Show credits starting from the associated academic year' filter", () => {
+        cy.get('[data-cy="ParticipationDate-filter-card"][data-active="false"]')
        cy.cs('Credit accumulation (for 3 students)').click()
-        cy.get('.ui.primary.button').contains('Show starting from associated year').click()
-        cy.get('[data-cy="CreditDate-filter-card"][data-active="true"]')
+        cy.get('label').contains('Show credits starting from the associated academic year').click()
+        cy.get('[data-cy="ParticipationDate-filter-card"][data-active="true"]')
        cy.get('.date-picker')
          .eq(0)
          .within(() => cy.get('input').should('have.value', '01.08.2020'))
        cy.contains('Reset All Filters')
-        cy.get('.ui.primary.button').contains('Show all credits').click()
-        cy.get('[data-cy="CreditDate-filter-card"][data-active="false"]')
+        cy.get('label').contains('Show credits starting from the associated academic year').click()
+        cy.get('[data-cy="ParticipationDate-filter-card"][data-active="false"]')
      })

      it.skip('students table has the correct tabs', () => {
@@ -10,17 +10,19 @@ describe('Teachers page tests', () => {
  const teacher1 = 'Luokkanen Liisa Viljami'
  const teacher2 = 'Perälä Juhani Susanna'

+  const statisticsHeaders = ['Name', 'Credits', 'Credits transferred', 'Passed']
+
  it('Check Statistics', () => {
-    cy.get(':nth-child(1) > .ui > .search').click()
+    cy.cs('semester-start').click()
    cy.contains('Syksy 2020').click()
    cy.cs('course-providers').click()
    cy.contains('Matemaattisten tieteiden kandiohjelma').click()
-    cy.cs('course-providers').children('.icon').click()
-    cy.contains('button', 'Search').click()
+    cy.get('body').click(0, 0) // Click outside of the select
+    cy.cs('search-statistics').click()
+
    cy.contains('Teacher')
-    const headers = ['Name', 'Credits', 'Credits transferred', 'Passed']
    cy.get('table thead tr th').should('have.length', 4)
-    headers.forEach((header, index) => {
+    statisticsHeaders.forEach((header, index) => {
      cy.get('table thead tr th').eq(index).should('contain', header)
    })
    cy.contains('td', teacher1).siblings().eq(0).contains('235')
@@ -30,15 +32,15 @@ describe('Teachers page tests', () => {
  })

  it('Teacher search works', () => {
-    cy.get('.borderless > :nth-child(3)').click()
-    cy.get('.prompt').type(teacher1.split(' ')[0])
+    cy.cs('Search').click()
+    cy.cs('teacher-search').type(teacher1.split(' ')[0])
    cy.get('table tbody tr').should('have.length', 4)
-    cy.get('table tbody tr').eq(2).contains('td', teacher1)
+    cy.get('table tbody tr').eq(1).contains('td', teacher1)
  })

  it('Can check teacher page', () => {
-    cy.get('.borderless > :nth-child(3)').click()
-    cy.get('.prompt').type(teacher2)
+    cy.cs('Search').click()
+    cy.cs('teacher-search').type(teacher2)

    // Prevent opening in new tab
    cy.contains('a', teacher2).invoke('removeAttr', 'target').click()
@@ -46,19 +48,17 @@ describe('Teachers page tests', () => {
    cy.contains(teacher2)
    cy.contains('Syksy 2023').click()
    cy.contains('Kevät 2019').click()
-    cy.get('.ok-sortable-table tbody tr')
-      .eq(0)
-      .within(() => {
-        const rowContent = ['MAT12004', 'Tilastollinen päättely I', '120', '0', '92.31%']
-        rowContent.forEach((content, index) => {
-          cy.get('td').eq(index).contains(content)
-        })
+    cy.contains('tr', 'MAT12004').within(() => {
+      const rowContent = ['MAT12004', 'Tilastollinen päättely I', '120', '0', '92.31%']
+      rowContent.forEach((content, index) => {
+        cy.get('td').eq(index).contains(content)
      })
+    })
  })

  it('Check leaderboad works', () => {
-    cy.get('.borderless > :nth-child(2)').click()
-    cy.get(':nth-child(1) > .ui > .search').click()
+    cy.cs('Leaderboard').click()
+    cy.cs('academic-year').click()
    cy.contains('2020-2021').click()
  })
 })
@@ -39,12 +39,6 @@ describe('University view', () => {
      checkProgressTables()
    })

-    it("'Graduated included / Graduated excluded' toggle works", () => {
-      cy.cs('graduated-toggle').click()
-      checkProgressBarCharts()
-      checkProgressTables()
-    })
-
    it("'All study rights / Special study rights excluded' toggle works", () => {
      cy.cs('study-right-toggle').click()
      checkProgressBarCharts()
@@ -55,7 +49,7 @@ describe('University view', () => {
    it.skip('years in the tables can be clicked to show faculty level breakdown', () => {
      cy.cs('study-right-toggle').click()
      cy.cs('bachelors-faculty-progress-table-show-button3').click()
-      cy.contains('29.5%').trigger('mouseover', { force: true })
+      cy.contains('29.5%').hover()
      cy.contains('Matemaattis-luonnontieteellinen tiedekunta')
      cy.contains('H50')
      cy.contains('0 Credits: 0')
@@ -72,7 +72,7 @@ describe('Users tests', () => {
      })

      it("only the mocked user's programmes are visible", () => {
-        cy.intercept('/api/v3/populationstatistics/studyprogrammes').as('studyprogrammes')
+        cy.intercept('/api/populationstatistics/studyprogrammes').as('studyprogrammes')
        cy.visit('/populations')
        cy.wait('@studyprogrammes').its('response.statusCode').should('be.oneOf', [200, 304])

@@ -58,17 +58,6 @@ const onlyStudyGuidanceGroupsUser = {
  hypersonsisuid: 'hy-hlo-2222222',
 }

-// TODO add user into anon-DB (check the need for changing hypersonid)
-// REMEMBER TO ADD ROLE openUniSearch
-// const openUniUser = {
-//   uid: 'openuniuser',
-//   displayname: 'Open Uni User',
-//   'shib-session-id': 'mock-cypress-session',
-//   hygroupcn: 'grp-oodikone-basics-users;hy-ypa-opa-dojo',
-//   mail: 'grp-toska+mockopenuniuser@helsinki.fi',
-//   hypersonsisuid: 'hy-hlo-9999999',
-// }
-
 const userHeaders = [
  adminUserHeaders,
  basicUserHeaders,
@@ -122,6 +111,19 @@ Cypress.Commands.add('selectFromDropdown', { prevSubject: false }, (label, index
  if (isMultiSelect) cy.get('#menu- > .MuiModal-backdrop').click()
 })

+/**
+ * Select item from FilterSearchableSelect dropdown.
+ * If the index is a number, select index-th item.
+ * Otherwise select the item containing index text.
+ */
+Cypress.Commands.add('selectFromAutocomplete', { prevSubject: false }, (label, index) => {
+  cy.cs(`${label}-selector`).click()
+  cy.get(`#${label}-popper.MuiAutocomplete-popper [role="listbox"]`).within(() => {
+    if (typeof index === 'number') cy.get('li').eq(index).click()
+    else cy.get('li').contains(index).click()
+  })
+})
+
 /**
 * Set range selector values FilterRange.
 * If the reset flag is set, the function tries to reset the original values.
@@ -177,3 +179,20 @@ Cypress.Commands.add('checkTableStats', (correctStats, tableName) => {
    cy.get('tr').filter(':visible').should('have.length', correctStats.length)
  })
 })
+
+/**
+ * Hover on the selected element.
+ */
+Cypress.Commands.add('hover', { prevSubject: 'element' }, (subject, options = {}) => {
+  cy.wrap(subject).trigger('mouseover', {
+    bubbles: true,
+    cancelable: true,
+    ...options,
+  })
+
+  cy.wrap(subject).trigger('mousemove', {
+    bubbles: true,
+    cancelable: true,
+    ...options,
+  })
+})
@@ -13,7 +13,6 @@
 // https://on.cypress.io/configuration
 // ***********************************************************

-require('@cypress/code-coverage/support')
 require('./commands')

 Cypress.on('uncaught:exception', error => {
@@ -25,6 +25,9 @@ services:
    build:
      context: services
      dockerfile: backend/Dockerfile
+    image: oodikone-backend:staging
+    profiles:
+      - oodikone

  frontend:
    <<: *defaults
@@ -32,6 +35,9 @@ services:
    build:
      context: services
      dockerfile: frontend/Dockerfile
+    image: oodikone-frontend:staging
+    profiles:
+      - oodikone

  kone-db:
    <<: *defaults
@@ -47,6 +53,7 @@ services:
    command: >
      sh -c 'redis-server --appendonly yes && redis-cli flushall'
    image: redis:7.2.6
+    container_name: redis
    ports:
      - 6379:6379

@@ -101,6 +108,8 @@ services:
      - 1337:80
    volumes:
      - ./nginx.conf:/etc/nginx/nginx.conf
+    profiles:
+      - oodikone

  # Following services are used to run sis-updater-worker when anon sis-db needs to be updated. Could probably also use production version, but this certainly works.
  sis-importer-db:
@@ -114,6 +123,7 @@ services:
    <<: *defaults
    build:
      context: updater/sis-updater-worker
+    container_name: sis-updater-worker
    depends_on:
      - redis
      - sis-db
@@ -1,47 +0,0 @@
-services:
-  oodikone-backend:
-    build:
-      context: ${OODIKONE_REPO:-.}/services
-      dockerfile: backend/Dockerfile
-      args:
-        SENTRY_ENVIRONMENT: ''
-        SENTRY_RELEASE: ''
-        SENTRY_DSN: ''
-        SERVICE_PROVIDER: fd
-        NODE_ENV: production
-    image: ${DOCKER_OODIKONE_NAMESPACE:-637423527834.dkr.ecr.eu-north-1.amazonaws.com/oodikone}/oodikone-backend:${DOCKER_IMAGE_TAG:-dev}
-
-  oodikone-frontend:
-    build:
-      context: ${OODIKONE_REPO:-.}/services
-      dockerfile: frontend/Dockerfile
-      args:
-        SENTRY_ENVIRONMENT: ''
-        SENTRY_RELEASE: ''
-        SENTRY_DSN: ''
-        SERVICE_PROVIDER: fd
-        LANGUAGE_CENTER_VIEW_ENABLED: 'false' # currently no intention to be enabled
-        SIS_URL: 'https://sis-qa.funidata.fi'
-        NODE_ENV: production
-    image: ${DOCKER_OODIKONE_NAMESPACE:-637423527834.dkr.ecr.eu-north-1.amazonaws.com/oodikone}/oodikone-frontend:${DOCKER_IMAGE_TAG:-dev}
-
-  updater-scheduler:
-    build:
-      context: ${OODIKONE_REPO:-.}/updater/sis-updater-scheduler
-      args:
-        SENTRY_ENVIRONMENT: ''
-        SENTRY_RELEASE: ''
-        SENTRY_DSN: ''
-        NODE_ENV: production
-    image: ${DOCKER_OODIKONE_NAMESPACE:-637423527834.dkr.ecr.eu-north-1.amazonaws.com/oodikone}/updater-scheduler:${DOCKER_IMAGE_TAG:-dev}
-
-  updater-worker:
-    build:
-      context: ${OODIKONE_REPO:-.}/updater/sis-updater-worker
-      args:
-        SENTRY_ENVIRONMENT: ''
-        SENTRY_RELEASE: ''
-        SENTRY_DSN: ''
-        SERVICE_PROVIDER: fd
-        NODE_ENV: production
-    image: ${DOCKER_OODIKONE_NAMESPACE:-637423527834.dkr.ecr.eu-north-1.amazonaws.com/oodikone}/updater-worker:${DOCKER_IMAGE_TAG:-dev}
@@ -1,190 +0,0 @@
-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}
-      IMPORTER_DB_API_USER: dev_user
-      IMPORTER_DB_API_PASSWORD: dev_password
-      ROOT_ORG_ID: ${ROOT_ORG_ID}
-      LANGUAGE_CENTER_VIEW_ENABLED: 'false'
-    ports:
-      - 8080:8080
-    volumes:
-      - backend-nodemod:/opt/app-root/backend/node_modules
-      - ./environments/testu:/opt/app-root/backend/src/environment
-      - ./services/backend/:/opt/app-root/backend
-      - ./services/shared/:/opt/app-root/shared
-
-  frontend:
-    <<: *defaults
-    build:
-      <<: *build_defaults
-      context: services/frontend
-    container_name: frontend
-    ports:
-      - 3000:3000
-    environment:
-      REACT_APP_SERVICE_PROVIDER: fd
-      REACT_APP_LANGUAGE_CENTER_VIEW_ENABLED: 'false'
-      REACT_APP_SIS_URL: 'https://sis-qa.funidata.fi'
-    volumes:
-      - frontend-nodemod:/opt/app-root/frontend/node_modules
-      - ./services/frontend/:/opt/app-root/frontend
-      - ./services/shared/:/opt/app-root/shared
-
-  kone-db:
-    <<: *defaults
-    container_name: kone-db
-    environment:
-      PGDATA: /data
-      POSTGRES_DB: kone-db
-      POSTGRES_HOST_AUTH_METHOD: trust
-    image: postgres:15.10
-    ports:
-      - 12349:5432
-    volumes:
-      - kone-db-data:/data
-
-  redis:
-    <<: *defaults
-    command: 'redis-server --appendonly yes'
-    container_name: redis
-    image: redis:6.2.16
-    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.10
-    volumes:
-      - sis-db-data:/data
-    shm_size: 2gb
-    ports:
-      - 12345:5432
-
-  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
-    environment:
-      REDIS_HOST: redis
-      REDIS_PORT: 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
-      SERVICE_PROVIDER: fd
-    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
-    extra_hosts:
-      - 'host.docker.internal:host-gateway'
-    environment:
-      DB_URL: postgres://postgres@sis-db:5432/sis-db
-      REDIS_HOST: redis
-      REDIS_PORT: 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
-      ROOT_ORG_ID: ${ROOT_ORG_ID}
-      SERVICE_PROVIDER: fd
-    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.10
-    volumes:
-      - user-db-data:/data
-    ports:
-      - 12347:5432
-
-volumes:
-  backend-nodemod:
-  frontend-nodemod:
-  kone-db-data:
-  redis-data:
-  sis-db-data:
-  user-db-data:
-
-networks:
-  default:
-    name: oodikone
-  importer:
-    name: importer_network
-    external: true
@@ -1,5 +1,26 @@
 services:
-  frontend:
+  api-tests:
    volumes:
-      - frontend-nodemod:/opt/app-root/frontend/node_modules
-      - ./services/frontend/instrumented:/opt/app-root/frontend/src
+      - backend-tests-nodemod:/opt/app-root/backend/node_modules
+      - ./services/backend/:/opt/app-root/backend
+      - ./services/shared/:/opt/app-root/shared
+    environment:
+      CI: 'true'
+      NODE_ENV: 'test'
+      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: test
+      SIS_DB_URL: postgres://postgres@sis-db:5432/sis-db
+      SIS_UPDATER_URL: http://sis-updater-scheduler:8082
+      JAMI_URL: 'http://jami:3003/'
+      IMPORTER_DB_API_URL: 'https://api-toska.apps.ocp-prod-0.k8s.it.helsinki.fi/importer'
+      CRYPT_KEY: 'e16730fce263d5270ba8dcf84d068a32556542455e71331880d6c1c5e4db9b4e'
+    build:
+      context: services/backend
+      dockerfile: dev.Dockerfile
+    command: npm run test
+
+volumes:
+  backend-tests-nodemod:
@@ -21,6 +21,7 @@ services:
    build:
      <<: *build_defaults
      context: services/backend
+    container_name: backend
    depends_on:
      - kone-db
      - redis
@@ -44,9 +45,9 @@ services:
    profiles:
      - oodikone
    volumes:
-      - backend-nodemod:/opt/app-root/backend/node_modules
      - ./services/backend/:/opt/app-root/backend
      - ./services/shared/:/opt/app-root/shared
+      - backend-nodemod:/opt/app-root/backend/node_modules

  frontend:
    <<: *defaults
@@ -59,9 +60,9 @@ services:
    profiles:
      - oodikone
    volumes:
-      - frontend-nodemod:/opt/app-root/frontend/node_modules
      - ./services/frontend/:/opt/app-root/frontend
      - ./services/shared/:/opt/app-root/shared
+      - frontend-nodemod:/opt/app-root/frontend/node_modules

  kone-db:
    <<: *defaults
@@ -132,6 +133,7 @@ services:
    build:
      <<: *build_defaults
      context: updater/sis-updater-worker
+    container_name: sis-updater-worker
    depends_on:
      - redis
      - sis-db
@@ -168,7 +170,7 @@ services:
      - npm_config_cache=/tmp
      - PORT=3003
      - NODE_ENV=dev
-      - DATABASE_URL=postgres://postgres:postgres@jami-db:5432/postgres
+      - DATABASE_URL=postgres://postgres:postgres@jami-db:5432/jami-db-real
    ports:
      - 3003:3003
    container_name: jami
@@ -8,11 +8,10 @@ Roles are defined [here](../services/backend/src/config/roles.ts). Criteria for
 - courseStatistics
 - facultyStatistics
 - fullSisuAccess
- openUniSearch
 - studyGuidanceGroups
 - teachers

-The roles `facultyStatistics`, `openUniSearch`, and `studyGuidanceGroups` simply enable certain views (_Faculties_, _Open uni student population_, and _Guidance groups_ respectively).
+The roles `facultyStatistics` and `studyGuidanceGroups` simply enable certain views (_Faculties_ and _Guidance groups_ respectively).

 ### courseStatistics

@@ -21,7 +20,7 @@ The roles `facultyStatistics`, `openUniSearch`, and `studyGuidanceGroups` simply

 ### teachers

- By default, the role only allows seeing the statistics of course providers (study programmes) they have full rights to (see [Programmes](#programmes))
+- By default, the role only allows seeing the statistics of course providers (degree programmes) they have full rights to (see [Programmes](#programmes))
 - This role always needs to be given and removed manually
 - If the user is a member of the `hy-dekaanit` or `hy-varadekaanit-opetus` IAM group (or is an admin), they can see leaderboards, information about individual teachers, and statistics of all course providers. They don't need to be given the `teachers` role manually.

@@ -43,7 +42,6 @@ The roles `facultyStatistics`, `openUniSearch`, and `studyGuidanceGroups` simply
 | Custom population    |             |  ✅   |       ✅       |
 | Completed courses    |     ✅      |  ✅   |       ✅       |
 | Close to graduation  |             |  ✅   |       ✅       |
-| Open uni population  |             |  ✅   |                |
 | Courses              |             |  ✅   |       ✅       |

 \* = anyone who can log in to Oodikone, check the [IAM groups](#iam-groups) section for more information
@@ -63,7 +61,6 @@ A user must be a member of either the `grp-oodikone-basic-users` or `grp-oodikon
 | grp-oodikone-basic-users | courseStatistics              |
 | grp-oodikone-users       | facultyStatistics             |
 | grp-toska                | admin                         |
-| hy-ypa-opa-dojo          | openUniSearch                 |

 `grp-oodikone-basic-users`: basically the whole staff (hy-\*-allstaff)

@@ -6,7 +6,7 @@ The made changes do not have any effects on faculty or trends views. **Needs man

 Basic rule of thumb is that for the master/licentiate programme I used names `combinedProgramme` and in some rare cases `secondProgramme` as whole or part of the variable names.

-## Study programme
+## Degree programme

 **Needs manual work** in the function `getCombinedProgrammeId` in `services/frontend/src/common/index.js` if new programmes is added. For showing the both programme data correctly, the filtering mechanism is changed to add both programmes and it is not caring for which programme user has acual rights or IAMrights. However, the links for the class stats level are hidden in studytrack tables, if the user has no rights for the programme.

@@ -15,7 +15,7 @@ Basic rule of thumb is that for the master/licentiate programme I used names `co
 - Overview
  - **Needs manual work**

-**Redis nightly study programme update**
+**Redis nightly degree programme update**

 - Updates automatically combined programme stats. **Needs manual work** here `services/backend/src/services/studyprogrammeHelpers.js` in the constant `combinedStudyprogrammes`. This might needs refactoring if bachelor programme can have many separate master programmes. Then remember to change function `refreshNewOverview` in `services/backend/src/events.js` accordingly to handle lists.

@@ -36,7 +36,7 @@ All things listed below should work automatically, if new combinations are done.

 - _Students of the studyprogramme by starting year_
  - Graduated field separated for both programmes
-  - All = currently enrolled + absent + inactive + graduated licentiate
+  - All = currently enrolled + absent + passive + graduated licentiate
 - _Progress of students of the studyprogramme by starting year_
  - computed for whole bachelor + master/licentiate studyright period
 - _Average graduation times_
@@ -85,12 +85,12 @@ All things listed below should work automatically, if new combinations are done.

 - **Graduated from programme** - possibility to filter out students based on graduation either in bachelor's or master's.

- **Studyright status** - active or inactive based on the chosen degree
+- **Studyright status** - active or passive based on the chosen degree

 - **Studytrack filter** (needs programme code) is not touched at the moment, thus **may need future manual work**.

 ## Study guidance groups

- Backend: student data is fetched by bachelor study programme code in `/v3/populationstatisticsbystudentnumbers`. Separation from code 'KHxx_xxx+MHxx_xxx' is done in backend.
+- Backend: student data is fetched by bachelor degree programme code in `/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 accordingly in `useFilterAndFormattedElementDetails()` function.
@@ -53,7 +53,7 @@ erDiagram
  open_uni_population_searches
  progress_criteria
  study_guidance_group_tags
-  study_programme_pins
+  degree_programme_pins
  tag ||--o{ tag_student : "belongs to"
  tag
  tag_student
@@ -55,11 +55,11 @@ The `semester_enrollments` column is an array of JSON objects. Each object conta

 The `type` field represents one of the following enrollment types. The `semester` field refers to a semester code, defined as `semestercode` in the model Semester.

-| value | meaning  | notes                            |
-| ----: | :------- | :------------------------------- |
-|     1 | Present  |                                  |
-|     2 | Absent   |                                  |
-|     3 | Inactive | neither 1 or 2 has been declared |
+| value | meaning | notes                            |
+| ----: | :------ | :------------------------------- |
+|     1 | Present |                                  |
+|     2 | Absent  |                                  |
+|     3 | Passive | neither 1 or 2 has been declared |

 ## Credit type code

@@ -2,26 +2,19 @@

 A collection of useful tools, documentation and other resources.

-## 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)
+- [qlty.sh](https://qlty.sh/gh/UniversityOfHelsinkiCS/projects/oodikone)
+  - Qlty.sh replaced Code climate which was introduced by Riku
+  - The usefulness of qlty.sh is sometimes questionable

 ## Database

 - [pgcli](https://www.pgcli.com)
  - A useful commandline tool to interact with the database
-  - Install: `$ pip install pgcli`
+  - Can be installed from some package managers or optionally via `$ pip install pgcli`
 - [Postgres documentation](https://www.postgresql.org/docs/15/index.html)
 - [Sequelize documentation](https://sequelize.org/docs/v6/)

@@ -29,8 +22,6 @@ A collection of useful tools, documentation and other resources.

 - [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
@@ -46,7 +37,6 @@ A collection of useful tools, documentation and other resources.
  - [Material Icons](https://mui.com/material-ui/material-icons/)
  - [MUI X Date pickers](https://mui.com/x/react-date-pickers/)
 - [Material React Table documentation](https://www.material-react-table.com/docs)
- [Semantic UI React documentation](https://react.semantic-ui.com)

 <!--

@@ -25,7 +25,7 @@ export default tseslint.config(
      'nyc-config.cjs',
      '.lintstagedrc.mjs',
      'cypress.config.js',
-    ]
+    ],
  },

  // Global options (excl. e2e)
@@ -44,8 +44,8 @@ export default tseslint.config(
      parser: tseslint.parser,
      parserOptions: {
        projectService: {
-          allowDefaultProject: ['*.{js,cjs}']
-        }
+          allowDefaultProject: ['*.{js,cjs}'],
+        },
      },
      globals: {
        ...globals.browser,
@@ -53,16 +53,16 @@ export default tseslint.config(
      },
    },
    plugins: {
-      'import-x': eslintPluginImportX
+      'import-x': eslintPluginImportX,
    },
    linterOptions: {
      reportUnusedDisableDirectives: 'error',
    },
    rules: {
-      'camelcase': 'off', // TODO: Enable. old db/backend logic is still using snake_case every now and then and needs a big refactor
+      camelcase: 'off', // TODO: Enable. old db/backend logic is still using snake_case every now and then and needs a big refactor
      'class-methods-use-this': 'off', // Disabled in favor of @typescript-eslint
      'consistent-return': 'off', // Disabled in favor of @typescript-eslint
-      'id-denylist': ['error', 'c', 'd', 'e', 'err', 't'],
+      'id-denylist': ['error', 'err'],
      'no-alert': 'error',
      'no-await-in-loop': 'error',
      'no-console': 'error',
@@ -75,24 +75,42 @@ export default tseslint.config(
      'prefer-const': 'error',
      'prefer-destructuring': 'off', // Disabled in favor of @typescript-eslint
      'dot-notation': 'off', // Disabled in favor of @typescript-eslint
-      'no-restricted-imports': ['error', { 'patterns': [{ 'regex': '^@mui/[^/]+$' }] }],
-      'quotes': ['error', 'single',
-        { avoidEscape: true, allowTemplateLiterals: false }
+      'no-restricted-imports': [
+        'error',
+        {
+          patterns: [
+            {
+              regex: '^@mui/[^/]+$',
+              message:
+                'Import only the needed module. This has no effect in prod due to tree-shake, but speeds up development builds.',
+            },
+            {
+              regex: '^src/.*',
+              message: 'Root imports will not resolve in production build (instead silently crash).',
+            },
+          ],
+        },
      ],
+      quotes: ['error', 'single', { avoidEscape: true, allowTemplateLiterals: false }],

      'import-x/no-commonjs': 'error',
      'import-x/no-default-export': 'error',
      'import-x/no-extraneous-dependencies': ['error', { devDependencies: false }],
-      'import-x/no-unused-modules': ['error',
+      'import-x/no-unused-modules': [
+        'error',
        {
          missingExports: true,
          unusedExports: true,
-          src: ['{services,updater}/**/*.{js,jsx,ts,tsx}']
-        }],
-      'import-x/order': ['error', {
-        alphabetize: { order: 'asc', caseInsensitive: true },
-        groups: [['builtin', 'external'], ['internal'], ['parent'], ['sibling', 'index']],
-      }],
+          src: ['{services,updater}/**/*.{js,jsx,ts,tsx}'],
+        },
+      ],
+      'import-x/order': [
+        'error',
+        {
+          alphabetize: { order: 'asc', caseInsensitive: true },
+          groups: [['builtin', 'external'], ['internal'], ['parent'], ['sibling', 'index']],
+        },
+      ],

      // TypeScript
      '@typescript-eslint/no-unused-vars': [
@@ -105,9 +123,7 @@ export default tseslint.config(
      '@typescript-eslint/consistent-return': 'error', // NOTE: This is weaker than tsconfig.json noImplicitReturns, and should be replaced once ts migration complete
      '@typescript-eslint/consistent-type-definitions': 'off',
      '@typescript-eslint/dot-notation': 'error',
-      '@typescript-eslint/prefer-destructuring': ['error',
-        { VariableDeclarator: { object: true } }
-      ],
+      '@typescript-eslint/prefer-destructuring': ['error', { VariableDeclarator: { object: true } }],
      '@typescript-eslint/no-empty-object-type': ['error', { allowInterfaces: 'with-single-extends' }],
      '@typescript-eslint/no-explicit-any': 'off', // TODO: enable when feeling brave
      '@typescript-eslint/no-implied-eval': 'error',
@@ -127,12 +143,12 @@ export default tseslint.config(
            'services/frontend/tsconfig.json',
            'services/frontend/tsconfig.node.json',
            'services/backend/tsconfig.json',
-            'services/shared/tsconfig.json'
+            'services/shared/tsconfig.json',
          ],
        }),
        createNodeResolver({
          extensions: ['.js', '.jsx', 'cjs', 'mjs', '.ts', '.tsx'],
-        })
+        }),
      ],
    },
  },
@@ -140,22 +156,22 @@ export default tseslint.config(
  {
    files: ['services/backend/src/routes/*.{ts,js}'],
    rules: {
-      '@typescript-eslint/no-misused-promises': 'off', // Errors come mainly from Express route handlers that are handled correctly by express-async-errors      
+      '@typescript-eslint/no-misused-promises': 'off', // Errors come mainly from Express route handlers that are handled correctly by express-async-errors
      '@typescript-eslint/consistent-return': 'off',
-    }
+    },
  },

  // Disable type-aware linting for javascript files
  {
    files: ['{updater,services}/**/*.{js,cjs}'],
-    extends: [tseslint.configs.disableTypeChecked]
+    extends: [tseslint.configs.disableTypeChecked],
  },

  // Frontend camelCase and react
  {
    files: ['services/frontend/**/*.{js,jsx,mjs,cjs,ts,tsx}'],
    plugins: {
-      'react': eslintPluginReact,
+      react: eslintPluginReact,
    },
    extends: [
      eslintPluginReact.configs.flat.recommended,
@@ -166,14 +182,15 @@ export default tseslint.config(
      parserOptions: {
        ecmaFeatures: {
          jsx: true,
-        }
-      }
+        },
+      },
    },
    rules: {
-      'camelcase': 'warn',
+      camelcase: 'warn',
      'react/prop-types': 'off', // Typescript but worse
      'react/no-unescaped-entities': 'off',
-      'react/function-component-definition': ['error',
+      'react/function-component-definition': [
+        'error',
        { namedComponents: 'arrow-function', unnamedComponents: 'arrow-function' },
      ],
      'react/no-array-index-key': 'error',
@@ -181,9 +198,7 @@ export default tseslint.config(
      'react/no-this-in-sfc': 'error',
      'react/prefer-stateless-function': 'error',
      'react/jsx-boolean-value': ['error', 'never'],
-      'react/jsx-filename-extension': ['error',
-        { allow: 'as-needed', extensions: ['.jsx', '.tsx'] }
-      ],
+      'react/jsx-filename-extension': ['error', { allow: 'as-needed', extensions: ['.jsx', '.tsx'] }],
      'react/jsx-no-leaked-render': 'warn', // TODO: enable, tho not that useful after full ts migration
      'react/jsx-no-useless-fragment': 'error',
      'react/jsx-props-no-spreading': 'warn', // TODO: enable, improves readability
@@ -191,18 +206,25 @@ export default tseslint.config(
      'react/jsx-tag-spacing': 'warn',
    },
    settings: {
-      'react': {
-        'version': 'detect'
-      }
-    }
+      react: {
+        version: 'detect',
+      },
+    },
  },

  // Cypress should only use rules provided by the plugin below
  {
    files: ['cypress/**/*.js'],
-    extends: [
-      eslintPluginCypress.configs.recommended
-    ]
+    extends: [eslintPluginCypress.configs.recommended],
+  },
+
+  // Override for backend api tests
+  {
+    files: ['services/backend/tests/**/*.ts'],
+    rules: {
+      'import-x/no-extraneous-dependencies': 'off',
+      'no-console': 'off',
+    },
  },

  // Overrides for CommonJS
@@ -210,7 +232,7 @@ export default tseslint.config(
    files: [
      'services/backend/**/*.js',
      'updater/sis-updater-worker/src/db/migrations/*.cjs',
-      'updater/sis-updater-scheduler/**/*.js'
+      'updater/sis-updater-scheduler/**/*.js',
    ],
    languageOptions: {
      sourceType: 'commonjs',
@@ -221,20 +243,9 @@ export default tseslint.config(
    },
  },

-  // Rapodiff
-  {
-    files: ['services/backend/src/rapodiff/**/*'],
-    rules: {
-      'no-console': 'off',
-    },
-  },
-
  // Migration files
  {
-    files: [
-      'updater/sis-updater-worker/src/db/migrations/*.cjs',
-      'services/backend/src/database/**/*.js'
-    ],
+    files: ['updater/sis-updater-worker/src/db/migrations/*.cjs', 'services/backend/src/database/**/*.js'],
    rules: {
      'import-x/no-unused-modules': 'off',
      '@typescript-eslint/no-empty-function': 'off',
@@ -252,5 +263,5 @@ export default tseslint.config(
      'no-promise-executor-return': 'off',
    },
  },
-  eslintPluginPrettierRecommended, // This must be the last plugin so it can override other configs
+  eslintPluginPrettierRecommended // This must be the last plugin so it can override other configs
 )
@@ -1,6 +0,0 @@
-const { parserPlugins } = require('@istanbuljs/schema').defaults.nyc
-
-module.exports = {
-  cache: false,
-  parserPlugins: parserPlugins.concat('typescript', 'jsx'),
-}
@@ -2,22 +2,20 @@
  "name": "oodikone",
  "description": "An application for analyzing university data.",
  "engines": {
-    "node": ">=22.0.0"
+    "node": ">=24.0.0"
  },
  "scripts": {
    "cypress": "cypress",
-    "cypress:open": "cypress open",
-    "cypress:run": "cypress run --browser chrome",
-    "instrument": "./scripts/instrument.sh",
+    "cypress:run": "cypress run --browser firefox",
    "eslint": "eslint",
    "lint:all": "eslint services/ updater/",
    "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",
+    "oodikone:ci:setup": "docker compose --file docker-compose.ci.yml --profile tests up --detach",
+    "oodikone:ci:api": "docker compose --file docker-compose.test.yml up --exit-code-from api-tests",
    "updater": "./run.sh updater anon up --detach",
    "updater:real": "./run.sh updater real up --detach",
    "both": "./run.sh both anon up --detach",
@@ -26,12 +24,11 @@
    "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",
-    "rapodiff": "docker exec -t oodikone_backend_1 /opt/app-root/backend/node_modules/.bin/tsx /opt/app-root/backend/src/rapodiff/rapodiff.js",
    "install:local": "npm i && npm i --prefix services/shared && npm i --prefix services/frontend && npm i --prefix services/backend && npm i --prefix updater/sis-updater-scheduler && npm i --prefix updater/sis-updater-worker",
-    "ci:local": "npm ci && npm ci --prefix services/shared && npm ci --prefix services/frontend && npm ci --prefix services/backend && npm ci --prefix updater/sis-updater-scheduler && npm ci --prefix updater/sis-updater-worker",
-    "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",
-    "ci:docker": "docker exec frontend npm ci && docker exec oodikone_backend_1 npm ci && docker exec sis-updater-scheduler npm ci && docker exec oodikone_sis-updater-worker_1 npm ci",
+    "install:docker": "docker exec frontend npm i && docker exec backend npm i && docker exec sis-updater-scheduler npm i && docker exec sis-updater-worker npm i",
    "install:both": "npm run install:local && npm run install:docker",
+    "ci:local": "npm ci && npm ci --prefix services/shared && npm ci --prefix services/frontend && npm ci --prefix services/backend && npm ci --prefix updater/sis-updater-scheduler && npm ci --prefix updater/sis-updater-worker",
+    "ci:docker": "docker exec frontend npm ci && docker exec backend npm ci && docker exec sis-updater-scheduler npm ci && docker exec sis-updater-worker npm ci",
    "ci:both": "npm run ci:local && npm run ci:docker"
  },
  "repository": {
@@ -44,29 +41,22 @@
  },
  "homepage": "https://github.com/UniversityOfHelsinkiCS/oodikone#readme",
  "devDependencies": {
-    "@cypress/code-coverage": "^3.14.4",
    "@eslint/js": "^9.28.0",
-    "@istanbuljs/schema": "^0.1.3",
-    "cypress": "^15.0.0",
+    "cypress": "^15.13.0",
    "eslint": "^9.28.0",
    "eslint-config-prettier": "^10.1.5",
    "eslint-import-resolver-typescript": "^4.4.3",
-    "eslint-plugin-cypress": "^5.1.1",
+    "eslint-plugin-cypress": "^6.2.3",
    "eslint-plugin-import-x": "^4.16.1",
    "eslint-plugin-prettier": "^5.4.1",
    "eslint-plugin-react": "^7.37.5",
    "eslint-plugin-react-hooks": "^5.2.0",
-    "globals": "^16.2.0",
+    "globals": "^17.4.0",
    "husky": "^9.1.7",
    "lint-staged": "^16.1.0",
-    "node-actionlint": "^1.2.2",
-    "nyc": "^17.1.0",
    "prettier": "3.5.3",
-    "stylelint": "^16.20.0",
-    "stylelint-config-standard": "^39.0.0",
+    "stylelint": "^17.6.0",
+    "stylelint-config-standard": "^40.0.0",
    "typescript-eslint": "^8.34.0"
-  },
-  "dependencies": {
-    "lodash": "^4.17.21"
  }
 }
@@ -35,7 +35,7 @@ parse_params() {
  option=${args[0]}

  #  parse arguments
-  [[ ("$option" != "oodikone" && "$option" != "updater" && "$option" != "both") ]] && \
+  [[ ("$option" != "oodikone" && "$option" != "updater" && "$option" != "both" && "$option" != "tests") ]] && \
    usage && die "Wrong option: $option"

  [[ ${#args[@]} -eq 1 ]] && usage && die "Wrong number of arguments"
@@ -47,7 +47,7 @@ parse_params() {
    compose_command=${args[*]:1}
  else
    version=${args[1]}
-    [[ "$version" != "anon" && "$version" != "real" && "$version" != "test" ]] && usage && \
+    [[ "$version" != "anon" && "$version" != "real" && "$version" != "api" ]] && usage && \
      die "Wrong version $version"
    compose_command=${args[*]:2}
  fi
@@ -70,8 +70,8 @@ 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"
+  if [[ "$version" == "api" ]]; then
+    env="--file docker-compose.ci.yml"
  fi
  return 0
 }
@@ -85,9 +85,9 @@ parse_params "$@"
 parse_profiles
 parse_env
 if [[ "$compose_command" == "" ]]; then
-  final_command="docker-compose ${env}"
+  final_command="docker compose ${env}"
 else
-  final_command="docker-compose ${env} ${profiles} ${compose_command}"
+  final_command="docker compose ${env} ${profiles} ${compose_command}"
 fi

 msg "${BLUE}Running: ${final_command}${NOFORMAT}"
@@ -11,7 +11,6 @@ PROJECT_ROOT="$(git rev-parse --show-toplevel)"
 DUMP_DIR="$PROJECT_ROOT/.databasedumps"
 S3_CONFIG_FILE=~/.s3cfg
 S3_BUCKET="s3://psyduck"
-DOCKER_COMPOSE=$PROJECT_ROOT/docker-compose.yml

 ## Following the naming convention in docker-compose, these are names for database
 ## services. The real data databases inside service will have names suffixed by "-real".
@@ -139,29 +138,6 @@ reset_databases() {
  successmsg "Database setup finished"
 }

-reset_jami_data() {
-  local database="jami-db"
-  local dump_destination="$DUMP_DIR/$database.sql.gz"
-  local s3_path="jami"
-
-  infomsg "Removing old data"
-
-
-
-  infomsg "Removing database and related volume"
-  docker volume rm oodikone_jami-data || warningmsg "This is okay, continuing"
-  docker-compose -f "$DOCKER_COMPOSE" down "$database" || warningmsg "This is okay, continuing"
-
-  infomsg "Starting postgres in the background"
-  docker-compose -f "$DOCKER_COMPOSE" up -d "$database"
-  retry docker-compose -f "$DOCKER_COMPOSE" exec "$database" pg_isready --dbname="postgres"
-
-  infomsg "Populating Jami"
-  docker exec -i "$database" /bin/bash -c "gunzip | psql -U postgres" < "$dump_destination" 2> /dev/null
-  docker-compose stop "$database"
-  msg ""
-}
-
 reset_all_real_data() {
  infomsg "Downloading real data dumps"
  for i in ${!DATABASES[*]}; do
@@ -1,30 +0,0 @@
-#!/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!"
@@ -0,0 +1,7 @@
+*/.dockerignore
+*/.eslintrc.json
+*/.gitignore
+*/*Dockerfile
+*/build
+*/dist
+*/node_modules
@@ -1,3 +0,0 @@
-.dockerignore
-*Dockerfile
-node_modules/
@@ -0,0 +1,3 @@
+ignore-scripts=true  
+min-release-age=7  
+save-prefix=  
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi10/nodejs-22-minimal AS build
+FROM registry.access.redhat.com/ubi9/nodejs-24-minimal AS build

 ENV TZ="Europe/Helsinki"

@@ -29,7 +29,7 @@ RUN npm ci --include=dev --prefix shared && npm ci --include=dev --prefix backen
 RUN npm run build --prefix shared && npm run build --prefix backend


-FROM registry.access.redhat.com/ubi10/nodejs-22-minimal
+FROM registry.access.redhat.com/ubi9/nodejs-24-minimal

 ENV TZ="Europe/Helsinki"

@@ -52,7 +52,8 @@ WORKDIR /opt/app-root/shared
 COPY --from=build /opt/app-root/shared/dist .

 WORKDIR /opt/app-root/backend
-COPY --from=build /opt/app-root/backend/package*.json .
+COPY --from=build /opt/app-root/backend/.npmrc .
+COPY --from=build /opt/app-root/backend/package*.json ./
 COPY --from=build /opt/app-root/backend/dist ./dist

 RUN npm ci --omit=dev
@@ -1,4 +1,4 @@
-FROM node:22-alpine
+FROM registry.access.redhat.com/ubi9/nodejs-24-minimal

 ENV TZ="Europe/Helsinki"

@@ -6,8 +6,10 @@ ENV NODE_ENV=development
 ENV NODE_OPTIONS=--max-old-space-size=4096

 WORKDIR /opt/app-root/backend
-COPY . .
+COPY --chown=1001:1001 . .
+
+USER 1001
 RUN npm ci

 EXPOSE 8080
-CMD ["node_modules/.bin/tsx", "watch", "--clear-screen=false", "index.js"]
+CMD ["node_modules/.bin/nodemon", "--exec", "node --import tsx index.ts", "--ext", "ts,js,json", "--watch", "src", "--watch", "index.ts", "--legacy-watch"]
@@ -2,28 +2,27 @@
  "name": "backend",
  "private": true,
  "scripts": {
-    "build": "tsc"
+    "build": "tsc",
+    "test": "node --import tsx --test --test-reporter spec --test-force-exit"
  },
  "dependencies": {
    "@oodikone/shared": "file:../shared",
-    "@sentry/node": "^10.5.0",
-    "@sentry/profiling-node": "^10.5.0",
+    "@sentry/node": "^10.43.0",
+    "@sentry/profiling-node": "^10.43.0",
    "axios": "^1.9.0",
    "bullmq": "^5.53.2",
    "compression": "^1.8.0",
    "cors": "^2.8.5",
    "cron": "^4.3.1",
    "dayjs": "^1.11.13",
-    "express": "^4.21.2",
-    "express-async-errors": "^3.1.1",
-    "lodash": "^4.17.21",
+    "express": "^5.2.1",
+    "lodash-es": "^4.18.1",
    "lru-cache": "^11.1.0",
    "morgan": "^1.10.0",
    "papaparse": "^5.5.3",
-    "pg": "^8.16.0",
+    "pg": "^8.20.0",
    "redis": "^4.7.1",
-    "reflect-metadata": "^0.2.2",
-    "sequelize": "^6.37.7",
+    "sequelize": "^6.37.8",
    "sequelize-typescript": "^2.1.6",
    "umzug": "^3.8.2",
    "unfuck-utf8-headers-middleware": "^1.0.1",
@@ -34,13 +33,16 @@
  "devDependencies": {
    "@types/compression": "^1.8.1",
    "@types/cors": "^2.8.19",
-    "@types/express": "^4.17.23",
-    "@types/lodash": "^4.17.17",
+    "@types/express": "^5.0.6",
+    "@types/lodash-es": "^4.17.12",
    "@types/morgan": "^1.9.10",
-    "@types/node": "^22.15.31",
-    "@types/validator": "^13.15.1",
+    "@types/node": "^24.10.1",
+    "@types/pg": "^8.20.0",
+    "@types/supertest": "^6.0.3",
+    "nodemon": "^3.1.11",
+    "supertest": "^7.2.2",
    "tsx": "^4.19.4",
-    "typescript": "^5.8.3"
+    "typescript": "^5.9.2"
  },
  "overrides": {
    "winston-gelf-transporter": {
@@ -1,4 +1,3 @@
-import 'express-async-errors'
 import express from 'express'

 import { baseUrl, backendPort } from './config'
@@ -1,14 +1,13 @@
 // Node env to use
 export const isDev = process.env.NODE_ENV === 'development'
+export const isTest = process.env.NODE_ENV === 'test'
 export const isStaging = process.env.REACT_APP_STAGING === 'true'
 export const isProduction = !isStaging && process.env.NODE_ENV === 'production'

 export const runningInCI = process.env.CI === 'true'

 // IAM group
-export const requiredGroup = isStaging
-  ? ['grp-oodikone-staging-users', 'grp-oodikone-basic-staging-users']
-  : ['grp-oodikone-users', 'grp-oodikone-basic-users']
+export const requiredGroup = ['grp-oodikone-users', 'grp-oodikone-basic-users']

 // Pate
 export const pateToken = process.env.PATE_API_TOKEN ?? ''
@@ -32,12 +31,6 @@ export const baseUrl = isDev ? '/api' : ''
 export const frontUrl = process.env.FRONT_URL
 export const backendPort = 8080

-// System run in whose environment
-export const serviceProvider = process.env.SERVICE_PROVIDER?.toLowerCase() ?? 'toska'
-
-// Optional logout-url configuration
-export const configLogoutUrl = serviceProvider === 'toska' ? undefined : process.env.LOGOUT_URL
-
 // Other stuff
 export const { DB_URL_KONE, DB_URL_USER, SECRET_TOKEN, SIS_DB_URL, SIS_UPDATER_URL, CRYPT_KEY } = process.env

@@ -5,7 +5,6 @@ export const roles = [
  'courseStatistics',
  'facultyStatistics',
  'fullSisuAccess',
-  'openUniSearch',
  'studyGuidanceGroups',
  'teachers',
 ] as const
@@ -13,7 +13,7 @@ import { updateBasicView, updateStudyTrackView } from './services/studyProgramme
 import { findAndSaveTeachers } from './services/teachers/top'
 import { deleteOutdatedUsers } from './services/userService'
 import logger from './util/logger'
-import { jobMaker, addToFlow } from './worker/queue'
+import { jobQueue } from './worker/queue'

 const schedule = (cronTime: string, onTick: () => void) => {
  const onComplete = null
@@ -41,7 +41,7 @@ export const refreshFaculties = async () => {
  logger.info('Adding jobs to refresh all faculties')
  const faculties = await getFaculties()
  for (const faculty of faculties) {
-    jobMaker.faculty(faculty.code)
+    jobQueue.refreshFaculty(faculty.code)
  }
 }

@@ -53,12 +53,13 @@ export const refreshLanguageCenterData = async () => {
 }

 const refreshProgrammesAndFaculties = async () => {
+  logger.info('Refreshing all degree programmes and faculties')
  const facultyCodes = (await getFaculties()).map(faculty => faculty.code)
  for (const faculty of facultyCodes) {
    const programmeCodes = (await getDegreeProgrammesOfFaculty(faculty, true))
      .map(programme => programme.code)
      .filter(code => isRelevantProgramme(code))
-    await addToFlow(faculty, programmeCodes)
+    await jobQueue.addToFlow(faculty, programmeCodes)
  }
 }

@@ -71,7 +72,7 @@ export const refreshProgramme = async (code: string) => {
 }

 export const refreshProgrammes = async () => {
-  logger.info('Refreshing study programme and study track overview statistics for all programmes')
+  logger.info('Refreshing degree programme and study track overview statistics for all programmes')
  const facultyCodes = (await getFaculties()).map(faculty => faculty.code)
  const programmeCodes: string[] = []
  for (const faculty of facultyCodes) {
@@ -82,7 +83,7 @@ export const refreshProgrammes = async () => {
  }
  for (const code of programmeCodes) {
    // If combined programme is given, this updates only the bachelor programme
-    jobMaker.programme(code)
+    jobQueue.refreshProgramme(code)
  }
 }

@@ -96,8 +97,12 @@ const dailyJobs = async () => {
  try {
    await refreshTeacherLeaderboard()
    await refreshProgrammesAndFaculties()
-    if (languageCenterViewEnabled) jobMaker.languagecenter()
-    jobMaker.closeToGraduation()
+
+    if (languageCenterViewEnabled) {
+      jobQueue.refreshLanguagecenter()
+    }
+
+    jobQueue.refreshCloseToGraduation()
  } catch (error) {
    logger.error('Daily jobs failed', error)
  }
@@ -118,11 +123,11 @@ export const startCron = () => {
    })
    schedule('0 19 * * 1', () => {
      logger.info('Updating students whose studyplans have not been updated recently')
-      jobMaker.studyplansUpdate(4)
+      jobQueue.refreshStudyplans(4)
    })
    schedule('0 10 * * 2', () => {
      logger.info('Updating students whose studyplans have not been updated recently')
-      jobMaker.studyplansUpdate(5)
+      jobQueue.refreshStudyplans(5)
    })
  }
 }
@@ -1,8 +1,8 @@
 import { Request, Response } from 'express'
-import { omit } from 'lodash'
 import morgan from 'morgan'

-import { FormattedUser } from '../types'
+import { FormattedUser } from '@oodikone/shared/types'
+import { omitKeys } from '@oodikone/shared/util'
 import { getFullStudyProgrammeRights } from '../util'
 import logger from '../util/logger'

@@ -52,7 +52,7 @@ const accessLogger = morgan((tokens, req: Request, res: Response): undefined =>
  const onlyIamRights = !user.isAdmin && fullStudyProgrammeRights.length === 0

  logger.info(message, {
-    ...omit(meta, ['studentsUserCanAccess']), // Don't log student list which might be huge
+    ...omitKeys(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
  })
@@ -1,10 +1,9 @@
 import * as Sentry from '@sentry/node'
 import { NextFunction, Request, Response } from 'express'
-import { intersection } from 'lodash'
+import { intersection } from 'lodash-es'

-import { configLogoutUrl, isDev, requiredGroup, serviceProvider } from '../config'
-import { getMockedUser, getMockedUserFd, getOrganizationAccess, getUserFd, getUserToska } from '../services/userService'
-import { FormattedUser, IamAccess } from '../types'
+import { requiredGroup } from '../config'
+import { getMockedUser, getOrganizationAccess, getUser } from '../services/userService'
 import { ApplicationError } from '../util/customErrors'
 import logger from '../util/logger'

@@ -14,30 +13,6 @@ 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, mockedBy: username })
-  }
-  return await getUserToska({
-    username,
-    name,
-    email,
-    iamGroups,
-    specialGroup,
-    sisId,
-    iamAccess,
-  })
-}
-
 type Headers = {
  displayname?: string
  hygroupcn?: string
@@ -49,7 +24,7 @@ type Headers = {
  'x-show-as-user'?: string
 }

-const toskaUserMiddleware = async (req: Request, _res: Response, next: NextFunction) => {
+export default async (req: Request, _: Response, next: NextFunction) => {
  const {
    'shib-session-id': sessionId,
    'x-show-as-user': showAsUser,
@@ -61,20 +36,15 @@ const toskaUserMiddleware = async (req: Request, _res: Response, next: NextFunct
    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) {
-    const reqUser = username ?? 'Anonymous user'
+  if (!username || !sessionId)
    throw new ApplicationError(
-      `${reqUser} requested ${req.url} without valid request headers. Missing: ${missingHeaders.join(', ')}`,
+      `${username ?? 'Anonymous user'} requested ${req.url} without authorization headers.`,
      403,
      { logoutUrl }
    )
-  }

  const iamGroups = parseIamGroups(hygroupcn!)
+
  const { iamAccess = {}, specialGroup = {} } = await getOrganizationAccess(sisId!, iamGroups)
  const iamRights = Object.keys(iamAccess)

@@ -83,49 +53,29 @@ const toskaUserMiddleware = async (req: Request, _res: Response, next: NextFunct
      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 })
-  }
+  const user =
+    showAsUser && specialGroup?.superAdmin
+      ? await getMockedUser({ userToMock: showAsUser, mockedBy: username })
+      : await getUser({
+          username,
+          name: name!,
+          email: email!,
+          iamGroups,
+          specialGroup,
+          sisId: sisId!,
+          iamAccess,
+        })

-  Sentry.setUser({ username: user.mockedBy ?? username! })
+  // Set username just-in-case there is error for invalid user
+  Sentry.setUser({ username: user?.mockedBy ?? username })
+  if (!user) throw new ApplicationError(`Username ${username} not found.`, 403, { logoutUrl })

  req.user = user
  req.logoutUrl = logoutUrl!

  next()
 }
-
-const fdUserMiddleware = async (req: Request, _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
@@ -1,10 +1,4 @@
 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
-
+const headers = ['uid', 'displayName', 'shib-session-id', 'hyGroupCn', 'mail', 'hyPersonSisuId']
 export default headersMiddleware(headers)
@@ -11,16 +11,7 @@ import {
  UpdatedAt,
 } from 'sequelize-typescript'

-import type {
-  Credit,
-  Enrollment,
-  Organization,
-  SISStudyRight,
-  SISStudyRightElement,
-  Student,
-  Studyplan,
-} from '@oodikone/shared/models'
-import { ExtentCode, SemesterEnrollment } from '@oodikone/shared/types'
+import type { SISStudyRight } from '@oodikone/shared/models'

 import { CreditModel } from './credit'
 import { EnrollmentModel } from './enrollment'
@@ -34,69 +25,72 @@ import { StudyrightExtentModel } from './studyrightExtent'
  underscored: true,
  tableName: 'sis_study_rights',
 })
-export class SISStudyRightModel extends Model<SISStudyRight> implements SISStudyRight {
+export class SISStudyRightModel extends Model implements SISStudyRight {
  @PrimaryKey
  @Column(DataType.STRING)
-  id!: string
+  declare id: SISStudyRight['id']

  @ForeignKey(() => OrganizationModel)
  @Column(DataType.STRING)
-  facultyCode!: string
+  declare facultyCode: SISStudyRight['facultyCode']

  @BelongsTo(() => OrganizationModel, { foreignKey: 'facultyCode', targetKey: 'code' })
-  organization!: Organization
+  declare organization: SISStudyRight['organization']

  @HasMany(() => StudyplanModel)
-  studyPlans!: Studyplan[]
+  declare studyPlans: SISStudyRight['studyPlans']

  @HasMany(() => SISStudyRightElementModel, { foreignKey: 'studyRightId' })
-  studyRightElements!: SISStudyRightElement[]
+  declare studyRightElements: SISStudyRight['studyRightElements']

  @Column(DataType.DATE)
-  startDate!: Date
+  declare startDate: SISStudyRight['startDate']

  @Column(DataType.DATE)
-  endDate!: Date
+  declare endDate: SISStudyRight['endDate']

  @Column(DataType.DATE)
-  studyStartDate!: Date
+  declare studyStartDate: SISStudyRight['studyStartDate']

  @Column(DataType.BOOLEAN)
-  cancelled!: boolean
+  declare cancelled: SISStudyRight['cancelled']

  @Column(DataType.STRING)
-  studentNumber!: string
+  declare studentNumber: SISStudyRight['studentNumber']

  @BelongsTo(() => StudentModel, { foreignKey: 'studentNumber', targetKey: 'studentnumber' })
-  student!: Student
+  declare student: SISStudyRight['student']

  @ForeignKey(() => StudyrightExtentModel)
  @Column(DataType.INTEGER)
-  extentCode!: ExtentCode
+  declare extentCode: SISStudyRight['extentCode']

  @Column(DataType.STRING)
-  admissionType!: string
+  declare admissionType: SISStudyRight['admissionType']

  @Column(DataType.JSONB)
-  semesterEnrollments!: SemesterEnrollment[] | null
+  declare semesterEnrollments: SISStudyRight['semesterEnrollments']
+
+  @Column(DataType.JSONB)
+  declare transferInfo: SISStudyRight['transferInfo']

  @HasMany(() => CreditModel, { foreignKey: 'studyright_id', sourceKey: 'id' })
-  credits!: Credit[]
+  declare credits: SISStudyRight['credits']

  @HasMany(() => EnrollmentModel, { foreignKey: 'studyright_id', sourceKey: 'id' })
-  enrollments!: Enrollment[]
+  declare enrollments: SISStudyRight['enrollments']

  @Column(DataType.BOOLEAN)
-  tvex!: boolean
+  declare tvex: SISStudyRight['tvex']

  @Column(DataType.ARRAY(DataType.STRING))
-  expirationRuleUrns!: string[]
+  declare expirationRuleUrns: SISStudyRight['expirationRuleUrns']

  @CreatedAt
  @Column(DataType.DATE)
-  createdAt!: Date
+  declare createdAt: SISStudyRight['createdAt']

  @UpdatedAt
  @Column(DataType.DATE)
-  updatedAt!: Date
+  declare updatedAt: SISStudyRight['updatedAt']
 }
@@ -10,57 +10,54 @@ import {
  UpdatedAt,
 } from 'sequelize-typescript'

-import type { SISStudyRight, SISStudyRightElement } from '@oodikone/shared/models'
-import type { Name, StudyTrack } from '@oodikone/shared/types'
-import { DegreeProgrammeType, Phase } from '@oodikone/shared/types'
-
+import type { SISStudyRightElement } from '@oodikone/shared/models'
 import { SISStudyRightModel } from './SISStudyRight'

@Table({
  underscored: true,
  tableName: 'sis_study_right_elements',
 })
-export class SISStudyRightElementModel extends Model<SISStudyRightElement> implements SISStudyRightElement {
+export class SISStudyRightElementModel extends Model implements SISStudyRightElement {
  @PrimaryKey
  @Column(DataType.STRING)
-  id!: string
+  declare id: SISStudyRightElement['id']

  @Column(DataType.DATE)
-  startDate!: Date
+  declare startDate: SISStudyRightElement['startDate']

  @Column(DataType.DATE)
-  endDate!: Date
+  declare endDate: SISStudyRightElement['endDate']

  @Column(DataType.BOOLEAN)
-  graduated!: boolean
+  declare graduated: SISStudyRightElement['graduated']

  @Column(DataType.INTEGER)
-  phase!: Phase
+  declare phase: SISStudyRightElement['phase']

  @ForeignKey(() => SISStudyRightModel)
  @Column(DataType.STRING)
-  studyRightId!: string
+  declare studyRightId: SISStudyRightElement['studyRightId']

  @BelongsTo(() => SISStudyRightModel, { foreignKey: 'studyRightId' })
-  studyRight!: SISStudyRight
+  declare studyRight: SISStudyRightElement['studyRight']

  @Column(DataType.STRING)
-  code!: string
+  declare code: SISStudyRightElement['code']

  @Column(DataType.JSONB)
-  name!: Name
+  declare name: SISStudyRightElement['name']

  @Column(DataType.JSONB)
-  studyTrack!: StudyTrack | null
+  declare studyTrack: SISStudyRightElement['studyTrack']

  @Column(DataType.STRING)
-  degreeProgrammeType!: DegreeProgrammeType
+  declare degreeProgrammeType: SISStudyRightElement['degreeProgrammeType']

  @CreatedAt
  @Column(DataType.DATE)
-  createdAt!: Date
+  declare createdAt: SISStudyRightElement['createdAt']

  @UpdatedAt
  @Column(DataType.DATE)
-  updatedAt!: Date
+  declare updatedAt: SISStudyRightElement['updatedAt']
 }
@@ -12,8 +12,7 @@ import {
  UpdatedAt,
 } from 'sequelize-typescript'

-import type { Course, CourseType, Credit, Enrollment, Organization } from '@oodikone/shared/models'
-import type { Name } from '@oodikone/shared/types'
+import type { Course } from '@oodikone/shared/models'

 import { CourseProviderModel } from './courseProvider'
 import { CourseTypeModel } from './courseType'
@@ -26,57 +25,60 @@ import { OrganizationModel } from './organization'
  modelName: 'course',
  tableName: 'course',
 })
-export class CourseModel extends Model<Course> implements Course {
+export class CourseModel extends Model implements Course {
  @PrimaryKey
  @Column(DataType.STRING)
-  id!: string
+  declare id: Course['id']

  @ForeignKey(() => CourseModel)
  @Column(DataType.STRING)
-  code!: string
+  declare code: Course['code']

  @ForeignKey(() => CourseTypeModel)
  @Column(DataType.STRING)
-  coursetypecode!: string
+  declare coursetypecode: Course['coursetypecode']

  @BelongsTo(() => CourseTypeModel, { foreignKey: 'coursetypecode', targetKey: 'coursetypecode' })
-  courseType!: CourseType
+  declare courseType: Course['courseType']

  @HasMany(() => CreditModel, { foreignKey: 'course_id', sourceKey: 'id' })
-  credits!: Credit[]
+  declare credits: Course['credits']

  @HasMany(() => EnrollmentModel, { foreignKey: 'course_id' })
-  enrollments!: Enrollment[]
+  declare enrollments: Course['enrollments']

  @BelongsToMany(() => OrganizationModel, () => CourseProviderModel, 'coursecode')
-  organizations!: Organization[]
+  declare organizations: Course['organizations']

  @Column(DataType.BOOLEAN)
-  is_study_module!: boolean
+  declare is_study_module: Course['is_study_module']

  @Column(DataType.JSONB)
-  name!: Name
+  declare name: Course['name']

  @Column(DataType.DATE)
-  max_attainment_date!: Date
+  declare max_attainment_date: Course['max_attainment_date']

  @Column(DataType.DATE)
-  min_attainment_date!: Date
+  declare min_attainment_date: Course['min_attainment_date']

  @CreatedAt
  @Column({ field: 'created_at', type: DataType.DATE })
-  createdAt!: Date
+  declare createdAt: Course['createdAt']

  @UpdatedAt
  @Column({ field: 'updated_at', type: DataType.DATE })
-  updatedAt!: Date
+  declare updatedAt: Course['updatedAt']

  @Column(DataType.JSONB)
-  substitutions!: string[]
+  declare substitutions: Course['substitutions']
+
+  @Column(DataType.JSONB)
+  declare substitution_groups: Course['substitution_groups']

  @Column(DataType.STRING)
-  course_unit_type!: string
+  declare course_unit_type: Course['course_unit_type']

  @Column({ field: 'main_course_code', type: DataType.STRING })
-  mainCourseCode!: string
+  declare mainCourseCode: Course['mainCourseCode']
 }
@@ -10,23 +10,23 @@ import { OrganizationModel } from './organization'
  modelName: 'course_provider',
  tableName: 'course_providers',
 })
-export class CourseProviderModel extends Model<CourseProvider> implements CourseProvider {
+export class CourseProviderModel extends Model implements CourseProvider {
  @ForeignKey(() => CourseModel)
  @Column(DataType.STRING)
-  coursecode!: string
+  declare coursecode: CourseProvider['coursecode']

  @Column(DataType.JSONB)
-  shares!: Array<{ share: number; startDate?: string; endDate?: string }> | null
+  declare shares: CourseProvider['shares']

  @ForeignKey(() => OrganizationModel)
  @Column(DataType.STRING)
-  organizationcode!: string
+  declare organizationcode: CourseProvider['organizationcode']

  @CreatedAt
  @Column(DataType.DATE)
-  createdAt!: Date
+  declare createdAt: CourseProvider['createdAt']

  @UpdatedAt
  @Column(DataType.DATE)
-  updatedAt!: Date
+  declare updatedAt: CourseProvider['updatedAt']
 }
@@ -1,8 +1,7 @@
 import { Column, CreatedAt, DataType, HasMany, Model, PrimaryKey, Table, UpdatedAt } from 'sequelize-typescript'

-import type { Course, CourseType } from '@oodikone/shared/models'
+import type { CourseType } from '@oodikone/shared/models'

-import { Name } from '@oodikone/shared/types'
 import { CourseModel } from './course'

@Table({
@@ -10,22 +9,22 @@ import { CourseModel } from './course'
  modelName: 'course_type',
  tableName: 'course_types',
 })
-export class CourseTypeModel extends Model<CourseType> implements CourseType {
+export class CourseTypeModel extends Model implements CourseType {
  @PrimaryKey
  @Column(DataType.STRING)
-  coursetypecode!: string
+  declare coursetypecode: CourseType['coursetypecode']

  @HasMany(() => CourseModel)
-  courses!: Course[]
+  declare courses: CourseType['courses']

  @Column(DataType.JSONB)
-  name!: Required<Name>
+  declare name: CourseType['name']

  @CreatedAt
  @Column(DataType.DATE)
-  createdAt!: Date
+  declare createdAt: CourseType['createdAt']

  @UpdatedAt
  @Column(DataType.DATE)
-  updatedAt!: Date
+  declare updatedAt: CourseType['updatedAt']
 }
@@ -11,7 +11,7 @@ import {
  UpdatedAt,
 } from 'sequelize-typescript'

-import type { Credit, Course, CreditType, Semester, SISStudyRight, Student, Teacher } from '@oodikone/shared/models'
+import type { Credit } from '@oodikone/shared/models'
 import { CreditTypeCode } from '@oodikone/shared/types'

 import { CourseModel } from './course'
@@ -27,85 +27,85 @@ import { TeacherModel } from './teacher'
  modelName: 'credit',
  tableName: 'credit',
 })
-export class CreditModel extends Model<Credit> implements Credit {
+export class CreditModel extends Model implements Credit {
  @PrimaryKey
  @Column(DataType.STRING)
-  id!: string
+  declare id: Credit['id']

  @Column(DataType.STRING)
-  grade!: string
+  declare grade: Credit['grade']

  @ForeignKey(() => StudentModel)
  @Column(DataType.STRING)
-  student_studentnumber!: string
+  declare student_studentnumber: Credit['student_studentnumber']

  @BelongsTo(() => StudentModel, { foreignKey: 'student_studentnumber', targetKey: 'studentnumber' })
-  student!: Student
+  declare student: Credit['student']

  @BelongsTo(() => SemesterModel, { foreignKey: 'semester_composite' })
-  semester!: Semester
+  declare semester: Credit['semester']

  @Column(DataType.DOUBLE)
-  credits!: number
+  declare credits: Credit['credits']

  @ForeignKey(() => CreditTypeModel)
  @Column(DataType.INTEGER)
-  credittypecode!: CreditTypeCode
+  declare credittypecode: Credit['credittypecode']

  @BelongsTo(() => CreditTypeModel, { foreignKey: 'credittypecode', targetKey: 'credittypecode' })
-  creditType!: CreditType
+  declare creditType: Credit['creditType']

  @Column(DataType.DATE)
-  createdate!: Date
+  declare createdate: Credit['createdate']

  @Column(DataType.DATE)
-  attainment_date!: Date
+  declare attainment_date: Credit['attainment_date']

  @BelongsToMany(() => TeacherModel, () => CreditTeacherModel, 'credit_id')
-  teachers!: Teacher[]
+  declare teachers: Credit['teachers']

  @Column(DataType.STRING)
-  course_code!: string
+  declare course_code: Credit['course_code']

  @BelongsTo(() => CourseModel, { foreignKey: 'course_id' })
-  course!: Course
+  declare course: Credit['course']

  @ForeignKey(() => CourseModel)
  @Column(DataType.STRING)
-  course_id!: string
+  declare course_id: Credit['course_id']

  @Column(DataType.STRING)
-  semester_composite!: string
+  declare semester_composite: Credit['semester_composite']

  @Column(DataType.INTEGER)
-  semestercode!: number
+  declare semestercode: Credit['semestercode']

  @Column(DataType.BOOLEAN)
-  isStudyModule!: boolean
+  declare isStudyModule: Credit['isStudyModule']

  @Column(DataType.STRING)
-  org!: string
+  declare org: Credit['org']

  @Column(DataType.STRING)
-  language!: string
+  declare language: Credit['language']

  @Column(DataType.BOOLEAN)
-  is_open!: boolean
+  declare is_open: Credit['is_open']

  @ForeignKey(() => SISStudyRightModel)
  @Column(DataType.STRING)
-  studyright_id!: string
+  declare studyright_id: Credit['studyright_id']

  @BelongsTo(() => SISStudyRightModel)
-  studyright!: SISStudyRight
+  declare studyright: Credit['studyright']

  @CreatedAt
  @Column(DataType.DATE)
-  createdAt!: Date
+  declare createdAt: Credit['createdAt']

  @UpdatedAt
  @Column(DataType.DATE)
-  updatedAt!: Date
+  declare updatedAt: Credit['updatedAt']

  static passed: ({ credittypecode }: { credittypecode: CreditTypeCode }) => boolean

@@ -10,20 +10,20 @@ import { TeacherModel } from './teacher'
  modelName: 'credit_teacher',
  tableName: 'credit_teachers',
 })
-export class CreditTeacherModel extends Model<CreditTeacher> implements CreditTeacher {
+export class CreditTeacherModel extends Model implements CreditTeacher {
  @ForeignKey(() => CreditModel)
  @Column(DataType.STRING)
-  credit_id!: string
+  declare credit_id: CreditTeacher['credit_id']

  @ForeignKey(() => TeacherModel)
  @Column(DataType.STRING)
-  teacher_id!: string
+  declare teacher_id: CreditTeacher['teacher_id']

  @CreatedAt
  @Column(DataType.DATE)
-  createdAt!: Date
+  declare createdAt: CreditTeacher['createdAt']

  @UpdatedAt
  @Column(DataType.DATE)
-  updatedAt!: Date
+  declare updatedAt: CreditTeacher['updatedAt']
 }
@@ -1,7 +1,6 @@
 import { Column, CreatedAt, DataType, Model, PrimaryKey, Table, UpdatedAt } from 'sequelize-typescript'

 import type { CreditType } from '@oodikone/shared/models'
-import { CreditTypeCode, Name } from '@oodikone/shared/types'

@Table({
  underscored: true,
@@ -11,16 +10,16 @@ import { CreditTypeCode, Name } from '@oodikone/shared/types'
 export class CreditTypeModel extends Model<CreditType> implements CreditType {
  @PrimaryKey
  @Column(DataType.INTEGER)
-  credittypecode!: CreditTypeCode
+  declare credittypecode: CreditType['credittypecode']

  @Column(DataType.JSONB)
-  name!: Required<Name>
+  declare name: CreditType['name']

  @CreatedAt
  @Column(DataType.DATE)
-  createdAt!: Date
+  declare createdAt: CreditType['createdAt']

  @UpdatedAt
  @Column(DataType.DATE)
-  updatedAt!: Date
+  declare updatedAt: CreditType['updatedAt']
 }
@@ -1,34 +1,33 @@
 import { Column, CreatedAt, DataType, Model, Table, UpdatedAt } from 'sequelize-typescript'

 import type { CurriculumPeriod } from '@oodikone/shared/models'
-import type { Name } from '@oodikone/shared/types'

@Table({
  underscored: true,
  modelName: 'curriculum_period',
  tableName: 'curriculum_periods',
 })
-export class CurriculumPeriodModel extends Model<CurriculumPeriod> implements CurriculumPeriod {
+export class CurriculumPeriodModel extends Model implements CurriculumPeriod {
  @Column({ type: DataType.STRING, primaryKey: true })
-  id!: string
+  declare id: CurriculumPeriod['id']

  @Column({ type: DataType.JSONB, allowNull: false })
-  name!: Name
+  declare name: CurriculumPeriod['name']

  @Column({ type: DataType.STRING, allowNull: false })
-  universityOrgId!: string
+  declare universityOrgId: CurriculumPeriod['universityOrgId']

  @Column({ type: DataType.DATE, allowNull: false })
-  startDate!: Date
+  declare startDate: CurriculumPeriod['startDate']

  @Column({ type: DataType.DATE, allowNull: false })
-  endDate!: Date
+  declare endDate: CurriculumPeriod['endDate']

  @CreatedAt
  @Column({ type: DataType.DATE, allowNull: false })
-  createdAt!: Date
+  declare createdAt: CurriculumPeriod['createdAt']

  @UpdatedAt
  @Column({ type: DataType.DATE, allowNull: false })
-  updatedAt!: Date
+  declare updatedAt: CurriculumPeriod['updatedAt']
 }
@@ -10,8 +10,7 @@ import {
  UpdatedAt,
 } from 'sequelize-typescript'

-import type { Enrollment, Semester, SISStudyRight, Student } from '@oodikone/shared/models'
-import { EnrollmentState } from '@oodikone/shared/types'
+import type { Enrollment } from '@oodikone/shared/models'

 import { CourseModel } from './course'
 import { SemesterModel } from './semester'
@@ -23,59 +22,59 @@ import { StudentModel } from './student'
  modelName: 'enrollment',
  tableName: 'enrollment',
 })
-export class EnrollmentModel extends Model<Enrollment> implements Enrollment {
+export class EnrollmentModel extends Model implements Enrollment {
  @PrimaryKey
  @Column(DataType.STRING)
-  id!: string
+  declare id: Enrollment['id']

  @ForeignKey(() => StudentModel)
  @Column(DataType.STRING)
-  studentnumber!: string
+  declare studentnumber: Enrollment['studentnumber']

  @BelongsTo(() => StudentModel, { foreignKey: 'studentnumber', targetKey: 'studentnumber' })
-  student!: Student
+  declare student: Enrollment['student']

  @Column(DataType.STRING)
-  course_code!: string
+  declare course_code: Enrollment['course_code']

  @Column(DataType.STRING)
-  state!: EnrollmentState
+  declare state: Enrollment['state']

  @Column(DataType.DATE)
-  enrollment_date_time!: Date
+  declare enrollment_date_time: Enrollment['enrollment_date_time']

  @ForeignKey(() => CourseModel)
  @Column(DataType.STRING)
-  course_id!: string
+  declare course_id: Enrollment['course_id']

  @ForeignKey(() => SemesterModel)
  @Column(DataType.STRING)
-  semester_composite!: string
+  declare semester_composite: Enrollment['semester_composite']

  @BelongsTo(() => SemesterModel, { foreignKey: 'semester_composite', targetKey: 'composite' })
-  semester!: Semester
+  declare semester: Enrollment['semester']

  @Column(DataType.INTEGER)
-  semestercode!: number
+  declare semestercode: Enrollment['semestercode']

  @Column(DataType.BOOLEAN)
-  is_open!: boolean
+  declare is_open: Enrollment['is_open']

  @ForeignKey(() => SISStudyRightModel)
  @Column({ type: DataType.STRING, allowNull: true })
-  studyright_id!: string
+  declare studyright_id: Enrollment['studyright_id']

  @BelongsTo(() => SISStudyRightModel, { foreignKey: 'studyright_id', targetKey: 'id', constraints: false })
-  studyright!: SISStudyRight
+  declare studyright: Enrollment['studyright']

  @BelongsTo(() => CourseModel, { foreignKey: 'course_id', targetKey: 'id' })
-  course!: CourseModel
+  declare course: Enrollment['course']

  @CreatedAt
  @Column(DataType.DATE)
-  createdAt!: Date
+  declare createdAt: Enrollment['createdAt']

  @UpdatedAt
  @Column(DataType.DATE)
-  updatedAt!: Date
+  declare updatedAt: Enrollment['updatedAt']
 }
@@ -1,28 +1,24 @@
-import { CreationOptional } from 'sequelize'
 import { AutoIncrement, Column, DataType, Model, PrimaryKey, Table } from 'sequelize-typescript'

-import type { CustomPopulationSearch, CustomPopulationSearchCreation } from '@oodikone/shared/models/kone'
+import type { CustomPopulationSearch } from '@oodikone/shared/models/kone'

@Table({
  underscored: false,
  modelName: 'custom_population_search',
  tableName: 'custom_population_searches',
 })
-export class CustomPopulationSearchModel
-  extends Model<CustomPopulationSearch, CustomPopulationSearchCreation>
-  implements CustomPopulationSearch
-{
+export class CustomPopulationSearchModel extends Model implements CustomPopulationSearch {
  @PrimaryKey
  @AutoIncrement
  @Column(DataType.BIGINT)
-  id!: CreationOptional<string>
+  declare id: CustomPopulationSearch['id']

  @Column(DataType.BIGINT)
-  userId!: string
+  declare userId: CustomPopulationSearch['userId']

  @Column(DataType.STRING)
-  name!: string
+  declare name: CustomPopulationSearch['name']

  @Column(DataType.ARRAY(DataType.STRING))
-  students!: string[]
+  declare students: CustomPopulationSearch['students']
 }
@@ -1,33 +1,32 @@
-import { CreationOptional } from 'sequelize'
 import { Column, DataType, Model, PrimaryKey, Table, AutoIncrement, Default } from 'sequelize-typescript'

-import type { ExcludedCourse, ExcludedCourseCreation } from '@oodikone/shared/models/kone'
+import type { ExcludedCourse } from '@oodikone/shared/models/kone'

@Table({
  underscored: true,
  modelName: 'excluded_course',
  tableName: 'excluded_courses',
 })
-export class ExcludedCourseModel extends Model<ExcludedCourse, ExcludedCourseCreation> implements ExcludedCourse {
+export class ExcludedCourseModel extends Model implements ExcludedCourse {
  @PrimaryKey
  @AutoIncrement
  @Column(DataType.INTEGER)
-  id!: CreationOptional<number>
+  declare id: ExcludedCourse['id']

  @Column(DataType.STRING)
-  programme_code!: string
+  declare programme_code: ExcludedCourse['programme_code']

  @Column(DataType.STRING)
-  course_code!: string
+  declare course_code: ExcludedCourse['course_code']

  @Column(DataType.STRING)
-  curriculum_version!: string
+  declare curriculum_version: ExcludedCourse['curriculum_version']

  @Default(DataType.NOW)
  @Column(DataType.DATE)
-  createdAt!: CreationOptional<Date>
+  declare createdAt: ExcludedCourse['createdAt']

  @Default(DataType.NOW)
  @Column(DataType.DATE)
-  updatedAt!: CreationOptional<Date>
+  declare updatedAt: ExcludedCourse['updatedAt']
 }
@@ -1,7 +1,6 @@
-import { CreationOptional } from 'sequelize'
 import { AutoIncrement, Column, DataType, Model, PrimaryKey, Table } from 'sequelize-typescript'

-import type { OpenUniPopulationSearch, OpenUniPopulationSearchCreation } from '@oodikone/shared/models/kone'
+import type { OpenUniPopulationSearch } from '@oodikone/shared/models/kone'

@Table({
  underscored: true,
@@ -9,21 +8,18 @@ import type { OpenUniPopulationSearch, OpenUniPopulationSearchCreation } from '@
  modelName: 'open_uni_population_search',
  tableName: 'open_uni_population_searches',
 })
-export class OpenUniPopulationSearchModel
-  extends Model<OpenUniPopulationSearch, OpenUniPopulationSearchCreation>
-  implements OpenUniPopulationSearch
-{
+export class OpenUniPopulationSearchModel extends Model implements OpenUniPopulationSearch {
  @PrimaryKey
  @AutoIncrement
  @Column(DataType.BIGINT)
-  id!: CreationOptional<string>
+  declare id: OpenUniPopulationSearch['id']

  @Column(DataType.BIGINT)
-  userId!: string
+  declare userId: OpenUniPopulationSearch['userId']

  @Column(DataType.STRING)
-  name!: string
+  declare name: OpenUniPopulationSearch['name']

  @Column(DataType.ARRAY(DataType.STRING))
-  courseCodes!: string[]
+  declare courseCodes: OpenUniPopulationSearch['courseCodes']
 }
@@ -1,7 +1,6 @@
-import { CreationOptional } from 'sequelize'
 import { Column, DataType, Model, PrimaryKey, Table } from 'sequelize-typescript'

-import type { ProgressCriteria, ProgressCriteriaCreation } from '@oodikone/shared/models/kone'
+import type { ProgressCriteria } from '@oodikone/shared/models/kone'

@Table({
  underscored: true,
@@ -9,50 +8,47 @@ import type { ProgressCriteria, ProgressCriteriaCreation } from '@oodikone/share
  modelName: 'progress_criteria',
  tableName: 'progress_criteria',
 })
-export class ProgressCriteriaModel
-  extends Model<ProgressCriteria, ProgressCriteriaCreation>
-  implements ProgressCriteria
-{
+export class ProgressCriteriaModel extends Model implements ProgressCriteria {
  @PrimaryKey
  @Column(DataType.STRING)
-  code!: string
+  declare code: ProgressCriteria['code']

  @Column(DataType.STRING)
-  curriculumVersion!: CreationOptional<string>
+  declare curriculumVersion: ProgressCriteria['curriculumVersion']

  @Column(DataType.ARRAY(DataType.STRING))
-  coursesYearOne!: string[]
+  declare coursesYearOne: ProgressCriteria['coursesYearOne']

  @Column(DataType.ARRAY(DataType.STRING))
-  coursesYearTwo!: string[]
+  declare coursesYearTwo: ProgressCriteria['coursesYearTwo']

  @Column(DataType.ARRAY(DataType.STRING))
-  coursesYearThree!: string[]
+  declare coursesYearThree: ProgressCriteria['coursesYearThree']

  @Column(DataType.ARRAY(DataType.STRING))
-  coursesYearFour!: string[]
+  declare coursesYearFour: ProgressCriteria['coursesYearFour']

  @Column(DataType.ARRAY(DataType.STRING))
-  coursesYearFive!: string[]
+  declare coursesYearFive: ProgressCriteria['coursesYearFive']

  @Column(DataType.ARRAY(DataType.STRING))
-  coursesYearSix!: string[]
+  declare coursesYearSix: ProgressCriteria['coursesYearSix']

  @Column(DataType.INTEGER)
-  creditsYearOne!: number
+  declare creditsYearOne: ProgressCriteria['creditsYearOne']

  @Column(DataType.INTEGER)
-  creditsYearTwo!: number
+  declare creditsYearTwo: ProgressCriteria['creditsYearTwo']

  @Column(DataType.INTEGER)
-  creditsYearThree!: number
+  declare creditsYearThree: ProgressCriteria['creditsYearThree']

  @Column(DataType.INTEGER)
-  creditsYearFour!: number
+  declare creditsYearFour: ProgressCriteria['creditsYearFour']

  @Column(DataType.INTEGER)
-  creditsYearFive!: number
+  declare creditsYearFive: ProgressCriteria['creditsYearFive']

  @Column(DataType.INTEGER)
-  creditsYearSix!: number
+  declare creditsYearSix: ProgressCriteria['creditsYearSix']
 }
@@ -1,7 +1,6 @@
-import { CreationOptional } from 'sequelize'
 import { AutoIncrement, Column, DataType, Model, PrimaryKey, Table, Unique } from 'sequelize-typescript'

-import type { StudyGuidanceGroupTag, StudyGuidanceGroupTagCreation } from '@oodikone/shared/models/kone'
+import type { StudyGuidanceGroupTag } from '@oodikone/shared/models/kone'

@Table({
  underscored: true,
@@ -9,22 +8,19 @@ import type { StudyGuidanceGroupTag, StudyGuidanceGroupTagCreation } from '@oodi
  modelName: 'study_guidance_group_tag',
  tableName: 'study_guidance_group_tags',
 })
-export class StudyGuidanceGroupTagModel
-  extends Model<StudyGuidanceGroupTag, StudyGuidanceGroupTagCreation>
-  implements StudyGuidanceGroupTag
-{
+export class StudyGuidanceGroupTagModel extends Model implements StudyGuidanceGroupTag {
  @PrimaryKey
  @AutoIncrement
  @Column(DataType.BIGINT)
-  id?: CreationOptional<string>
+  declare id: StudyGuidanceGroupTag['id']

  @Unique
  @Column(DataType.STRING)
-  studyGuidanceGroupId!: string
+  declare studyGuidanceGroupId: StudyGuidanceGroupTag['studyGuidanceGroupId']

  @Column(DataType.STRING)
-  studyProgramme!: string | null
+  declare studyProgramme: StudyGuidanceGroupTag['studyProgramme']

  @Column(DataType.STRING)
-  year!: string | null
+  declare year: StudyGuidanceGroupTag['year']
 }
@@ -8,11 +8,11 @@ import type { StudyProgrammePin } from '@oodikone/shared/models/kone'
  modelName: 'study_programme_pin',
  tableName: 'study_programme_pins',
 })
-export class StudyProgrammePinModel extends Model<StudyProgrammePin> implements StudyProgrammePin {
+export class StudyProgrammePinModel extends Model implements StudyProgrammePin {
  @PrimaryKey
  @Column(DataType.INTEGER)
-  userId!: number
+  declare userId: StudyProgrammePin['userId']

  @Column(DataType.ARRAY(DataType.STRING))
-  studyProgrammes!: string[]
+  declare studyProgrammes: StudyProgrammePin['studyProgrammes']
 }
@@ -1,7 +1,6 @@
-import { CreationOptional } from 'sequelize'
 import { AutoIncrement, BelongsTo, Column, DataType, ForeignKey, Model, PrimaryKey, Table } from 'sequelize-typescript'

-import type { Tag, TagCreation, TagStudent } from '@oodikone/shared/models/kone'
+import type { Tag } from '@oodikone/shared/models/kone'

 import { TagStudentModel } from './tagStudent'

@@ -9,25 +8,25 @@ import { TagStudentModel } from './tagStudent'
  modelName: 'tag',
  tableName: 'tag',
 })
-export class TagModel extends Model<Tag, TagCreation> implements Tag {
+export class TagModel extends Model implements Tag {
  @PrimaryKey
  @AutoIncrement
  @ForeignKey(() => TagStudentModel)
  @Column(DataType.BIGINT)
-  tag_id!: CreationOptional<string>
+  declare tag_id: Tag['tag_id']

  @BelongsTo(() => TagStudentModel)
-  tagStudent!: CreationOptional<TagStudent>
+  declare tagStudent: Tag['tagStudent']

  @Column(DataType.STRING)
-  tagname!: string
+  declare tagname: Tag['tagname']

  @Column(DataType.STRING)
-  studytrack!: string
+  declare studytrack: Tag['studytrack']

  @Column(DataType.STRING)
-  year!: string | null
+  declare year: Tag['year']

  @Column(DataType.BIGINT)
-  personal_user_id!: string | null
+  declare personal_user_id: Tag['personal_user_id']
 }
@@ -1,7 +1,6 @@
-import { CreationOptional } from 'sequelize'
 import { AutoIncrement, BelongsTo, Column, DataType, ForeignKey, Model, PrimaryKey, Table } from 'sequelize-typescript'

-import type { Tag, TagStudent, TagStudentCreation } from '@oodikone/shared/models/kone'
+import type { TagStudent } from '@oodikone/shared/models/kone'

 import { StudentModel } from '../student'
 import { TagModel } from './tag'
@@ -10,18 +9,18 @@ import { TagModel } from './tag'
  modelName: 'tag_student',
  tableName: 'tag_student',
 })
-export class TagStudentModel extends Model<TagStudent, TagStudentCreation> implements TagStudent {
+export class TagStudentModel extends Model implements TagStudent {
  @PrimaryKey
  @AutoIncrement
  @ForeignKey(() => TagModel)
  @Column(DataType.BIGINT)
-  tag_id!: string
+  declare tag_id: TagStudent['tag_id']

  @PrimaryKey
  @ForeignKey(() => StudentModel)
  @Column(DataType.STRING)
-  studentnumber!: string
+  declare studentnumber: TagStudent['studentnumber']

  @BelongsTo(() => TagModel)
-  tag!: CreationOptional<Tag>
+  declare tag: TagStudent['tag']
 }
@@ -10,8 +10,7 @@ import {
  UpdatedAt,
 } from 'sequelize-typescript'

-import type { Organization, ProgrammeModule, SISStudyRight } from '@oodikone/shared/models'
-import type { Name } from '@oodikone/shared/types'
+import type { Organization } from '@oodikone/shared/models'

 import { CourseModel } from './course'
 import { CourseProviderModel } from './courseProvider'
@@ -23,37 +22,37 @@ import { SISStudyRightModel } from './SISStudyRight'
  modelName: 'organization',
  tableName: 'organization',
 })
-export class OrganizationModel extends Model<Organization> implements Organization {
+export class OrganizationModel extends Model implements Organization {
  @PrimaryKey
  @Column(DataType.STRING)
-  id!: string
+  declare id: Organization['id']

  @Column(DataType.STRING)
-  code!: string
+  declare code: Organization['code']

  @Column(DataType.JSONB)
-  name!: Name
+  declare name: Organization['name']

  @Column(DataType.STRING)
-  parent_id!: string
+  declare parent_id: Organization['parent_id']

  @HasMany(() => OrganizationModel, { foreignKey: 'parent_id', as: 'children' })
-  children!: Organization[]
+  declare children: Organization['children']

  @HasMany(() => ProgrammeModuleModel, { foreignKey: 'organization_id' })
-  programmeModules!: ProgrammeModule[]
+  declare programmeModules: Organization['programmeModules']

  @HasMany(() => SISStudyRightModel, { foreignKey: 'facultyCode', sourceKey: 'code' })
-  SISStudyRights!: SISStudyRight[]
+  declare SISStudyRights: Organization['SISStudyRights']

  @BelongsToMany(() => CourseModel, () => CourseProviderModel, 'organizationcode')
-  courses!: CourseModel[]
+  declare courses: Organization['courses']

  @CreatedAt
  @Column(DataType.DATE)
-  createdAt!: Date
+  declare createdAt: Organization['createdAt']

  @UpdatedAt
  @Column(DataType.DATE)
-  updatedAt!: Date
+  declare updatedAt: Organization['updatedAt']
 }
@@ -12,7 +12,6 @@ import {
 } from 'sequelize-typescript'

 import type { Organization, ProgrammeModule } from '@oodikone/shared/models'
-import { DegreeProgrammeType, Name } from '@oodikone/shared/types'

 import { OrganizationModel } from './organization'
 import { ProgrammeModuleChildModel } from './programmeModuleChild'
@@ -22,62 +21,62 @@ import { ProgrammeModuleChildModel } from './programmeModuleChild'
  modelName: 'programme_module',
  tableName: 'programme_modules',
 })
-export class ProgrammeModuleModel extends Model<ProgrammeModule> implements ProgrammeModule {
+export class ProgrammeModuleModel extends Model implements ProgrammeModule {
  @PrimaryKey
  @Column(DataType.STRING)
-  id!: string
+  declare id: ProgrammeModule['id']

  @BelongsToMany(() => ProgrammeModuleModel, () => ProgrammeModuleChildModel, 'child_id')
-  parents!: ProgrammeModule[]
+  declare parents: ProgrammeModule[]

  @BelongsToMany(() => ProgrammeModuleModel, () => ProgrammeModuleChildModel, 'parent_id')
-  children!: ProgrammeModule[]
+  declare children: ProgrammeModule[]
+
+  @BelongsTo(() => OrganizationModel, { foreignKey: 'organization_id' })
+  declare organization: Organization

  @Column(DataType.STRING)
-  group_id!: string
+  declare group_id: ProgrammeModule['group_id']

  @Column(DataType.STRING)
-  code!: string
+  declare code: ProgrammeModule['code']

  @Column(DataType.JSONB)
-  name!: Name
+  declare name: ProgrammeModule['name']

  @Column(DataType.STRING)
-  type!: 'course' | 'module'
+  declare type: ProgrammeModule['type']

  @Column(DataType.INTEGER)
-  order!: number
+  declare order: ProgrammeModule['order']

  @Column(DataType.STRING)
-  studyLevel!: string
+  declare studyLevel: ProgrammeModule['studyLevel']

  @ForeignKey(() => OrganizationModel)
  @Column(DataType.STRING)
-  organization_id!: string
-
-  @BelongsTo(() => OrganizationModel, { foreignKey: 'organization_id' })
-  organization!: Organization
+  declare organization_id: ProgrammeModule['organization_id']

  @Column(DataType.DATE)
-  valid_from!: Date
+  declare valid_from: ProgrammeModule['valid_from']

  @Column(DataType.DATE)
-  valid_to!: Date
+  declare valid_to: ProgrammeModule['valid_to']

  @Column(DataType.ARRAY(DataType.STRING))
-  curriculum_period_ids!: string[]
+  declare curriculum_period_ids: ProgrammeModule['curriculum_period_ids']

  @Column(DataType.STRING)
-  degreeProgrammeType!: DegreeProgrammeType | null
+  declare degreeProgrammeType: ProgrammeModule['degreeProgrammeType']

  @Column(DataType.INTEGER)
-  minimumCredits!: number | null
+  declare minimumCredits: ProgrammeModule['minimumCredits']

  @CreatedAt
  @Column(DataType.DATE)
-  createdAt!: Date
+  declare createdAt: ProgrammeModule['createdAt']

  @UpdatedAt
  @Column(DataType.DATE)
-  updatedAt!: Date
+  declare updatedAt: ProgrammeModule['updatedAt']
 }
@@ -9,23 +9,23 @@ import { ProgrammeModuleModel } from './programmeModule'
  modelName: 'programme_module_child',
  tableName: 'programme_module_children',
 })
-export class ProgrammeModuleChildModel extends Model<ProgrammeModuleChild> implements ProgrammeModuleChild {
+export class ProgrammeModuleChildModel extends Model implements ProgrammeModuleChild {
  @PrimaryKey
  @Column(DataType.STRING)
-  composite!: string
+  declare composite: ProgrammeModuleChild['composite']

  @ForeignKey(() => ProgrammeModuleModel)
  @Column(DataType.STRING)
-  parentId!: string
+  declare parentId: ProgrammeModuleChild['parentId']

  @Column(DataType.STRING)
-  childId!: string
+  declare childId: ProgrammeModuleChild['childId']

  @CreatedAt
  @Column(DataType.DATE)
-  createdAt!: Date
+  declare createdAt: ProgrammeModuleChild['createdAt']

  @UpdatedAt
  @Column(DataType.DATE)
-  updatedAt!: Date
+  declare updatedAt: ProgrammeModuleChild['updatedAt']
 }
@@ -1,50 +1,49 @@
 import { Column, CreatedAt, DataType, Model, PrimaryKey, Table, UpdatedAt } from 'sequelize-typescript'

 import type { Semester } from '@oodikone/shared/models'
-import type { Name } from '@oodikone/shared/types'

@Table({
  underscored: true,
  modelName: 'semester',
  tableName: 'semesters',
 })
-export class SemesterModel extends Model<Semester> implements Semester {
+export class SemesterModel extends Model implements Semester {
  @PrimaryKey
  @Column(DataType.STRING)
-  composite!: string
+  declare composite: Semester['composite']

  @Column(DataType.INTEGER)
-  semestercode!: number
+  declare semestercode: Semester['semestercode']

  @Column(DataType.JSONB)
-  name!: Name
+  declare name: Semester['name']

  @Column(DataType.INTEGER)
-  startYear!: number
+  declare startYear: Semester['startYear']

  @Column(DataType.DATE)
-  startdate!: Date
+  declare startdate: Semester['startdate']

  @Column(DataType.DATE)
-  enddate!: Date
+  declare enddate: Semester['enddate']

  @Column(DataType.INTEGER)
-  yearcode!: number
+  declare yearcode: Semester['yearcode']

  @Column(DataType.STRING)
-  yearname!: string
+  declare yearname: Semester['yearname']

  @Column(DataType.STRING)
-  org!: string
+  declare org: Semester['org']

  @Column(DataType.INTEGER)
-  termIndex!: number
+  declare termIndex: Semester['termIndex']

  @CreatedAt
  @Column(DataType.DATE)
-  createdAt!: Date
+  declare createdAt: Semester['createdAt']

  @UpdatedAt
  @Column(DataType.DATE)
-  updatedAt!: Date
+  declare updatedAt: Semester['updatedAt']
 }
@@ -1,8 +1,6 @@
 import { Column, CreatedAt, DataType, HasMany, Model, PrimaryKey, Table, UpdatedAt } from 'sequelize-typescript'

-import type { Student, Credit, Enrollment, SISStudyRight, Studyplan } from '@oodikone/shared/models'
-import type { Name } from '@oodikone/shared/types'
-import { GenderCode } from '@oodikone/shared/types'
+import type { Student } from '@oodikone/shared/models'

 import { CreditModel } from './credit'
 import { EnrollmentModel } from './enrollment'
@@ -14,73 +12,73 @@ import { StudyplanModel } from './studyplan'
  modelName: 'student',
  tableName: 'student',
 })
-export class StudentModel extends Model<Student> implements Student {
+export class StudentModel extends Model implements Student {
  @PrimaryKey
  @Column(DataType.STRING)
-  studentnumber!: string
+  declare studentnumber: Student['studentnumber']

  @Column(DataType.STRING)
-  lastname!: string
+  declare lastname: Student['lastname']

  @Column(DataType.STRING)
-  firstnames!: string
+  declare firstnames: Student['firstnames']

  @Column(DataType.STRING)
-  abbreviatedname!: string
+  declare abbreviatedname: Student['abbreviatedname']

  @HasMany(() => EnrollmentModel, { foreignKey: 'studentnumber', sourceKey: 'studentnumber' })
-  enrollments!: Enrollment[]
+  declare enrollments: Student['enrollments']

  @HasMany(() => SISStudyRightModel, { foreignKey: 'studentNumber', sourceKey: 'studentnumber' })
-  studyRights!: SISStudyRight[]
+  declare studyRights: Student['studyRights']

  @HasMany(() => StudyplanModel, { foreignKey: 'studentnumber', sourceKey: 'studentnumber' })
-  studyplans!: Studyplan[]
+  declare studyplans: Student['studyplans']

  @HasMany(() => CreditModel, { foreignKey: 'student_studentnumber', sourceKey: 'studentnumber' })
-  credits!: Credit[]
+  declare credits: Student['credits']

  @Column(DataType.DATE)
-  birthdate!: Date
+  declare birthdate: Student['birthdate']

  @Column(DataType.INTEGER)
-  creditcount!: number
+  declare creditcount: Student['creditcount']

  @Column(DataType.DATE)
-  dateofuniversityenrollment!: Date
+  declare dateofuniversityenrollment: Student['dateofuniversityenrollment']

  @Column(DataType.STRING)
-  email!: string
+  declare email: Student['email']

  @Column(DataType.STRING)
-  secondary_email!: string
+  declare secondary_email: Student['secondary_email']

  @Column(DataType.STRING)
-  national_student_number!: string
+  declare national_student_number: Student['national_student_number']

  @Column(DataType.STRING)
-  phone_number!: string
+  declare phone_number: Student['phone_number']

  @Column(DataType.JSONB)
-  citizenships!: Name[]
+  declare citizenships: Student['citizenships']

  @Column(DataType.STRING)
-  gender_code!: GenderCode
+  declare gender_code: Student['gender_code']

  @Column(DataType.STRING)
-  sis_person_id!: string
+  declare sis_person_id: Student['sis_person_id']

  @Column(DataType.BOOLEAN)
-  hasPersonalIdentityCode!: boolean
+  declare hasPersonalIdentityCode: Student['hasPersonalIdentityCode']

  @Column(DataType.STRING)
-  preferredLanguage!: string
+  declare preferredLanguage: Student['preferredLanguage']

  @CreatedAt
  @Column(DataType.DATE)
-  createdAt!: Date
+  declare createdAt: Student['createdAt']

  @UpdatedAt
  @Column(DataType.DATE)
-  updatedAt!: Date
+  declare updatedAt: Student['updatedAt']
 }
@@ -10,7 +10,7 @@ import {
  UpdatedAt,
 } from 'sequelize-typescript'

-import type { SISStudyRight, Student, Studyplan } from '@oodikone/shared/models'
+import type { Studyplan } from '@oodikone/shared/models'

 import { SISStudyRightModel } from './SISStudyRight'
 import { StudentModel } from './student'
@@ -20,48 +20,48 @@ import { StudentModel } from './student'
  modelName: 'studyplan',
  tableName: 'studyplan',
 })
-export class StudyplanModel extends Model<Studyplan> implements Studyplan {
+export class StudyplanModel extends Model implements Studyplan {
  @PrimaryKey
  @Column(DataType.STRING)
-  id!: string
+  declare id: Studyplan['id']

  @ForeignKey(() => StudentModel)
  @Column(DataType.STRING)
-  studentnumber!: string
+  declare studentnumber: Studyplan['studentnumber']

  @BelongsTo(() => StudentModel, { foreignKey: 'studentnumber', targetKey: 'studentnumber' })
-  student!: Student
+  declare student: Studyplan['student']

  @ForeignKey(() => SISStudyRightModel)
  @Column(DataType.STRING)
-  sis_study_right_id!: string
+  declare sis_study_right_id: Studyplan['sis_study_right_id']

  @BelongsTo(() => SISStudyRightModel, { foreignKey: 'sis_study_right_id', targetKey: 'id', as: 'studyRight' })
-  studyRight!: SISStudyRight
+  declare studyRight: Studyplan['studyRight']

  @Column(DataType.STRING)
-  programme_code!: string
+  declare programme_code: Studyplan['programme_code']

  @Column(DataType.ARRAY(DataType.STRING))
-  included_courses!: string[]
+  declare included_courses: Studyplan['included_courses']

  @Column({ type: DataType.ARRAY(DataType.TEXT), field: 'included_modules' })
-  includedModules!: string[]
+  declare includedModules: Studyplan['includedModules']

  @Column(DataType.STRING)
-  sisu_id!: string
+  declare sisu_id: Studyplan['sisu_id']

  @Column(DataType.DOUBLE)
-  completed_credits!: number
+  declare completed_credits: Studyplan['completed_credits']

  @Column(DataType.STRING)
-  curriculum_period_id!: string
+  declare curriculum_period_id: Studyplan['curriculum_period_id']

  @CreatedAt
  @Column(DataType.DATE)
-  createdAt!: Date
+  declare createdAt: Studyplan['createdAt']

  @UpdatedAt
  @Column(DataType.DATE)
-  updatedAt!: Date
+  declare updatedAt: Studyplan['updatedAt']
 }
@@ -1,26 +1,25 @@
 import { Column, CreatedAt, DataType, Model, PrimaryKey, Table, UpdatedAt } from 'sequelize-typescript'

 import type { StudyrightExtent } from '@oodikone/shared/models'
-import { ExtentCode } from '@oodikone/shared/types'

@Table({
  underscored: true,
  modelName: 'studyright_extent',
  tableName: 'studyright_extents',
 })
-export class StudyrightExtentModel extends Model<StudyrightExtent> implements StudyrightExtent {
+export class StudyrightExtentModel extends Model implements StudyrightExtent {
  @PrimaryKey
  @Column(DataType.INTEGER)
-  extentcode!: ExtentCode
+  declare extentcode: StudyrightExtent['extentcode']

  @Column(DataType.STRING)
-  name!: string
+  declare name: StudyrightExtent['name']

  @CreatedAt
  @Column(DataType.DATE)
-  createdAt!: Date
+  declare createdAt: StudyrightExtent['createdAt']

  @UpdatedAt
  @Column(DataType.DATE)
-  updatedAt!: Date
+  declare updatedAt: StudyrightExtent['updatedAt']
 }
@@ -1,6 +1,6 @@
 import { BelongsToMany, Column, CreatedAt, DataType, Model, PrimaryKey, Table, UpdatedAt } from 'sequelize-typescript'

-import type { Teacher, Credit } from '@oodikone/shared/models'
+import type { Teacher } from '@oodikone/shared/models'

 import { CreditModel } from './credit'
 import { CreditTeacherModel } from './creditTeacher'
@@ -10,22 +10,22 @@ import { CreditTeacherModel } from './creditTeacher'
  modelName: 'teacher',
  tableName: 'teacher',
 })
-export class TeacherModel extends Model<Teacher> implements Teacher {
+export class TeacherModel extends Model implements Teacher {
  @PrimaryKey
  @Column(DataType.STRING)
-  id!: string
+  declare id: Teacher['id']

  @Column(DataType.STRING)
-  name!: string
+  declare name: Teacher['name']

  @BelongsToMany(() => CreditModel, () => CreditTeacherModel)
-  credits!: Credit[]
+  declare credits: Teacher['credits']

  @CreatedAt
  @Column(DataType.DATE)
-  createdAt!: Date
+  declare createdAt: Teacher['createdAt']

  @UpdatedAt
  @Column(DataType.DATE)
-  updatedAt!: Date
+  declare updatedAt: Teacher['updatedAt']
 }
@@ -1,11 +1,7 @@
-import { CreationOptional } from 'sequelize'
 import { AutoIncrement, Column, DataType, Default, Model, PrimaryKey, Table, Unique } from 'sequelize-typescript'

-import type { Language } from '@oodikone/shared/language'
 import type { User, UserCreation } from '@oodikone/shared/models/user'

-import type { Role } from '@oodikone/shared/types'
-
@Table({
  underscored: true,
  timestamps: false,
@@ -16,33 +12,33 @@ export class UserModel extends Model<User, UserCreation> implements User {
  @PrimaryKey
  @AutoIncrement
  @Column(DataType.BIGINT)
-  id!: CreationOptional<string>
+  declare id: User['id']

  @Column(DataType.STRING)
-  fullName!: string
+  declare fullName: User['fullName']

  @Unique
  @Column(DataType.STRING)
-  username!: string
+  declare username: User['username']

  @Column(DataType.STRING)
-  email!: string
+  declare email: User['email']

  @Default('fi')
  @Column(DataType.STRING)
-  language!: CreationOptional<Language>
+  declare language: User['language']

  @Column(DataType.STRING)
-  sisuPersonId!: string
+  declare sisuPersonId: User['sisuPersonId']

  @Column(DataType.DATE)
-  lastLogin!: Date
+  declare lastLogin: User['lastLogin']

  @Default([])
  @Column(DataType.ARRAY(DataType.STRING))
-  roles!: CreationOptional<Role[]>
+  declare roles: User['roles']

  @Default([])
  @Column(DataType.ARRAY(DataType.STRING))
-  programmeRights!: CreationOptional<string[]>
+  declare programmeRights: User['programmeRights']
 }
@@ -1,2 +0,0 @@
-*.csv
-*.csv#
@@ -1,22 +0,0 @@
-# Rapodiff
-
-Use this to check differences between oodikone and rapo.
-
-## How to load the CSV file from Rapo
-
-1. Go to Rapo and open ”Koulutusohjelmien vuosiseuranta”
-2. Navigate to ”Opintopisteet ja opetus / Credits and teaching”
-3. From the faculty dropdown menu, select all the faculties
-4. From the bottom of the page, click ”Vie -> Tiedot -> CSV”
-5. Rename the file to `data.csv` and copy it to this directory
-
-## Usage
-
-1. Have real oodikone running. Then run rapodiff **in the root directory**: `npm run rapodiff -- args`
-2. place args with a mode. omit args to print possible modes.
-
-## Known differences in APIs
-
- rapo does not show students that have graduated (it however takes some days for rapo to notice a graduation)
- rapo does not handle the starting year of transfers properly (shows in old staring population)
- rapo show some students incorrectly passive, see https://github.com/UniversityOfHelsinkiCS/oodikone/issues/3521
@@ -1,188 +0,0 @@
-const { orderBy } = require('lodash')
-
-// dbConnections must be imported to avoid Sequelize errors even if it's not used
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const { dbConnections } = require('../database/connection')
-const { computeCreditsProduced } = require('../services/providerCredits')
-const { parseCsv, printProgressBar } = require('./helpers')
-
-const diffs = []
-let noDiffCounter = 0
-
-// Change weird rapo programmecodes to oodikone format, example: 300-M003 => MH30_003
-const transformProgrammeCode = oldCode => `${oldCode[4]}H${oldCode.slice(0, 2)}_${oldCode.slice(5, 8)}`
-
-const formatData = data =>
-  data.reduce((obj, cur) => {
-    const parseNum = str => (str === '' ? 0 : parseFloat(str.replace(',', '.')))
-    const [
-      year,
-      facultyCode,
-      programmeInfo,
-      basic,
-      exchange,
-      otherUni,
-      openUni,
-      special,
-      total,
-      transferredFromAbroad,
-      otherTransferred,
-    ] = cur
-    const programmeCode = transformProgrammeCode(programmeInfo.split(' ')[0])
-    if (!obj[programmeCode]) obj[programmeCode] = {}
-    obj[programmeCode][year] = {
-      year: parseNum(year),
-      facultyCode,
-      programmeInfo,
-      basic: parseNum(basic),
-      'incoming-exchange': parseNum(exchange),
-      agreement: parseNum(otherUni),
-      'open-uni': parseNum(openUni),
-      separate: parseNum(special),
-      total: parseNum(total),
-      transferred: parseNum(transferredFromAbroad) + parseNum(otherTransferred),
-    }
-    return obj
-  }, {})
-
-const diff = (rapoData, okData, code) => {
-  for (const year of Object.keys(okData)) {
-    if (year !== '2022' && year !== '2023') continue
-    const rapo = rapoData[year]
-    const ok = okData[year]
-    if (!rapo) {
-      if (!ok) console.log(`Year ${year} not in rapo for code ${code}, skipping`)
-      continue
-    }
-    for (const field of ['basic', 'incoming-exchange', 'open-uni', 'agreement', 'separate', 'transferred']) {
-      const okValue = Math.round(ok[field] || 0)
-      const rapoValue = Math.round(rapo[field] || 0)
-      const diff = Math.abs(okValue - rapoValue)
-      if (diff === 0) {
-        noDiffCounter++
-        continue
-      }
-      const percentage = rapoValue !== 0 ? Number(((diff / rapoValue) * 100).toFixed(2)) : 100
-      diffs.push({ field, year, code, okValue, rapoValue, diff, 'diff %': percentage })
-    }
-  }
-}
-
-const processProgrammes = async data => {
-  let programmeCounter = 0
-  const rapoProgrammeData = formatData(data.slice(1))
-  const allProgrammeCodes = [...new Set(Object.keys(rapoProgrammeData))]
-  for (const programmeCode of allProgrammeCodes) {
-    const okProgrammeData = await computeCreditsProduced(programmeCode, false, true)
-    diff(rapoProgrammeData[programmeCode], okProgrammeData.stats, programmeCode)
-    printProgressBar(allProgrammeCodes.length, ++programmeCounter)
-  }
-  const fieldToSortBy = 'diff' // 'diff %'
-  const orderedDiffs = orderBy(diffs, fieldToSortBy, 'asc')
-  console.table(orderedDiffs)
-  console.log(`${diffs.length} diffs found with current settings. Numbers with no diff: ${noDiffCounter}`)
-  const totalDiff = orderedDiffs.reduce((sum, cur) => cur.diff + sum, 0)
-  console.log('Total difference: ', totalDiff)
-}
-
-const programmeCreditsDiff = async fileName => {
-  console.log('Running studyprogramme credits diff')
-  await parseCsv(fileName, processProgrammes)
-  console.log('Diff completed.')
-}
-
-/* 
-separate
-Suoritus on erillisellä opiskeluoikeudella opettajankoulutuksen opintoja suorittavan opiskelijan suorittama
-Suoritus on erillisellä opiskeluoikeudella opiskelevan suorittama
-
-agreement
-Suoritus on korkeakoulujen välisillä yhteistyösopimuksilla opiskelevan suorittama
-
-
-open-uni
-Suoritus on avoimessa korkeakouluopetuksessa suoritettu
-
-incoming-exchange
-Suoritus on tulevan kansainvälisen vaihto-opiskelijan suorittama
-
-basic
-perustutkinto-opiskelija = 1
-ja
-Tuntematon
-tai (ehkä):
-Suoritus on kotimainen harjoittelujakso
-?? Opintosuoritus on täydennyskoulutuksessa suoritettu ??
-
-other
-perustutkinto-opiskelija = 0 && tuntematon
-
-*/
-
-const getCategory = (typeName, isBasic, hyvaksiluettu) => {
-  if (hyvaksiluettu) return 'transferred' // ?? unsure
-  if (isBasic || ['Suoritus on kotimainen harjoittelujakso', 'Tuntematon'].includes(typeName)) return 'basic'
-  if (typeName === 'Suoritus on avoimessa korkeakouluopetuksessa suoritettu') return 'open-uni'
-  if (typeName === 'Suoritus on tulevan kansainvälisen vaihto-opiskelijan suorittama') return 'incoming-exchange'
-  if (typeName.startsWith('Suoritus on erillisellä opiskeluoikeudella')) return 'separate'
-  if (typeName === 'Suoritus on korkeakoulujen välisillä yhteistyösopimuksilla opiskelevan suorittama')
-    return 'agreement'
-  return 'other'
-}
-
-const processIds = async (rawData, code, field) => {
-  const data = rawData.slice(0, 21628) // 11476 = KTM viimeinen
-  const rapoData = data
-    .map(row => ({
-      id: row[0].slice(11),
-      type: getCategory(row[1], row[3] === '1', row[6] === '1'),
-      typeCode: row[8],
-      isModule: row[9] !== '0',
-      credits: parseFloat(row[10]),
-      included: row[4] === '1',
-    }))
-    .filter(course => !course.isModule && (field === 'transferred' || course.included))
-  const rapoIds = rapoData.filter(course => course.credits > 0 && course.type === field).map(row => row.id)
-  const rapoCredits = rapoData.reduce(
-    (stats, cur) => {
-      stats[cur.type] += cur.credits
-      return stats
-    },
-    {
-      transferred: 0,
-      total: '_',
-      basic: 0,
-      'open-uni': 0,
-      separate: 0,
-      'incoming-exchange': 0,
-      agreement: 0,
-      other: 0,
-    }
-  )
-  const stats = await computeCreditsProduced(code, false, true, field)
-  if (!stats.stats.ids) {
-    console.log({ rapoCredits })
-    console.log('Edit getCreditsProduced code so that it saves a list of the relevant ids you want to compare.')
-    return
-  }
-  const okIdMap = stats.stats.ids
-  const rapoIdMap = rapoIds.reduce((obj, cur) => {
-    obj[cur] = true
-    return obj
-  }, {})
-  const onlyInRapo = Object.keys(rapoIdMap).filter(id => !okIdMap[id])
-  const onlyInOk = Object.keys(okIdMap).filter(id => !rapoIdMap[id])
-  console.log('\n onlyInRapo: ', onlyInRapo.length)
-  console.dir(onlyInRapo.slice(0, 30))
-  console.log('\n onlyInOk: ', onlyInOk.length)
-  console.dir(onlyInOk.slice(0, 30))
-  delete stats.ids
-  console.log(stats.stats['2022'])
-  console.log('rapoCredits: ', rapoCredits)
-}
-
-const testNewCalc = async (fileName, code, field) => {
-  await parseCsv(fileName, async data => processIds(data, code, field))
-}
-
-module.exports = { programmeCreditsDiff, testNewCalc }
@@ -1,36 +0,0 @@
-const fs = require('fs/promises')
-const Papa = require('papaparse')
-
-const parseCsv = async (fileName, fun) => {
-  try {
-    const file = await fs.readFile(`${__dirname}/${fileName}`, 'utf8')
-    Papa.parsePromise = file => {
-      return new Promise((complete, error) => {
-        Papa.parse(file, { complete, error })
-      })
-    }
-    const data = await Papa.parsePromise(file)
-    await fun(data?.data)
-  } catch (error) {
-    console.log(error)
-  }
-}
-
-const printProgressBar = (total, current) => {
-  const barLength = 30
-  const progress = Math.floor((current / total) * barLength)
-  const empty = barLength - progress
-
-  const progressBar = `[${'#'.repeat(progress)}${'-'.repeat(empty)}]`
-  const percentage = Math.floor((current / total) * 100)
-
-  process.stdout.clearLine()
-  process.stdout.cursorTo(0)
-  process.stdout.write(`${progressBar} ${percentage} %`)
-
-  if (current >= total) {
-    console.log()
-  }
-}
-
-module.exports = { parseCsv, printProgressBar }
@@ -1,31 +0,0 @@
-const { programmeCreditsDiff, testNewCalc } = require('./creditsDiff')
-
-// ** To add new mode, just type key and function here **
-const modes = {
-  // Check credits with current local oodikone data against provided data.csv in rapodiff folder.
-  credits: () => programmeCreditsDiff('data.csv'),
-  // Provide programme code as argument. Parses credits from credits.csv in rapodiff folder. This must be obtained from Rapo people. This tells which credit ids are found in oodikone but not rapo, and vice versa.
-  // notice: check mode requires writing ids in to the stats object in credits calculating function.
-  // Add something like this there:
-  // if (category === 'open-uni' && credits > 0 && new Date(attainmentDate).getFullYear() === 2022) stats.ids[id] = true
-  check: (fileName, code, field) => testNewCalc(fileName, code, field),
-}
-
-const main = async () => {
-  console.log('**RAPODIFF**\n')
-  const mode = process.argv[2]
-  const modeFunction = modes[mode]
-  const arg = process.argv[3]
-  const arg2 = process.argv[4]
-  const arg3 = process.argv[5]
-  if (!modeFunction) {
-    console.log(
-      'Unknown or missing mode. Supply the mode as an argument (e.g. `npm run rapodiff -- credits`). Supported modes:\n'
-    )
-    console.log(Object.keys(modes).join('\n'))
-    return
-  }
-  await modeFunction(arg, arg2, arg3)
-}
-
-main().then(() => process.exit(0))
@@ -3,7 +3,7 @@ import compression from 'compression'
 import cors from 'cors'
 import { Express, json as jsonExpress } from 'express'

-import { frontUrl, languageCenterViewEnabled, serviceProvider } from './config'
+import { frontUrl, languageCenterViewEnabled } from './config'
 import accessLogger from './middleware/accessLogger'
 import * as auth from './middleware/auth'
 import currentUserMiddleware from './middleware/currentUser'
@@ -15,7 +15,6 @@ import completedCoursesSearch from './routes/completedCoursesSearch'
 import courseExclusions from './routes/courseExclusions'
 import courses from './routes/courses'
 import curriculumPeriods from './routes/curriculumPeriods'
-import customOpenUniSearch from './routes/customOpenUniSearch'
 import customPopulationSearch from './routes/customPopulationSearch'
 import faculties from './routes/faculties'
 import feedback from './routes/feedback'
@@ -34,8 +33,7 @@ import tags from './routes/tags'
 import teachers from './routes/teachers'
 import university from './routes/university'
 import updater from './routes/updater'
-import usersToska from './routes/users'
-import usersFd from './routes/usersFd'
+import users from './routes/users'

 const routes = (app: Express, url: string) => {
  app.use(cors({ credentials: true, origin: frontUrl }))
@@ -43,7 +41,7 @@ const routes = (app: Express, url: string) => {
  app.use(compression())

  app.use(headersMiddleware)
-  app.use(currentUserMiddleware) // eslint-disable-line @typescript-eslint/no-misused-promises
+  app.use(currentUserMiddleware)
  app.use(accessLogger)
  app.use(`${url}/login`, login)
  app.use(url, courses)
@@ -53,10 +51,9 @@ const routes = (app: Express, url: string) => {
  app.use(`${url}/semesters/codes`, semesters)
  app.use(url, tags)
  app.use(url, programmeModules)
-  app.use(`${url}/v3/course-exclusions`, courseExclusions)
-  app.use(`${url}/v2/studyprogrammes`, studyProgramme)
+  app.use(`${url}/course-exclusions`, courseExclusions)
+  app.use(`${url}/studyprogrammes`, studyProgramme)
  app.use(`${url}/programme-criteria`, studyProgrammeCriteria)
-  app.use(`${url}/openunisearch`, auth.roles(['openUniSearch']), customOpenUniSearch)
  app.use(`${url}/changelog`, changelog)
  app.use(`${url}/completedcoursessearch`, completedCoursesSearch)
  if (languageCenterViewEnabled) {
@@ -66,19 +63,14 @@ const routes = (app: Express, url: string) => {
  app.use(`${url}/university`, university)
  app.use(`${url}/updater`, auth.roles(['admin']), updater)
  app.use(`${url}/teachers`, teachers)
-  if (serviceProvider === 'toska') {
-    app.use(`${url}/users`, usersToska)
-  } else {
-    app.use(`${url}/users`, usersToska)
-    app.use(`${url}/users`, usersFd)
-  }
+  app.use(`${url}/users`, users)
  app.use(`${url}/feedback`, feedback)
  app.use(`${url}/custom-population-search`, customPopulationSearch)
  app.use(`${url}/studyguidancegroups`, auth.roles(['studyGuidanceGroups']), studyGuidanceGroups)
  app.use(`${url}/close-to-graduation`, auth.roles(['fullSisuAccess', 'studyGuidanceGroups']), closeToGraduation)
  app.use(`${url}/study-programme-pins`, studyProgrammePins)
  app.use(`${url}/curriculum-periods`, curriculumPeriods)
-  app.get('*', (_, res) => {
+  app.get('', (_, res) => {
    res.status(404).json({ error: 'unknown endpoint' })
  })
  Sentry.setupExpressErrorHandler(app)
@@ -1,20 +1,19 @@
 import axios from 'axios'
-import { Request, Response, Router } from 'express'
+import { Router } from 'express'

 import { Release } from '@oodikone/shared/types'
-import { isDev } from '../config'
+import { isDev, isTest } from '../config'

 const router = Router()

 const changelog: { data?: Release[] } = {}

-export type ChangelogResBody = Release[]
-
-router.get<never, ChangelogResBody>('/', async (_req: Request, res: Response) => {
+router.get<never, Release[]>('/', async (_, res) => {
  if (changelog.data) {
    return res.status(200).send(changelog.data)
  }
-  if (isDev) {
+
+  if (isDev || isTest) {
    const fakeRelease: Release[] = [
      {
        description: '**Feature 1**\n- Added a fancy new feature \n\n**Feature 2**\n- Fixed a bug\n- Fixed another bug',
@@ -35,8 +34,11 @@ router.get<never, ChangelogResBody>('/', async (_req: Request, res: Response) =>
        version: '0.0.1',
      },
    ]
+
+    changelog.data = fakeRelease
    return res.status(200).json(fakeRelease)
  }
+
  const response = await axios.get('https://api.github.com/repos/UniversityOfHelsinkiCS/oodikone/releases')
  const releasesFromAPI: Release[] = response.data.map((release: Record<string, any>) => ({
    description: release.body,
@@ -44,6 +46,7 @@ router.get<never, ChangelogResBody>('/', async (_req: Request, res: Response) =>
    title: release.name,
    version: release.tag_name,
  }))
+
  changelog.data = releasesFromAPI
  res.status(200).json(releasesFromAPI)
 })
@@ -1,22 +1,24 @@
 import { Router } from 'express'

-import { findStudentsCloseToGraduation, getCloseToGraduationData } from '../services/populations/closeToGraduation'
+import type { CloseToGraduationResBody } from '@oodikone/shared/routes/closeToGraduation'
+import { getCloseToGraduationData } from '../services/populations/closeToGraduation'
 import { getAllStudentsUserHasInGroups } from '../services/studyGuidanceGroups'
 import { hasFullAccessToStudentData } from '../util'

 const router = Router()

-type CloseToGraduationResBody = Awaited<ReturnType<typeof findStudentsCloseToGraduation>>
-
 router.get<never, CloseToGraduationResBody>('/', async (req, res) => {
  const { user } = req
-  if (hasFullAccessToStudentData(user.roles)) {
-    const result = await getCloseToGraduationData()
+
+  if (!hasFullAccessToStudentData(user.roles)) {
+    const studentNumbers = await getAllStudentsUserHasInGroups(user.sisPersonId)
+    const result = await getCloseToGraduationData(studentNumbers)
+
    return res.json(result)
  }
-  const studentsInUsersGuidanceGroups = await getAllStudentsUserHasInGroups(user.sisPersonId)
-  const result = await getCloseToGraduationData(studentsInUsersGuidanceGroups)
-  res.json(result)
+
+  const result = await getCloseToGraduationData()
+  return res.json(result)
 })

 export default router
@@ -1,14 +1,14 @@
 import { Router } from 'express'
-import { difference, intersection } from 'lodash'
+import { difference, intersection } from 'lodash-es'

 import { CanError } from '@oodikone/shared/routes'
 import { tryCatch } from '@oodikone/shared/util'
 import { Courses, FormattedStudent, getCompletedCourses } from '../services/completedCoursesSearch'
 import {
-  getOpenUniSearches,
-  createNewSearch,
-  deleteSearch,
-  updateSearch,
+  getUserSearches,
+  createNewUserSearch,
+  deleteUserSearch,
+  updateUserSearch,
  FoundSearch,
 } from '../services/openUni/openUniManageSearches'
 import { hasFullAccessToStudentData, safeJSONParse } from '../util'
@@ -42,18 +42,11 @@ router.get<never, SearchResBody, SearchReqBody, SearchQuery>('/', async (req, re
    return res.status(400).json({ error: 'Courses must be of type array' })
  }

-  const answerTimeout = new Promise((_, reject) => setTimeout(() => reject(new Error('Request timeout')), 6000))
-
  // Teachers can also get rights to students via Importer if
  // the students have enrolled to their courses in last 8 months
  // (acual logic a bit different, see Importer)
  const { data: teacherRightsToStudents, error } = importerClient
-    ? await tryCatch<{ data: string[] }>(
-        Promise.race([
-          importerClient.post('/teacher-rights/', { teacherId, studentNumbers }),
-          answerTimeout as Promise<never>, // This will always reject with an Error
-        ])
-      )
+    ? await tryCatch<{ data: string[] }>(importerClient.post('/teacher-rights/', { teacherId, studentNumbers }))
    : { data: null, error: null }

  if (error) {
@@ -79,7 +72,7 @@ export type GetSearchResBody = FoundSearch[]

 router.get<never, GetSearchResBody>('/searches', async (req, res) => {
  const userId = req.user.id
-  const foundSearches = await getOpenUniSearches(userId)
+  const foundSearches = await getUserSearches(userId)
  return res.json(foundSearches)
 })

@@ -105,7 +98,7 @@ router.post<never, CreateSearchResBody, CreateSearchReqBody>('/searches', async
  if (courseCodes && !Array.isArray(courseCodes)) {
    return res.status(400).json({ error: 'Courselist must be type of array' })
  }
-  const createdSearch = await createNewSearch(userId, name, courseCodes)
+  const createdSearch = await createNewUserSearch(userId, name, courseCodes)
  if (!createdSearch) {
    return res.status(400).json({ error: 'Failed to create courselist' })
  }
@@ -137,7 +130,7 @@ router.put<UpdateSearchParams, UpdateSearchResBody, UpdateSearchReqBody>('/searc
    return res.status(422).end()
  }

-  const updatedSearch = await updateSearch(userId, id, courseCodes)
+  const updatedSearch = await updateUserSearch(userId, id, courseCodes)
  if (!updatedSearch) {
    return res.status(404).json({ error: 'Courselist could not be found' })
  }
@@ -162,7 +155,7 @@ router.delete<DeleteSearchParams, DeleteSearchResBody>('/searches/:id', async (r
    return res.status(422).end()
  }

-  const deletedSearch = await deleteSearch(userId, id)
+  const deletedSearch = await deleteUserSearch(userId, id)
  if (!deletedSearch) {
    return res.status(404).json({ error: 'Courselist could not be found' })
  }
@@ -1,19 +1,20 @@
 import { Router } from 'express'

+import type { ExcludedCoursesResBody, ExcludedCoursesReqBody } from '@oodikone/shared/routes/courseExclusions'
 import { addExcludedCourses, removeExcludedCourses } from '../services/excludedCourses'
+import { hasFullAccessToStudentData } from '../util'

 const router = Router()

-export type ExcludedCoursesParams = { code: string }
-export type ExcludedCoursesResBody = void
-export type ExcludedCoursesReqBody = {
-  courseCodes: string[]
-  curriculumVersion: string
-}
+router.post<never, ExcludedCoursesResBody, ExcludedCoursesReqBody>('/', async (req, res) => {
+  const { programmeCode, courseCodes, curriculumVersion } = req.body
+  const { roles, programmeRights } = req.user
+
+  const hasFullAccess = hasFullAccessToStudentData(roles)
+  const hasAccessToProgramme = programmeRights.map(({ code }) => code).includes(programmeCode)
+
+  if (!hasFullAccess && !hasAccessToProgramme) return res.status(403).end()

-router.post<ExcludedCoursesParams, ExcludedCoursesResBody, ExcludedCoursesReqBody>('/:code', async (req, res) => {
-  const { code: programmeCode } = req.params
-  const { courseCodes, curriculumVersion } = req.body
  const result = await addExcludedCourses(courseCodes, curriculumVersion, programmeCode)
  if (!result) {
    res.status(400).end()
@@ -22,9 +23,15 @@ router.post<ExcludedCoursesParams, ExcludedCoursesResBody, ExcludedCoursesReqBod
  res.status(201).end()
 })

-router.delete<ExcludedCoursesParams, ExcludedCoursesResBody, ExcludedCoursesReqBody>('/:code', async (req, res) => {
-  const { code: programmeCode } = req.params
-  const { courseCodes, curriculumVersion } = req.body
+router.delete<never, ExcludedCoursesResBody, ExcludedCoursesReqBody>('/', async (req, res) => {
+  const { programmeCode, courseCodes, curriculumVersion } = req.body
+  const { roles, programmeRights } = req.user
+
+  const hasFullAccess = hasFullAccessToStudentData(roles)
+  const hasAccessToProgramme = programmeRights.map(({ code }) => code).includes(programmeCode)
+
+  if (!hasFullAccess && !hasAccessToProgramme) return res.status(403).end()
+
  const result = await removeExcludedCourses(courseCodes, curriculumVersion, programmeCode)
  if (!result) {
    res.status(400).end()
--- a/Show More
+++ b/Show More