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

Booking integration #90

Open
wants to merge 93 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
ca43cb7
Added scopes and executed_for to booking service
Top-Ranger Jul 20, 2023
d20ac7d
Merge remote-tracking branch 'origin/main' into booking
Top-Ranger Feb 9, 2024
da913da
Buildable and testable schedule-service
Top-Ranger Feb 28, 2024
ee2137f
Reenable measurement of covered lines
Top-Ranger Feb 28, 2024
b5d33b9
Reenable measurement of covered lines
Top-Ranger Feb 28, 2024
9613a66
booking-backend buildable
Top-Ranger Feb 28, 2024
753e4d5
booking-frontend buildable
Top-Ranger Feb 28, 2024
509b87b
Cleanup
Top-Ranger Apr 22, 2024
5774dda
Implement deleteBookingByIDDestroy by reusing code
Top-Ranger May 16, 2024
8fa0652
Added authorization dummys for tests
Top-Ranger May 16, 2024
af13c15
Added authorization to booking server
Top-Ranger May 21, 2024
35147b7
fix wrong error message in case of unknown status
lojuk May 21, 2024
4d9c708
Added script for quick test setup in devcontainer
Top-Ranger May 21, 2024
e6c9b12
Merge branch 'booking' of github.com:Cross-Lab-Project/crosslab into …
lojuk May 21, 2024
30661c6
Merged authorization-dummy into fake-request
Top-Ranger May 22, 2024
8ecc2c1
Merge branch 'booking' of github.com:Cross-Lab-Project/crosslab into …
lojuk May 22, 2024
5d3ed3e
Added dummys for
Top-Ranger May 24, 2024
87d993c
Merge branch 'booking' of github.com:Cross-Lab-Project/crosslab into …
Top-Ranger May 24, 2024
15e3568
Started fixing tests
Top-Ranger May 24, 2024
bae2301
Test fix
Top-Ranger May 24, 2024
e6a7c31
Fixing tests
Top-Ranger May 24, 2024
68a3bd6
Test clean up
Top-Ranger May 24, 2024
e29cce8
Test setup script: Always drop data in database
Top-Ranger May 28, 2024
f934184
Implemented test for dispatchCallback
Top-Ranger May 28, 2024
fe8babc
Added 'reservateDevice() - local single device'
Top-Ranger May 28, 2024
e6baeee
Fixed test
Top-Ranger May 29, 2024
e300ac5
Implemented tests
Top-Ranger May 29, 2024
fe92772
it seems sleep needs to be waited
lojuk Jun 5, 2024
5772d0f
Implemented test DeleteBooking() local single device
Top-Ranger Jun 5, 2024
658433d
Tested DeleteBooking()
Top-Ranger Jun 6, 2024
01eee44
Tested freeDevice()
Top-Ranger Jun 6, 2024
277a302
Completed testiing of reservateDevice() and internal.ts
Top-Ranger Jun 6, 2024
e0eaab3
Completed testing of booling backend for now
Top-Ranger Jun 7, 2024
a70045f
Tested postBooking()
Top-Ranger Jun 11, 2024
d865651
Implemented tests
Top-Ranger Jun 11, 2024
44604c8
Tested deleteBookingByID()
Top-Ranger Jun 11, 2024
a86bf8e
Tested deleteBookingByIDDestroy()
Top-Ranger Jun 11, 2024
8e8b907
Tested patchBookingByID()
Top-Ranger Jun 13, 2024
8de8f21
Updated booking test script
Top-Ranger Jun 13, 2024
913a494
Added some more test cases
Top-Ranger Jun 14, 2024
5bcb8b6
Updated dependencies
Top-Ranger Jun 14, 2024
7422866
Merge remote-tracking branch 'origin/main' into booking
Top-Ranger Jun 14, 2024
793d18d
Merge remote-tracking branch 'origin/main' into booking
Top-Ranger Jun 21, 2024
586ba48
WIP: booking service integration
lassertos Jun 24, 2024
bff4b68
WIP: builder
Jun 24, 2024
a77e4c2
WIP: booking service integration
Jun 25, 2024
f6bdac3
Callbacks are POST and send {Status: "status"}
Top-Ranger Jun 25, 2024
94657cb
Merge remote-tracking branch 'origin/booking' into booking-integration
lassertos Jun 25, 2024
59a7f4a
WIP: booking service integration
lassertos Jun 25, 2024
c21f6c1
WIP: booking service integration
Jun 27, 2024
a1c0616
Send URL+ID in Callback
Top-Ranger Jul 8, 2024
639507e
Merge remote-tracking branch 'origin/booking' into booking-integration
Jul 8, 2024
5f3af2b
Fixed line length of API strings
Top-Ranger Jul 8, 2024
11b78df
Updated config files to get all vars from env
Top-Ranger Jul 8, 2024
f590992
Merge remote-tracking branch 'origin/booking' into booking-integration
Jul 8, 2024
a35d3b7
Don't allow anonymous user to create bookings
Top-Ranger Jul 8, 2024
44c50e3
Fixed test with config change
Top-Ranger Jul 9, 2024
8d7636e
Merge remote-tracking branch 'origin/booking' into booking-integration
Jul 9, 2024
96e4ce5
Merge branch 'builder' into booking-integration
Jul 9, 2024
f8c8f20
wip booking service integration
Jul 11, 2024
4e4eb5b
wip booking service integration
Jul 11, 2024
494734f
Added more debugging logs
Top-Ranger Jul 11, 2024
76ffa63
add error logging
lojuk Jul 11, 2024
b4a9c89
Merge branch 'booking-integration' of github.com:Cross-Lab-Project/cr…
lojuk Jul 11, 2024
fdd6f07
Plastering bigint to string everywhere
Top-Ranger Jul 11, 2024
b989291
Do not free devices not booked
Top-Ranger Jul 12, 2024
71f3cc7
Always ack free message
Top-Ranger Jul 12, 2024
803ee73
Support milliseconds
Top-Ranger Jul 12, 2024
49b5c10
wip booking service integration
Jul 15, 2024
c2f9ef1
wip integration booking service
Jul 15, 2024
57045a6
wip booking service integration
Jul 15, 2024
9b95824
add env for integration-test
Jul 17, 2024
cea6488
Fixed URL comparison
Top-Ranger Aug 13, 2024
c154c16
Fixed call for device callback
Top-Ranger Sep 3, 2024
e5b8970
Fixed id parsing
Top-Ranger Sep 3, 2024
94ee359
Removed unneeded permission check
Top-Ranger Sep 3, 2024
4be55c3
Ignore callbacks for devices not (longer) booked
Top-Ranger Sep 3, 2024
f386331
fix integration-test
lassertos Sep 3, 2024
cf42afd
add availability to devices inside group (integration-test)
lassertos Sep 4, 2024
f4e86c8
Fixed patch booking with empty device list
Top-Ranger Sep 4, 2024
2fcee2d
Added hack to add port to localhost for integration-test
Top-Ranger Sep 4, 2024
ded206b
Fixed hack
Top-Ranger Sep 4, 2024
1473fe6
Added hack
Top-Ranger Sep 4, 2024
7349a69
Fixed 'undefinded'
Top-Ranger Sep 4, 2024
555a0f4
Fixed schedule server for edge device
Top-Ranger Sep 5, 2024
e84d2ad
fix unavailable instantiated devices
lassertos Sep 5, 2024
380200e
Cleaned up messages
Top-Ranger Sep 6, 2024
b61849c
Removed logger since it is no longer needed
Top-Ranger Sep 6, 2024
2ca41a5
Started fixing tests
Top-Ranger Oct 9, 2024
0a7850b
Merge branch 'booking-integration' of github.com:Cross-Lab-Project/cr…
Top-Ranger Oct 9, 2024
7fd35bd
Merge branch 'main' into booking-integration
lassertos Nov 1, 2024
e100eb2
finish merge main branch
lassertos Nov 1, 2024
2a2d40b
add build-spec script for booking services
lassertos Nov 4, 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
157 changes: 138 additions & 19 deletions .jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ helper/python-test-helper:
- script: test
dependencies:
- helper/python-test-helper:build
- helper/python-test-helper:lint
tags:
- test

