Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

app/models.py

@@ -252,7 +252,7 @@ class AnonymousUser(AnonymousUserMixin):
 
 class JobInput(db.Model):
     """
-    Class to define Files.
+    Class to define JobInputs.
     """
     __tablename__ = 'job_inputs'
     # Primary key
@@ -265,10 +265,21 @@ class JobInput(db.Model):
                               lazy='dynamic',
                               cascade='save-update, merge, delete')
 
+    def __repr__(self):
+        """
+        String representation of the JobInput. For human readability.
+        """
+        return '<JobInput %r>' % self.filename
+
+    def to_dict(self):
+        return {'id': self.id,
+                'filename': self.filename,
+                'job_id': self.job_id}
+
 
 class JobResult(db.Model):
     """
-    Class to define Files.
+    Class to define JobResults.
     """
     __tablename__ = 'job_results'
     # Primary key
@@ -277,6 +288,17 @@ class JobResult(db.Model):
     job_id = db.Column(db.Integer, db.ForeignKey('jobs.id'))
     job_input_id = db.Column(db.Integer, db.ForeignKey('job_inputs.id'))
 
+    def __repr__(self):
+        """
+        String representation of the JobResult. For human readability.
+        """
+        return '<JobResult %r>' % self.filename
+
+    def to_dict(self):
+        return {'id': self.id,
+                'filename': self.filename,
+                'job_id': self.job_id}
+
 
 class Job(db.Model):
     """
@@ -325,8 +347,10 @@ class Job(db.Model):
                 'description': self.description,
                 'end_date': (self.end_date.timestamp() if self.end_date else
                              None),
+                'inputs': [input.to_dict() for input in self.inputs],
                 'mem_mb': self.mem_mb,
                 'n_cores': self.n_cores,
+                'results': [result.to_dict() for result in self.results],
                 'service': self.service,
                 'service_args': self.service_args,
                 'service_version': self.service_version,