diff --git a/lib/debug.py b/lib/debug.py index 4f922eb69..58da5ca0b 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -1,9 +1,12 @@ #!/usr/bin/env python3 - +from sqlalchemy.orm import sessionmaker from sqlalchemy import create_engine - -from models import Company, Dev +import ipdb +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() + + ipdb.set_trace() diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c96..9d83daf12 100644 Binary files a/lib/freebies.db and b/lib/freebies.db differ diff --git a/lib/migrations/versions/4ecf6d961128_remove_name_column_from_freebies_table.py b/lib/migrations/versions/4ecf6d961128_remove_name_column_from_freebies_table.py new file mode 100644 index 000000000..12c9271d6 --- /dev/null +++ b/lib/migrations/versions/4ecf6d961128_remove_name_column_from_freebies_table.py @@ -0,0 +1,32 @@ +"""remove name column from freebies table + +Revision ID: 4ecf6d961128 +Revises: f0ede71968ab +Create Date: 2023-06-11 19:13:55.598121 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '4ecf6d961128' +down_revision = 'f0ede71968ab' +branch_labels = None +depends_on = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('freebies', schema=None) as batch_op: + batch_op.drop_column('name') + + # ### 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.add_column(sa.Column('name', sa.VARCHAR(), nullable=True)) + + # ### end Alembic commands ### diff --git a/lib/migrations/versions/a6406e795d69_add_freebies_table.py b/lib/migrations/versions/a6406e795d69_add_freebies_table.py new file mode 100644 index 000000000..4c4892fa9 --- /dev/null +++ b/lib/migrations/versions/a6406e795d69_add_freebies_table.py @@ -0,0 +1,38 @@ +"""add freebies table + +Revision ID: a6406e795d69 +Revises: 5f72c58bf48c +Create Date: 2023-06-11 18:43:32.597726 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'a6406e795d69' +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('name', sa.String(), nullable=True), + sa.Column('item_name', sa.String(), nullable=True), + sa.Column('value', sa.Integer(), nullable=True), + sa.Column('company_id', sa.Integer(), nullable=True), + sa.Column('dev_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/f0ede71968ab_connect_tables_has_many_to_has_many.py b/lib/migrations/versions/f0ede71968ab_connect_tables_has_many_to_has_many.py new file mode 100644 index 000000000..fdec628f2 --- /dev/null +++ b/lib/migrations/versions/f0ede71968ab_connect_tables_has_many_to_has_many.py @@ -0,0 +1,28 @@ +"""connect tables has_many to has_many + +Revision ID: f0ede71968ab +Revises: a6406e795d69 +Create Date: 2023-06-11 18:57:46.065689 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'f0ede71968ab' +down_revision = 'a6406e795d69' +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..31335999f 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,6 +1,14 @@ from sqlalchemy import ForeignKey, Column, Integer, String, MetaData -from sqlalchemy.orm import relationship, backref +from sqlalchemy.orm import relationship from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.ext.associationproxy import association_proxy +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +import ipdb + +engine = create_engine('sqlite:///freebies.db') +Session = sessionmaker(bind=engine) +session = Session() convention = { "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", @@ -15,15 +23,79 @@ class Company(Base): id = Column(Integer(), primary_key=True) name = Column(String()) founding_year = Column(Integer()) + + freebies = relationship('Freebie', back_populates='company', cascade='all, delete-orphan') + + # not sure I can explain this: + devs = association_proxy('freebies', 'dev', + creator=lambda dv: Freebie(dev=dv)) def __repr__(self): return f'' + + def give_freebie(self, dev, item_name, value): + freebie = Freebie(item_name, value) + freebie.dev = dev + freebie.company = self + + @classmethod + def oldest_company(cls): + return session.query(cls).order_by(cls.founding_year).first() + # the code below was my best try - I think this has something to do with + # fine tuning the query object before execution VS grabbing all the records + # and then doing iteration... + # companies = session.query(cls) + # comp = min(companies, key=lambda x: x["founding_year"]) + # return comp + + class Dev(Base): __tablename__ = 'devs' id = Column(Integer(), primary_key=True) - name= Column(String()) + name = Column(String()) + + freebies = relationship('Freebie', back_populates='dev', cascade='all, delete-orphan') + # not sure I can explain this: + companies = association_proxy('freebies', 'company', + creator=lambda cpy: Freebie(company=cpy)) def __repr__(self): return f'' + + def received_one(self, item_name): + dev_freebie = session.query(Freebie).filter(Freebie.dev_id == self.id, Freebie.item_name == item_name).all() + if dev_freebie: + return True + else: + return False + + def give_away(self, dev, freebie): + if self.id == freebie.dev_id: + freebie.dev_id = dev.id + + + + +class Freebie(Base): + __tablename__ = 'freebies' + + id = Column(Integer(), primary_key=True) + item_name = Column(String()) + value = Column(Integer()) + + company_id = Column(Integer(), ForeignKey('companies.id')) + dev_id = Column(Integer(), ForeignKey('devs.id')) + + company = relationship('Company', back_populates='freebies') + dev = relationship('Dev', back_populates='freebies') + + def __repr__(self): + return f'' + + def print_details(self): + return f'{self.dev.name} owns a {self.item_name} from {self.company.name}' + + + \ No newline at end of file diff --git a/lib/seed.py b/lib/seed.py index b16becbbb..c90ab87af 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,44 @@ #!/usr/bin/env python3 +from faker import Faker +from random import choice as rc + +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker + +from models import Company, Freebie, Dev + +engine = create_engine('sqlite:///freebies.db') +Session = sessionmaker(bind=engine) +session = Session() + +fake = Faker() + + +def delete_records(): + session.query(Company).delete() + session.query(Freebie).delete() + session.query(Dev).delete() + session.commit() + +def create_records(): + companies = [Company(name=fake.name(), founding_year=fake.random_int(min=1930, max=2023)) for i in range(20)] + freebies = [Freebie(item_name=fake.name(), value=fake.random_int(min=1, max=117)) for i in range(100)] + devs = [Dev(name=fake.name()) for i in range(50)] + session.add_all(companies + freebies + devs) + session.commit() + return companies, freebies, devs + +def relate_records(companies, freebies, devs): + for freebie in freebies: + freebie.dev = rc(devs) + freebie.company = rc(companies) + + session.add_all(freebies) + session.commit() + +if __name__ == '__main__': + delete_records() + companies, freebies, devs = create_records() + relate_records(companies, freebies, devs) + -# Script goes here!