Major WIP state machine

backend/app/api/endpoints/departures.py

@@ -38,7 +38,7 @@ async def create_departure(
     current_user: User = Depends(get_current_operator_user)
 ):
     """Create a new departure record"""
-    departure = crud_departure.create(db, obj_in=departure_in, created_by=current_user.username)
+    departure = crud_departure.create(db, obj_in=departure_in, created_by=current_user.username, submitted_via="ADMIN")
     
     # Send real-time update via WebSocket
     if hasattr(request.app.state, 'connection_manager'):

backend/app/api/endpoints/public.py

@@ -173,10 +173,10 @@ async def get_public_departures(db: Session = Depends(get_db)):
             'isDeparture': False
         })
     
-    # Add departures to other airports with BOOKED_OUT status
+    # Add departures to other airports with BOOKED_OUT and GROUND status
     departures_to_airports = crud_departure.get_multi(
         db,
-        status=DepartureStatus.BOOKED_OUT,
+        status=None,  # Get all statuses
         limit=1000
     )
     
@@ -187,17 +187,25 @@ async def get_public_departures(db: Session = Depends(get_db)):
     
     # Convert departures to match the format for display
     for dep in departures_to_airports:
-        # Only include departures booked out today
-        if not (today_start <= dep.created_dt < today_end):
+        # Only include departures booked out today and not yet departed
+        if not (today_start <= dep.created_dt < today_end) or dep.status == DepartureStatus.DEPARTED:
             continue
+        
+        # Map status for display
+        display_status = 'BOOKED_OUT'
+        if dep.status == DepartureStatus.GROUND:
+            display_status = 'CONTACT'
+        elif dep.status == DepartureStatus.LOCAL:
+            display_status = 'DEPARTED'
+        
         departures_list.append({
             'ac_call': dep.callsign or dep.registration,
             'ac_reg': dep.registration,
             'ac_type': dep.type,
             'out_to': dep.out_to,
             'etd': dep.etd or dep.created_dt,
-            'departed_dt': None,
-            'status': 'BOOKED_OUT',
+            'departed_dt': dep.departed_dt,
+            'status': display_status,
             'isLocalFlight': False,
             'isDeparture': True
         })

backend/app/api/endpoints/public_book.py

@@ -18,7 +18,7 @@ from app.crud.crud_circuit import crud_circuit
 from app.crud.crud_departure import departure as crud_departure
 from app.crud.crud_arrival import arrival as crud_arrival
 from app.models.local_flight import SubmissionSource
-from app.models.departure import SubmissionSource as DepartureSubmissionSource
+from app.models.departure import DepartureStatus
 from app.models.arrival import SubmissionSource as ArrivalSubmissionSource
 
 router = APIRouter()
@@ -136,11 +136,10 @@ async def public_book_departure(
         notes=departure_in.notes,
     )
     
-    departure = crud_departure.create(db, obj_in=departure_create, created_by="PUBLIC_PILOT")
+    departure = crud_departure.create(db, obj_in=departure_create, created_by="PUBLIC_PILOT", submitted_via="PUBLIC")
     
-    # Update with submission source and pilot email
+    # Update with pilot email (submitted_via is already set in create method)
     db.query(type(departure)).filter(type(departure).id == departure.id).update({
-        type(departure).submitted_via: DepartureSubmissionSource.PUBLIC,
         type(departure).pilot_email: departure_in.pilot_email,
     })
     db.commit()