From 0e31fca44290b6586e7a27f717f65bcc70b677e5 Mon Sep 17 00:00:00 2001
From: Brian Rosner <brian@brosner.com>
Date: Sun, 12 Jan 2025 13:19:56 -0700
Subject: [PATCH] fix import bug

---
 tests/conftest.py        | 24 +++++++++++++-----------
 tests/test_flight.py     | 25 +++++++++++--------------
 teufa/v1_api/__init__.py |  2 +-
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 604bef2..aa3fb95 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -12,20 +12,22 @@ def app():
     app = create_app()
     with app.app_context():
         dbm.Base.metadata.create_all(db.engine)
-
-        tenant = dbm.Tenant(
-            name="Default",
-            hostname="localhost",
-        )
-        db.session.add(tenant)
-        db.session.commit()
-        g.tenant = tenant
-
         yield app
-
         dbm.Base.metadata.drop_all(db.engine)
 
 
 @pytest.fixture
-def client(app: Flask) -> FlaskClient:
+def tenant(app: Flask):
+    tenant = dbm.Tenant(
+        name="Default",
+        hostname="localhost",
+    )
+    db.session.add(tenant)
+    db.session.commit()
+
+    return tenant
+
+
+@pytest.fixture
+def client(app: Flask, tenant) -> FlaskClient:
     return app.test_client()
diff --git a/tests/test_flight.py b/tests/test_flight.py
index 927eae1..48ebfe8 100644
--- a/tests/test_flight.py
+++ b/tests/test_flight.py
@@ -1,6 +1,3 @@
-import json
-
-from flask import g
 from flask.testing import FlaskClient
 from sqlalchemy.sql import func, select
 
@@ -8,9 +5,9 @@ from teufa import db as dbm
 from teufa.ext import db
 
 
-def test_create_flight(client: FlaskClient):
+def test_create_flight(client: FlaskClient, tenant: dbm.Tenant):
     aircraft = dbm.Aircraft(
-        tenant_id=g.tenant.id,
+        tenant_id=tenant.id,
         icao="B737",
         tail_number="N12345",
         range_nm=3000,
@@ -40,9 +37,9 @@ def test_create_flight(client: FlaskClient):
     }
 
 
-def test_get_flight(client: FlaskClient):
+def test_get_flight(client: FlaskClient, tenant: dbm.Tenant):
     aircraft = dbm.Aircraft(
-        tenant_id=g.tenant.id,
+        tenant_id=tenant.id,
         icao="B737",
         tail_number="N12345",
         range_nm=3000,
@@ -52,7 +49,7 @@ def test_get_flight(client: FlaskClient):
     db.session.add(
         dbm.Flight(
             id=1,
-            tenant_id=g.tenant.id,
+            tenant_id=tenant.id,
             departure_icao="KDEN",
             arrival_icao="KLGA",
             aircraft_id=aircraft.id,
@@ -80,9 +77,9 @@ def test_get_flight_not_found(client: FlaskClient):
     assert response.json == {"message": "Flight not found"}
 
 
-def test_update_flight(client: FlaskClient):
+def test_update_flight(client: FlaskClient, tenant: dbm.Tenant):
     aircraft = dbm.Aircraft(
-        tenant_id=g.tenant.id,
+        tenant_id=tenant.id,
         icao="B737",
         tail_number="N12345",
         range_nm=3000,
@@ -92,7 +89,7 @@ def test_update_flight(client: FlaskClient):
     db.session.add(
         dbm.Flight(
             id=1,
-            tenant_id=g.tenant.id,
+            tenant_id=tenant.id,
             departure_icao="KDEN",
             arrival_icao="KLGA",
             aircraft_id=aircraft.id,
@@ -137,9 +134,9 @@ def test_update_flight_not_found(client: FlaskClient):
     assert response.json == {"message": "Flight not found"}
 
 
-def test_delete_flight(client: FlaskClient):
+def test_delete_flight(client: FlaskClient, tenant: dbm.Tenant):
     aircraft = dbm.Aircraft(
-        tenant_id=g.tenant.id,
+        tenant_id=tenant.id,
         icao="B737",
         tail_number="N12345",
         range_nm=3000,
@@ -149,7 +146,7 @@ def test_delete_flight(client: FlaskClient):
     db.session.add(
         dbm.Flight(
             id=1,
-            tenant_id=g.tenant.id,
+            tenant_id=tenant.id,
             departure_icao="KDEN",
             arrival_icao="KLGA",
             aircraft_id=aircraft.id,
diff --git a/teufa/v1_api/__init__.py b/teufa/v1_api/__init__.py
index 122e773..479bfbe 100644
--- a/teufa/v1_api/__init__.py
+++ b/teufa/v1_api/__init__.py
@@ -2,8 +2,8 @@ from flask import Blueprint, Flask, g, request
 from flask_restful import Api
 from sqlalchemy import select
 
+from .. import db as dbm
 from ..ext import db
-from . import db as dbm
 from .flights import FlightCollectionResource, FlightResource
 
 bp = Blueprint("api", __name__, url_prefix="/api")