slococo
/
fids
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix more bugs

This commit is contained in:
Santiago Lo Coco 2023-12-04 21:29:16 -03:00
parent f7463e0543
commit b5d0095604
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -149,7 +149,7 @@ build-gateway:
- export TEST_IMAGE=${GATEWAY_TEST_IMAGE_NAME} - export TEST_IMAGE=${GATEWAY_TEST_IMAGE_NAME}
- *build-and-push-script - *build-and-push-script
build-browser-dev: build-browser-client-dev:
extends: extends:
- .build - .build
script: script:
@ -457,6 +457,9 @@ test-catcher:
- *changes-frontend - *changes-frontend
- *changes-backend - *changes-backend
script: script:
- export CLIENT_IMAGE=${BROWSER_CLIENT_DEV_IMAGE_NAME}
- export FOLDER=browser-domain
- *test-script
- export CLIENT_IMAGE=${CATCHER_TEST_IMAGE_NAME} - export CLIENT_IMAGE=${CATCHER_TEST_IMAGE_NAME}
- export FOLDER=testing/catcher - export FOLDER=testing/catcher
- *test-integration - *test-integration
@ -469,6 +472,9 @@ test-catcher:
- job: build-catcher - job: build-catcher
optional: true optional: true
artifacts: false artifacts: false
- job: build-browser-client-dev
optional: true
artifacts: false
- *needs-backend-tests - *needs-backend-tests
deliver-dockerhub: deliver-dockerhub:

1
flights-domain/flights-information/src/api/cruds/flight.py
View File

@ -48,6 +48,7 @@ def is_flight_collision(db: Session, flight: Flight, id: int = None):
Flight.departure_time.between( Flight.departure_time.between(
departure_time_lower_limit, departure_time_upper_limit departure_time_lower_limit, departure_time_upper_limit
), ),
Flight.status != "Deleted",
) )
.count() .count()
) )