[FIX] remove info fields (#685)

* remove has_coordinates and has_images from info

* remove studyset

* always join the user table

* fix broken test

Author: jdkent

store/neurostore/resources/base.py

@@ -433,7 +433,7 @@ def __init__(self):
     def view_search(self, q, args):
         return q
 
-    def join_tables(self, q):
+    def join_tables(self, q, args):
         if self._model is User:
             return q
         return q.options(joinedload("user"))
@@ -504,8 +504,7 @@ def search(self):
         q = q.order_by(getattr(attr, desc)())
 
         # join the relevant tables for output
-        if not args.get("flat"):
-            q = self.join_tables(q)
+        q = self.join_tables(q, args)
 
         pagination_query = q.paginate(
             page=args["page"],

store/neurostore/resources/data.py

@@ -262,10 +262,11 @@ def view_search(self, q, args):
 
         return q
 
-    def join_tables(self, q):
+    def join_tables(self, q, args):
         "join relevant tables to speed up query"
-        q = q.options(joinedload("versions"))
-        return super().join_tables(q)
+        if not args.get("flat"):
+            q = q.options(joinedload("versions"))
+        return super().join_tables(q, args)
 
     def post(self):
         from .base import clear_cache
@@ -402,11 +403,12 @@ def view_search(self, q, args):
             )
         return q
 
-    def join_tables(self, q):
+    def join_tables(self, q, args):
         "join relevant tables to speed up query"
-        q = q.options(joinedload("base_study"))
-        q = q.options(joinedload("analyses"))
-        return super().join_tables(q)
+        if not args.get("flat"):
+            q = q.options(joinedload("base_study"))
+            q = q.options(joinedload("analyses"))
+        return super().join_tables(q, args)
 
     def serialize_records(self, records, args, exclude=tuple()):
         if args.get("studyset_owner"):

store/neurostore/schemas/data.py

@@ -167,7 +167,7 @@ class BaseDataSchema(BaseSchema):
         attribute="user_id", dump_only=True, metadata={"info_field": True}
     )
     username = fields.String(
-        attribute="user.name", dump_only=True, metadata={"info_field": True}
+        attribute="user.name", dump_only=True, metadata={"info_field": True}, default=None,
     )
 
 
@@ -337,15 +337,15 @@ class StudySchema(BaseDataSchema):
         "id",
         many=True,
         dump_only=True,
-        metadata={"id_field": True, "info_field": True},
+        metadata={"id_field": True},
     )
     base_study = fields.Pluck(
         "BaseStudySchema",
         "id",
         dump_only=True,
     )
-    has_coordinates = fields.Bool(dump_only=True, metadata={"info_field": True})
-    has_images = fields.Bool(dump_only=True, metadata={"info_field": True})
+    has_coordinates = fields.Bool(dump_only=True)
+    has_images = fields.Bool(dump_only=True)
     source_updated_at = fields.DateTime(dump_only=True, allow_none=True)
 
     class Meta:

store/neurostore/tests/api/test_base_studies.py

@@ -1,5 +1,6 @@
 """Test Base Study Endpoint"""
 from neurostore.models import BaseStudy, Analysis
+from neurostore.schemas import StudySchema
 
 
 def test_post_list_of_studies(auth_client, ingest_neuroquery):
@@ -56,10 +57,18 @@ def test_info_base_study(auth_client, ingest_neurosynth, session):
 
     assert single_info_resp.status_code == 200
     assert single_reg_resp.status_code == 200
-    info_fields = ["has_coordinates", "has_images", "studysets"]
-    for field in info_fields:
-        assert field in single_info_resp.json()["versions"][0]
-    assert "id" in single_info_resp.json()["versions"][0]
+
+    info_fields = [
+        f
+        for f, v in StudySchema._declared_fields.items()
+        if v.metadata.get("info_field")
+    ]
+
+    study = single_info_resp.json()["versions"][0]
+
+    for f in info_fields:
+        assert f in study
+
     assert isinstance(single_reg_resp.json()["versions"][0], str)