test

Author: GeorgeGoodall

application/data_access/digital_land_queries.py

@@ -1,6 +1,7 @@
 import logging
 from typing import List
 from sqlalchemy.orm import Session
+from sqlalchemy import func
 
 from application.core.models import (
     DatasetModel,
@@ -44,6 +45,13 @@ def get_dataset_query(session: Session, dataset) -> DatasetModel:
 
 def get_datasets_with_data_by_typology(
     session: Session, typology
+) -> List[DatasetModel]:
+    # return get_datasets_with_data_by_typology_old(session, typology)
+    return get_datasets_with_data_by_typology_new(session, typology)
+
+
+def get_datasets_with_data_by_typology_old(
+    session: Session, typology
 ) -> List[DatasetModel]:
     from sqlalchemy import func
 
@@ -57,6 +65,19 @@ def get_datasets_with_data_by_typology(
     return [DatasetModel.from_orm(ds.DatasetOrm) for ds in datasets]
 
 
+def get_datasets_with_data_by_typology_new(
+    session: Session, typology
+) -> List[DatasetModel]:
+    query = session.query(DatasetOrm).join(
+        EntityOrm, DatasetOrm.dataset == EntityOrm.dataset
+    )
+    query = query.filter(DatasetOrm.typology == typology)
+    query = query.group_by(DatasetOrm.dataset)
+    query = query.having(func.count(EntityOrm.entity) > 0)
+    datasets = query.all()
+    return [DatasetModel.from_orm(ds) for ds in datasets]
+
+
 def get_typologies(session: Session) -> List[TypologyModel]:
     typologies = session.query(TypologyOrm).order_by(TypologyOrm.typology).all()
     return [TypologyModel.from_orm(t) for t in typologies]