Major refactor WIP

backend/app/schemas/departure.py

@@ -10,6 +10,7 @@ class DepartureStatus(str, Enum):
     DEPARTED = "DEPARTED"
     LOCAL = "LOCAL"
     CANCELLED = "CANCELLED"
+    PENDING = "PENDING"
 
 
 class SubmissionSource(str, Enum):
@@ -46,7 +47,7 @@ class DepartureBase(BaseModel):
 
 
 class DepartureCreate(DepartureBase):
-    pass
+    arrival_id: Optional[int] = None
 
 
 class DepartureUpdate(BaseModel):
@@ -79,6 +80,7 @@ class Departure(DepartureBase):
     updated_at: datetime
     submitted_via: Optional[SubmissionSource] = None
     pilot_email: Optional[str] = None
+    arrival_id: Optional[int] = None
 
     class Config:
         from_attributes = True

backend/app/schemas/local_flight.py

@@ -75,6 +75,7 @@ class LocalFlightUpdate(BaseModel):
     contact_dt: Optional[datetime] = None
     departed_dt: Optional[datetime] = None
     takeoff_dt: Optional[datetime] = None
+    landed_dt: Optional[datetime] = None
     circuits: Optional[int] = None
     notes: Optional[str] = None
 

backend/app/schemas/movement.py

@@ -0,0 +1,34 @@
+from typing import Optional
+from pydantic import BaseModel
+from datetime import datetime
+from app.models.movement import MovementType
+
+
+class MovementBase(BaseModel):
+    movement_type: MovementType
+    aircraft_registration: str
+    aircraft_type: Optional[str] = None
+    callsign: Optional[str] = None
+    timestamp: datetime
+    entity_type: str
+    entity_id: int
+    to_location: Optional[str] = None
+    from_location: Optional[str] = None
+    runway: Optional[str] = None
+    wind: Optional[str] = None
+    pressure_setting: Optional[str] = None
+    created_by: Optional[str] = None
+    ip_address: Optional[str] = None
+    notes: Optional[str] = None
+
+
+class MovementCreate(MovementBase):
+    pass
+
+
+class Movement(MovementBase):
+    id: int
+    created_at: datetime
+
+    class Config:
+        from_attributes = True

backend/app/schemas/ppr.py

@@ -11,6 +11,7 @@ class PPRStatus(str, Enum):
     LANDED = "LANDED"
     DELETED = "DELETED"
     DEPARTED = "DEPARTED"
+    ACTIVATED = "ACTIVATED"
 
 
 class UserRole(str, Enum):