Fix filter circuit by subject (#432)

Author: GianlucaFicarelli

app/service/circuit.py

@@ -43,13 +43,17 @@
 def _load(query: sa.Select):
     return query.options(
         joinedload(Circuit.license),
-        joinedload(Circuit.subject).joinedload(Subject.species),
-        joinedload(Circuit.subject).joinedload(Subject.strain),
+        joinedload(Circuit.subject).options(
+            joinedload(Subject.species),
+            joinedload(Subject.strain),
+        ),
         joinedload(Circuit.brain_region),
         joinedload(Circuit.created_by),
         joinedload(Circuit.updated_by),
-        selectinload(Circuit.contributions).joinedload(Contribution.agent),
-        selectinload(Circuit.contributions).joinedload(Contribution.role),
+        selectinload(Circuit.contributions).options(
+            joinedload(Contribution.agent),
+            joinedload(Contribution.role),
+        ),
         selectinload(Circuit.assets),
         raiseload("*"),
     )
@@ -141,22 +145,30 @@ def read_many(
     facets: FacetsDep,
     in_brain_region: InBrainRegionDep,
 ) -> ListResponse[CircuitRead]:
+    subject_alias = aliased(Subject, flat=True)
     agent_alias = aliased(Agent, flat=True)
     created_by_alias = aliased(Agent, flat=True)
     updated_by_alias = aliased(Agent, flat=True)
 
     aliases: Aliases = {
+        Subject: subject_alias,
         Agent: {
             "contribution": agent_alias,
             "created_by": created_by_alias,
             "updated_by": updated_by_alias,
-        }
+        },
     }
-    facet_keys = filter_keys = [
+    facet_keys = [
         "brain_region",
         "created_by",
         "updated_by",
         "contribution",
+        "subject.species",
+        "subject.strain",
+    ]
+    filter_keys = [
+        "subject",
+        *facet_keys,
     ]
     name_to_facet_query_params, filter_joins = query_params_factory(
         db_model_class=Circuit,

tests/test_circuit.py

@@ -225,3 +225,23 @@ def test_filtering(client, root_circuit, models):
         },
     ).json()["data"]
     assert len(data) == 4
+
+    data = assert_request(
+        client.get,
+        url=ROUTE,
+        params={
+            "root_circuit_id": str(root_circuit.id),
+            "subject__species__name": "Test Species",
+        },
+    ).json()["data"]
+    assert len(data) == len(models)
+
+    data = assert_request(
+        client.get,
+        url=ROUTE,
+        params={
+            "root_circuit_id": str(root_circuit.id),
+            "subject__species__name": "Unknown",
+        },
+    ).json()["data"]
+    assert len(data) == 0