add tenant api (#24)

brosner · web-flow · commit bd7bc5ed39f4 · 2025-01-19T16:37:04.000-07:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -16,7 +16,6 @@ dependencies = [
     "psycopg<4.0.0,>=3.1.19",
     "alembic<2.0.0,>=1.13.1",
     "pydantic<3.0.0,>=2.7.1",
-    "flask-restful<1.0.0,>=0.3.10",
 ]
 
 [project.scripts]
diff --git a/tests/test_tenant.py b/tests/test_tenant.py
@@ -0,0 +1,120 @@
+from flask.testing import FlaskClient
+from sqlalchemy.sql import func, select
+
+from teufa import db as dbm
+from teufa.ext import db
+
+
+def test_create_tenant(client: FlaskClient):
+    response = client.post(
+        "/api/v1/admin/tenants",
+        json={
+            "tenant": {
+                "name": "Test Tenant",
+                "hostname": "test.tenant.com",
+            }
+        },
+    )
+
+    assert response.status_code == 201
+    assert response.json == {
+        "tenant": {
+            "id": 1,
+            "name": "Test Tenant",
+            "hostname": "test.tenant.com",
+        }
+    }
+
+
+def test_get_tenant(client: FlaskClient):
+    tenant = dbm.Tenant(
+        name="Test Tenant",
+        hostname="test.tenant.com",
+    )
+    db.session.add(tenant)
+    db.session.commit()
+
+    response = client.get(f"/api/v1/admin/tenants/{tenant.id}")
+
+    assert response.status_code == 200
+    assert response.json == {
+        "tenant": {
+            "id": tenant.id,
+            "name": "Test Tenant",
+            "hostname": "test.tenant.com",
+        }
+    }
+
+
+def test_get_tenant_not_found(client: FlaskClient):
+    response = client.get("/api/v1/admin/tenants/1")
+
+    assert response.status_code == 404
+    assert response.json == {"message": "Tenant not found"}
+
+
+def test_update_tenant(client: FlaskClient):
+    tenant = dbm.Tenant(
+        name="Test Tenant",
+        hostname="test.tenant.com",
+    )
+    db.session.add(tenant)
+    db.session.commit()
+
+    response = client.put(
+        f"/api/v1/admin/tenants/{tenant.id}",
+        json={
+            "tenant": {
+                "name": "Updated Tenant",
+                "hostname": "updated.tenant.com",
+            }
+        },
+    )
+
+    assert response.status_code == 200
+    assert response.json == {
+        "tenant": {
+            "id": tenant.id,
+            "name": "Updated Tenant",
+            "hostname": "updated.tenant.com",
+        }
+    }
+
+
+def test_update_tenant_not_found(client: FlaskClient):
+    response = client.put(
+        "/api/v1/admin/tenants/1",
+        json={
+            "tenant": {
+                "name": "Updated Tenant",
+                "hostname": "updated.tenant.com",
+            }
+        },
+    )
+
+    assert response.status_code == 404
+    assert response.json == {"message": "Tenant not found"}
+
+
+def test_delete_tenant(client: FlaskClient):
+    tenant = dbm.Tenant(
+        name="Test Tenant",
+        hostname="test.tenant.com",
+    )
+    db.session.add(tenant)
+    db.session.commit()
+
+    response = client.delete(f"/api/v1/admin/tenants/{tenant.id}")
+
+    assert response.status_code == 204
+    assert response.data == b""
+
+    with db.session.begin():
+        assert db.session.scalar(select(func.count(dbm.Tenant.id))) == 0
+
+
+def test_delete_tenant_not_found(client: FlaskClient):
+    response = client.delete("/api/v1/admin/tenants/1")
+
+    assert response.status_code == 404
+    assert response.json == {"message": "Tenant not found"}
diff --git a/teufa/app.py b/teufa/app.py
@@ -2,7 +2,7 @@
 
 from .config import Config
 from .ext import db
-from .v1_api import bp as v1_bp
+from .v1_api import v1_bp
 
 
 def create_app():
diff --git a/teufa/dao.py b/teufa/dao.py
@@ -7,6 +7,38 @@ class Error(BaseModel):
     message: str
 
 
+class Tenant(BaseModel):
+    id: int | None = None
+    name: str
+    hostname: str
+
+
+class PartialTenant(BaseModel):
+    id: int | object = empty
+    name: str | object = empty
+    hostname: str | object = empty
+
+
+class CreateTenantRequest(BaseModel):
+    tenant: Tenant
+
+
+class CreateTenantResponse(BaseModel):
+    tenant: Tenant
+
+
+class UpdateTenantRequest(BaseModel):
+    tenant: PartialTenant
+
+
+class UpdateTenantResponse(BaseModel):
+    tenant: Tenant
+
+
+class GetTenantResponse(BaseModel):
+    tenant: Tenant
+
+
 class Flight(BaseModel):
     id: int | None = None
     departure_icao: str
diff --git a/teufa/v1_api/__init__.py b/teufa/v1_api/__init__.py
@@ -1,15 +1,22 @@
-from flask import Blueprint, Flask, g, request
-from flask_restful import Api
+from flask import Blueprint, g, request
 from sqlalchemy import select
 
 from .. import db as dbm
 from ..ext import db
-from .flights import FlightCollectionResource, FlightResource
+from .flights import flights_bp
+from .tenants import tenants_bp
 
-bp = Blueprint("api", __name__, url_prefix="/api")
+v1_bp = Blueprint("v1", __name__, url_prefix="/api/v1")
 
+admin_bp = Blueprint("admin", __name__, url_prefix="/admin")
 
-@bp.before_request
+admin_bp.register_blueprint(tenants_bp)
+v1_bp.register_blueprint(admin_bp)
+
+api_bp = Blueprint("api", __name__, url_prefix="/")
+
+
+@api_bp.before_request
 def before_request():
     if not hasattr(g, "tenant"):
         hostname = request.host.split(":")[0]
@@ -18,7 +25,5 @@ def before_request():
         ).first()
 
 
