From b55792e5e381440d0b93bb95b86cf1b46a58073f Mon Sep 17 00:00:00 2001 From: Notisset Date: Sun, 1 Oct 2017 18:04:47 +0200 Subject: [PATCH] added missing foreign keys; removed unused tables --- autogestionale/database.py | 28 +++++----------------------- web.py | 1 + 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/autogestionale/database.py b/autogestionale/database.py index 6942b9c..432831d 100644 --- a/autogestionale/database.py +++ b/autogestionale/database.py @@ -109,6 +109,8 @@ class Entry(Base): starts_at = Column(DateTime, nullable=False, default=datetime.now) ends_at = Column(DateTime) created_at = Column(DateTime, nullable=False, default=datetime.now) + event_uid = Column(Integer, ForeignKey('event.uid'), + nullable=False) class Event(Base): @@ -118,6 +120,8 @@ class Event(Base): starts_at = Column(DateTime, nullable=False, default=datetime.now) ends_at = Column(DateTime) created_at = Column(DateTime, nullable=False, default=datetime.now) + group_uid = Column(Integer, ForeignKey('group.uid'), + nullable=False) entries = relationship('Entry', lazy='joined') @@ -129,7 +133,7 @@ class Group(Base): description = Column(String, nullable=False) created_at = Column(DateTime, nullable=False, default=datetime.now) - products = relationship('Event', lazy='joined') + events = relationship('Event', lazy='joined') class ProductCategory(Base): @@ -154,25 +158,3 @@ class Product(Base): created_at = Column(DateTime, nullable=False, default=datetime.now) category = relationship('ProductCategory', lazy='joined') - - -class Transaction(Base): - __tablename__ = 'transactions' - uid = Column(Integer, primary_key=True) - event_uid = Column(Integer, ForeignKey('events.uid'), nullable=False) - created_at = Column(DateTime, nullable=False, default=datetime.now) - - event = relationship('Event', lazy='joined') - orders = relationship('Order', lazy='joined') - - -class Order(Base): - __tablename__ = 'orders' - uid = Column(Integer, primary_key=True) - product_uid = Column(Integer, ForeignKey('products.uid'), nullable=False) - quantity = Column(Integer, nullable=False) - transaction_uid = Column(Integer, ForeignKey( - 'transactions.uid'), nullable=False) - - product = relationship('Product', lazy='joined') - transaction = relationship('Transaction', lazy='joined') diff --git a/web.py b/web.py index 236616f..eaf96b4 100755 --- a/web.py +++ b/web.py @@ -27,6 +27,7 @@ if __name__ == '__main__': loop = asyncio.get_event_loop() app = setup_app(loop, config) + app['db'] = db web.run_app(app, host=config.core.get('GENERAL', 'Address'), port=config.core.getint('GENERAL', 'Port'))