Fix more bugs

.gitlab-ci.yml

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

flights-domain/flights-information/src/api/cruds/flight.py

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