Merge branch 'main' into next

TUM-Dev · Jul 20, 2024 · 73b5bc9 · 73b5bc9
2 parents fd1b943 + e6cabe5
commit 73b5bc9
Show file tree

Hide file tree

Showing 140 changed files with 10,511 additions and 2,843 deletions.
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v3
         with:
-          version: 9.1.3
+          version: 9.5.0
           package_json_file: webclient/package.json
           run_install: |
             - cwd: webclient
@@ -44,7 +44,5 @@ jobs:
             PR comes from [this Workflow Run](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
             
             [ 1 ]: https://github.com/peter-evans/create-pull-request
-          assignees: CommanderStorm
-          reviewers: CommanderStorm
           branch: chore/formatting-fixes
           delete-branch: true
diff --git a/.github/workflows/server-cicd.yml b/.github/workflows/server-cicd.yml
@@ -29,7 +29,9 @@ jobs:
         run: |
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
           git config --global user.name "github-actions[bot]"
-      - run: cargo test --workspace
+      - name: Setup | install insta
+        run: curl -LsSf https://insta.rs/install.sh | sh
+      - run: cargo insta test --workspace
         working-directory: server
   linting:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/update-data.yml b/.github/workflows/update-data.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v3
         with:
-          version: 9.1.3
+          version: 9.5.0
           package_json_file: webclient/package.json
           run_install: |
             - cwd: webclient
@@ -42,12 +42,6 @@ jobs:
           CONNECTUM_OAUTH_CLIENT_ID: ${{ secrets.CONECTUM_OAUTH_CLIENT_ID }}
           CONNECTUM_OAUTH_CLIENT_SECRET: ${{ secrets.CONECTUM_OAUTH_CLIENT_SECRET }}
         working-directory: data/external
-      - name: Download mytum data
-        continue-on-error: true # a PR deleting all data will be created if this fails => fail obvious
-        run: PYTHONPATH=$PYTHONPATH:.. python3 scrapers/roomfinder.py
-        env:
-          TQDM_MININTERVAL: 100
-        working-directory: data/external
       - continue-on-error: true # a PR deleting all data will be created if this fails => fail obvious
         run: ls -lah data/external/results
       - continue-on-error: true # a PR deleting all data will be created if this fails => fail obvious

diff --git a/.github/workflows/webclient-cicd.yml b/.github/workflows/webclient-cicd.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v3
         with:
-          version: 9.1.3
+          version: 9.5.0
           package_json_file: webclient/package.json
           run_install: |
             - cwd: webclient

diff --git a/.prettierignore b/.prettierignore
@@ -6,5 +6,4 @@ 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
-server/main-api/test/test-queries.yaml
 deployment/k3s
diff --git a/README.md b/README.md
@@ -87,8 +87,9 @@ docker compose -f docker-compose.local.yml up --build
 ```
 
 > [!NOTE]
-> Because we have a tileserver, running the following command is required once.
->
+> While most of the setup is simple, we need to download data (only Oberbayern is needed) for the initial setup. This takes 1-2 minutes.
+> Please first bring up a [postgis](https://postgis.net/) instance (for example via `docker compose -f docker-compose.local.yml up --build`) and then run:
+> 
 > ```bash
 > wget -O data.pbf https://download.geofabrik.de/europe/germany/bayern/oberbayern-latest.osm.pbf
 > docker run -it -v $(pwd):/data -e PGPASSWORD=CHANGE_ME --network="host" iboates/osm2pgsql:latest osm2pgsql --create --slim --database postgres --user     postgres --host 127.0.0.1 --port 5432 /data/data.pbf --hstore --hstore-add-index --hstore-column raw

diff --git a/data/external/results/maps_roomfinder.json b/data/external/results/maps_roomfinder.json
@@ -1708,7 +1708,7 @@
     "width": 386
   },
   {
-    "desc": "01-05-0507 Zentralgeb\u00e4ude 7 EG",
+    "desc": "01-05-0502 Zentralgeb\u00e4ude 7 EG",
     "height": 540,
     "id": "rf228",
     "latlonbox": {
@@ -1722,7 +1722,7 @@
     "width": 720
   },
   {
-    "desc": "01-05-0507 Zentralgeb\u00e4ude 7 1.OG",
+    "desc": "01-05-0502 Zentralgeb\u00e4ude 7 1.OG",
     "height": 540,
     "id": "rf229",
     "latlonbox": {
@@ -1736,7 +1736,7 @@
     "width": 720
   },
   {
-    "desc": "01-05-0507 Zentralgeb\u00e4ude 7 2.OG",
+    "desc": "01-05-0502 Zentralgeb\u00e4ude 7 2.OG",
     "height": 540,
     "id": "rf230",
     "latlonbox": {
@@ -1750,7 +1750,7 @@
     "width": 720
   },
   {
-    "desc": "01-05-0507 Zentralgeb\u00e4ude 7 3.OG",
+    "desc": "01-05-0502 Zentralgeb\u00e4ude 7 3.OG",
     "height": 540,
     "id": "rf231",
     "latlonbox": {
@@ -1764,7 +1764,7 @@
     "width": 720
   },
   {
-    "desc": "01-05-0507 Zentralgeb\u00e4ude 7 1.UG",
+    "desc": "01-05-0502 Zentralgeb\u00e4ude 7 1.UG",
     "height": 540,
     "id": "rf232",
     "latlonbox": {
@@ -1778,7 +1778,7 @@
     "width": 720
   },
   {
-    "desc": "01-05-0507 Zentralgeb\u00e4ude 7 2.UG",
+    "desc": "01-05-0502 Zentralgeb\u00e4ude 7 2.UG",
     "height": 540,
     "id": "rf233",
     "latlonbox": {

diff --git a/data/external/results/orgs-de_tumonline.json b/data/external/results/orgs-de_tumonline.json
@@ -11028,5 +11028,10 @@
     "code": "TUS4F7E",
     "name": "Lehrstuhl f\u00fcr Food Texture Engineering (Prof. Guldin)",
     "path": "TUM/Schools/Life Sciences/Departments/Life Science Engineering/Food Texture Engineering (Prof. Guldin)"
+  },
+  "56417": {
+    "code": "TUCSP17",
+    "name": "Professur f\u00fcr Optimization and Sustainable Decision Making (Prof. Thielen)",
+    "path": "TUM/Integrative Research Institutes/TUM Campus Straubing f\u00fcr Biotechnologie und Nachhaltigkeit (TUMCS)/Lehrst\u00fchle und Professuren/Optimization and Sustainable Decision Making (Prof. Thielen)"
   }
 }
diff --git a/data/external/results/orgs-en_tumonline.json b/data/external/results/orgs-en_tumonline.json
@@ -11028,5 +11028,10 @@
     "code": "TUS4F7E",
     "name": "Chair of Food Texture Engineering (Prof. Guldin)",
     "path": "TUM/Schools/Life Sciences/Departments/Life Science Engineering/Food Texture Engineering (Prof. Guldin)"
+  },
+  "56417": {
+    "code": "TUCSP17",
+    "name": "Associate Professorship of Optimization and Sustainable Decision Making (Prof. Thielen)",
+    "path": "TUM/Integrative Research Institutes/TUM Campus Straubing for Biotechnology and Sustainability (TUMCS)/Chairs and Professorships/Optimization and Sustainable Decision Making (Prof. Thielen)"
   }
 }