diff --git a/lib/debug.py b/lib/debug.py index 4f922eb69..8d51a0dcb 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -1,9 +1,17 @@ #!/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') + Session = sessionmaker(bind=engine) + session = Session() + import ipdb; ipdb.set_trace() + + + + \ No newline at end of file diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c96..99953cf55 100644 Binary files a/lib/freebies.db and b/lib/freebies.db differ diff --git a/lib/migrations/versions/3c86d230fcbe_added_the_freebie_model.py b/lib/migrations/versions/3c86d230fcbe_added_the_freebie_model.py new file mode 100644 index 000000000..574e4c9b5 --- /dev/null +++ b/lib/migrations/versions/3c86d230fcbe_added_the_freebie_model.py @@ -0,0 +1,37 @@ +"""Added the Freebie model + +Revision ID: 3c86d230fcbe +Revises: 5f72c58bf48c +Create Date: 2024-07-24 20:26:51.440273 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '3c86d230fcbe' +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('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/9cbace057015_changed_the_repr_functions.py b/lib/migrations/versions/9cbace057015_changed_the_repr_functions.py new file mode 100644 index 000000000..8504d980c --- /dev/null +++ b/lib/migrations/versions/9cbace057015_changed_the_repr_functions.py @@ -0,0 +1,28 @@ +"""Changed the repr functions + +Revision ID: 9cbace057015 +Revises: 3c86d230fcbe +Create Date: 2024-07-25 11:18:07.384498 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '9cbace057015' +down_revision = '3c86d230fcbe' +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..b4e6c7303 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 = { @@ -9,21 +9,84 @@ Base = declarative_base(metadata=metadata) + +engine = create_engine('sqlite:///freebies.db') +Session = sessionmaker(bind=engine) +session = Session() + +#Create a Table object +company_dev = Table( + 'company_dev', + Base.metadata, + Column('company_id', Integer, ForeignKey('companies.id'), primary_key=True), + Column('dev_id', Integer, ForeignKey('devs.id'), primary_key=True), + extend_existing=True, +) + +#Company Class Definition class Company(Base): __tablename__ = 'companies' - id = Column(Integer(), primary_key=True) - name = Column(String()) - founding_year = Column(Integer()) + id = Column(Integer, primary_key=True) + name = Column(String) + founding_year = Column(Integer) + + freebies = relationship("Freebie", backref=backref("company")) + devs = relationship("Dev", secondary=company_dev, back_populates="companies") def __repr__(self): - return f'' + return f'' + + def give_freebie(self, dev, item_name, value): + new_freebie = Freebie(item_name=item_name, value=value, dev=dev, company=self) + session.add(new_freebie) + session.commit() + + @classmethod + 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) + + freebies = relationship("Freebie", backref=backref("dev")) + companies = relationship("Company", secondary=company_dev, back_populates="devs") + + def __repr__(self): + return f'' + + 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 in self.freebies: + freebie.dev = dev + session.commit() + + +#Freebie Class Definition +class Freebie(Base): + __tablename__ = 'freebies' + id = Column(Integer(), primary_key=True) - name= Column(String()) + item_name = Column(String()) + value = Column(Integer()) + + company_id = Column(Integer(), ForeignKey('companies.id')) + dev_id = Column(Integer(), ForeignKey('devs.id')) + + dev = relationship("Dev", back_populates="freebies") + company = relationship("Company", back_populates="freebies") def __repr__(self): - return f'' + return f'' + + def print_details(self): + print(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..d9229b37a 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,71 @@ #!/usr/bin/env python3 # Script goes here! + +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +from models import Base, Company, Dev, Freebie +from faker import Faker +import random + +fake = Faker() + +if __name__ == "__main__": + engine = create_engine('sqlite:///freebies.db') + Base.metadata.create_all(engine) + + Session = sessionmaker(bind=engine) + session = Session() + + session.query(Company).delete() + session.query(Dev).delete() + session.query(Freebie).delete() + session.commit() + + #Create fake companies, devs and freebies + companies = [ + Company( + name=fake.unique.company(), + founding_year=fake.unique.year() + ) + for _ in range(10)] + + session.bulk_save_objects(companies) + session.commit() + + devs = [ + Dev( + name=fake.unique.name() + ) + for _ in range(10)] + + session.bulk_save_objects(devs) + session.commit() + + freebies = [ + Freebie( + item_name=fake.unique.word(), + value=random.randint(1, 100), + company_id = random.randint(1, 10), + dev_id = random.randint(1, 10) + ) + for _ in range(10)] + + session.bulk_save_objects(freebies) + session.commit() + + + + + + + + + + + + + + + +