diff --git a/lib/debug.py b/lib/debug.py index 4f922eb69..a4553f825 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -1,9 +1,51 @@ #!/usr/bin/env python3 from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker -from models import Company, Dev +from models import Company, Dev, Freebie if __name__ == '__main__': engine = create_engine('sqlite:///freebies.db') - import ipdb; ipdb.set_trace() + Session = sessionmaker(bind=engine) + session = Session() + + freebie = session.query(Freebie).first() + print('_' * 50 + 'Freebie' + '_' * 50) + print(freebie) + print(freebie.dev) + dev2 = freebie.dev + print(freebie.company) + print(freebie.print_details()) + # print('_' * 100) + + company = session.query(Company).first() + print('_' * 50 + 'Company' + '_' * 50) + dev = session.query(Dev).first() + company.give_freebie(dev2, 'bike', 4000) + session.add(dev2) + session.commit() + print(dev2) + print(dev.freebies) + print(company) + print(company.freebies) + print(company.devs) + print(Company.oldest_compay()) + # print('_' * 100) + + # dev = session.query(Dev).first() + freebie2 = session.query(Freebie).filter(Freebie.item_name == 'bike', Freebie.id == 151).first() + print('_' * 50 + 'Dev' + '_' * 50) + print(dev) + print(dev.freebies) + print(dev.companies) + print(dev.received_one('playstation')) + print(dev.give_away(dev2, freebie2)) + session.add(freebie2) + session.commit() + # print('_' * 100) + print(dev2.freebies) + print(company.devs) + session.close() + + import pdb; pdb.set_trace() diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c96..efcdd703d 100644 Binary files a/lib/freebies.db and b/lib/freebies.db differ diff --git a/lib/migrations/versions/2dfb7ef6c89c_added_methods_to_models.py b/lib/migrations/versions/2dfb7ef6c89c_added_methods_to_models.py new file mode 100644 index 000000000..1f983c8bd --- /dev/null +++ b/lib/migrations/versions/2dfb7ef6c89c_added_methods_to_models.py @@ -0,0 +1,28 @@ +"""added methods to models + +Revision ID: 2dfb7ef6c89c +Revises: eb9fd7da9ca4 +Create Date: 2023-06-04 13:45:44.778514 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '2dfb7ef6c89c' +down_revision = 'eb9fd7da9ca4' +branch_labels = None +depends_on = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### diff --git a/lib/migrations/versions/d94b79d72883_updated_freebie_model.py b/lib/migrations/versions/d94b79d72883_updated_freebie_model.py new file mode 100644 index 000000000..6d725abb0 --- /dev/null +++ b/lib/migrations/versions/d94b79d72883_updated_freebie_model.py @@ -0,0 +1,33 @@ +"""updated Freebie model + +Revision ID: d94b79d72883 +Revises: 5f72c58bf48c +Create Date: 2023-06-04 00:03:54.393439 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'd94b79d72883' +down_revision = '5f72c58bf48c' +branch_labels = None +depends_on = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + 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.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('freebies') + # ### end Alembic commands ### diff --git a/lib/migrations/versions/eb9fd7da9ca4_add_company_dev_association_table.py b/lib/migrations/versions/eb9fd7da9ca4_add_company_dev_association_table.py new file mode 100644 index 000000000..cb742dced --- /dev/null +++ b/lib/migrations/versions/eb9fd7da9ca4_add_company_dev_association_table.py @@ -0,0 +1,46 @@ +"""add company-dev association table + +Revision ID: eb9fd7da9ca4 +Revises: d94b79d72883 +Create Date: 2023-06-04 00:46:57.198671 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'eb9fd7da9ca4' +down_revision = 'd94b79d72883' +branch_labels = None +depends_on = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('company_devs', + sa.Column('company_id', sa.Integer(), nullable=False), + sa.Column('dev_id', sa.Integer(), nullable=False), + sa.ForeignKeyConstraint(['company_id'], ['companies.id'], name=op.f('fk_company_devs_company_id_companies')), + sa.ForeignKeyConstraint(['dev_id'], ['devs.id'], name=op.f('fk_company_devs_dev_id_devs')), + sa.PrimaryKeyConstraint('company_id', 'dev_id') + ) + with op.batch_alter_table('freebies', schema=None) as batch_op: + batch_op.add_column(sa.Column('dev_id', sa.Integer(), nullable=True)) + batch_op.add_column(sa.Column('company_id', sa.Integer(), nullable=True)) + batch_op.create_foreign_key(batch_op.f('fk_freebies_company_id_companies'), 'companies', ['company_id'], ['id']) + batch_op.create_foreign_key(batch_op.f('fk_freebies_dev_id_devs'), 'devs', ['dev_id'], ['id']) + + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('freebies', schema=None) as batch_op: + batch_op.drop_constraint(batch_op.f('fk_freebies_dev_id_devs'), type_='foreignkey') + batch_op.drop_constraint(batch_op.f('fk_freebies_company_id_companies'), type_='foreignkey') + batch_op.drop_column('company_id') + batch_op.drop_column('dev_id') + + op.drop_table('company_devs') + # ### end Alembic commands ### diff --git a/lib/models.py b/lib/models.py index 2681bee5a..105737496 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,5 +1,5 @@ -from sqlalchemy import ForeignKey, Column, Integer, String, MetaData -from sqlalchemy.orm import relationship, backref +from sqlalchemy import ForeignKey, Column, Integer, String, MetaData, Table, create_engine +from sqlalchemy.orm import relationship, backref, sessionmaker from sqlalchemy.ext.declarative import declarative_base convention = { @@ -8,6 +8,17 @@ metadata = MetaData(naming_convention=convention) Base = declarative_base(metadata=metadata) +engine = create_engine('sqlite:///freebies.db') +Session = sessionmaker(bind=engine) +session = Session() + +company_dev = Table( + 'company_devs', + Base.metadata, + Column('company_id', ForeignKey('companies.id'), primary_key=True), + Column('dev_id', ForeignKey('devs.id'), primary_key=True), + extend_existing=True +) class Company(Base): __tablename__ = 'companies' @@ -15,6 +26,24 @@ class Company(Base): id = Column(Integer(), primary_key=True) name = Column(String()) founding_year = Column(Integer()) + freebies = relationship('Freebie', backref='company') + devs = relationship('Dev', secondary=company_dev, back_populates='companies') + + @classmethod + def oldest_compay(cls): + return session.query(Company).order_by(Company.founding_year.asc()).first() + + def give_freebie(self, dev, item_name, value): + freebie = Freebie( + item_name = item_name, + value = value, + dev_id = dev.id, + company_id = self.id + ) + dev.companies.append(self) + session.add(freebie) + # session.add(dev) + session.commit() def __repr__(self): return f'' @@ -24,6 +53,41 @@ class Dev(Base): id = Column(Integer(), primary_key=True) name= Column(String()) + freebies = relationship('Freebie', backref='dev') + companies = relationship('Company', secondary=company_dev, back_populates='devs') + + def received_one(self, item_name): + for freebie in self.freebies: + if freebie.item_name == item_name: + return True + else: + return False + + def give_away(self, dev, freebie): + if freebie.dev == self: + freebie.dev = dev + + # session.add(freebie) + # session.commit() 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 print_details(self): + return f'{self.dev} owns a ' + \ + f'{self.item_name} from {self.company}' + + + def __repr__(self) -> str: + return f'