Merge branch 'main' into calendar_frontend

TUM-Dev · Sep 20, 2023 · 2419546 · 2419546
2 parents b3216b7 + f1274e0
commit 2419546
Show file tree

Hide file tree

Showing 78 changed files with 7,665 additions and 5,458 deletions.
diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml
@@ -29,24 +29,24 @@ jobs:
     outputs:
       tags: ${{ steps.meta.outputs.tags }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
       - run: cp openapi.yaml data/output
       - name: Log in to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-buildx-action@v3
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: ${{ inputs.context }}
           push: true

diff --git a/.github/workflows/add-deployment.yaml b/.github/workflows/add-deployment.yaml
@@ -10,7 +10,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
         with:
           ref: deployment
       - run: git config --global user.email "github-actions[bot]@users.noreply.github.com"

diff --git a/.github/workflows/data-cicd.yml b/.github/workflows/data-cicd.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         python-version: ["3.10", "3.11"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
         with:

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -12,7 +12,7 @@ jobs:
   linting:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
       - uses: actions/setup-node@v3
         with:
           cache: 'npm'

diff --git a/.github/workflows/remove-deployment.yml b/.github/workflows/remove-deployment.yml
@@ -9,7 +9,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
         with:
           ref: deployment
       - run: git config --global user.email "github-actions[bot]@users.noreply.github.com"

diff --git a/.github/workflows/server-cicd.yml b/.github/workflows/server-cicd.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup | Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
       - name: Setup | Rust
         uses: actions-rust-lang/[email protected]
         with:
@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup | Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
       - name: Setup | Rust
         uses: actions-rust-lang/[email protected]
         with:
@@ -60,30 +60,6 @@ jobs:
     permissions:
       contents: read
       packages: write
-  building-db-init-build:
-    uses: ./.github/workflows/_docker-build.yml
-    needs:
-      - tests
-      - linting
-    with:
-      image_suffix: building-db-init
-      context: ./server/main-api
-      dockerfile: Dockerfile.dbinit
-    permissions:
-      contents: read
-      packages: write
-  mieli-search-init-build:
-    uses: ./.github/workflows/_docker-build.yml
-    needs:
-      - tests
-      - linting
-    with:
-      image_suffix: mieli-search-init
-      context: ./server/main-api
-      dockerfile: Dockerfile.msinit
-    permissions:
-      contents: read
-      packages: write
   feedback-deployment:
     uses: ./.github/workflows/_restart-argocd.yml
     needs:
@@ -104,8 +80,6 @@ jobs:
     uses: ./.github/workflows/_restart-argocd.yml
     needs:
       - server-build
-      - building-db-init-build
-      - mieli-search-init-build
     with:
       deployment: server
     secrets:

diff --git a/.github/workflows/webclient-cicd.yml b/.github/workflows/webclient-cicd.yml
@@ -20,7 +20,7 @@ jobs:
       image: cypress/browsers:node16.16.0-chrome107-ff107
       options: --user 1001
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
       - uses: actions/setup-node@v3
         with:
           cache: 'npm'
@@ -35,7 +35,7 @@ jobs:
   webclient-linting:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
       - uses: actions/setup-node@v3
         with:
           cache: 'npm'

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -47,11 +47,11 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/asottile/add-trailing-comma
-    rev: v3.0.0
+    rev: v3.1.0
     hooks:
       - id: add-trailing-comma
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 23.7.0
     hooks:
       - id: black
         language_version: python3
@@ -61,7 +61,7 @@ repos:
       - id: python-check-blanket-noqa
       - id: python-use-type-annotations
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
       - id: flake8
         additional_dependencies:
@@ -88,15 +88,15 @@ repos:
         types: [python]
         exclude: migrations
   - repo: https://github.com/sourcery-ai/sourcery
-    rev: v1.5.0
+    rev: v1.8.1b22
     hooks:
     - id: sourcery
       # * review only changed lines:
       # * omit the summary
       args: [--diff=git diff HEAD, --no-summary]
   # markdown
   - repo: https://github.com/DavidAnson/markdownlint-cli2
-    rev: v0.8.1
+    rev: v0.9.2
     hooks:
       - id: markdownlint-cli2-fix
         exclude: .github/pull_request_template.md

diff --git a/.prettierignore b/.prettierignore
@@ -6,6 +6,5 @@ data/sources/15_patches-rooms_tumonline.yaml
 data/sources/45_custom-maps.yaml
 data/sources/46_overlay-maps.yaml
 data/sources/img/img-sources.yaml
-data/search_synonyms.json
 server/main-api/test/test-queries.yaml
 deployment/k3s
diff --git a/README.md b/README.md
@@ -60,7 +60,6 @@ download the latest compiled files:
 ```bash
 wget -P data/output https://nav.tum.de/cdn/api_data.json
 wget -P data/output https://nav.tum.de/cdn/search_data.json
-wget -P data/output https://nav.tum.de/cdn/search_synonyms.json
 ```
 
 Else you can follow the steps in the [data documentation](data/README.md).

diff --git a/data/Dockerfile b/data/Dockerfile
@@ -24,9 +24,6 @@ COPY output/openapi.yaml output/openapi.yaml
 # put all data into the cdn folder
 COPY external/results/maps/roomfinder output/maps/roomfinder
 
-# Synonyms are also provided via the cdn for the server container build
-COPY search_synonyms.json output/
-
 # compress data (only using gzip, because brotli on ngnix is a royal pain)
 RUN gzip --force --keep --recursive output/
 

diff --git a/data/README.md b/data/README.md
@@ -79,8 +79,7 @@ data
 │   ├── img/
 │   └── <custom data>
 ├── compile.py           # 🠔 The main script
-├── data-format_*.yaml   # 🠔 Data format specification
-└── search_synonyms.json # 🠔 synonyms that MeiliSearch considers
+└── data-format_*.yaml   # 🠔 Data format specification
 ```
 
 Deployment related there are also these files:

diff --git a/data/external/results/orgs-de_tumonline.json b/data/external/results/orgs-de_tumonline.json
@@ -1127,12 +1127,6 @@
     "name": "Lehrstuhl f\u00fcr P\u00e4dagogische Psychologie (Prof. Seidel)",
     "path": "TUM/Schools/Social Sciences and Technology/Departments/Educational Sciences/P\u00e4dagogische Psychologie (Prof. Seidel)"
   },
-  "TUEDS18": {
-    "code": "TUEDS18",
-    "id": 43860,
-    "name": "Lehrstuhl f\u00fcr Schulp\u00e4dagogik (N.N.)",
-    "path": "TUM/Schools/Social Sciences and Technology/Departments/Educational Sciences/Schulp\u00e4dagogik (N.N.)"
-  },
   "TUEDS22": {
     "code": "TUEDS22",
     "id": 44904,
@@ -1157,12 +1151,6 @@
     "name": "Lehrstuhl f\u00fcr Lehren und Lernen mit Digitalen Medien (Prof. Bannert)",
     "path": "TUM/Schools/Social Sciences and Technology/Departments/Educational Sciences/Lehren und Lernen mit Digitalen Medien (Prof. Bannert)"
   },
-  "TUEDS26": {
-    "code": "TUEDS26",
-    "id": 48757,
-    "name": "Professur f\u00fcr Pers\u00f6nlichkeits- und Sozialpsychologie (N.N.)",
-    "path": "TUM/Schools/Social Sciences and Technology/Departments/Educational Sciences/Pers\u00f6nlichkeits- und Sozialpsychologie (N.N.)"
-  },
   "TUEDS27": {
     "code": "TUEDS27",
     "id": 48758,
@@ -3063,13 +3051,13 @@
     "code": "TUMEBB1",
     "id": 27418,
     "name": "Lehrstuhl f\u00fcr Biologische Bildgebung (HMGU) (Prof. Ntziachristos)",
-    "path": "TUM/Fakult\u00e4ten/Medizin/Biologische Bildgebung (HMGU) (Prof. Ntziachristos)"
+    "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Biologische Bildgebung (HMGU) (Prof. Ntziachristos)"
   },
   "TUMEBB3": {
     "code": "TUMEBB3",
     "id": 51557,
     "name": "Professur f\u00fcr Translationale Optoakustik (HMGU) (Prof. Pleitez Rafael)",
-    "path": "TUM/Fakult\u00e4ten/Medizin/Translationale Optoakustik (HMGU) (Prof. Pleitez Rafael)"
+    "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Translationale Optoakustik (HMGU) (Prof. Pleitez Rafael)"
   },
   "TUMEBDS": {
     "code": "TUMEBDS",
@@ -3159,7 +3147,7 @@
     "code": "TUMEDF2",
     "id": 44966,
     "name": "Lehrstuhl f\u00fcr Stoffwechselerkrankungen (HMGU) (Prof. Tsch\u00f6p)",
-    "path": "TUM/Fakult\u00e4ten/Medizin/Stoffwechselerkrankungen (HMGU) (Prof. Tsch\u00f6p)"
+    "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Stoffwechselerkrankungen (HMGU) (Prof. Tsch\u00f6p)"
   },
   "TUMEDF3": {
     "code": "TUMEDF3",
@@ -3531,7 +3519,7 @@
     "code": "TUMELP0",
     "id": 45511,
     "name": "Lehrstuhl f\u00fcr Neuroproteomik (DZNE) (Prof. Lichtenthaler)",
-    "path": "TUM/Fakult\u00e4ten/Medizin/Neuroproteomik (DZNE) (Prof. Lichtenthaler)"
+    "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Neuroproteomik (DZNE) (Prof. Lichtenthaler)"
   },
   "TUMEMA0": {
     "code": "TUMEMA0",
@@ -3555,7 +3543,7 @@
     "code": "TUMEMD0",
     "id": 47897,
     "name": "Lehrstuhl f\u00fcr Medizindidaktik, Medizinische Lehrentwicklung und Bildungsforschung (Prof. Berberat)",
-    "path": "TUM/Fakult\u00e4ten/Medizin/Medizindidaktik, Medizinische Lehrentwicklung und Bildungsforschung (Prof. Berberat)"
+    "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Medizindidaktik, Medizinische Lehrentwicklung und Bildungsforschung (Prof. Berberat)"
   },
   "TUMEMI0": {
     "code": "TUMEMI0",
@@ -3615,7 +3603,7 @@
     "code": "TUMEMS0",
     "id": 54661,
     "name": "Lehrstuhl f\u00fcr Molekulare Stoffwechselkontrolle (HMGU) (Prof. Herzig)",
-    "path": "TUM/Fakult\u00e4ten/Medizin/Molekulare Stoffwechselkontrolle (HMGU) (Prof. Herzig)"
+    "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Molekulare Stoffwechselkontrolle (HMGU) (Prof. Herzig)"
   },
   "TUMENC0": {
     "code": "TUMENC0",
@@ -3639,7 +3627,7 @@
     "code": "TUMEND0",
     "id": 54664,
     "name": "Professur f\u00fcr Neurobiologie des Diabetes (HMGU) (Prof. Pfluger)",
-    "path": "TUM/Fakult\u00e4ten/Medizin/Neurobiologie des Diabetes (HMGU) (Prof. Pfluger)"
+    "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Neurobiologie des Diabetes (HMGU) (Prof. Pfluger)"
   },
   "TUMENL0": {
     "code": "TUMENL0",
@@ -3897,7 +3885,7 @@
     "code": "TUMESO0",
     "id": 54659,
     "name": "Lehrstuhl f\u00fcr Angewandte Stammzell- und Organoidsysteme (Prof. Hebrok)",
-    "path": "TUM/Fakult\u00e4ten/Medizin/Angewandte Stammzell- und Organoidsysteme (Prof. Hebrok)"
+    "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Angewandte Stammzell- und Organoidsysteme (Prof. Hebrok)"
   },
   "TUMESSK": {
     "code": "TUMESSK",
@@ -3945,13 +3933,13 @@
     "code": "TUMETG0",
     "id": 54667,
     "name": "Lehrstuhl f\u00fcr Translationale Genomik (HMGU) (Prof. Zeggini)",
-    "path": "TUM/Fakult\u00e4ten/Medizin/Translationale Genomik (HMGU) (Prof. Zeggini)"
+    "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Translationale Genomik (HMGU) (Prof. Zeggini)"
   },
   "TUMETIU": {
     "code": "TUMETIU",
     "id": 51637,
     "name": "Professur f\u00fcr Translationale Immunologie in der Umweltmedizin (UNIKA-T) (Prof. Renner)",
-    "path": "TUM/Fakult\u00e4ten/Medizin/Translationale Immunologie in der Umweltmedizin (UNIKA-T) (Prof. Renner)"
+    "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Translationale Immunologie in der Umweltmedizin (UNIKA-T) (Prof. Renner)"
   },
   "TUMETU0": {
     "code": "TUMETU0",
@@ -3981,7 +3969,7 @@
     "code": "TUMEUM0",
     "id": 46577,
     "name": "Lehrstuhl f\u00fcr Umweltmedizin (Prof. Traidl-Hoffmann)",
-    "path": "TUM/Fakult\u00e4ten/Medizin/Umweltmedizin (Prof. Traidl-Hoffmann)"
+    "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren/Umweltmedizin (Prof. Traidl-Hoffmann)"
   },
   "TUMEUR0": {
     "code": "TUMEUR0",
@@ -5693,6 +5681,12 @@
     "name": "Informatik Heilbronn 6 - Professur f\u00fcr Data Analytics & Statistics (Prof. Piribauer)",
     "path": "TUM/Schools/Computation, Information and Technology/Departments/Computer Science/Informatik Heilbronn 6 - Professur f\u00fcr Data Analytics & Statistics (Prof. Piribauer)"
   },
+  "TUS1305": {
+    "code": "TUS1305",
+    "id": 55237,
+    "name": "Professur f\u00fcr AI Planning in Dynamic Environments (Prof. Khadiv)",
+    "path": "TUM/Schools/Computation, Information and Technology/Departments/Computer Engineering/AI Planning in Dynamic Environments (Prof. Khadiv)"
+  },
   "TUS1306": {
     "code": "TUS1306",
     "id": 54757,
@@ -6569,6 +6563,12 @@
     "name": "School Office der TUM School of Medicine and Health in Gr\u00fcndung",
     "path": "TUM/Schools/Medicine and Health in Gr\u00fcndung/School Office"
   },
+  "TUS5PL0": {
+    "code": "TUS5PL0",
+    "id": 55217,
+    "name": "Weitere Lehrst\u00fchle und Professuren",
+    "path": "TUM/Fakult\u00e4ten/Medizin/Weitere Lehrst\u00fchle und Professuren"
+  },
   "TUS6000": {
     "code": "TUS6000",
     "id": 51900,
@@ -8036,8 +8036,8 @@
   "TUWZP9O": {
     "code": "TUWZP9O",
     "id": 15669,
-    "name": "Lehrstuhl f\u00fcr Tierhygiene (Prof. Langosch komm.)",
-    "path": "TUM/Schools/Life Sciences/Departments/Molecular Life Sciences/Tierhygiene (Prof. Langosch komm.)"
+    "name": "Lehrstuhl f\u00fcr Tierhygiene (N.N.)",
+    "path": "TUM/Schools/Life Sciences/Departments/Molecular Life Sciences/Tierhygiene (N.N.)"
   },
   "TUWZQ3Z": {
     "code": "TUWZQ3Z",