Expand Down Expand Up @@ -97,6 +98,7 @@ services/auth:
- script: test
dependencies:
- services/auth:build
- services/auth:lint
tags:
- test

Expand All @@ -114,6 +116,7 @@ services/authorization:
- script: build
dependencies:
- services/common:build
- services/common:lint
- script: build-docker
dependencies:
- services/authorization:build
Expand All @@ -125,28 +128,107 @@ services/authorization:
- script: test
dependencies:
- services/authorization:build
- services/authorization:lint
tags:
- test

services/booking/src/common:
- script: build
dependencies:
- helper/crosslab-typescript-addon:build
- helper/openapi-codegeneration:build
- services/booking:build-spec
- services/booking/src/booking-backend:build-spec
- services/booking/src/booking-frontend:build-spec
- services/booking/src/schedule-service:build-spec
- services/device:build-spec
- clients/api/js:build

services/booking/src/device-reservation:
- script: build
dependencies:
- services/booking/src/common:build
- script: test
dependencies:
- services/booking/src/device-reservation:build
tags:
- test
- script: build-docker
dependencies:
- services/booking/src/device-reservation:build

services/booking/src/test_common:
- script: build
dependencies:
- services/booking/src/common:build
- services/booking/src/device-reservation:build

services/booking/src/booking-backend:
- script: build-spec
paths:
- ./api
- script: build
dependencies:
- services/booking:build-spec
- services/booking/src/test_common:build
- script: test
dependencies:
- services/booking/src/booking-backend:build
tags:
- test
- script: build-docker
dependencies:
- services/booking/src/booking-backend:build

