diff --git a/.github/workflows/server-cicd.yml b/.github/workflows/server-cicd.yml index ed8b46c73..88696cc3b 100644 --- a/.github/workflows/server-cicd.yml +++ b/.github/workflows/server-cicd.yml @@ -31,7 +31,7 @@ jobs: git config --global user.name "github-actions[bot]" - name: Setup | install insta run: curl -LsSf https://insta.rs/install.sh | sh - - run: cargo insta test --workspace + - run: cargo insta test working-directory: server linting: runs-on: ubuntu-latest @@ -48,7 +48,7 @@ jobs: with: workspaces: | server - - run: cargo clippy --workspace + - run: cargo clippy working-directory: server server-build: uses: ./.github/workflows/_docker-build.yml diff --git a/deployment/README.md b/deployment/README.md index 50faac252..d3acd40ce 100644 --- a/deployment/README.md +++ b/deployment/README.md @@ -4,10 +4,7 @@ This Project details how to deploy NavigaTUM The documentation for the specific sub-services can be found in the respective directories: - [Data](../data/README.md) -- Backend-Servers - - [API Server](../server/main-api/README.md) - - [Feedback](../server/feedback/README.md) - - [Calendar](../server/calendar/README.md) +- [Backend-Server](../server/README.md) - [Website](../webclient/README.md) - [Maps](../map/README.md) diff --git a/server/.dockerignore b/server/.dockerignore index b51e6332f..eb5a316cb 100644 --- a/server/.dockerignore +++ b/server/.dockerignore @@ -1,2 +1 @@ target -api_data.db diff --git a/server/.gitignore b/server/.gitignore index b51e6332f..eb5a316cb 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -1,2 +1 @@ target -api_data.db diff --git a/server/Cargo.toml b/server/Cargo.toml index 6b4001269..62d7b3aae 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,84 @@ -[workspace] -members = ["main-api"] -resolver = "2" +[package] +name = "navigatum-server" +version = "1.0.0" +authors = ["Markus A ", "Frank Elsinga "] +edition = "2021" +description = "Navigating around TUM with excellence – An API and website to search for rooms, buildings and other places" +repository = "https://github.com/TUM-Dev/navigatum" +readme = "README.md" +license = "GPL-3.0" +keywords = ["website", "navigation", "api-rest", "tum"] +default-run = "navigatum-server" + +[[bin]] +name = "navigatum-server" +path = "src/main.rs" + +[dependencies] +# logging/obeservability +actix-web-prom = { version = "0.8.0", default-features = false, features = [] } +tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json", "fmt"] } +tracing = "0.1.40" +tracing-log = { version = "0.2.0", features = ["std", "log-tracer", "interest-cache"] } +tracing-actix-web = "0.7.11" +sentry = { version = "0.34.0", features = ["tracing", "metrics", "backtrace", "contexts", "debug-images", "panic", "reqwest", "rustls"] } +sentry-actix = "0.34.0" + +#serialisation +serde = { version = "1.0.200", features = ["derive"] } +serde_json = { version = "1.0.116", features = ["raw_value"] } +serde_yaml = "0.9.34" + +# runtime + webserver +tokio = { version = "1.37", features = ["full"] } +actix-web = { version = "4.5.1", default-features = false, features = ["macros", "compress-gzip", "compress-zstd", "compress-brotli", "cookies", "http2"] } +actix-cors = "0.7.0" +rustls = { version = "0.23.5", default-features = false, features = ["ring"] } # the aws' fips complient libary has weird bingen issues which require deeper looking into + +cached = { version = "0.53.0", features = ["default", "async", "tokio", "disk_store"] } +futures = "0.3.30" +unicode-truncate = "1.1.0" + +# database +sqlx = { version = "0.8.0", features = ["postgres", "runtime-tokio", "tls-rustls", "migrate", "macros", "chrono", "json"] } +chrono = { version = "0.4.38", default-features = false, features = ["serde"] } + +# search +meilisearch-sdk = "0.27.0" +logos = "0.14.0" +regex = "1.10.4" + +# web access +oauth2 = { version = "4.4.2", default-features = false, features = ["rustls-tls", "reqwest"] } +reqwest = { version = "0.12.4", default-features = false, features = ["rustls-tls", "http2", "charset", "json", "gzip", "hickory-dns", "zstd", "brotli", "deflate"] } + +# image production +image = { version = "0.25.1", default-features = false, features = ["jpeg", "png", "webp"] } +imageproc = "0.25.0" +ab_glyph = "0.2.25" +lazy_static = "1.4.0" + +rand = "0.8.5" +octocrab = { version = "0.39.0", default-features = false, features = ["rustls", "rustls-webpki-tokio", "retry", "default-client"] } + +# auth/security +jsonwebtoken = { version = "9.3.0", default-features = false, features = [] } +actix-governor = { version = "0.5.0", features = ["logger"] } + +# proposing feedback +tempfile = "3.10.1" +base64 = "0.22.1" +time = "0.3.36" +polars = { version = "0.41.3", features = ["parquet", "dtype-struct"] } +#polars = { git = "https://github.com/CommanderStorm/polars.git", branch = "serialisation-experiment", features = ["parquet", "serde", "dtype-full"] } + +[dev-dependencies] +insta = { version = "1.39.0", features = ["yaml", "json", "redactions"] } +pretty_assertions = "1.4.0" +testcontainers = { version = "0.21.0", features = ["watchdog"] } +testcontainers-modules = { version = "0.9.0", features = ["postgres", "meilisearch"] } +tracing-test = "0.2.5" + [profile.release] strip = false diff --git a/server/Dockerfile b/server/Dockerfile index 84416dcb9..d988515d0 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -16,20 +16,19 @@ ENV USER=root ENV RUSTFLAGS="-C target-feature=-crt-static -C link-arg=-fuse-ld=mold" # (probably cached) first run of the image build => only dependencies -COPY ./Cargo.* ./ -COPY main-api/Cargo.* ./main-api/ -RUN mkdir -p ./main-api/src/ \ - && echo "fn main() { println!(\"Hello, world!\");}" > ./main-api/src/main.rs +COPY Cargo.* ./ +RUN mkdir -p ./src/ \ + && echo "fn main() { println!(\"Hello, world!\");}" > ./src/main.rs -RUN cargo build --release --workspace \ +RUN cargo build --release \ && rm -fr target/release/deps/navigatum* # second run of the image build (including our code) COPY .sqlx .sqlx -COPY main-api/src ./main-api/src -COPY main-api/migrations ./main-api/migrations -RUN cargo build --release --workspace +COPY src src +COPY migrations migrations +RUN cargo build --release # RUN diff --git a/server/README.md b/server/README.md index 7ff2d52b8..1d6ef1bde 100644 --- a/server/README.md +++ b/server/README.md @@ -1,7 +1,148 @@ # Server -Our server is architected as a single monolith (with low coupling, chill). -The reason behind this is that we are a very small team (=mostly a singe dev) and -limit ourselves to the service itself. +This folder contains the main backend server for NavigaTUM. -Please see the [main-api](/server/main-api) for the main API server, which serves the API endpoints +## Getting started + +### Prerequisites + +For getting started, there are some system dependencys which you will need. +Please follow the [system dependencys docs](/resources/documentation/Dependencys.md) before trying to run this part of +our project. + +### Additional dependency + +We have a few API endpoints which require additional dependencies. + +As a general rule of thumb, if you probably want to **skip the tileserver**, but need to **do the SQLite Database** and +**MeiliSearch** setup. +The reason for this is, that the `preview` endpoint is the only endpoint, which requires the tileserver and said +endpoint is a non-essential part of the project. + +#### How to Set up the Databases + +At the beginning of the main api we set up both meilisearch and the database. +This will ensure that the sqlite database and meilisearch index is created. + +This requires meilisearch to be online. +To set up [MeiliSearch](https://github.com/meilisearch/MeiliSearch), either follow their installation instructions or +use + +```bash +docker run -it --rm -p 7700:7700 getmeili/meilisearch:latest +``` + +MeiliSearch provides an interactive interface at . + +To set up the Postgis, run the following command: + +```bash +docker run -it --rm -e POSTGRES_PASSWORD=CHANGE_ME -p 5432:5432 postgis/postgis:latest +``` + +### Starting the server + +Run `cargo run` to start the server. +The server should now be available on `localhost:8080` if you have configured the correct environment. + +> [!NOTE] +> `cargo run --release` is used to start the server for an optimised production build (use this if you want to profile +> the `search` or `preview` functions, it makes quite a difference). + +### Environment Variables + +| variable | module | | usage/description | +|-----------------------------------|----------------------------------|-----------------------------------------|--------------------------------------------------------------------------------------------------------| +| `POSTGRES_{USER,PASSWORD,URL,DB}` | [`all`](./main.rs) | required | Used to connect to the db | +| `GIT_COMMIT_SHA` | [`main`](./main.rs) | optional | Shown in the status endpint (also set at build time in docker) | +| `LOG_LEVEL` | [`main`](./main.rs) | optional | Controlls what is being logged (default=`info` in release and `debug` in development mode) | +| `GITHUB_TOKEN` | [`feedback`](./feeedback/mod.rs) | | A GitHub token with `write` access to `repo`.
This is used to create issues/PRs on the repository. | +| `JWT_KEY` | [`feedback`](./feeedback/mod.rs) | | A key used to sign JWTs.
This is used to authenticate that feedback tokens were given out by us. | +| `MIELI_{URL,MASTER_KEY}` | [`search`](./search/mod.rs) | | Allows searching via meiliserch | +| `CDN_URL` | [`setup`](./setup/mod.rs) | required
can be skipped via flags | Source of truth of the data | + +### Adding Migrations + +For the database-connector we use sqlx. +Migrations can be run with the `sqlx-cli` tool. Said tool can be installed with: + +```bash +cargo install sqlx-cli +``` + +Migrations can be added using + +```bash +cargo sqlx migrate add -r +``` + +### Adding/editing database queries + +To get compiletime guarantees for our queries, we use sqlx. +To add/edit a query, you will need to run the following command: + +```bash +cargo sqlx migrate run --database-url postgres://postgres:CHANGE_ME@localhost:5432/postgres +cargo sqlx prepare --database-url postgres://postgres:CHANGE_ME@localhost:5432/postgres +``` + +### How to Set up the tileserver (needed for the `preview` endpoint) + +To set up your tileserver, head over to the [`map`](https://github.com/TUM-Dev/NavigaTUM/tree/main/map) folder and +follow the instructions there. + +### API-Changes + +#### Editing + +If you have made changes to the API, you need to update the API documentation. + +There are two editors for the API documentation (both are imperfect): + +- [Swagger Editor](https://editor.swagger.io/?url=https://raw.githubusercontent.com/TUM-Dev/navigatum/main/openapi.yaml) +- [stoplight](https://stoplight.io/) + +#### Testing + +Of course documentation is one part of the process. +Run API-Fuzz-Test and [schemathesis](https://github.com/schemathesis/schemathesis) on API Server to ensure specification +is up-to-date and without holes. +To do so, run the following commands against the API Server: + +```bash +python -m venv venv +source venv/bin/activate +pip install schemathesis +st run --workers=auto --base-url=http://localhost:3003 --checks=all ../openapi.yaml +``` + +Some fuzzing-goals may not be available for you locally, as they require prefix-routing (f.ex.`/cdn` to the CDN) and +some fuzzing-goals are automatically tested in our CI. +You can exchange `--base-url=http://localhost:3003` to `--base-url=https://nav.tum.de` for the full public API, or +restrict your scope using an option like `--endpoint=/api/search`. + +### Approval tests + +Some of our tests are approval tests. +Please install [insta](https://insta.rs/docs/quickstart/) to have a working environment. + +You can then run `cargo insta test` instead of `cargo test` to review the needed changes. +If you don't want to do this, using the version we provide via CI is fine, but the DX is way better with the correct +tooling. + +## License + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . + +--- diff --git a/server/main-api/Cargo.toml b/server/main-api/Cargo.toml deleted file mode 100644 index 30cbc7e05..000000000 --- a/server/main-api/Cargo.toml +++ /dev/null @@ -1,80 +0,0 @@ -[package] -name = "navigatum-server" -version = "1.0.0" -authors = ["Markus A ", "Frank Elsinga "] -edition = "2021" -description = "Navigating around TUM with excellence – An API and website to search for rooms, buildings and other places" -repository = "https://github.com/TUM-Dev/navigatum" -readme = "README.md" -license = "GPL-3.0" -keywords = ["website", "navigation", "api-rest", "tum"] -default-run = "navigatum-server" - -[[bin]] -name = "navigatum-server" -path = "src/main.rs" - -[dependencies] -# logging/obeservability -actix-web-prom = { version = "0.8.0", default-features = false, features = [] } -tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json", "fmt"] } -tracing = "0.1.40" -tracing-log = { version = "0.2.0", features = ["std", "log-tracer", "interest-cache"] } -tracing-actix-web = "0.7.11" -sentry = { version = "0.34.0", features = ["tracing", "metrics", "backtrace", "contexts", "debug-images", "panic", "reqwest", "rustls"] } -sentry-actix = "0.34.0" - -#serialisation -serde = { version = "1.0.200", features = ["derive"] } -serde_json = { version = "1.0.116", features = ["raw_value"] } -serde_yaml = "0.9.34" - -# runtime + webserver -tokio = { version = "1.37", features = ["full"] } -actix-web = { version = "4.5.1", default-features = false, features = ["macros", "compress-gzip", "compress-zstd", "compress-brotli", "cookies", "http2"] } -actix-cors = "0.7.0" -rustls = { version = "0.23.5", default-features = false, features = ["ring"] } # the aws' fips complient libary has weird bingen issues which require deeper looking into - -cached = { version = "0.53.0", features = ["default", "async", "tokio", "disk_store"] } -futures = "0.3.30" -unicode-truncate = "1.1.0" - -# database -sqlx = { version = "0.8.0", features = ["postgres", "runtime-tokio", "tls-rustls", "migrate", "macros", "chrono", "json"] } -chrono = { version = "0.4.38", default-features = false, features = ["serde"] } - -# search -meilisearch-sdk = "0.27.0" -logos = "0.14.0" -regex = "1.10.4" - -# web access -oauth2 = { version = "4.4.2", default-features = false, features = ["rustls-tls", "reqwest"] } -reqwest = { version = "0.12.4", default-features = false, features = ["rustls-tls", "http2", "charset", "json", "gzip", "hickory-dns", "zstd", "brotli", "deflate"] } - -# image production -image = { version = "0.25.1", default-features = false, features = ["jpeg", "png", "webp"] } -imageproc = "0.25.0" -ab_glyph = "0.2.25" -lazy_static = "1.4.0" - -rand = "0.8.5" -octocrab = { version = "0.39.0", default-features = false, features = ["rustls", "rustls-webpki-tokio", "retry", "default-client"] } - -# auth/security -jsonwebtoken = { version = "9.3.0", default-features = false, features = [] } -actix-governor = { version = "0.5.0", features = ["logger"] } - -# proposing feedback -tempfile = "3.10.1" -base64 = "0.22.1" -time = "0.3.36" -polars = { version = "0.41.3", features = ["parquet", "dtype-struct"] } -#polars = { git = "https://github.com/CommanderStorm/polars.git", branch = "serialisation-experiment", features = ["parquet", "serde", "dtype-full"] } - -[dev-dependencies] -insta = { version = "1.39.0", features = ["yaml", "json", "redactions"] } -pretty_assertions = "1.4.0" -testcontainers = { version = "0.21.0", features = ["watchdog"] } -testcontainers-modules = { version = "0.9.0", features = ["postgres", "meilisearch"] } -tracing-test = "0.2.5" diff --git a/server/main-api/README.md b/server/main-api/README.md deleted file mode 100644 index 160e6551e..000000000 --- a/server/main-api/README.md +++ /dev/null @@ -1,148 +0,0 @@ -# Main-API - -This folder contains the main backend server for NavigaTUM. - -## Getting started - -### Prerequisites - -For getting started, there are some system dependencys which you will need. -Please follow the [system dependencys docs](/resources/documentation/Dependencys.md) before trying to run this part of -our project. - -### Additional dependency - -We have a few API endpoints which require additional dependencies. - -As a general rule of thumb, if you probably want to **skip the tileserver**, but need to **do the SQLite Database** and -**MeiliSearch** setup. -The reason for this is, that the `preview` endpoint is the only endpoint, which requires the tileserver and said -endpoint is a non-essential part of the project. - -#### How to Set up the Databases - -At the beginning of the main api we set up both meilisearch and the database. -This will ensure that the sqlite database and meilisearch index is created. - -This requires meilisearch to be online. -To set up [MeiliSearch](https://github.com/meilisearch/MeiliSearch), either follow their installation instructions or -use - -```bash -docker run -it --rm -p 7700:7700 getmeili/meilisearch:latest -``` - -MeiliSearch provides an interactive interface at . - -To set up the Postgis, run the following command: - -```bash -docker run -it --rm -e POSTGRES_PASSWORD=CHANGE_ME -p 5432:5432 postgis/postgis:latest -``` - -### Starting the server - -Run `cargo run` to start the server. -The server should now be available on `localhost:8080` if you have configured the correct environment. - -> [!NOTE] -> `cargo run --release` is used to start the server for an optimised production build (use this if you want to profile -> the `search` or `preview` functions, it makes quite a difference). - -### Environment Variables - -| variable | module | | usage/description | -|-----------------------------------|----------------------------------|-----------------------------------------|--------------------------------------------------------------------------------------------------------| -| `POSTGRES_{USER,PASSWORD,URL,DB}` | [`all`](./main.rs) | required | Used to connect to the db | -| `GIT_COMMIT_SHA` | [`main`](./main.rs) | optional | Shown in the status endpint (also set at build time in docker) | -| `LOG_LEVEL` | [`main`](./main.rs) | optional | Controlls what is being logged (default=`info` in release and `debug` in development mode) | -| `GITHUB_TOKEN` | [`feedback`](./feeedback/mod.rs) | | A GitHub token with `write` access to `repo`.
This is used to create issues/PRs on the repository. | -| `JWT_KEY` | [`feedback`](./feeedback/mod.rs) | | A key used to sign JWTs.
This is used to authenticate that feedback tokens were given out by us. | -| `MIELI_{URL,MASTER_KEY}` | [`search`](./search/mod.rs) | | Allows searching via meiliserch | -| `CDN_URL` | [`setup`](./setup/mod.rs) | required
can be skipped via flags | Source of truth of the data | - -### Adding Migrations - -For the database-connector we use sqlx. -Migrations can be run with the `sqlx-cli` tool. Said tool can be installed with: - -```bash -cargo install sqlx-cli -``` - -Migrations can be added using - -```bash -cargo sqlx migrate add -r -``` - -### Adding/editing database queries - -To get compiletime guarantees for our queries, we use sqlx. -To add/edit a query, you will need to run the following command: - -```bash -cargo sqlx migrate run --database-url postgres://postgres:CHANGE_ME@localhost:5432/postgres -cargo sqlx prepare --database-url postgres://postgres:CHANGE_ME@localhost:5432/postgres --workspace -``` - -### How to Set up the tileserver (needed for the `preview` endpoint) - -To set up your tileserver, head over to the [`map`](https://github.com/TUM-Dev/NavigaTUM/tree/main/map) folder and -follow the instructions there. - -### API-Changes - -#### Editing - -If you have made changes to the API, you need to update the API documentation. - -There are two editors for the API documentation (both are imperfect): - -- [Swagger Editor](https://editor.swagger.io/?url=https://raw.githubusercontent.com/TUM-Dev/navigatum/main/openapi.yaml) -- [stoplight](https://stoplight.io/) - -#### Testing - -Of course documentation is one part of the process. -Run API-Fuzz-Test and [schemathesis](https://github.com/schemathesis/schemathesis) on API Server to ensure specification -is up-to-date and without holes. -To do so, run the following commands against the API Server: - -```bash -python -m venv venv -source venv/bin/activate -pip install schemathesis -st run --workers=auto --base-url=http://localhost:3003 --checks=all ../openapi.yaml -``` - -Some fuzzing-goals may not be available for you locally, as they require prefix-routing (f.ex.`/cdn` to the CDN) and -some fuzzing-goals are automatically tested in our CI. -You can exchange `--base-url=http://localhost:3003` to `--base-url=https://nav.tum.de` for the full public API, or -restrict your scope using an option like `--endpoint=/api/search`. - -### Approval tests - -Some of our tests are approval tests. -Please install [insta](https://insta.rs/docs/quickstart/) to have a working environment. - -You can then run `cargo insta test` instead of `cargo test` to review the needed changes. -If you don't want to do this, using the version we provide via CI is fine, but the DX is way better with the correct -tooling. - -## License - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - ---- diff --git a/server/main-api/migrations/20230323144107_create_calendar.down.sql b/server/migrations/20230323144107_create_calendar.down.sql similarity index 100% rename from server/main-api/migrations/20230323144107_create_calendar.down.sql rename to server/migrations/20230323144107_create_calendar.down.sql diff --git a/server/main-api/migrations/20230323144107_create_calendar.up.sql b/server/migrations/20230323144107_create_calendar.up.sql similarity index 100% rename from server/main-api/migrations/20230323144107_create_calendar.up.sql rename to server/migrations/20230323144107_create_calendar.up.sql diff --git a/server/main-api/migrations/20230603173046_new_table_rooms.down.sql b/server/migrations/20230603173046_new_table_rooms.down.sql similarity index 100% rename from server/main-api/migrations/20230603173046_new_table_rooms.down.sql rename to server/migrations/20230603173046_new_table_rooms.down.sql diff --git a/server/main-api/migrations/20230603173046_new_table_rooms.up.sql b/server/migrations/20230603173046_new_table_rooms.up.sql similarity index 100% rename from server/main-api/migrations/20230603173046_new_table_rooms.up.sql rename to server/migrations/20230603173046_new_table_rooms.up.sql diff --git a/server/main-api/migrations/20230902115254_base-schema.down.sql b/server/migrations/20230902115254_base-schema.down.sql similarity index 100% rename from server/main-api/migrations/20230902115254_base-schema.down.sql rename to server/migrations/20230902115254_base-schema.down.sql diff --git a/server/main-api/migrations/20230902115254_base-schema.up.sql b/server/migrations/20230902115254_base-schema.up.sql similarity index 100% rename from server/main-api/migrations/20230902115254_base-schema.up.sql rename to server/migrations/20230902115254_base-schema.up.sql diff --git a/server/main-api/migrations/20230902115306_aliases.down.sql b/server/migrations/20230902115306_aliases.down.sql similarity index 100% rename from server/main-api/migrations/20230902115306_aliases.down.sql rename to server/migrations/20230902115306_aliases.down.sql diff --git a/server/main-api/migrations/20230902115306_aliases.up.sql b/server/migrations/20230902115306_aliases.up.sql similarity index 100% rename from server/main-api/migrations/20230902115306_aliases.up.sql rename to server/migrations/20230902115306_aliases.up.sql diff --git a/server/main-api/migrations/20240101134507_migrate_to_tum_calendar.down.sql b/server/migrations/20240101134507_migrate_to_tum_calendar.down.sql similarity index 100% rename from server/main-api/migrations/20240101134507_migrate_to_tum_calendar.down.sql rename to server/migrations/20240101134507_migrate_to_tum_calendar.down.sql diff --git a/server/main-api/migrations/20240101134507_migrate_to_tum_calendar.up.sql b/server/migrations/20240101134507_migrate_to_tum_calendar.up.sql similarity index 100% rename from server/main-api/migrations/20240101134507_migrate_to_tum_calendar.up.sql rename to server/migrations/20240101134507_migrate_to_tum_calendar.up.sql diff --git a/server/main-api/migrations/20240123175552_store_when_last_scrape_happened.down.sql b/server/migrations/20240123175552_store_when_last_scrape_happened.down.sql similarity index 100% rename from server/main-api/migrations/20240123175552_store_when_last_scrape_happened.down.sql rename to server/migrations/20240123175552_store_when_last_scrape_happened.down.sql diff --git a/server/main-api/migrations/20240123175552_store_when_last_scrape_happened.up.sql b/server/migrations/20240123175552_store_when_last_scrape_happened.up.sql similarity index 100% rename from server/main-api/migrations/20240123175552_store_when_last_scrape_happened.up.sql rename to server/migrations/20240123175552_store_when_last_scrape_happened.up.sql diff --git a/server/main-api/migrations/20240505224430_fix-calendar-id-not-extracted.down.sql b/server/migrations/20240505224430_fix-calendar-id-not-extracted.down.sql similarity index 100% rename from server/main-api/migrations/20240505224430_fix-calendar-id-not-extracted.down.sql rename to server/migrations/20240505224430_fix-calendar-id-not-extracted.down.sql diff --git a/server/main-api/migrations/20240505224430_fix-calendar-id-not-extracted.up.sql b/server/migrations/20240505224430_fix-calendar-id-not-extracted.up.sql similarity index 100% rename from server/main-api/migrations/20240505224430_fix-calendar-id-not-extracted.up.sql rename to server/migrations/20240505224430_fix-calendar-id-not-extracted.up.sql diff --git a/server/main-api/migrations/20240509001948_added-cascading-deletions.down.sql b/server/migrations/20240509001948_added-cascading-deletions.down.sql similarity index 100% rename from server/main-api/migrations/20240509001948_added-cascading-deletions.down.sql rename to server/migrations/20240509001948_added-cascading-deletions.down.sql diff --git a/server/main-api/migrations/20240509001948_added-cascading-deletions.up.sql b/server/migrations/20240509001948_added-cascading-deletions.up.sql similarity index 100% rename from server/main-api/migrations/20240509001948_added-cascading-deletions.up.sql rename to server/migrations/20240509001948_added-cascading-deletions.up.sql diff --git a/server/main-api/migrations/20240628192147_hash_based_intialisation.down.sql b/server/migrations/20240628192147_hash_based_intialisation.down.sql similarity index 100% rename from server/main-api/migrations/20240628192147_hash_based_intialisation.down.sql rename to server/migrations/20240628192147_hash_based_intialisation.down.sql diff --git a/server/main-api/migrations/20240628192147_hash_based_intialisation.up.sql b/server/migrations/20240628192147_hash_based_intialisation.up.sql similarity index 100% rename from server/main-api/migrations/20240628192147_hash_based_intialisation.up.sql rename to server/migrations/20240628192147_hash_based_intialisation.up.sql diff --git a/server/main-api/migrations/20240703163202_more_complete_calendar.down.sql b/server/migrations/20240703163202_more_complete_calendar.down.sql similarity index 100% rename from server/main-api/migrations/20240703163202_more_complete_calendar.down.sql rename to server/migrations/20240703163202_more_complete_calendar.down.sql diff --git a/server/main-api/migrations/20240703163202_more_complete_calendar.up.sql b/server/migrations/20240703163202_more_complete_calendar.up.sql similarity index 100% rename from server/main-api/migrations/20240703163202_more_complete_calendar.up.sql rename to server/migrations/20240703163202_more_complete_calendar.up.sql diff --git a/server/main-api/migrations/20240709000000_init_hstore.down.sql b/server/migrations/20240709000000_init_hstore.down.sql similarity index 100% rename from server/main-api/migrations/20240709000000_init_hstore.down.sql rename to server/migrations/20240709000000_init_hstore.down.sql diff --git a/server/main-api/migrations/20240709000000_init_hstore.up.sql b/server/migrations/20240709000000_init_hstore.up.sql similarity index 100% rename from server/main-api/migrations/20240709000000_init_hstore.up.sql rename to server/migrations/20240709000000_init_hstore.up.sql diff --git a/server/main-api/migrations/20240710191621_no_enum_types.down.sql b/server/migrations/20240710191621_no_enum_types.down.sql similarity index 100% rename from server/main-api/migrations/20240710191621_no_enum_types.down.sql rename to server/migrations/20240710191621_no_enum_types.down.sql diff --git a/server/main-api/migrations/20240710191621_no_enum_types.up.sql b/server/migrations/20240710191621_no_enum_types.up.sql similarity index 100% rename from server/main-api/migrations/20240710191621_no_enum_types.up.sql rename to server/migrations/20240710191621_no_enum_types.up.sql diff --git a/server/main-api/migrations/20240715133417_timezone.down.sql b/server/migrations/20240715133417_timezone.down.sql similarity index 100% rename from server/main-api/migrations/20240715133417_timezone.down.sql rename to server/migrations/20240715133417_timezone.down.sql diff --git a/server/main-api/migrations/20240715133417_timezone.up.sql b/server/migrations/20240715133417_timezone.up.sql similarity index 100% rename from server/main-api/migrations/20240715133417_timezone.up.sql rename to server/migrations/20240715133417_timezone.up.sql diff --git a/server/main-api/migrations/20240727225546_transport.down.sql b/server/migrations/20240727225546_transport.down.sql similarity index 100% rename from server/main-api/migrations/20240727225546_transport.down.sql rename to server/migrations/20240727225546_transport.down.sql diff --git a/server/main-api/migrations/20240727225546_transport.up.sql b/server/migrations/20240727225546_transport.up.sql similarity index 100% rename from server/main-api/migrations/20240727225546_transport.up.sql rename to server/migrations/20240727225546_transport.up.sql diff --git a/server/main-api/src/build.rs b/server/src/build.rs similarity index 100% rename from server/main-api/src/build.rs rename to server/src/build.rs diff --git a/server/main-api/src/calendar/connectum.rs b/server/src/calendar/connectum.rs similarity index 100% rename from server/main-api/src/calendar/connectum.rs rename to server/src/calendar/connectum.rs diff --git a/server/main-api/src/calendar/mod.rs b/server/src/calendar/mod.rs similarity index 100% rename from server/main-api/src/calendar/mod.rs rename to server/src/calendar/mod.rs diff --git a/server/main-api/src/calendar/models.rs b/server/src/calendar/models.rs similarity index 100% rename from server/main-api/src/calendar/models.rs rename to server/src/calendar/models.rs diff --git a/server/main-api/src/calendar/refresh.rs b/server/src/calendar/refresh.rs similarity index 100% rename from server/main-api/src/calendar/refresh.rs rename to server/src/calendar/refresh.rs diff --git a/server/main-api/src/calendar/snapshots/navigatum_server__calendar__tests__index_get-5.snap b/server/src/calendar/snapshots/navigatum_server__calendar__tests__index_get-5.snap similarity index 95% rename from server/main-api/src/calendar/snapshots/navigatum_server__calendar__tests__index_get-5.snap rename to server/src/calendar/snapshots/navigatum_server__calendar__tests__index_get-5.snap index 7c26ee280..48fa10e55 100644 --- a/server/main-api/src/calendar/snapshots/navigatum_server__calendar__tests__index_get-5.snap +++ b/server/src/calendar/snapshots/navigatum_server__calendar__tests__index_get-5.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/calendar/mod.rs +source: src/calendar/mod.rs expression: actual --- 5121.EG.003: diff --git a/server/main-api/src/calendar/snapshots/navigatum_server__calendar__tests__index_get-6.snap b/server/src/calendar/snapshots/navigatum_server__calendar__tests__index_get-6.snap similarity index 95% rename from server/main-api/src/calendar/snapshots/navigatum_server__calendar__tests__index_get-6.snap rename to server/src/calendar/snapshots/navigatum_server__calendar__tests__index_get-6.snap index 6d1ac80a7..650a1039a 100644 --- a/server/main-api/src/calendar/snapshots/navigatum_server__calendar__tests__index_get-6.snap +++ b/server/src/calendar/snapshots/navigatum_server__calendar__tests__index_get-6.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/calendar/mod.rs +source: src/calendar/mod.rs expression: actual --- 5121.EG.001: diff --git a/server/main-api/src/feedback/github.rs b/server/src/feedback/github.rs similarity index 100% rename from server/main-api/src/feedback/github.rs rename to server/src/feedback/github.rs diff --git a/server/main-api/src/feedback/mod.rs b/server/src/feedback/mod.rs similarity index 100% rename from server/main-api/src/feedback/mod.rs rename to server/src/feedback/mod.rs diff --git a/server/main-api/src/feedback/post_feedback.rs b/server/src/feedback/post_feedback.rs similarity index 100% rename from server/main-api/src/feedback/post_feedback.rs rename to server/src/feedback/post_feedback.rs diff --git a/server/main-api/src/feedback/proposed_edits/coordinate.rs b/server/src/feedback/proposed_edits/coordinate.rs similarity index 100% rename from server/main-api/src/feedback/proposed_edits/coordinate.rs rename to server/src/feedback/proposed_edits/coordinate.rs diff --git a/server/main-api/src/feedback/proposed_edits/discription.rs b/server/src/feedback/proposed_edits/discription.rs similarity index 100% rename from server/main-api/src/feedback/proposed_edits/discription.rs rename to server/src/feedback/proposed_edits/discription.rs diff --git a/server/main-api/src/feedback/proposed_edits/image.rs b/server/src/feedback/proposed_edits/image.rs similarity index 100% rename from server/main-api/src/feedback/proposed_edits/image.rs rename to server/src/feedback/proposed_edits/image.rs diff --git a/server/main-api/src/feedback/proposed_edits/mod.rs b/server/src/feedback/proposed_edits/mod.rs similarity index 100% rename from server/main-api/src/feedback/proposed_edits/mod.rs rename to server/src/feedback/proposed_edits/mod.rs diff --git a/server/main-api/src/feedback/proposed_edits/tmp_repo.rs b/server/src/feedback/proposed_edits/tmp_repo.rs similarity index 100% rename from server/main-api/src/feedback/proposed_edits/tmp_repo.rs rename to server/src/feedback/proposed_edits/tmp_repo.rs diff --git a/server/main-api/src/feedback/tokens.rs b/server/src/feedback/tokens.rs similarity index 100% rename from server/main-api/src/feedback/tokens.rs rename to server/src/feedback/tokens.rs diff --git a/server/main-api/src/limited/hash_map.rs b/server/src/limited/hash_map.rs similarity index 100% rename from server/main-api/src/limited/hash_map.rs rename to server/src/limited/hash_map.rs diff --git a/server/main-api/src/limited/mod.rs b/server/src/limited/mod.rs similarity index 100% rename from server/main-api/src/limited/mod.rs rename to server/src/limited/mod.rs diff --git a/server/main-api/src/limited/vec.rs b/server/src/limited/vec.rs similarity index 100% rename from server/main-api/src/limited/vec.rs rename to server/src/limited/vec.rs diff --git a/server/main-api/src/localisation.rs b/server/src/localisation.rs similarity index 100% rename from server/main-api/src/localisation.rs rename to server/src/localisation.rs diff --git a/server/main-api/src/locations/details.rs b/server/src/locations/details.rs similarity index 100% rename from server/main-api/src/locations/details.rs rename to server/src/locations/details.rs diff --git a/server/main-api/src/locations/mod.rs b/server/src/locations/mod.rs similarity index 100% rename from server/main-api/src/locations/mod.rs rename to server/src/locations/mod.rs diff --git a/server/main-api/src/locations/nearby.rs b/server/src/locations/nearby.rs similarity index 100% rename from server/main-api/src/locations/nearby.rs rename to server/src/locations/nearby.rs diff --git a/server/main-api/src/locations/preview.rs b/server/src/locations/preview.rs similarity index 100% rename from server/main-api/src/locations/preview.rs rename to server/src/locations/preview.rs diff --git a/server/main-api/src/locations/static/logo-card.png b/server/src/locations/static/logo-card.png similarity index 100% rename from server/main-api/src/locations/static/logo-card.png rename to server/src/locations/static/logo-card.png diff --git a/server/main-api/src/locations/static/logo.png b/server/src/locations/static/logo.png similarity index 100% rename from server/main-api/src/locations/static/logo.png rename to server/src/locations/static/logo.png diff --git a/server/main-api/src/locations/static/pin.png b/server/src/locations/static/pin.png similarity index 100% rename from server/main-api/src/locations/static/pin.png rename to server/src/locations/static/pin.png diff --git a/server/main-api/src/locations/static/pin.svg b/server/src/locations/static/pin.svg similarity index 100% rename from server/main-api/src/locations/static/pin.svg rename to server/src/locations/static/pin.svg diff --git a/server/main-api/src/main.rs b/server/src/main.rs similarity index 100% rename from server/main-api/src/main.rs rename to server/src/main.rs diff --git a/server/main-api/src/maps/fetch_tile.rs b/server/src/maps/fetch_tile.rs similarity index 100% rename from server/main-api/src/maps/fetch_tile.rs rename to server/src/maps/fetch_tile.rs diff --git a/server/main-api/src/maps/font/Cantarell-Bold.ttf b/server/src/maps/font/Cantarell-Bold.ttf similarity index 100% rename from server/main-api/src/maps/font/Cantarell-Bold.ttf rename to server/src/maps/font/Cantarell-Bold.ttf diff --git a/server/main-api/src/maps/font/Cantarell-BoldOblique.ttf b/server/src/maps/font/Cantarell-BoldOblique.ttf similarity index 100% rename from server/main-api/src/maps/font/Cantarell-BoldOblique.ttf rename to server/src/maps/font/Cantarell-BoldOblique.ttf diff --git a/server/main-api/src/maps/font/Cantarell-Oblique.ttf b/server/src/maps/font/Cantarell-Oblique.ttf similarity index 100% rename from server/main-api/src/maps/font/Cantarell-Oblique.ttf rename to server/src/maps/font/Cantarell-Oblique.ttf diff --git a/server/main-api/src/maps/font/Cantarell-Regular.ttf b/server/src/maps/font/Cantarell-Regular.ttf similarity index 100% rename from server/main-api/src/maps/font/Cantarell-Regular.ttf rename to server/src/maps/font/Cantarell-Regular.ttf diff --git a/server/main-api/src/maps/font/SIL Open Font License.txt b/server/src/maps/font/SIL Open Font License.txt similarity index 100% rename from server/main-api/src/maps/font/SIL Open Font License.txt rename to server/src/maps/font/SIL Open Font License.txt diff --git a/server/main-api/src/maps/mod.rs b/server/src/maps/mod.rs similarity index 100% rename from server/main-api/src/maps/mod.rs rename to server/src/maps/mod.rs diff --git a/server/main-api/src/maps/overlay_map.rs b/server/src/maps/overlay_map.rs similarity index 100% rename from server/main-api/src/maps/overlay_map.rs rename to server/src/maps/overlay_map.rs diff --git a/server/main-api/src/maps/overlay_text.rs b/server/src/maps/overlay_text.rs similarity index 100% rename from server/main-api/src/maps/overlay_text.rs rename to server/src/maps/overlay_text.rs diff --git a/server/main-api/src/models.rs b/server/src/models.rs similarity index 100% rename from server/main-api/src/models.rs rename to server/src/models.rs diff --git a/server/main-api/src/search/mod.rs b/server/src/search/mod.rs similarity index 100% rename from server/main-api/src/search/mod.rs rename to server/src/search/mod.rs diff --git a/server/main-api/src/search/search_executor/formatter.rs b/server/src/search/search_executor/formatter.rs similarity index 100% rename from server/main-api/src/search/search_executor/formatter.rs rename to server/src/search/search_executor/formatter.rs diff --git a/server/main-api/src/search/search_executor/lexer.rs b/server/src/search/search_executor/lexer.rs similarity index 100% rename from server/main-api/src/search/search_executor/lexer.rs rename to server/src/search/search_executor/lexer.rs diff --git a/server/main-api/src/search/search_executor/merger.rs b/server/src/search/search_executor/merger.rs similarity index 100% rename from server/main-api/src/search/search_executor/merger.rs rename to server/src/search/search_executor/merger.rs diff --git a/server/main-api/src/search/search_executor/mod.rs b/server/src/search/search_executor/mod.rs similarity index 100% rename from server/main-api/src/search/search_executor/mod.rs rename to server/src/search/search_executor/mod.rs diff --git a/server/main-api/src/search/search_executor/parser.rs b/server/src/search/search_executor/parser.rs similarity index 100% rename from server/main-api/src/search/search_executor/parser.rs rename to server/src/search/search_executor/parser.rs diff --git a/server/main-api/src/search/search_executor/query.rs b/server/src/search/search_executor/query.rs similarity index 100% rename from server/main-api/src/search/search_executor/query.rs rename to server/src/search/search_executor/query.rs diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-10.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-10.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-10.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-10.snap index 75ae0a0e0..0963a8286 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-10.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-10.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: typo with short word and at first letter expression: actual info: "'f abuer' should get '5602.EG.001' in 1 results # typo with short word and at first letter" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-11.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-11.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-11.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-11.snap index d74723b09..3ac2af70f 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-11.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-11.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "main room called 'service desk', only all 114abc.. subrooms have 'ssz' in the name" expression: actual info: "'ssz' should get '0501.EG.144' in 1 results # main room called 'service desk', only all 114abc.. subrooms have 'ssz' in the name" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-12.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-12.snap similarity index 94% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-12.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-12.snap index d512ce1a1..693fdcc23 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-12.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-12.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'Immathalle' should get '0501.EG.136' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-13.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-13.snap similarity index 86% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-13.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-13.snap index 00db6cdd8..e8e4c7ec0 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-13.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-13.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: Copy/paste from real search expression: actual info: "'Augustenstraße 44; Raum 209; 2.OG' should get '2903.02.209' in 1 results # Copy/paste from real search" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-14.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-14.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-14.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-14.snap index 80242c66a..d6f2a1f00 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-14.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-14.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "there are two basic lab course rooms, this is one of them" expression: actual info: "'praktikumsraum mi' should get '5604.EG.038' in 2 results # there are two basic lab course rooms, this is one of them" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-15.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-15.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-15.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-15.snap index 50b731f86..99b2c7756 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-15.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-15.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "'5604.02.033' is a valid result before the two lab course rooms" expression: actual info: "'physik labor mi' should get '5604.EG.036' in 3 results # '5604.02.033' is a valid result before the two lab course rooms" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-16.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-16.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-16.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-16.snap index 4986f816d..de55d24f2 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-16.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-16.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "This is 'N-1403@0104', but 'N1403@0104' can be before this" expression: actual info: "'n1403' should get '0104.U1.403' in 2 results # This is 'N-1403@0104', but 'N1403@0104' can be before this" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-17.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-17.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-17.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-17.snap index 9154b206b..e78e0955d 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-17.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-17.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "typo + it's 'Fachschaftsbüro' in the data" expression: actual info: "'fachschaft pyhsik' should get '5101.EG.257' in 1 results # typo + it's 'Fachschaftsbüro' in the data" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-18.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-18.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-18.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-18.snap index 707785a3f..7910f8411 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-18.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-18.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "H.003 is the correct room, but people have problems remembering how many zeroes are in the room number" expression: actual info: "'H.0003' should get '2910.EG.003' in 1 results # H.003 is the correct room, but people have problems remembering how many zeroes are in the room number" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-19.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-19.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-19.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-19.snap index 5e1a98812..4ccafa6b0 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-19.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-19.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "H.003 is the correct room, but people have problems remembering how many zeroes are in the room number" expression: actual info: "'H.03' should get '2910.EG.003' in 1 results # H.003 is the correct room, but people have problems remembering how many zeroes are in the room number" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-2.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-2.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-2.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-2.snap index 73e06139a..ab60770e3 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-2.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-2.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: target is hallucinated as it currently does not exist expression: actual info: "'tb innenstadt' should get 'tb-arcisstraße' in 1 results # target is hallucinated as it currently does not exist" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-20.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-20.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-20.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-20.snap index ed3c3f5fc..94efe378d 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-20.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-20.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "H.003 is the correct room, but people have problems remembering how many zeroes are in the room number" expression: actual info: "'H.3' should get '2910.EG.003' in 1 results # H.003 is the correct room, but people have problems remembering how many zeroes are in the room number" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-21.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-21.snap similarity index 94% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-21.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-21.snap index ce2508261..3bc6a3423 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-21.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-21.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "The architects name is a N2119. There are other rooms which are actually named '2119', which means 4 is the best case." expression: actual info: "'2119' should get '0101.02.119' in 4 results # The architects name is a N2119. There are other rooms which are actually named '2119', which means 4 is the best case." diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-22.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-22.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-22.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-22.snap index f9a746bd9..60fc37687 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-22.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-22.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "This should match this Lecture hall and not the HS 1, just because both are in the Bolzmanstr. *3* 4 is the best case." expression: actual info: "'MI HS3' should get '5606.EG.011' in 1 results # This should match this Lecture hall and not the HS 1, just because both are in the Bolzmanstr. *3* 4 is the best case." diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-3.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-3.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-3.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-3.snap index 097e50ffd..c89e8ccc0 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-3.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-3.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'interims I' should get '5620' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-4.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-4.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-4.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-4.snap index d0064e941..b1655f41e 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-4.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-4.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "Note: It is not really in Arcisstr., just close" expression: actual info: "'Studitum Arcisstr' should get '0201' in 1 results # Note: It is not really in Arcisstr., just close" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-5.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-5.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-5.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-5.snap index ea0e96029..09f1b660b 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-5.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-5.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "uses 'str.' instead of 'straße'" expression: actual info: "'Karlsstr. 47' should get '2906' in 1 results # uses 'str.' instead of 'straße'" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-6.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-6.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-6.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-6.snap index 9a5e83be2..ac406d602 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-6.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-6.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'mi hs 1' should get '5602.EG.001' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-7.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-7.snap similarity index 89% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-7.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-7.snap index f7b3dd04f..14753ddc8 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-7.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-7.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "old name before the NS renamings was 'MW 0001, Gustav-Niemann-Hörsaal', changed in Q1 24" expression: actual info: "'niemann' should get '5510.EG.001' in 1 results # old name before the NS renamings was 'MW 0001, Gustav-Niemann-Hörsaal', changed in Q1 24" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-8.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-8.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-8.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-8.snap index e9b7fbdb1..df5f846e3 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-8.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-8.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "old name before the NS renamings was 'MW 0001, Gustav-Niemann-Hörsaal', changed in Q1 24" expression: actual info: "'mw g niemann' should get '5510.EG.001' in 1 results # old name before the NS renamings was 'MW 0001, Gustav-Niemann-Hörsaal', changed in Q1 24" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-9.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-9.snap similarity index 82% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-9.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-9.snap index fbdf45264..267848818 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-9.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries-9.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'CH22209' should get '5402.01.220J' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries.snap index 6d2efab6d..9df64cc2f 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__bad_queries.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: target is hallucinated as it currently does not exist expression: actual info: "'mathe bib' should get 'mi-bib' in 1 results # target is hallucinated as it currently does not exist" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-10.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-10.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-10.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-10.snap index 881dee1de..671081f26 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-10.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-10.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'ZIEL' should get 'wzw-ziel' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-11.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-11.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-11.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-11.snap index 21ef1cb03..8955d46aa 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-11.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-11.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'5604.00.011' should get '5604.EG.011' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-12.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-12.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-12.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-12.snap index 04fcc9f9d..9b9a11d2b 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-12.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-12.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: MI Magistrale expression: actual info: "'5601.EG.001' should get '5601.EG.001' in 1 results # MI Magistrale" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-13.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-13.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-13.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-13.snap index 97d5c39e3..cb4b999f5 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-13.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-13.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: A search for the Architects name should return the correct room expression: actual info: "'00.01.001' should get '5601.EG.001' in 1 results # A search for the Architects name should return the correct room" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-14.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-14.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-14.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-14.snap index 8e289b58e..41beddae5 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-14.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-14.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'03.08.011' should get '5608.03.011' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-15.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-15.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-15.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-15.snap index 08ed7a702..d7561705d 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-15.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-15.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'MW 1801' should get '5508.02.801' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-16.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-16.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-16.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-16.snap index 21c73606f..a5e9822c8 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-16.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-16.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: splitting necessary expression: actual info: "'MW1801' should get '5508.02.801' in 1 results # splitting necessary" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-17.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-17.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-17.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-17.snap index a3ee0c503..434a13be1 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-17.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-17.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: splitting necessary expression: actual info: "'MW0001' should get '5510.EG.001' in 1 results # splitting necessary" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-18.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-18.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-18.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-18.snap index b63e6f083..0f9e1b86c 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-18.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-18.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: splitting necessary expression: actual info: "'MW2001' should get '5510.02.001' in 1 results # splitting necessary" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-19.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-19.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-19.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-19.snap index 9cdc91984..4ab896dcb 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-19.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-19.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'1801 maschinen' should get '5508.02.801' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-2.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-2.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-2.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-2.snap index 596439cbd..b369a1a78 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-2.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-2.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'wzw' should get 'wzw' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-20.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-20.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-20.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-20.snap index 60dea444c..b1dae1de7 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-20.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-20.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'Raum 0337 mw' should get '5503.EG.337' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-21.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-21.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-21.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-21.snap index 425d45760..b2248baf4 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-21.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-21.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'pyhsik hs 2' should get '5101.EG.502' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-22.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-22.snap similarity index 89% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-22.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-22.snap index 1fae75a64..61ab17d4d 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-22.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-22.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'mössbauer' should get '5101.EG.501' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-23.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-23.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-23.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-23.snap index bb87e5c5e..323ae2455 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-23.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-23.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'342 Physik' should get '5101.EG.342' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-24.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-24.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-24.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-24.snap index 83f24374a..989aa5f8b 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-24.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-24.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "lecture hall, should be preferred over other rooms" expression: actual info: "'2503' should get '5101.EG.503' in 1 results # lecture hall, should be preferred over other rooms" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-25.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-25.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-25.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-25.snap index b94371c12..652278b2f 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-25.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-25.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "seminar room, should be preferred over other rooms" expression: actual info: "'1116' should get '5111.01.116' in 1 results # seminar room, should be preferred over other rooms" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-26.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-26.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-26.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-26.snap index a3950e445..4ea61984d 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-26.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-26.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'C.3202' should get '5140.01.202' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-27.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-27.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-27.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-27.snap index ac1e40cbb..3cc5c072a 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-27.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-27.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: Not sure about target here expression: actual info: "'1010 znn' should get '5115.01.010' in 1 results # Not sure about target here" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-28.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-28.snap similarity index 94% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-28.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-28.snap index 5366e8d33..e459ea146 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-28.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-28.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'0092@5433' should get '5433.EG.092' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-29.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-29.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-29.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-29.snap index 6ff551524..b1b11cd13 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-29.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-29.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'0026m@5510' should get '5510.EG.026M' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-3.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-3.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-3.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-3.snap index e6449c080..1041c0ab5 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-3.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-3.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'5301' should get '5301' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-30.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-30.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-30.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-30.snap index 4f368042d..6681e6390 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-30.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-30.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'019 lmu' should get '5123.EG.019' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-31.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-31.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-31.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-31.snap index 269ec5a41..a04219d21 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-31.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-31.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'audimax' should get '0509.EG.980' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-32.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-32.snap similarity index 96% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-32.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-32.snap index ae2f345a8..105e9029c 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-32.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-32.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'1229 seminarraum' should get '0502.01.229' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-33.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-33.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-33.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-33.snap index cbf0f850c..e0f189f9a 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-33.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-33.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "H.003 is the correct room, but people have problems remembering how many zeroes are in the room number" expression: actual info: "'H.003' should get '2910.EG.003' in 1 results # H.003 is the correct room, but people have problems remembering how many zeroes are in the room number" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-34.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-34.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-34.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-34.snap index 1a7eb369a..ff6ad46a9 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-34.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-34.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'MI HS 3' should get '5606.EG.011' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-35.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-35.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-35.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-35.snap index 561c7a997..53148f073 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-35.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-35.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: Architects names should be matchable literally expression: actual info: "'N1406' should get '0104.01.406' in 1 results # Architects names should be matchable literally" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-36.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-36.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-36.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-36.snap index 87296851e..f24315d0d 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-36.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-36.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: Architects names should be matchable literally expression: actual info: "'N-1406' should get '0104.U1.406' in 1 results # Architects names should be matchable literally" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-4.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-4.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-4.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-4.snap index 26013a244..bbc1c6eab 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-4.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-4.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'interims' should get 'garching-interims' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-5.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-5.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-5.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-5.snap index 2e26fab8e..9977d3ab2 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-5.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-5.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'Interims 2' should get '5416' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-6.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-6.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-6.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-6.snap index 8041e2ad6..8f0428fec 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-6.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-6.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "Should give the 'new' mensa" expression: actual info: "'Mensa Garching' should get '5304' in 1 results # Should give the 'new' mensa" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-7.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-7.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-7.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-7.snap index aa0225233..bd24af86e 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-7.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-7.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'neue Mensa' should get '5304' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-8.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-8.snap similarity index 96% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-8.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-8.snap index 919e77c37..aa67dc702 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-8.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-8.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'Physik Container' should get '5140' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-9.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-9.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-9.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-9.snap index 4aad8d57e..77272c33d 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-9.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries-9.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'znn' should get '5115' in 1 results" diff --git a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries.snap b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries.snap similarity index 97% rename from server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries.snap rename to server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries.snap index 47de02b1d..ed5de1182 100644 --- a/server/main-api/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries.snap +++ b/server/src/search/search_executor/snapshots/navigatum_server__search__search_executor__test__good_queries.snap @@ -1,5 +1,5 @@ --- -source: main-api/src/search/search_executor/mod.rs +source: src/search/search_executor/mod.rs description: "" expression: actual info: "'hochbrück' should get 'garching-hochbrueck' in 1 results" diff --git a/server/main-api/src/search/search_executor/test-queries.bad.yaml b/server/src/search/search_executor/test-queries.bad.yaml similarity index 100% rename from server/main-api/src/search/search_executor/test-queries.bad.yaml rename to server/src/search/search_executor/test-queries.bad.yaml diff --git a/server/main-api/src/search/search_executor/test-queries.good.yaml b/server/src/search/search_executor/test-queries.good.yaml similarity index 100% rename from server/main-api/src/search/search_executor/test-queries.good.yaml rename to server/src/search/search_executor/test-queries.good.yaml diff --git a/server/main-api/src/setup/database/alias.rs b/server/src/setup/database/alias.rs similarity index 100% rename from server/main-api/src/setup/database/alias.rs rename to server/src/setup/database/alias.rs diff --git a/server/main-api/src/setup/database/data.rs b/server/src/setup/database/data.rs similarity index 100% rename from server/main-api/src/setup/database/data.rs rename to server/src/setup/database/data.rs diff --git a/server/main-api/src/setup/database/mod.rs b/server/src/setup/database/mod.rs similarity index 100% rename from server/main-api/src/setup/database/mod.rs rename to server/src/setup/database/mod.rs diff --git a/server/main-api/src/setup/meilisearch.rs b/server/src/setup/meilisearch.rs similarity index 100% rename from server/main-api/src/setup/meilisearch.rs rename to server/src/setup/meilisearch.rs diff --git a/server/main-api/src/setup/mod.rs b/server/src/setup/mod.rs similarity index 100% rename from server/main-api/src/setup/mod.rs rename to server/src/setup/mod.rs diff --git a/server/main-api/src/setup/search_synonyms.yaml b/server/src/setup/search_synonyms.yaml similarity index 100% rename from server/main-api/src/setup/search_synonyms.yaml rename to server/src/setup/search_synonyms.yaml diff --git a/server/main-api/src/setup/tests.rs b/server/src/setup/tests.rs similarity index 100% rename from server/main-api/src/setup/tests.rs rename to server/src/setup/tests.rs diff --git a/server/main-api/src/setup/transportation.rs b/server/src/setup/transportation.rs similarity index 100% rename from server/main-api/src/setup/transportation.rs rename to server/src/setup/transportation.rs