Better movement reporting

backend/alembic/versions/002_local_flights.py

@@ -79,6 +79,7 @@ def upgrade() -> None:
         sa.Column('flight_type', sa.Enum('LOCAL', 'CIRCUITS', 'DEPARTURE', name='localflighttype'), nullable=False),
         sa.Column('status', sa.Enum('BOOKED_OUT', 'DEPARTED', 'LANDED', 'CANCELLED', name='localflightstatus'), nullable=False, server_default='BOOKED_OUT'),
         sa.Column('duration', sa.Integer(), nullable=True, comment='Duration in minutes'),
+        sa.Column('circuits', sa.Integer(), nullable=True, default=0, comment='Actual number of circuits completed'),
         sa.Column('notes', sa.Text(), nullable=True),
         sa.Column('created_dt', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
         sa.Column('etd', sa.DateTime(), nullable=True),

backend/app/crud/crud_local_flight.py

@@ -5,6 +5,7 @@ from datetime import date, datetime
 from app.models.local_flight import LocalFlight, LocalFlightStatus, LocalFlightType
 from app.schemas.local_flight import LocalFlightCreate, LocalFlightUpdate, LocalFlightStatusUpdate
 from app.models.journal import EntityType
+from app.models.circuit import Circuit
 from app.crud.crud_journal import journal
 
 
@@ -149,6 +150,11 @@ class CRUDLocalFlight:
             db_obj.departed_dt = current_time
         elif status == LocalFlightStatus.LANDED:
             db_obj.landed_dt = current_time
+            # Count circuits from the circuits table and populate the circuits column
+            circuit_count = db.query(func.count(Circuit.id)).filter(
+                Circuit.local_flight_id == flight_id
+            ).scalar()
+            db_obj.circuits = circuit_count
         
         db.add(db_obj)
         db.commit()

backend/app/models/local_flight.py

@@ -28,6 +28,7 @@ class LocalFlight(Base):
     flight_type = Column(SQLEnum(LocalFlightType), nullable=False, index=True)
     status = Column(SQLEnum(LocalFlightStatus), nullable=False, default=LocalFlightStatus.BOOKED_OUT, index=True)
     duration = Column(Integer, nullable=True)  # Duration in minutes
+    circuits = Column(Integer, nullable=True, default=0)  # Actual number of circuits completed
     notes = Column(Text, nullable=True)
     created_dt = Column(DateTime, nullable=False, server_default=func.current_timestamp(), index=True)
     etd = Column(DateTime, nullable=True, index=True)  # Estimated Time of Departure

backend/app/schemas/local_flight.py

@@ -62,6 +62,7 @@ class LocalFlightUpdate(BaseModel):
     status: Optional[LocalFlightStatus] = None
     etd: Optional[datetime] = None
     departed_dt: Optional[datetime] = None
+    circuits: Optional[int] = None
     notes: Optional[str] = None
 
 
@@ -77,6 +78,7 @@ class LocalFlightInDBBase(LocalFlightBase):
     etd: Optional[datetime] = None
     departed_dt: Optional[datetime] = None
     landed_dt: Optional[datetime] = None
+    circuits: Optional[int] = None
     created_by: Optional[str] = None
     updated_at: datetime