Skip to content
Snippets Groups Projects
Commit 45894dab authored by Robin Sonnabend's avatar Robin Sonnabend
Browse files

Fixed database modeling code

parent f2067d25
No related branches found
No related tags found
No related merge requests found
...@@ -40,6 +40,12 @@ class Event(db.Model): ...@@ -40,6 +40,12 @@ class Event(db.Model):
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
name = db.Column(db.String, unique=True) name = db.Column(db.String, unique=True)
def __init__(self, name):
self.name = name
def __repr__(self):
return "<Event(id={}, name={})>".format(self.id, self.name)
class Topic(db.Model): class Topic(db.Model):
__tablename__ = "topics" __tablename__ = "topics"
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
...@@ -49,15 +55,17 @@ class Topic(db.Model): ...@@ -49,15 +55,17 @@ class Topic(db.Model):
event = relationship("Event", backref=backref("topics",order_by=id)) event = relationship("Event", backref=backref("topics",order_by=id))
def __init__(self, name, mode): def __init__(self, name, mode, event_id):
self.name = name self.name = name
self.mode = mode self.mode = mode
self.event_id = event_id
def __repr__(self): def __repr__(self):
return "<Event(id={}, name='{}', mode='{}')>".format( return "<Topic(id={}, name='{}', mode='{}', event_id={})>".format(
self.id, self.id,
self.name, self.name,
self.mode self.mode,
self.event_id
) )
...@@ -68,15 +76,15 @@ class Speaker(db.Model): ...@@ -68,15 +76,15 @@ class Speaker(db.Model):
event_id = db.Column(db.Integer, db.ForeignKey("events.id"), nullable=False) event_id = db.Column(db.Integer, db.ForeignKey("events.id"), nullable=False)
event = relationship("Event", backref=backref("speakers",order_by=id)) event = relationship("Event", backref=backref("speakers",order_by=id))
def __init__(self, name, event): def __init__(self, name, event_id):
self.name = name self.name = name
self.event = event self.event_id = event_id
def __repr__(self): def __repr__(self):
return "<Speaker(id={}, name='{}', event={})>".format( return "<Speaker(id={}, name='{}', event_id={})>".format(
self.id, self.id,
self.name, self.name,
self.event self.event_id
) )
...@@ -85,27 +93,26 @@ class Statement(db.Model): ...@@ -85,27 +93,26 @@ class Statement(db.Model):
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
speaker_id = db.Column(db.Integer, db.ForeignKey("speakers.id"), nullable=False) speaker_id = db.Column(db.Integer, db.ForeignKey("speakers.id"), nullable=False)
event_id = db.Column(db.Integer, db.ForeignKey("events.id"), nullable=False) event_id = db.Column(db.Integer, db.ForeignKey("events.id"), nullable=False)
speaker = relationship("Speaker", backref=backref("statements",order_by=id))
event = relationship("Event", backref=backref("statements",order_by=id))
insertion_time = db.Column(db.DateTime) insertion_time = db.Column(db.DateTime)
executed = db.Column(db.Boolean) executed = db.Column(db.Boolean)
execution_time = db.Column(db.DateTime) execution_time = db.Column(db.DateTime)
def __init__(self, speaker, event, insertion_time=None, executed=False, execution_time=None): speaker = relationship("Speaker", backref=backref("statements",order_by=id))
self.speaker = speaker event = relationship("Event", backref=backref("statements",order_by=id))
self.event = event
def __init__(self, speaker_id, event_id, insertion_time=None, executed=False, execution_time=None):
self.speaker_id = speaker_id
self.event_id = event_id
self.insertion_time = insertion_time or datetime.now() self.insertion_time = insertion_time or datetime.now()
self.executed = executed self.executed = executed
self.execution_time = execution_time or datetime.now() self.execution_time = execution_time or datetime.now()
def __repr__(self): def __repr__(self):
return "<Statement(id={}, speaker={}, event={}, insertion_time={}, executed={}, execution_time={})>".format( return "<Statement(id={}, speaker={}, event_id={}, topic_id={}, insertion_time={}, executed={}, execution_time={})>".format(
self.id, self.id,
self.speaker, self.speaker,
#self.event, self.event_id,
self.topic, self.topic_id,
self.insertion_time, self.insertion_time,
self.executed, self.executed,
self.execution_time self.execution_time
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment