Andras/BoundlessFlowCampus2K

Fork 0

#964-Implement-Meue-Service #1076

Open

c24elipe wants to merge 39 commits from #964-Implement-Meue-Service into team_2_week_7

c24elipe commented

2026-05-21 09:57:20 +00:00

Collaborator

Developed on

This has been developed using JetBrains Rider and dotnet 10, on Arch Linux.

What's been done?

This is an implementation of the menu service.
Its goal is to read data from the restaurant "Götasalen"'s public ICS calendar.
The data then gets saved in memory and in the database to ping the restaurants endpoint and then the database as little as possible.

APi endpoints added:

"/": health check
"/today": get today's menu.
"/today/{category}": gets a specific category of today's food.
"/week": get the current week's menu.
"/week/{category}": gets a specific category of weekly food.
"/categories": Get all categories found.

What files have been created (A super quick overview)

DockerCompose/compose.yaml
- I added the correct time zone to the database and menuService to allow correct time conversions.
- Added menu service container.
DockerCompose/init_sql/04-menu.sql
- I added a new database, two tables (menu_entries and menu_categories)
entryPoint/nginx.conf
- Added menu service to the entrypoint under "api/menu/."
All scripts/*:
- Added menu service to be built and used.
service/menuService/menuService/DatabaseLogic/CacheLogic.cs
- This script contains the main logic for cashing in the in-memory and database storage used.
service/menuService/menuService/DatabaseLogic/DatabaseQueries.cs:
- This script handles the database interactions (save and read menus and categories)
service/menuService/menuService/Endpoints/MenuEndpoints.cs
- Handles the endpoints for the users. Note that no saving should be here since the internal system handles it.
service/menuService/menuService/Modals/Request/MenuEntry.cs
- Is meant to be the main response and data received from the database.
service/menuService/menuService/Services/MenuService.cs
- This is the service (glue) of this application. However, it works more like a patchboard here since it just connects other classes' methods mostly
service/menuService/menuService/Util/Ics/IcsFetcher.cs
- Handles the fetching of the ICS schedule file from the restaurant.
service/menuService/menuService/Util/Ics/IcsParser.cs
- Is the parser for the ics file to ParseResult objects that the rest of the program can use.
service/menuService/menuService/Util/Ics/ParseResult.cs
- A record that the ICS data gets parsed to.
service/menuService/menuService/Util/Menu/MenuFilters.cs
- General help functions that help the program get the current week and or the categories.
service/menuService/menuService.Tests/*":
- Added tests for some of the more important logic parts of the main application.

Issues

Main issue: #964
Testing: #1016 (Very lightly done)

## Developed on This has been developed using JetBrains Rider and dotnet 10, on Arch Linux. ## What's been done? This is an implementation of the menu service. Its goal is to read data from the restaurant "Götasalen"'s public ICS calendar. The data then gets saved in memory and in the database to ping the restaurants endpoint and then the database as little as possible. APi endpoints added: * "**/**": health check * "**/today**": get today's menu. * "**/today/{category}**": gets a specific category of today's food. * "**/week**": get the current week's menu. * "**/week/{category}**": gets a specific category of weekly food. * "**/categories**": Get all categories found. ## What files have been created (A super quick overview) * **DockerCompose/compose.yaml** * I added the correct time zone to the database and menuService to allow correct time conversions. * Added menu service container. * **DockerCompose/init_sql/04-menu.sql** * I added a new database, two tables (menu_entries and menu_categories) * **entryPoint/nginx.conf** * Added menu service to the entrypoint under "**api/menu/**." * All scripts/*: * Added menu service to be built and used. * **service/menuService/menuService/DatabaseLogic/CacheLogic.cs** * This script contains the main logic for cashing in the in-memory and database storage used. * **service/menuService/menuService/DatabaseLogic/DatabaseQueries.cs**: * This script handles the database interactions (save and read menus and categories) * **service/menuService/menuService/Endpoints/MenuEndpoints.cs** * Handles the endpoints for the users. Note that no saving should be here since the internal system handles it. * **service/menuService/menuService/Modals/Request/MenuEntry.cs** * Is meant to be the main response and data received from the database. * **service/menuService/menuService/Services/MenuService.cs** * This is the service (glue) of this application. However, it works more like a patchboard here since it just connects other classes' methods mostly * **service/menuService/menuService/Util/Ics/IcsFetcher.cs** * Handles the fetching of the ICS schedule file from the restaurant. * **service/menuService/menuService/Util/Ics/IcsParser.cs** * Is the parser for the ics file to ParseResult objects that the rest of the program can use. * **service/menuService/menuService/Util/Ics/ParseResult.cs** * A record that the ICS data gets parsed to. * **service/menuService/menuService/Util/Menu/MenuFilters.cs** * General help functions that help the program get the current week and or the categories. * **service/menuService/menuService.Tests/***": * Added tests for some of the more important logic parts of the main application. ## Issues Main issue: #964 Testing: #1016 (Very lightly done)

c24elipe added 33 commits

2026-05-21 09:57:20 +00:00

Created the skeleton of menu Service de6b4d654d

Removed var 368f5effb3

Basic Ics parser added 2d8f9d0ccc

Fixed naming error 7ccf2d1c14

Added SQL 20ac5b0f6f

Added some shit 8bcb8a3d8c

Update 04-menu.sql 08b25ac92f

Created the skeleton of menu Service 8e1b908016

Removed var 75b3b5e0f1

Basic Ics parser added 596440d270

Fixed naming error cbce70a0b0

Added SQL 7a37af8154

Added some shit f5074cf99d

Update 04-menu.sql 34cec8418a

Merge branch '#964-Implement-Meue-Service' of https://git.webug.se/Andras/BoundlessFlowCampus2K into #964-Implement-Meue-Service bca0cdb383

Quick fix of broken commit 6246eb8eea

laptop changes b3fd07cf4e

Merge branch '#964-Implement-Meue-Service' of https://git.webug.se/Andras/BoundlessFlowCampus2K into #964-Implement-Meue-Service bc2f2ec807

Updated the program 39ce51a2a0

Removed bad comment fc228a9326

Works, but doesn't parse correctly db16cb6dd9

Fix parsing and formatting fa6cfba1ae

Fix small parsing error, still parses some stuff wrong 40ea0c5738

Added some logging and logic errors 93a6bcbbd4

Updated some code to use cash 1b49e815b2

Divided up and cleaned up d4d645adea

Added basic tests 0b6b4664d2

Added basic comments to cacheLogic 78f2ea208f

Added more comments 72ff6c5d66

Added comments 6f94e49e89

re-internald backend network f6a33ebb78

Update compose.yaml 7d62b71132

Removed unused files 58ed90c3e8

c24elipe added 1 commit

2026-05-21 10:06:39 +00:00

Removed .idea folder 43784d7025

c24elipe added 1 commit

2026-05-21 10:07:32 +00:00

Removed unused files 64cf221189

c24elipe added 1 commit

2026-05-21 10:09:40 +00:00

Merge remote-tracking branch 'origin/team_2_week_7' into #964-Implement-Meue-Service fad9341490

c24elipe added 1 commit

2026-05-21 11:33:22 +00:00

Updated the docker compose stack a49b456eff

c24elipe added 1 commit

2026-05-21 11:39:48 +00:00

Added missing comments 419c931c8c

c24elipe added 1 commit

2026-05-21 11:49:43 +00:00

Merge remote-tracking branch 'origin/team_2_week_7' into #964-Implement-Meue-Service 60397db578

This pull request can be merged automatically.

You are not authorized to merge this pull request.

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin #964-Implement-Meue-Service:#964-Implement-Meue-Service

git switch #964-Implement-Meue-Service

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch team_2_week_7

git merge --no-ff #964-Implement-Meue-Service

git switch #964-Implement-Meue-Service

git rebase team_2_week_7

git switch team_2_week_7

git merge --ff-only #964-Implement-Meue-Service

git switch #964-Implement-Meue-Service

git rebase team_2_week_7

git switch team_2_week_7

git merge --no-ff #964-Implement-Meue-Service

git switch team_2_week_7

git merge --squash #964-Implement-Meue-Service