add base_study attribute (#599)

jdkent · web-flow · commit 28c25c5d7d94 · 2023-10-04T05:13:00.000-05:00
diff --git a/store/neurostore/openapi b/store/neurostore/openapi
@@ -1 +1 @@
-Subproject commit c0c2a174540d48b6a6daec89977c7e4a103b4eb4
+Subproject commit e588a84e73e4ca12e97ca0df34e2be1999a2ab45
diff --git a/store/neurostore/resources/data.py b/store/neurostore/resources/data.py
@@ -339,6 +339,7 @@ def view_search(self, q, args):
 
     def join_tables(self, q):
         "join relevant tables to speed up query"
+        q = q.options(joinedload("base_study"))
         q = q.options(joinedload("analyses"))
         return super().join_tables(q)
 
diff --git a/store/neurostore/schemas/data.py b/store/neurostore/schemas/data.py
@@ -330,6 +330,7 @@ class StudySchema(BaseDataSchema):
         dump_only=True, metadata={"db_only": True}, allow_none=True
     )
     studysets = fields.Pluck("StudysetSchema", "_id", many=True, dump_only=True)
+    base_study = fields.Pluck("BaseStudySchema", "_id", dump_only=True, metadata={"db_only": True})
     has_coordinates = fields.Bool(dump_only=True)
     has_images = fields.Bool(dump_only=True)
     # studysets = fields.Nested(

Original file line number	Diff line number	Diff line change
`@@ -330,6 +330,7 @@ class StudySchema(BaseDataSchema):`
`330`	`330`	`dump_only=True, metadata={"db_only": True}, allow_none=True`
`331`	`331`	`)`
`332`	`332`	`studysets = fields.Pluck("StudysetSchema", "_id", many=True, dump_only=True)`
	`333`	`+ base_study = fields.Pluck("BaseStudySchema", "_id", dump_only=True, metadata={"db_only": True})`
`333`	`334`	`has_coordinates = fields.Bool(dump_only=True)`
`334`	`335`	`has_images = fields.Bool(dump_only=True)`
`335`	`336`	`# studysets = fields.Nested(`