-api = Api(bp)
-
-api.add_resource(FlightCollectionResource, "/v1/flights")
-api.add_resource(FlightResource, "/v1/flights/<int:flight_id>")
+api_bp.register_blueprint(flights_bp)
+v1_bp.register_blueprint(api_bp)
diff --git a/teufa/v1_api/flights.py b/teufa/v1_api/flights.py
@@ -1,102 +1,103 @@
-from flask import g, request
-from flask_restful import Resource
+from flask import Blueprint, g, jsonify, request
 
 from .. import dao
 from .. import db as dbm
 from ..ext import db
 
+flights_bp = Blueprint("flights", __name__)
 
-class FlightCollectionResource(Resource):
-    def post(self):
-        data = request.get_json()
 
-        req = dao.CreateFlightRequest(**data)
+@flights_bp.route("/flights", methods=["POST"])
+def create_flight():
+    data = request.get_json()
+    req = dao.CreateFlightRequest(**data)
 
-        flight = dbm.Flight(
-            tenant_id=g.tenant.id,
-            departure_icao=req.flight.departure_icao,
-            arrival_icao=req.flight.arrival_icao,
-            aircraft_id=req.flight.aircraft_id,
-        )
+    flight = dbm.Flight(
+        tenant_id=g.tenant.id,
+        departure_icao=req.flight.departure_icao,
+        arrival_icao=req.flight.arrival_icao,
+        aircraft_id=req.flight.aircraft_id,
+    )
 
-        db.session.add(flight)
-        db.session.commit()
+    db.session.add(flight)
+    db.session.commit()
 
