Merge remote-tracking branch 'origin/main' into add_street_tree

Author: sonnenteich

app/main.py

@@ -18,6 +18,7 @@
 from .api.school import route_school
 from .api.police import route_police
 from .api.xplan import route_xplan
+from .api.tree import route_street_tree
 
 
 app = FastAPI(
@@ -78,3 +79,4 @@ async def custom_validation_error_handler(
 app.include_router(route_administrative)
 app.include_router(route_demographic)
 app.include_router(route_energy)
+app.include_router(route_street_tree)

app/models/tree.py

@@ -1,17 +1,20 @@
 from sqlmodel import SQLModel, Field
 from geoalchemy2 import Geometry
 from sqlalchemy import Column, Numeric, String, Date
+from typing import Optional
+import datetime
 
-class StreetTreeRegister(SQLModel):
-    __tablename__ = "flensburg.street_tree_register"
+class StreetTreeRegister(SQLModel, table=True):
+    __tablename__ = "street_tree_register"
+    __table_args__ = {'schema': 'flensburg'}
 
-    id: int = Field(primary_key=True, nullable=False)
-    tree_number = Column(String, nullable=False)
-    street = Column(String, nullable=False)
-    area_type = Column(String)
-    species = Column(String, nullable=False)
-    north = Column(Numeric, nullable=False)
-    east = Column(Numeric, nullable=False)
-    register_date = Column(Date, nullable=False)
-    type = Column(String, nullable=False)
-    geom = Column(Geometry('POINT', srid=4326))
+    id: int = Field(primary_key=True)  # nullable=False implied for primary_key
+    tree_number: str = Field(nullable=False)  # simple field, no sa_column so nullable allowed here
+    street: str = Field(sa_column=Column(String, nullable=False))
+    area_type: Optional[str] = Field(sa_column=Column(String, nullable=True), default=None)
+    species: str = Field(sa_column=Column(String, nullable=False))
+    north: float = Field(sa_column=Column(Numeric, nullable=False))
+    east: float = Field(sa_column=Column(Numeric, nullable=False))
+    registration_date: datetime.date = Field(sa_column=Column(Date(), nullable=False))
+    type: str = Field(sa_column=Column(String, nullable=False))
+    geom: object = Field(sa_column=Column(Geometry('POINT', srid=31467), nullable=True))  # nullable depends on DB column

app/schemas/tree.py

@@ -9,13 +9,14 @@ class StreetTreeResponse(BaseModel):
     id: int
     tree_number: str
     street: str
-    area_type: str
+    area_type: Optional[str]
     species: str
     north: float
     east: float
-    register_date: str
+    registration_date: str
     type: str
-    geom = GeoPoint
+    geom: GeoPoint  # Correctly typed attribute
+
 
 class CrsProperties(BaseModel):
     name: str

app/services/tree.py

@@ -1,13 +1,12 @@
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy.future import select
-
-from ..models.tree import StreetTreeRegister
+from sqlmodel import select
+from app.models.tree import StreetTreeRegister
 
 async def get_tree_by_id(session: AsyncSession, tree_id: int):
     model = StreetTreeRegister
 
-    stmt = select(model.id).where(model.id == tree_id)
+    stmt = select(model).where(model.id == tree_id)
     result = await session.execute(stmt)
-    row = result.mappings().one_or_none()
+    row = result.scalars().first()
 
     return row