Adding serialiazer for study files

crc/models/file.py

@@ -6,7 +6,7 @@ from marshmallow_sqlalchemy import SQLAlchemyAutoSchema
 from sqlalchemy import func, Index
 from sqlalchemy.dialects.postgresql import UUID
 
-from crc import db
+from crc import db, ma
 
 
 class FileType(enum.Enum):
@@ -139,3 +139,9 @@ class LookupDataSchema(SQLAlchemyAutoSchema):
         include_relationships = False
         include_fk = False  # Includes foreign keys
 
+
+class SimpleFileSchema(ma.Schema):
+
+    class Meta:
+        model = FileModel
+        fields = ["name"]

crc/models/study.py

@@ -5,6 +5,7 @@ from sqlalchemy import func
 
 from crc import db, ma
 from crc.api.common import ApiErrorSchema
+from crc.models.file import FileModel, SimpleFileSchema
 from crc.models.protocol_builder import ProtocolBuilderStatus, ProtocolBuilderStudy
 from crc.models.workflow import WorkflowSpecCategoryModel, WorkflowState, WorkflowStatus, WorkflowSpecModel, \
     WorkflowModel
@@ -39,6 +40,10 @@ class StudyModel(db.Model):
         if self.on_hold:
             self.protocol_builder_status = ProtocolBuilderStatus.HOLD
 
+    def files(self):
+        _files = FileModel.query.filter_by(workflow_id=self.workflow[0].id)
+        return _files
+
 
 class WorkflowMetadata(object):
     def __init__(self, id, name, display_name, description, spec_version, category_id, state: WorkflowState, status: WorkflowStatus,
@@ -154,3 +159,16 @@ class StudySchema(ma.Schema):
     def make_study(self, data, **kwargs):
         """Can load the basic study data for updates to the database, but categories are write only"""
         return Study(**data)
+
+
+class StudyFilesSchema(ma.Schema):
+
+    # files = fields.List(fields.Nested(SimpleFileSchema), dump_only=True)
+    files = fields.Method('_files')
+
+    class Meta:
+        model = Study
+        additional = ["id", "title", "last_updated", "primary_investigator_id"]
+
+    def _files(self, obj):
+        return [file.name for file in obj.files()]

crc/models/workflow.py

@@ -73,10 +73,11 @@ class WorkflowModel(db.Model):
     bpmn_workflow_json = db.Column(db.JSON)
     status = db.Column(db.Enum(WorkflowStatus))
     study_id = db.Column(db.Integer, db.ForeignKey('study.id'))
+    study = db.relationship("StudyModel", backref='workflow')
     workflow_spec_id = db.Column(db.String, db.ForeignKey('workflow_spec.id'))
     workflow_spec = db.relationship("WorkflowSpecModel")
     spec_version = db.Column(db.String)
     total_tasks = db.Column(db.Integer, default=0)
     completed_tasks = db.Column(db.Integer, default=0)
 #    task_history = db.Column(db.ARRAY(db.String), default=[]) # The history stack of user completed tasks.
-    last_updated = db.Column(db.DateTime)
+    last_updated = db.Column(db.DateTime)