jamesp/ppr-ng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unknown type supprt

Browse Source
This commit is contained in:
James Pattinson
2026-03-23 12:47:08 -04:00
parent bddbe1451f
commit d2c9bc0370
7 changed files with 345 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/alembic/versions/004_user_aircraft.py
+50
View File
@@ -0,0 +1,50 @@
"""Add user_aircraft table for user-defined aircraft types
Revision ID: 004_user_aircraft
Revises: 003_public_booking
Create Date: 2026-03-23 12:00:00.000000
This migration adds a user_aircraft table to store aircraft types
that are manually entered by users when not found in the main aircraft database.
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '004_user_aircraft'
down_revision = '003_public_booking'
branch_labels = None
depends_on = None
def upgrade() -> None:
"""
Create user_aircraft table for storing user-defined aircraft types.
"""
op.create_table('user_aircraft',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('registration', sa.String(length=25), nullable=False),
sa.Column('type_code', sa.String(length=30), nullable=False),
sa.Column('clean_reg', sa.String(length=25), nullable=False),
sa.Column('created_by', sa.String(length=16), nullable=False),
sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), onupdate=sa.text('CURRENT_TIMESTAMP'), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('registration')
)
# Create indexes
op.create_index('idx_user_aircraft_registration', 'user_aircraft', ['registration'])
op.create_index('idx_user_aircraft_clean_reg', 'user_aircraft', ['clean_reg'])
op.create_index('idx_user_aircraft_created_by', 'user_aircraft', ['created_by'])
def downgrade() -> None:
"""
Drop user_aircraft table.
"""
op.drop_index('idx_user_aircraft_created_by', table_name='user_aircraft')
op.drop_index('idx_user_aircraft_clean_reg', table_name='user_aircraft')
op.drop_index('idx_user_aircraft_registration', table_name='user_aircraft')
op.drop_table('user_aircraft')
backend/app/api/endpoints/aircraft.py
+85 -5
View File
@@ -2,8 +2,8 @@ from typing import List, Optional
from fastapi import APIRouter, Depends, HTTPException, Query
from sqlalchemy.orm import Session
from app.api.deps import get_db, get_current_active_user
from app.models.ppr import Aircraft
from app.schemas.ppr import Aircraft as AircraftSchema
from app.models.ppr import Aircraft, UserAircraft
from app.schemas.ppr import Aircraft as AircraftSchema, UserAircraftCreate
from app.models.ppr import User
router = APIRouter()
@@ -18,6 +18,7 @@ async def lookup_aircraft_by_registration(
"""
Lookup aircraft by registration (clean match).
Removes non-alphanumeric characters from input for matching.
Checks user_aircraft table first, then aircraft table.
"""
# Clean the input registration (remove non-alphanumeric characters)
clean_input = ''.join(c for c in registration if c.isalnum()).upper()
@@ -25,7 +26,29 @@ async def lookup_aircraft_by_registration(
if len(clean_input) < 4:
return []
# Query aircraft table using clean_reg column
# First check user_aircraft table
user_aircraft = db.query(UserAircraft).filter(
UserAircraft.clean_reg.like(f"{clean_input}%")
).limit(10).all()
if user_aircraft:
# Convert UserAircraft to Aircraft-like objects
result = []
for ua in user_aircraft:
# Create a mock Aircraft object with the user data
result.append({
'id': ua.id,
'registration': ua.registration,
'type_code': ua.type_code,
'clean_reg': ua.clean_reg,
'icao24': None,
'manufacturer_icao': None,
'manufacturer_name': None,
'model': None
})
return result
# If no user aircraft found, check main aircraft table
aircraft_list = db.query(Aircraft).filter(
Aircraft.clean_reg.like(f"{clean_input}%")
).limit(10).all()
@@ -42,6 +65,7 @@ async def public_lookup_aircraft_by_registration(
Public lookup aircraft by registration (clean match).
Removes non-alphanumeric characters from input for matching.
No authentication required.
Checks user_aircraft table first, then aircraft table.
"""
# Clean the input registration (remove non-alphanumeric characters)
clean_input = ''.join(c for c in registration if c.isalnum()).upper()
@@ -49,7 +73,28 @@ async def public_lookup_aircraft_by_registration(
if len(clean_input) < 4:
return []
# Query aircraft table using clean_reg column
# First check user_aircraft table
user_aircraft = db.query(UserAircraft).filter(
UserAircraft.clean_reg.like(f"{clean_input}%")
).limit(10).all()
if user_aircraft:
# Convert UserAircraft to Aircraft-like objects
result = []
for ua in user_aircraft:
result.append({
'id': ua.id,
'registration': ua.registration,
'type_code': ua.type_code,
'clean_reg': ua.clean_reg,
'icao24': None,
'manufacturer_icao': None,
'manufacturer_name': None,
'model': None
})
return result
# If no user aircraft found, check main aircraft table
aircraft_list = db.query(Aircraft).filter(
Aircraft.clean_reg.like(f"{clean_input}%")
).limit(10).all()
@@ -81,4 +126,39 @@ async def search_aircraft(
(Aircraft.model.like(f"%{q}%"))
).limit(limit).all()
return aircraft_list
return aircraft_list
@router.post("/user-aircraft", response_model=dict)
async def save_user_aircraft(
aircraft: UserAircraftCreate,
db: Session = Depends(get_db),
current_user: User = Depends(get_current_active_user)
):
"""
Save a user-defined aircraft type for a registration.
"""
# Clean the registration
clean_reg = ''.join(c for c in aircraft.registration if c.isalnum()).upper()
# Check if already exists
existing = db.query(UserAircraft).filter(
UserAircraft.registration == aircraft.registration.upper()
).first()
if existing:
raise HTTPException(status_code=400, detail="Aircraft registration already exists in user database")
# Create new user aircraft
user_aircraft = UserAircraft(
registration=aircraft.registration.upper(),
type_code=aircraft.type_code.upper(),
clean_reg=clean_reg,
created_by=current_user.username
)
db.add(user_aircraft)
db.commit()
db.refresh(user_aircraft)
return {"message": "Aircraft saved successfully", "id": user_aircraft.id}
backend/app/models/ppr.py
+12
View File
@@ -88,4 +88,16 @@ class Aircraft(Base):
model = Column(String(255), nullable=True)
clean_reg = Column(String(25), nullable=True, index=True)
created_at = Column(DateTime, nullable=False, server_default=func.current_timestamp())
updated_at = Column(DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp())
class UserAircraft(Base):
__tablename__ = "user_aircraft"
id = Column(Integer, primary_key=True, autoincrement=True)
registration = Column(String(25), nullable=False, unique=True, index=True)
type_code = Column(String(30), nullable=False)
clean_reg = Column(String(25), nullable=False, index=True)
created_by = Column(String(16), nullable=False, index=True)
created_at = Column(DateTime, nullable=False, server_default=func.current_timestamp())
updated_at = Column(DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp())
backend/app/schemas/ppr.py
+21 -1
View File
@@ -214,4 +214,24 @@ class Aircraft(AircraftBase):
id: int
class Config:
from_attributes = True
from_attributes = True
# User Aircraft schemas
class UserAircraftBase(BaseModel):
registration: str
type_code: str
clean_reg: str
created_by: str
class UserAircraft(UserAircraftBase):
id: int
class Config:
from_attributes = True
class UserAircraftCreate(BaseModel):
registration: str
type_code: str