Commit 2ddbfe5b authored by Sarah Abrishami's avatar Sarah Abrishami

added new columns

parent 91403bf6
......@@ -10,6 +10,7 @@ class Dataset(db.Model):
__tablename__ = 'dataset'
uid = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid4)
data = db.Column(JSONB)
name = db.Column(db.String)
created_date = db.Column(db.DateTime, default=datetime.now())
modified_date = db.Column(db.DateTime, default=datetime.now())
......@@ -20,9 +21,10 @@ class Dataset(db.Model):
for field in ['data', 'created_date', 'modified_date']:
if field in dct:
setattr(self, field, dct[field])
setattr(self, 'name', dct['data']['name'])
def to_dict(self, keys=['uid', 'created_date', 'modified_date', 'data']):
dct = {'uid': str(self.uid), 'created_date': str(self.created_date), 'data': self.data,
def to_dict(self, keys=['uid', 'created_date', 'modified_date', 'data', 'name']):
dct = {'uid': str(self.uid), 'created_date': str(self.created_date), 'data': self.data, 'name': self.name,
'modified_date': str(self.modified_date)}
out = {}
for key in keys:
......@@ -37,19 +39,20 @@ class RuleGroup(db.Model):
rules = db.Column(JSONB)
created_date = db.Column(db.DateTime, default=datetime.now())
modified_date = db.Column(db.DateTime, default=datetime.now())
other = db.Column(JSONB)
def __repr__(self):
return f'<RuleGroup {self.uid}>'
def from_dict(self, dct):
for field in ['name', 'rules', 'created_date', 'modified_date']:
for field in ['name', 'rules', 'created_date', 'modified_date', 'other']:
if field in dct:
setattr(self, field, dct[field])
return self
def to_dict(self):
dct = {'uid': str(self.uid), 'name': self.name, 'created_date': str(self.created_date), 'rules': self.rules,
'modified_date': str(self.modified_date)}
'modified_date': str(self.modified_date), 'other': self.other}
return dct
def get_name(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment