Add associated dataset to all new featuresets

Author: acrellin

cesium_app/handlers/feature.py

@@ -99,6 +99,7 @@ async def post(self):
         fset = Featureset(name=featureset_name,
                           file_uri=fset_path,
                           project=dataset.project,
+                          dataset=dataset,
                           features_list=features_to_use,
                           custom_features_script=None)
         DBSession().add(fset)

cesium_app/models.py

@@ -26,6 +26,7 @@ class Dataset(Base):
     project_id = sa.Column(sa.ForeignKey('projects.id', ondelete='CASCADE'),
                            nullable=False, index=True)
     project = relationship('Project', back_populates='datasets')
+    featureset = relationship('Featureset', back_populates='dataset')
     files = relationship('DatasetFile', backref='dataset', cascade='all')
 
     def display_info(self):
@@ -66,15 +67,15 @@ class Featureset(Base):
     project_id = sa.Column(sa.ForeignKey('projects.id', ondelete='CASCADE'),
                            nullable=False, index=True)
     project = relationship('Project', back_populates='featuresets')
+    dataset_id = sa.Column(sa.ForeignKey('datasets.id'))
+    dataset = relationship('Dataset')
     name = sa.Column(sa.String(), nullable=False)
     features_list = sa.Column(sa.ARRAY(sa.VARCHAR()), nullable=False, index=True)
     custom_features_script = sa.Column(sa.String())
     file_uri = sa.Column(sa.String(), nullable=True, index=True)
     task_id = sa.Column(sa.String())
     finished = sa.Column(sa.DateTime)
 
-    project = relationship('Project')
-
 
 class Model(Base):
     project_id = sa.Column(sa.ForeignKey('projects.id', ondelete='CASCADE'),