services/booking/src/booking-frontend:
- script: build-spec
paths:
- ./api
- script: build
dependencies:
- services/booking:build-spec
- services/booking/src/booking-backend:build
- script: test
dependencies:
- services/booking/src/booking-frontend:build
tags:
- test
- script: build-docker
dependencies:
- services/booking/src/booking-frontend:build

services/booking/src/schedule-service:
- script: build-spec
paths:
- ./api
- script: build
dependencies:
- services/booking:build-spec
- services/common:build
- services/booking/src/common:build
- services/booking/src/test_common:build
- helper/crosslab-typescript-addon:build
- helper/openapi-codegeneration:build
# - script: test
# dependencies:
# - services/booking/src/schedule-service:build
# tags:
# - test
- script: build-docker
dependencies:
- services/booking/src/schedule-service:build

services/booking:
- script: build-spec
# - script: lint-spec
# dependencies:
# - services/booking:build-spec
# tags:
# - test
# - script: build
# dependencies:
# - services/booking:build-spec
# - services/common:build
# - helper/crosslab-typescript-addon:build
# - helper/openapi-codegeneration:build
# - clients/api/js:build
# - script: test
# dependencies:
# - services/booking:build
# tags:
# - test
- script: build-spec
paths:
- ./api
- script: lint-spec
paths:
- ./api
dependencies:
- services/booking:build-spec
tags:
- test

services/device:
- script: build-spec
Expand Down Expand Up @@ -189,6 +271,10 @@ services/experiment:
- script: build
dependencies:
- services/experiment:build-spec
- services/booking/src/booking-backend:build-spec
- services/booking/src/booking-frontend:build-spec
- services/booking/src/schedule-service:build-spec
- services/booking:build-spec
- services/common:build
- helper/crosslab-typescript-addon:build
- helper/openapi-codegeneration:build
Expand Down Expand Up @@ -306,6 +392,7 @@ clients/api/python:
- script: test
dependencies:
- clients/api/python:build
- clients/api/python:lint
tags:
- test

Expand All @@ -322,7 +409,9 @@ clients/soa/python:
- test
- script: test
dependencies:
- clients/api/python:test
- clients/soa/python:build
- clients/soa/python:lint
- helper/python-test-helper:test
tags:
- test
Expand Down Expand Up @@ -350,7 +439,10 @@ clients/soa_services/electricalConnection/python:
- test
- script: test
dependencies:
- clients/api/python:test
- clients/soa/python:test
- clients/soa_services/electricalConnection/python:build
- clients/soa_services/electricalConnection/python:lint
- helper/python-test-helper:test
tags:
- test
Expand All @@ -377,7 +469,10 @@ clients/soa_services/webcam/python:
- test
- script: test
dependencies:
- clients/api/python:test
- clients/soa/python:test
- clients/soa_services/webcam/python:build
- clients/soa_services/webcam/python:lint
- helper/python-test-helper:test
tags:
- test
Expand All @@ -404,7 +499,10 @@ clients/soa_services/file/python:
- test
- script: test
dependencies:
- clients/api/python:test
- clients/soa/python:test
- clients/soa_services/file/python:build
- clients/soa_services/file/python:lint
- helper/python-test-helper:test
tags:
- test
Expand All @@ -431,7 +529,10 @@ clients/soa_services/message/python:
- test
- script: test
dependencies:
- clients/api/python:test
- clients/soa/python:test
- clients/soa_services/message/python:build
- clients/soa_services/message/python:lint
- helper/python-test-helper:test
tags:
- test
Expand All @@ -458,7 +559,10 @@ clients/soa_services/parameter/python:
- test
- script: test
dependencies:
- clients/api/python:test
- clients/soa/python:test
- clients/soa_services/message/python:build
- clients/soa_services/message/python:lint
- helper/python-test-helper:test
tags:
- test
Expand All @@ -483,11 +587,26 @@ integration-test:
- services/common:build
- services/auth:build
- services/authorization:build
# - services/booking:build
- services/booking/src/booking-backend:build
- services/booking/src/booking-frontend:build
- services/booking/src/device-reservation:build
- services/booking/src/schedule-service:build
- services/device:build
- services/experiment:build
- services/federation:build
- services/gateway:build
- services/auth:build-docker
- services/authorization:build-docker
- services/booking/src/booking-backend:build-docker
- services/booking/src/booking-frontend:build-docker
- services/booking/src/device-reservation:build-docker
- services/booking/src/schedule-service:build-docker
- services/device:build-docker
- services/experiment:build-docker
- services/federation:build-docker
- services/gateway:build-docker
- services/auth:test
- services/authorization:test
- clients/api/js:build
- clients/soa/js:build
- clients/soa_services/electricalConnection/js:build
Expand Down
Loading