diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c96..8c4b35eaf 100644 Binary files a/lib/freebies.db and b/lib/freebies.db differ diff --git a/lib/migrations/versions/4a3901e34cf7_create_freebie_model.py b/lib/migrations/versions/4a3901e34cf7_create_freebie_model.py new file mode 100644 index 000000000..1b711bc54 --- /dev/null +++ b/lib/migrations/versions/4a3901e34cf7_create_freebie_model.py @@ -0,0 +1,45 @@ +"""Create Freebie Model + +Revision ID: 4a3901e34cf7 +Revises: 5f72c58bf48c +Create Date: 2023-04-12 17:03:27.794785 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '4a3901e34cf7' +down_revision = '5f72c58bf48c' +branch_labels = None +depends_on = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('dev_companies', + sa.Column('dev_id', sa.Integer(), nullable=False), + sa.Column('company_id', sa.Integer(), nullable=False), + sa.ForeignKeyConstraint(['company_id'], ['companies.id'], name=op.f('fk_dev_companies_company_id_companies')), + sa.ForeignKeyConstraint(['dev_id'], ['devs.id'], name=op.f('fk_dev_companies_dev_id_devs')), + sa.PrimaryKeyConstraint('dev_id', 'company_id') + ) + op.create_table('freebies', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('item_name', sa.String(), nullable=True), + sa.Column('value', sa.Integer(), nullable=True), + sa.Column('dev_id', sa.Integer(), nullable=True), + sa.Column('company_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['company_id'], ['companies.id'], name=op.f('fk_freebies_company_id_companies')), + sa.ForeignKeyConstraint(['dev_id'], ['devs.id'], name=op.f('fk_freebies_dev_id_devs')), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('freebies') + op.drop_table('dev_companies') + # ### end Alembic commands ### diff --git a/lib/models.py b/lib/models.py index 2681bee5a..38c0c92ea 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,4 +1,4 @@ -from sqlalchemy import ForeignKey, Column, Integer, String, MetaData +from sqlalchemy import ForeignKey, Column, Integer, String, MetaData, Table from sqlalchemy.orm import relationship, backref from sqlalchemy.ext.declarative import declarative_base @@ -9,6 +9,13 @@ Base = declarative_base(metadata=metadata) +dev_company = Table( + 'dev_companies', + Base.metadata, + Column('dev_id', ForeignKey('devs.id'), primary_key=True), + Column('company_id', ForeignKey('companies.id'), primary_key=True) +) + class Company(Base): __tablename__ = 'companies' @@ -16,6 +23,9 @@ class Company(Base): name = Column(String()) founding_year = Column(Integer()) + freebies = relationship('Freebie', backref=backref('company')) + devs = relationship('Dev', secondary=dev_company, back_populates='companies') + def __repr__(self): return f'' @@ -25,5 +35,21 @@ class Dev(Base): id = Column(Integer(), primary_key=True) name= Column(String()) + freebies = relationship('Freebie', backref=backref('dev')) + companies = relationship('Company', secondary=dev_company, back_populates='devs') + def __repr__(self): return f'' + +class Freebie(Base): + __tablename__ = 'freebies' + + id = Column(Integer(), primary_key=True) + item_name = Column(String()) + value = Column(Integer()) + + dev_id = Column(Integer(), ForeignKey('devs.id')) + company_id = Column(Integer(), ForeignKey('companies.id')) + + def __repr__(self): + return f'' \ No newline at end of file