-        res = dao.CreateFlightResponse(
-            **{
-                "flight": {
-                    "id": flight.id,
-                    "departure_icao": flight.departure_icao,
-                    "arrival_icao": flight.arrival_icao,
-                    "aircraft_id": flight.aircraft_id,
-                }
+    res = dao.CreateFlightResponse(
+        **{
+            "flight": {
+                "id": flight.id,
+                "departure_icao": flight.departure_icao,
+                "arrival_icao": flight.arrival_icao,
+                "aircraft_id": flight.aircraft_id,
             }
-        )
+        }
+    )
 
-        return res.model_dump(), 201
+    return jsonify(res.model_dump()), 201
 
 
-class FlightResource(Resource):
-    def get(self, flight_id):
-        flight = db.session.get(dbm.Flight, flight_id)
+@flights_bp.route("/flights/<int:flight_id>", methods=["GET"])
+def get_flight(flight_id):
+    flight = db.session.get(dbm.Flight, flight_id)
 
-        if not flight:
-            return dao.Error(message="Flight not found").model_dump(), 404
+    if not flight:
+        return jsonify(dao.Error(message="Flight not found").model_dump()), 404
 
-        res = dao.GetFlightResponse(
-            **{
-                "flight": {
-                    "id": flight.id,
-                    "departure_icao": flight.departure_icao,
-                    "arrival_icao": flight.arrival_icao,
-                    "aircraft_id": flight.aircraft_id,
-                }
+    res = dao.GetFlightResponse(
+        **{
+            "flight": {
+                "id": flight.id,
+                "departure_icao": flight.departure_icao,
+                "arrival_icao": flight.arrival_icao,
+                "aircraft_id": flight.aircraft_id,
             }
-        )
+        }
+    )
 
-        return res.model_dump()
+    return jsonify(res.model_dump())
 
-    def put(self, flight_id):
-        flight = db.session.get(dbm.Flight, flight_id)
 
-        if not flight:
-            return dao.Error(message="Flight not found").model_dump(), 404
+@flights_bp.route("/flights/<int:flight_id>", methods=["PUT"])
+def update_flight(flight_id):
+    flight = db.session.get(dbm.Flight, flight_id)
 
-        data = request.get_json()
+    if not flight:
+        return jsonify(dao.Error(message="Flight not found").model_dump()), 404
 
-        req = dao.UpdateFlightRequest(**data)
+    data = request.get_json()
+    req = dao.UpdateFlightRequest(**data)
 
-        if req.flight.id is not dao.empty:
-            flight.id = req.flight.id
-        if req.flight.departure_icao is not dao.empty:
-            flight.departure_icao = req.flight.departure_icao
-        if req.flight.arrival_icao is not dao.empty:
-            flight.arrival_icao = req.flight.arrival_icao
-        if req.flight.aircraft_id is not dao.empty:
-            flight.aircraft_id = req.flight.aircraft_id
+    if req.flight.departure_icao is not dao.empty:
+        flight.departure_icao = req.flight.departure_icao
+    if req.flight.arrival_icao is not dao.empty:
+        flight.arrival_icao = req.flight.arrival_icao
+    if req.flight.aircraft_id is not dao.empty:
+        flight.aircraft_id = req.flight.aircraft_id
 
-        db.session.commit()
+    db.session.commit()
 
-        res = dao.UpdateFlightResponse(
-            **{
-                "flight": {
-                    "id": flight.id,
-                    "departure_icao": flight.departure_icao,
-                    "arrival_icao": flight.arrival_icao,
-                    "aircraft_id": flight.aircraft_id,
-                }
+    res = dao.UpdateFlightResponse(
+        **{
+            "flight": {
+                "id": flight.id,
+                "departure_icao": flight.departure_icao,
+                "arrival_icao": flight.arrival_icao,
+                "aircraft_id": flight.aircraft_id,
             }
-        )
+        }
+    )
 
-        return res.model_dump()
+    return jsonify(res.model_dump())
 
-    def delete(self, flight_id):
-        flight = db.session.get(dbm.Flight, flight_id)
 
-        if not flight:
-            return dao.Error(message="Flight not found").model_dump(), 404
+@flights_bp.route("/flights/<int:flight_id>", methods=["DELETE"])
+def delete_flight(flight_id):
+    flight = db.session.get(dbm.Flight, flight_id)
 
-        db.session.delete(flight)
-        db.session.commit()
+    if not flight:
+        return jsonify(dao.Error(message="Flight not found").model_dump()), 404
 
-        return "", 204
+    db.session.delete(flight)
+    db.session.commit()
+
+    return "", 204
diff --git a/teufa/v1_api/tenants.py b/teufa/v1_api/tenants.py
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ dependencies = [`
`16`	`16`	`"psycopg<4.0.0,>=3.1.19",`
`17`	`17`	`"alembic<2.0.0,>=1.13.1",`
`18`	`18`	`"pydantic<3.0.0,>=2.7.1",`
`19`		`- "flask-restful<1.0.0,>=0.3.10",`
`20`	`19`	`]`
`21`	`20`
`22`	`21`	`[project.scripts]`