diff --git a/lib/debug.py b/lib/debug.py index 4f922eb69..107f93f17 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -1,9 +1,25 @@ #!/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() + + first_freebie = session.query(Freebie).first() + Freebie.dev = session.query(Dev).filter(Dev.id == first_freebie.dev_id).all() + Freebie.company = session.query(Company).filter(Company.id == first_freebie.company_id).all() + + first_company = session.query(Company).first() + Company.freebies = Company.get_freebies(session) + Company.devs = [session.query(Dev).get(Freebie.dev_id) for Freebie in Company.freebies] + + first_dev = session.query(Dev).first() + Dev.freebies = Dev.get_freebies(session) + Dev.companies = [session.query(Company).get(Freebie.company_id) for Freebie in Dev.freebies] + + import ipdb; ipdb.set_trace() \ No newline at end of file diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c96..c3832b4bf 100644 Binary files a/lib/freebies.db and b/lib/freebies.db differ diff --git a/lib/migrations/versions/cdd7a444a408_added_company_dev_table.py b/lib/migrations/versions/cdd7a444a408_added_company_dev_table.py new file mode 100644 index 000000000..bdffc03ea --- /dev/null +++ b/lib/migrations/versions/cdd7a444a408_added_company_dev_table.py @@ -0,0 +1,34 @@ +"""Added company_dev table + +Revision ID: cdd7a444a408 +Revises: e9ab616974f8 +Create Date: 2023-06-10 13:46:05.957110 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'cdd7a444a408' +down_revision = 'e9ab616974f8' +branch_labels = None +depends_on = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('company_dev', + 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_dev_company_id_companies')), + sa.ForeignKeyConstraint(['dev_id'], ['devs.id'], name=op.f('fk_company_dev_dev_id_devs')), + sa.PrimaryKeyConstraint('company_id', 'dev_id') + ) + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('company_dev') + # ### end Alembic commands ### diff --git a/lib/migrations/versions/e9ab616974f8_added_freebie_table.py b/lib/migrations/versions/e9ab616974f8_added_freebie_table.py new file mode 100644 index 000000000..e73866032 --- /dev/null +++ b/lib/migrations/versions/e9ab616974f8_added_freebie_table.py @@ -0,0 +1,37 @@ +"""Added freebie table + +Revision ID: e9ab616974f8 +Revises: 5f72c58bf48c +Create Date: 2023-06-10 12:56:14.120957 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'e9ab616974f8' +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.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') + # ### end Alembic commands ### diff --git a/lib/migrations/versions/eac61359ad88_updates.py b/lib/migrations/versions/eac61359ad88_updates.py new file mode 100644 index 000000000..6d2c07b15 --- /dev/null +++ b/lib/migrations/versions/eac61359ad88_updates.py @@ -0,0 +1,28 @@ +"""updates + +Revision ID: eac61359ad88 +Revises: cdd7a444a408 +Create Date: 2023-06-10 15:35:46.809855 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'eac61359ad88' +down_revision = 'cdd7a444a408' +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/models.py b/lib/models.py index 2681bee5a..dde191655 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,14 @@ Base = declarative_base(metadata=metadata) +company_dev = Table( + 'company_dev', + 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' @@ -16,14 +24,76 @@ class Company(Base): name = Column(String()) founding_year = Column(Integer()) + devs = relationship('Dev', secondary=company_dev, back_populates='companies') + freebies = relationship('Freebie', backref=backref('company'), cascade='all, delete-orphan') + def __repr__(self): - return f'' + return f'' + + @classmethod + def get_freebies(cls, session): + first_company = session.query(cls).first() + return session.query(Freebie).filter(Freebie.company_id == first_company.id).all() + + @property + def dev_names(self): + return [dev.name for dev in self.devs] + + def give_freebie(self, dev, item_name, value): + new_freebie = Freebie(item_name=item_name, value=value, company=self, dev=dev) + return new_freebie + + def oldest_company(cls, session): + return session.query(cls).order_by(cls.founding_year).first() class Dev(Base): __tablename__ = 'devs' id = Column(Integer(), primary_key=True) name= Column(String()) + + companies = relationship('Company', secondary=company_dev, back_populates='devs') + freebies = relationship('Freebie', backref=backref('dev'), cascade='all, delete-orphan') + + def __repr__(self): + return f'' + + @classmethod + def get_freebies(cls, session): + first_dev = session.query(cls).first() + return session.query(Freebie).filter(Freebie.dev_id == first_dev.id).all() + + @property + def company_names(self): + return [company.name for company in self.companies] + + def received_one(self, item_name): + return any(freebie.item_name == item_name for freebie in self.freebies) + + def give_away(self, dev, freebie): + if freebie.dev == self: + freebie.dev = dev + +class Freebie(Base): + __tablename__ = 'freebies' + + id = Column(Integer(), primary_key =True) + item_name= Column(String()) + value = Column(Integer()) + + dev_id = Column(ForeignKey('devs.id')) + company_id = Column(ForeignKey('companies.id')) + def __repr__(self): - return f'' + return f'Freebie(id:{self.id}, ' + \ + f'Name:{self.item_name}, ' + \ + f'company_id:{self.company_id}, ' + \ + f'dev_id:{self.dev_id})' + + def print_details(self, session): + dev_name = session.query(Dev.name).filter(Dev.id == self.dev_id).scalar() + company_name = session.query(Company.name).filter(Company.id == self.company_id).scalar() + return f'{dev_name} owns a {self.item_name} from {company_name}' + + diff --git a/lib/seed.py b/lib/seed.py index b16becbbb..a3ea96cef 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,94 @@ #!/usr/bin/env python3 +from faker import Faker +import random +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker -# Script goes here! +from models import Company, Dev, Freebie + +fake = Faker() + +if __name__ == '__main__': + + engine = create_engine('sqlite:///freebies.db') + Session = sessionmaker(bind=engine) + session = Session() + + session.query(Company).delete() + session.query(Dev).delete() + session.query(Freebie).delete() + + fake = Faker() + + companies = [] + for i in range(50): + company = Company( + name = fake.name(), + founding_year = random.randint(1965,2023) + ) + + # add and commit individually to get IDs back + session.add(company) + session.commit() + + companies.append(company) + + devs = [] + for i in range(25): + dev = Dev( + name=fake.name(), + ) + + session.add(dev) + session.commit() + + devs.append(dev) + + freebies = [] + for company in companies: + for i in range(random.randint(1,5)): + dev = random.choice(devs) + if company not in dev.companies: + dev.companies.append(company) + session.add(dev) + session.commit() + + freebie = Freebie( + item_name=fake.name(), + value=random.randint(0, 50), + company_id=company.id, + dev_id=dev.id, + ) + + freebies.append(freebie) + + session.bulk_save_objects(freebies) + session.commit() + session.close() + +# def delete_records(): +# session.query(Company).delete() +# session.query(Dev).delete() +# session.query(Freebie).delete() +# session.commit() + +# def create_records(): +# companies = [Company() for i in range(100)] +# devs = [Dev() for i in range(1000)] +# freebies = [Freebie() for i in range(500)] +# session.add_all(companies + devs + freebies) +# session.commit() +# return companies, devs, freebies + +# def relate_records(companies, devs, freebies): +# for freebie in freebies: +# freebie.company = rc(companies) +# freebie.dev = rc(devs) + +# session.add_all(freebies) +# session.commit() + +# if __name__ == '__main__': +# delete_records() +# companies, devs, freebies = create_records() +# relate_records(companies, devs, freebies) \ No newline at end of file