fix issue with aps endpoint

Author: Ghosts6

ap_monitor/app/db.py

@@ -110,6 +110,14 @@ def get_apclient_db_dep():
     finally:
         db.close()
 
+def get_wireless_db_dep():
+    """FastAPI dependency for getting wireless_count DB session (generator, not context manager)."""
+    db = WirelessSessionLocal()
+    try:
+        yield db
+    finally:
+        db.close()
+
 def init_db():
     """Initialize databases by creating tables."""
     try:
@@ -144,5 +152,6 @@ def init_db():
     'get_wireless_db_session',
     'get_apclient_db_session',
     'get_apclient_db_dep',
+    'get_wireless_db_dep',
     'init_db'
 ]

ap_monitor/app/main.py

@@ -21,7 +21,8 @@
     init_db,
     WirelessBase,
     APClientBase,
-    get_apclient_db_dep
+    get_apclient_db_dep,
+    get_wireless_db_dep
 )
 from ap_monitor.app.models import (
     Campus, Building, ClientCount,
@@ -714,13 +715,12 @@ def insert_apclientcount_data(device_info_list, timestamp, session=None):
         raise
 
 @app.get("/aps", response_model=List[dict], tags=["Access Points"])
-def get_aps(db: Session = Depends(get_wireless_db)):
+def get_aps(db: Session = Depends(get_wireless_db_dep)):
     """Get all access points from the database."""
     try:
         logger.info("Fetching AP data from the database")
         aps = db.query(AccessPoint).all()
         logger.info(f"Retrieved {len(aps)} AP records")
-        
         return [{
             "apid": ap.apid,
             "apname": ap.apname,
@@ -774,7 +774,7 @@ def get_client_counts(
         raise HTTPException(status_code=500, detail=str(e))
 
 @app.get("/buildings", response_model=List[dict], tags=["Buildings"])
-def get_buildings(db: Session = Depends(get_wireless_db)):
+def get_buildings(db: Session = Depends(get_wireless_db_dep)):
     """Get list of buildings with their details."""
     try:
         logger.info("Fetching list of buildings")
@@ -792,7 +792,7 @@ def get_buildings(db: Session = Depends(get_wireless_db)):
         raise HTTPException(status_code=500, detail="Internal server error")
 
 @app.get("/floors/{building_id}", response_model=List[dict], tags=["Floors"])
-def get_floors(building_id: int, db: Session = Depends(get_wireless_db)):
+def get_floors(building_id: int, db: Session = Depends(get_wireless_db_dep)):
     """Get floors for a specific building."""
     try:
         floors = db.query(Floor).filter_by(buildingid=building_id).all()
@@ -810,7 +810,7 @@ def get_floors(building_id: int, db: Session = Depends(get_wireless_db)):
         raise HTTPException(status_code=500, detail="Internal server error")
 
 @app.get("/rooms/{floor_id}", response_model=List[dict], tags=["Rooms"])
-def get_rooms(floor_id: int, db: Session = Depends(get_wireless_db)):
+def get_rooms(floor_id: int, db: Session = Depends(get_wireless_db_dep)):
     """Get rooms for a specific floor."""
     try:
         rooms = db.query(Room).filter_by(floorid=floor_id).all()
@@ -827,7 +827,7 @@ def get_rooms(floor_id: int, db: Session = Depends(get_wireless_db)):
         raise HTTPException(status_code=500, detail="Internal server error")
 
 @app.get("/radio-types", response_model=List[dict], tags=["Radio Types"])
-def get_radio_types(db: Session = Depends(get_wireless_db)):
+def get_radio_types(db: Session = Depends(get_wireless_db_dep)):
     """Get all radio types."""
     try:
         radio_types = db.query(RadioType).all()
@@ -843,7 +843,7 @@ def get_radio_types(db: Session = Depends(get_wireless_db)):
         raise HTTPException(status_code=500, detail="Internal server error")
 
 @app.post("/wireless/campuses/", response_model=CampusResponse)
-def create_campus(campus: CampusCreate, db: Session = Depends(get_wireless_db)):
+def create_campus(campus: CampusCreate, db: Session = Depends(get_wireless_db_dep)):
     """Create a new campus."""
     db_campus = Campus(campus_name=campus.campus_name)
     db.add(db_campus)
@@ -852,12 +852,12 @@ def create_campus(campus: CampusCreate, db: Session = Depends(get_wireless_db)):
     return db_campus
 
 @app.get("/wireless/campuses/", response_model=List[CampusResponse])
-def get_campuses(db: Session = Depends(get_wireless_db)):
+def get_campuses(db: Session = Depends(get_wireless_db_dep)):
     """Get all campuses."""
     return db.query(Campus).all()
 
 @app.post("/wireless/buildings/", response_model=BuildingResponse)
-def create_building(building: BuildingCreate, db: Session = Depends(get_wireless_db)):
+def create_building(building: BuildingCreate, db: Session = Depends(get_wireless_db_dep)):
     """Create a new building."""
     db_building = Building(**building.dict())
     db.add(db_building)
@@ -866,15 +866,15 @@ def create_building(building: BuildingCreate, db: Session = Depends(get_wireless
     return db_building
 
 @app.get("/wireless/buildings/", response_model=List[BuildingResponse])
-def get_wireless_buildings(campus_id: Optional[int] = None, db: Session = Depends(get_wireless_db)):
+def get_wireless_buildings(campus_id: Optional[int] = None, db: Session = Depends(get_wireless_db_dep)):
     """Get all buildings, optionally filtered by campus."""
     query = db.query(Building)
     if campus_id:
         query = query.filter(Building.campus_id == campus_id)
     return query.all()
 
 @app.post("/wireless/client-counts/", response_model=ClientCountResponse)
-def create_client_count(count: ClientCountCreate, db: Session = Depends(get_wireless_db)):
+def create_client_count(count: ClientCountCreate, db: Session = Depends(get_wireless_db_dep)):
     """Create a new client count."""
     db_count = ClientCount(**count.dict())
     db.add(db_count)
@@ -887,7 +887,7 @@ def get_wireless_client_counts(
     building_id: Optional[int] = None,
     start_time: Optional[datetime] = None,
     end_time: Optional[datetime] = None,
-    db: Session = Depends(get_wireless_db)
+    db: Session = Depends(get_wireless_db_dep)
 ):
     """Get client counts with optional filters."""
     query = db.query(ClientCount)

ap_monitor/tests/conftest.py

@@ -18,7 +18,9 @@
 )
 from ap_monitor.app.db import (
     get_wireless_db,
-    get_apclient_db
+    get_apclient_db,
+    get_wireless_db_dep,
+    get_apclient_db_dep
 )
 from ap_monitor.app.main import app
 
@@ -62,26 +64,19 @@ def set_sqlite_pragma(dbapi_connection, connection_record):
 @pytest.fixture(autouse=True)
 def create_test_db():
     # Import wireless models before creating wireless tables
-    from ap_monitor.app.models import Building, Campus, ClientCount, WirelessBase
+    from ap_monitor.app.models import Building, Campus, ClientCount, WirelessBase, ApBuilding, Floor, Room, AccessPoint, ClientCountAP, RadioType, APClientBase
     WirelessBase.metadata.drop_all(bind=wireless_engine)
     WirelessBase.metadata.create_all(bind=wireless_engine)
-
-    # Import apclient models before creating apclient tables
-    from ap_monitor.app.models import ApBuilding, Floor, Room, AccessPoint, ClientCountAP, RadioType, APClientBase
     APClientBase.metadata.drop_all(bind=apclient_engine)
     APClientBase.metadata.create_all(bind=apclient_engine)
-    
     # Verify tables are created correctly
     inspector = inspect(apclient_engine)
     tables = inspector.get_table_names()
     print(f"Tables in apclient_engine: {tables}")
-    
-    # Verify table schemas
     for table_name in ['buildings', 'floors', 'rooms', 'accesspoints', 'clientcount', 'radiotypes']:
         assert table_name in tables, f"{table_name} table not created"
         columns = [col['name'] for col in inspector.get_columns(table_name)]
         print(f"Columns in {table_name}: {columns}")
-    
     # Add default radio types
     with APClientSessionLocal() as session:
         if not session.query(RadioType).first():
@@ -91,9 +86,7 @@ def create_test_db():
                 RadioType(radioname="radio2", radioid=3)
             ])
             session.commit()
-    
     yield
-    
     WirelessBase.metadata.drop_all(bind=wireless_engine)
     APClientBase.metadata.drop_all(bind=apclient_engine)
 
@@ -131,8 +124,22 @@ def override_get_apclient_db():
         finally:
             pass
 
+    def override_get_wireless_db_dep():
+        try:
+            yield wireless_db
+        finally:
+            pass
+    
+    def override_get_apclient_db_dep():
+        try:
+            yield apclient_db
+        finally:
+            pass
+    
     app.dependency_overrides[get_wireless_db] = override_get_wireless_db
     app.dependency_overrides[get_apclient_db] = override_get_apclient_db
+    app.dependency_overrides[get_wireless_db_dep] = override_get_wireless_db_dep
+    app.dependency_overrides[get_apclient_db_dep] = override_get_apclient_db_dep
 
     # Add scheduler to app state
     app.state.scheduler = scheduler

ap_monitor/tests/test_main.py

@@ -83,15 +83,17 @@ def override_get_db_with_mock_ap():
     def override():
         yield mock_session
 
+    from ap_monitor.app.db import get_wireless_db_dep, get_apclient_db_dep
     app.dependency_overrides[get_wireless_db] = override
     app.dependency_overrides[get_apclient_db] = override
+    app.dependency_overrides[get_wireless_db_dep] = override
+    app.dependency_overrides[get_apclient_db_dep] = override
     yield
     app.dependency_overrides.clear()
 
 @pytest.fixture
 def override_get_db_with_mock_buildings():
     mock_building = MagicMock()
-    # Patch to match the API's expected attribute names and values
     mock_building.building_id = 1
     mock_building.building_name = "BuildingA"
 
@@ -104,8 +106,11 @@ def override_get_db_with_mock_buildings():
     def override():
         yield mock_session
 
+    from ap_monitor.app.db import get_wireless_db_dep, get_apclient_db_dep
     app.dependency_overrides[get_wireless_db] = override
     app.dependency_overrides[get_apclient_db] = override
+    app.dependency_overrides[get_wireless_db_dep] = override
+    app.dependency_overrides[get_apclient_db_dep] = override
     yield
     app.dependency_overrides.clear()
 
@@ -353,10 +358,13 @@ def override_get_db_with_mock_aps():
     mock_session.query.return_value = mock_query
 
     def override():
-        return mock_session
+        yield mock_session
 
+    from ap_monitor.app.db import get_wireless_db_dep, get_apclient_db_dep
     app.dependency_overrides[get_wireless_db] = override
     app.dependency_overrides[get_apclient_db] = override
+    app.dependency_overrides[get_wireless_db_dep] = override
+    app.dependency_overrides[get_apclient_db_dep] = override
     yield
     app.dependency_overrides.clear()