Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New calendar backend #945

Merged
merged 38 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
f451088
removed the old backend
CommanderStorm Jan 15, 2024
46289c0
intial calendar implementation
CommanderStorm Jan 15, 2024
a0453f4
moved the details into a different file
CommanderStorm Jan 15, 2024
8e10aac
details
CommanderStorm Jan 15, 2024
08c0acf
renamed `DBRoomEntry` -> `Location` and `DBRoomKeyAlias` -> `Location…
CommanderStorm Jan 15, 2024
2dc6e28
basic infra
CommanderStorm Jan 16, 2024
decdae9
calendar removal
CommanderStorm Jan 16, 2024
fb08fe7
oath support
CommanderStorm Jan 16, 2024
3154a3a
added a db migration
CommanderStorm Jan 16, 2024
cd8200b
implemented the using of stale results
CommanderStorm Jan 16, 2024
b467148
finished the implementation
CommanderStorm Jan 16, 2024
16d9499
remvoed the calendar deployment
CommanderStorm Jan 16, 2024
59323f7
fixed a few code style issues
CommanderStorm Jan 16, 2024
9516552
Merge branch 'main' into new-calendar-backend
CommanderStorm Jan 17, 2024
67f204b
Formatting fix
CommanderStorm Jan 17, 2024
b2d4a15
fixed faulty time checks
CommanderStorm Jan 17, 2024
33502c0
better documentation/logging
CommanderStorm Jan 17, 2024
6618549
refactored the oauth implementation
CommanderStorm Jan 17, 2024
e5a9736
added a bit of debug output
CommanderStorm Jan 17, 2024
5b5ec9c
formatting fixes
CommanderStorm Jan 17, 2024
5d9702d
tmp, has to be reverted !!!
CommanderStorm Jan 17, 2024
a968483
implemented adaptive rescraping
CommanderStorm Jan 23, 2024
fdbc6ec
implemented a strategy based calendar fetcher
CommanderStorm Jan 23, 2024
ebc065f
added the `skip_{db,ms}_setup` features
CommanderStorm Jan 23, 2024
9c1eb7c
migrated to using `crate::BoxedError` instead of `Box<dyn std::error:…
CommanderStorm Jan 23, 2024
4ac6ceb
formatting fixes
CommanderStorm Jan 24, 2024
d9c44a5
fixed unintutive strategy
CommanderStorm Jan 24, 2024
5e1c215
formatting fix
CommanderStorm Jan 24, 2024
4e14151
Merge branch 'main' into new-calendar-backend
CommanderStorm Jan 24, 2024
c5414e8
cargo lock
CommanderStorm Jan 24, 2024
22249fb
formatting fixes
CommanderStorm Jan 24, 2024
a81bbc2
adapted the dockerfile
CommanderStorm Jan 24, 2024
da26b51
removed the calendar from the openapi specs
CommanderStorm Jan 24, 2024
d94c4b8
formatting fixes
CommanderStorm Jan 24, 2024
91f2965
made sure the dockerfile runs
CommanderStorm Jan 24, 2024
3ecc1c6
reworded the calendar docs
CommanderStorm Jan 24, 2024
fbc7c7d
made sure that npm run format is documented
CommanderStorm Jan 24, 2024
b6b6954
linting fix
CommanderStorm Jan 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions .github/workflows/server-cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,21 +69,3 @@ jobs:
deployment: feedback
secrets:
ARGOCD_TOKEN: ${{ secrets.ARGOCD_TOKEN }}
calendar-deployment:
uses: ./.github/workflows/_restart-argocd.yml
if: ${{ github.ref }} == 'refs/heads/main'
needs:
- server-build
with:
deployment: calendar
secrets:
ARGOCD_TOKEN: ${{ secrets.ARGOCD_TOKEN }}
server-deployment:
uses: ./.github/workflows/_restart-argocd.yml
if: ${{ github.ref }} == 'refs/heads/main'
needs:
- server-build
with:
deployment: server
secrets:
ARGOCD_TOKEN: ${{ secrets.ARGOCD_TOKEN }}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ spec:
value: http://api-svc.navigatum.svc.cluster.local:3003
- name: FEEDBACK_API_URL
value: http://feedback-svc.navigatum.svc.cluster.local:3004
- name: CALENDAR_API_URL
value: http://calendar-svc.navigatum.svc.cluster.local:3005
resources:
requests:
cpu: 5m
Expand Down
20 changes: 0 additions & 20 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ services:
CDN_URL: http://data:3002
MAIN_API_URL: http://main-api:3003
FEEDBACK_API_URL: http://feedback-api:3004
CALENDAR_API_URL: http://calendar-api:3005
depends_on:
tileserver:
condition: service_healthy
Expand Down Expand Up @@ -112,25 +111,6 @@ services:
test: wget -q --spider http://localhost:3004/api/feedback/status
retries: 5
start_period: 10s
calendar-api:
image: ghcr.io/tum-dev/navigatum-server:latest
restart: always
build: ./server
command: /bin/navigatum-calendar
environment:
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
POSTGRES_USER: ${POSTGRES_USER}
POSTGRES_DB: ${POSTGRES_DB}
POSTGRES_URL: db:5432
depends_on:
db:
condition: service_healthy
ports:
- "3005:3005"
healthcheck:
test: wget -q --spider http://localhost:3005/api/calendar/status
retries: 5
start_period: 10s
db:
image: postgres:16
restart: unless-stopped
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

This file was deleted.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading