Andras/BoundlessFlowCampus2K
3
6
Fork 0
Code Issues 144 Pull requests 13 Projects Releases Packages Wiki Activity Actions 2

#351-roombooking-functionality-and-restructuring #546

Merged
b24johka merged 11 commits from #351-roombooking-functionality-and-restructuring into team_1_week_3 2026-04-28 08:15:03 +00:00
Conversation 4 Commits 11 Files changed 18 +405 -363
a24antej commented 2026-04-24 10:10:57 +00:00
Collaborator
Copy link

Changes

  • Merged the readRoomBookingmockup/roomBookingDbHandler into to main service (roomBookingApiMockup)
  • Temporarly disabled readRoomBookingmockup/roomBookingDbHandler while this PR is being reviewed, Can delete this after the review.
  • Added more fucntionality to the service
    • Create mockup
    • Delete booking
    • search by building
    • search for spesific room in building
  • Added documentation
  • Added insertion, deletion and update handling in the database handler
  • update and insertion has currently no endpoint (except for mockup generation )

important urls for testing

  • View all bookings: localhost/api/roombooking/all
  • Create mockup data: localhost/api/roombooking/createmockup
  • Delete a booking: localhost/api/roombooking/delete/{ID}
  • Search:
    • localhost/api/roombooking/search/{building}
    • localhost/api/roombooking/search/{building}/{roomNr}

Note

The merging of reader into the service works as a proof of concept and may be implemented into other services such as the parkingservice

# Changes - Merged the readRoomBookingmockup/roomBookingDbHandler into to main service (roomBookingApiMockup) - Temporarly disabled readRoomBookingmockup/roomBookingDbHandler while this PR is being reviewed, Can delete this after the review. - Added more fucntionality to the service - Create mockup - Delete booking - search by building - search for spesific room in building - Added documentation - Added insertion, deletion and update handling in the database handler - update and insertion has currently no endpoint (except for mockup generation ) ## important urls for testing - View all bookings: `localhost/api/roombooking/all` - Create mockup data: `localhost/api/roombooking/createmockup` - Delete a booking: `localhost/api/roombooking/delete/{ID}` - Search: - `localhost/api/roombooking/search/{building}` - `localhost/api/roombooking/search/{building}/{roomNr}` ## Note The merging of reader into the service works as a proof of concept and may be implemented into other services such as the parkingservice 
have integrated the reader into to service (as a seperate class) and started on working with adding additional endpoints, currently only delete and createmockup
I have added the functionality so search by building and search for a spesific room in a building.
Created some documentation for the functions of the classes.
Cleaned up some old commented out code
a24antej commented 2026-04-24 10:15:54 +00:00
Author
Collaborator
Copy link

When testing myself i noticed that sometimes the service failed to connect to mqtt on startup and thus i have made so that the mqtt client tries to connect up to 5 times. Currently i have not gotten the error but keep in mind that this may still occur.

When testing myself i noticed that sometimes the service failed to connect to mqtt on startup and thus i have made so that the mqtt client tries to connect up to 5 times. Currently i have not gotten the error but keep in mind that this may still occur.
b24johka 2026-04-27 07:06:34 +00:00
a24hirsa commented 2026-04-27 09:10:36 +00:00
Collaborator
Copy link

Code looks good but there is alot of old code left as just comments that break the structure that needs to be removed latter.

You also need to modify the Unix versions of installation and build scripts in the same way you modified the Windows version so that it can be used/tested on linux systems, because currently i can't test them on linux

Code looks good but there is alot of old code left as just comments that break the structure that needs to be removed latter. You also need to modify the Unix versions of installation and build scripts in the same way you modified the Windows version so that it can be used/tested on linux systems, because currently i can't test them on linux
Cleaned out commented out code and removed the roomBookingDbHandler files.
removed DbHandlern from scripts and added potentially nececary pakages in the installation scripts
Fixed the bug that roombooking does not reach mqtt user and password environmental variables.
Only needed to add them in the compose file.
a24hirsa commented 2026-04-28 08:00:15 +00:00
Collaborator
Copy link

Nice everything works good on linux and is ready to merge imo

Nice everything works good on linux and is ready to merge imo
b24johka commented 2026-04-28 08:14:57 +00:00
Collaborator
Copy link

The review has been sufficient and this will be merged right away. Good job!

The review has been sufficient and this will be merged right away. Good job!
b24johka merged commit 04a2a29a40 into team_1_week_3 2026-04-28 08:15:03 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
a24hirsa
Labels
Clear labels   
_CRITICAL_

Only use this label for critical tasks that are project-scope,and must be addressed ASAP.

  
API

   
app

   
backEnd

   
Blocked-waiting-for-further-changes

   
bug

Something is not working

  
bug-only-on-server-for-mobile-not-webpage

   
Bug-Report-After-Merge

   
cleanup

Issues to cleanup the codebase (restructure folders, remove deprecated or smelly code)

  
close

Issue to close

  
design

   
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
feature request

   
frontEnd

   
further-changes-needed

   
future-problem-not-fixint-this-period

   
help wanted

Need some help

  
invalid

Something is wrong

  
last-week-issue-to-fix

   
library

   
low-priority

   
needs input

Issue needs input from product owner or customer

  
needs review

issue is in need of review

  
not-implemented.

   
project documentation

   
question

More information is needed

  
research

   
reviewed

This Issue has been reviewed

  
Script

   
security

use this for security-related issues

  
SQL

  
style

   
Team 1

Team 1 is responsible for this issue

  
Team 2

Team 2 is responsible for this issue

  
team leaders

   
test-creation

   
testing

   
topLevel

Reserved for top-level, project-wide issues.

  
unassigned

   
Under-review

   
wontfix

This won't be fixed

No labels
_CRITICAL_
API
app
backEnd
Blocked-waiting-for-further-changes
bug
bug-only-on-server-for-mobile-not-webpage
Bug-Report-After-Merge
cleanup
close
design
duplicate
enhancement
feature request
frontEnd
further-changes-needed
future-problem-not-fixint-this-period
help wanted
invalid
last-week-issue-to-fix
library
low-priority
needs input
needs review
not-implemented.
project documentation
question
research
reviewed
Script
security
SQL
style
Team 1
Team 2
team leaders
test-creation
testing
topLevel
unassigned
Under-review
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
Andras/BoundlessFlowCampus2K!546
No description provided.