changed back to sql query

Author: sonnenteich

app/services/tree.py

@@ -14,61 +14,35 @@ async def get_tree_by_id(session: AsyncSession, tree_id: int):
     return row
 
 async def get_tree_by_species(session: AsyncSession):
-    # Alias for subquery
-    gef = aliased(StreetTreeRegister)
-
-    stmt = (
-        select(
-            StreetTreeRegister.id,
-            StreetTreeRegister.tree_number,
-            StreetTreeRegister.street,
-            StreetTreeRegister.species,
-            StreetTreeRegister.type,
-            func.round(
-                func.ST_X(func.ST_Transform(StreetTreeRegister.geom, 4326)).cast('numeric'),
-                6
-            ).label("lon"),
-            func.round(
-                func.ST_Y(func.ST_Transform(StreetTreeRegister.geom, 4326)).cast('numeric'),
-                6
-            ).label("lat"),
-            case(
-                (
-                    StreetTreeRegister.species.ilike("%Tilia%"), 1,
-                ),
-                (
-                    StreetTreeRegister.species.ilike("%Acer%"), 2,
-                ),
-                (
-                    StreetTreeRegister.species.ilike("%Quercus%"), 3,
-                ),
-                (
-                    StreetTreeRegister.species.ilike("%Fagus%"), 4,
-                ),
-                (
-                    StreetTreeRegister.species.ilike("%Betula%"), 5,
-                ),
-                (
-                    StreetTreeRegister.species.ilike("%Carpinus%"), 6,
-                ),
-                else_=0,
-            ).label("species_index")
-        )
-        .where(
-            StreetTreeRegister.type == 'bestand',
-            not_(
-                exists()
-                .where(
-                    and_(
-                        gef.type == 'gefaellt',
-                        gef.tree_number == StreetTreeRegister.tree_number,
-                        gef.street == StreetTreeRegister.street,
-                    )
-                )
-            )
-        )
-        .order_by(StreetTreeRegister.species)
-    )
+    stmt = text('''
+        SELECT
+            tr.id,
+            tr.tree_number,
+            tr.street,
+            tr.species,
+            tr.type,
+            ROUND(ST_X(ST_Transform(tr.geom, 4326))::numeric, 6) AS lon,
+            ROUND(ST_Y(ST_Transform(tr.geom, 4326))::numeric, 6) AS lat,
+            CASE
+                WHEN tr.species ILIKE '%Tilia%' THEN 1
+                WHEN tr.species ILIKE '%Acer%' THEN 2
+                WHEN tr.species ILIKE '%Quercus%' THEN 3
+                WHEN tr.species ILIKE '%Fagus%' THEN 4
+                WHEN tr.species ILIKE '%Betula%' THEN 5
+                WHEN tr.species ILIKE '%Carpinus%' THEN 6
+                ELSE 0
+            END AS species_index
+        FROM flensburg.street_tree_register tr
+        WHERE tr.type = 'bestand'
+          AND NOT EXISTS (
+            SELECT 1
+            FROM flensburg.street_tree_register gef
+            WHERE gef.type = 'gefaellt'
+              AND gef.tree_number = tr.tree_number
+              AND gef.street = tr.street
+          )
+        ORDER BY tr.species
+    ''')
 
     result = await session.execute(stmt)
     rows = result.mappings().all()