diff --git a/lib/debug.py b/lib/debug.py index 4f922eb69..017fc0f76 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -1,9 +1,35 @@ -#!/usr/bin/env python3 - from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +from models import Company, Dev, Freebie + +engine = create_engine('sqlite:///freebie.db') +Session = sessionmaker(bind=engine) +session = Session() + +# Fetch some test data +alice = session.query(Dev).filter_by(name="Alice").first() +google = session.query(Company).filter_by(name="Google").first() +first_freebie = session.query(Freebie).first() + +print("\n--- Running automated debug tests ---\n") + +# Test Dev.companies() method +print("Alice's companies:", alice.companies() if alice else "No Alice found") + +# Test Dev.received_one() method +print("Has Alice received a 'T-shirt'? ->", alice.received_one("T-shirt") if alice else "No Alice found") + +# Test Freebie.print_details() +if first_freebie: + print("Freebie details:", first_freebie.print_details()) +else: + print("No freebies found") + +# Test Company.oldest_company() +oldest = Company.oldest_company(session) +print("Oldest company:", oldest) -from models import Company, Dev +print("\n--- End of automated tests ---\n") -if __name__ == '__main__': - engine = create_engine('sqlite:///freebies.db') - import ipdb; ipdb.set_trace() +# Drop into ipdb to continue manual testing +import ipdb; ipdb.set_trace() diff --git a/lib/freebie.db b/lib/freebie.db new file mode 100644 index 000000000..0bdf8b9f7 Binary files /dev/null and b/lib/freebie.db differ diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c96..72f51660d 100644 Binary files a/lib/freebies.db and b/lib/freebies.db differ diff --git a/lib/migrations/versions/5241293fc7a0_create_freebies_table.py b/lib/migrations/versions/5241293fc7a0_create_freebies_table.py new file mode 100644 index 000000000..1169a2ff6 --- /dev/null +++ b/lib/migrations/versions/5241293fc7a0_create_freebies_table.py @@ -0,0 +1,54 @@ +"""Create freebies table + +Revision ID: 5241293fc7a0 +Revises: c8b598c23fce +Create Date: 2025-05-25 23:46:05.647399 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '5241293fc7a0' +down_revision = 'c8b598c23fce' +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.alter_column('item_name', + existing_type=sa.VARCHAR(), + nullable=True) + batch_op.alter_column('value', + existing_type=sa.INTEGER(), + nullable=True) + batch_op.alter_column('dev_id', + existing_type=sa.INTEGER(), + nullable=True) + batch_op.alter_column('company_id', + existing_type=sa.INTEGER(), + nullable=True) + + # ### 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.alter_column('company_id', + existing_type=sa.INTEGER(), + nullable=False) + batch_op.alter_column('dev_id', + existing_type=sa.INTEGER(), + nullable=False) + batch_op.alter_column('value', + existing_type=sa.INTEGER(), + nullable=False) + batch_op.alter_column('item_name', + existing_type=sa.VARCHAR(), + nullable=False) + + # ### end Alembic commands ### diff --git a/lib/migrations/versions/c8b598c23fce_create_freebies_table.py b/lib/migrations/versions/c8b598c23fce_create_freebies_table.py new file mode 100644 index 000000000..fd22600ae --- /dev/null +++ b/lib/migrations/versions/c8b598c23fce_create_freebies_table.py @@ -0,0 +1,30 @@ +"""Create freebies table + +Revision ID: c8b598c23fce +Revises: 5f72c58bf48c +Create Date: 2025-05-25 23:34:21.836762 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'c8b598c23fce' +down_revision = '5f72c58bf48c' +branch_labels = None +depends_on = None + + +def upgrade() -> None: + op.create_table( + 'freebies', + sa.Column('id', sa.Integer(), primary_key=True), + sa.Column('item_name', sa.String(), nullable=False), + sa.Column('value', sa.Integer(), nullable=False), + sa.Column('company_id', sa.Integer(), sa.ForeignKey('companies.id'), nullable=False), + sa.Column('dev_id', sa.Integer(), sa.ForeignKey('devs.id'), nullable=False) + ) + +def downgrade() -> None: + op.drop_table('freebies') diff --git a/lib/models.py b/lib/models.py index 2681bee5a..7ec460232 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,9 +1,12 @@ from sqlalchemy import ForeignKey, Column, Integer, String, MetaData -from sqlalchemy.orm import relationship, backref +from sqlalchemy.orm import relationship, backref, Session # <-- add Session here from sqlalchemy.ext.declarative import declarative_base +# ... rest of your code ... + +# Use naming convention to help Alembic convention = { - "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", + "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s" } metadata = MetaData(naming_convention=convention) @@ -12,18 +15,63 @@ 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", back_populates="company") def __repr__(self): - return f'' + return f"" + + def devs(self): + return list({freebie.dev for freebie in self.freebies}) + + def give_freebie(self, dev, item_name, value): + return Freebie(item_name=item_name, value=value, company=self, dev=dev) + + @classmethod + def oldest_company(cls, session: Session): + return session.query(cls).order_by(cls.founding_year.asc()).first() + class Dev(Base): __tablename__ = 'devs' - id = Column(Integer(), primary_key=True) - name= Column(String()) + id = Column(Integer, primary_key=True) + name = Column(String) + + freebies = relationship("Freebie", back_populates="dev") + + def __repr__(self): + return f"" + + def companies(self): + return list({freebie.company for freebie in self.freebies}) + + 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 + + +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'' + return f"" + + def print_details(self): + return f"{self.dev.name} owns a {self.item_name} from {self.company.name}" diff --git a/lib/seed.py b/lib/seed.py index b16becbbb..420f9c8b6 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,28 @@ -#!/usr/bin/env python3 +from models import Base, Company, Dev, Freebie +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker -# Script goes here! +engine = create_engine('sqlite:///freebie.db') +Session = sessionmaker(bind=engine) +session = Session() + +# Drop and recreate tables +Base.metadata.drop_all(engine) +Base.metadata.create_all(engine) + +# Create Companies +c1 = Company(name="Google", founding_year=1998) +c2 = Company(name="Apple", founding_year=1976) + +# Create Devs +d1 = Dev(name="Alice") +d2 = Dev(name="Bob") + +# Create Freebies +f1 = Freebie(item_name="Sticker", value=5, company=c1, dev=d1) +f2 = Freebie(item_name="T-shirt", value=20, company=c2, dev=d1) +f3 = Freebie(item_name="Mug", value=15, company=c1, dev=d2) + +# Add all to session +session.add_all([c1, c2, d1, d2, f1, f2, f3]) +session.commit()