fix the has_images,has_coordinates query (#1170)

Author: jdkent

store/backend/neurostore/resources/base.py

@@ -162,45 +162,34 @@ def update_base_studies(self, base_studies):
 
         # Subquery for new_has_coordinates
         new_has_coordinates_subquery = (
-            sa.select(
-                sa.func.coalesce(
-                    sa.func.bool_and(Point.analysis_id != None), False  # noqa E711
-                )  # noqa E711
-            )
-            .where(Point.analysis_id == Analysis.id)
-            .correlate(Study)
+            sa.select(sa.func.count(Point.id) > 0)
+            .select_from(Study)
+            .join(Analysis, Analysis.study_id == Study.id)
+            .join(Point, Point.analysis_id == Analysis.id)
+            .where(Study.base_study_id == BaseStudy.id)
+            .correlate(BaseStudy)
             .scalar_subquery()
         )
 
         # Subquery for new_has_images
         new_has_images_subquery = (
-            sa.select(
-                sa.func.coalesce(
-                    sa.func.bool_and(Image.analysis_id != None), False  # noqa E711
-                )  # noqa E711
-            )
-            .where(Image.analysis_id == Analysis.id)
-            .correlate(Study)
+            sa.select(sa.func.count(Image.id) > 0)
+            .select_from(Study)
+            .join(Analysis, Analysis.study_id == Study.id)
+            .join(Image, Image.analysis_id == Analysis.id)
+            .where(Study.base_study_id == BaseStudy.id)
+            .correlate(BaseStudy)
             .scalar_subquery()
         )
 
         # Main query
-        query = (
-            sa.select(
-                BaseStudy.id,
-                BaseStudy.has_images,
-                BaseStudy.has_coordinates,
-                new_has_coordinates_subquery.label("new_has_coordinates"),
-                new_has_images_subquery.label("new_has_images"),
-            )
-            .distinct()
-            .select_from(BaseStudy)
-            .join(Study, Study.base_study_id == BaseStudy.id)
-            .outerjoin(Analysis, Analysis.study_id == Study.id)
-            .where(
-                BaseStudy.id.in_(base_studies),
-            )
-        )
+        query = sa.select(
+            BaseStudy.id,
+            BaseStudy.has_images,
+            BaseStudy.has_coordinates,
+            new_has_coordinates_subquery.label("new_has_coordinates"),
+            new_has_images_subquery.label("new_has_images"),
+        ).where(BaseStudy.id.in_(base_studies))
 
         affected_base_studies = db.session.execute(query).fetchall()
         update_base_studies = []

store/backend/neurostore/tests/api/test_base_studies.py

@@ -340,6 +340,19 @@ def test_has_coordinates_images(auth_client, session):
     assert base_study_2.has_coordinates is True
     assert base_study_2.has_images is True
 
+    # adding an analysis without media should not flip the flags back to False
+    empty_analysis_resp = auth_client.post(
+        "/api/analyses/",
+        data={
+            "study": create_full_study.json()["id"],
+            "name": "empty analysis",
+        },
+    )
+    assert empty_analysis_resp.status_code == 200
+    session.refresh(base_study_2)
+    assert base_study_2.has_coordinates is True
+    assert base_study_2.has_images is True
+
     # delete analysis a
     analysis_ids = create_full_study.json()["analyses"]
     analyses = [Analysis.query.filter_by(id=id_).one() for id_ in analysis_ids]