diff --git a/lib/__pycache__/models.cpython-38.pyc b/lib/__pycache__/models.cpython-38.pyc new file mode 100644 index 000000000..651887808 Binary files /dev/null and b/lib/__pycache__/models.cpython-38.pyc differ diff --git a/lib/debug.py b/lib/debug.py index 4f922eb69..9f85f7b32 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -1,9 +1,12 @@ #!/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() diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c96..9034eb80d 100644 Binary files a/lib/freebies.db and b/lib/freebies.db differ diff --git a/lib/migrations/__pycache__/env.cpython-38.pyc b/lib/migrations/__pycache__/env.cpython-38.pyc new file mode 100644 index 000000000..5dd4d6227 Binary files /dev/null and b/lib/migrations/__pycache__/env.cpython-38.pyc differ diff --git a/lib/migrations/versions/__pycache__/5f72c58bf48c_create_companies_devs.cpython-38.pyc b/lib/migrations/versions/__pycache__/5f72c58bf48c_create_companies_devs.cpython-38.pyc new file mode 100644 index 000000000..a0fdebb10 Binary files /dev/null and b/lib/migrations/versions/__pycache__/5f72c58bf48c_create_companies_devs.cpython-38.pyc differ diff --git a/lib/migrations/versions/__pycache__/7a71dbf71c64_create_db.cpython-38.pyc b/lib/migrations/versions/__pycache__/7a71dbf71c64_create_db.cpython-38.pyc new file mode 100644 index 000000000..19a126ca0 Binary files /dev/null and b/lib/migrations/versions/__pycache__/7a71dbf71c64_create_db.cpython-38.pyc differ diff --git a/lib/migrations/versions/__pycache__/ac964de1c36d_add_freebies_table.cpython-38.pyc b/lib/migrations/versions/__pycache__/ac964de1c36d_add_freebies_table.cpython-38.pyc new file mode 100644 index 000000000..189bd41a6 Binary files /dev/null and b/lib/migrations/versions/__pycache__/ac964de1c36d_add_freebies_table.cpython-38.pyc differ diff --git a/lib/migrations/versions/__pycache__/cf2b7a97af0d_add_freebies_table.cpython-38.pyc b/lib/migrations/versions/__pycache__/cf2b7a97af0d_add_freebies_table.cpython-38.pyc new file mode 100644 index 000000000..ba85cc90b Binary files /dev/null and b/lib/migrations/versions/__pycache__/cf2b7a97af0d_add_freebies_table.cpython-38.pyc differ diff --git a/lib/migrations/versions/ac964de1c36d_add_freebies_table.py b/lib/migrations/versions/ac964de1c36d_add_freebies_table.py new file mode 100644 index 000000000..18efc0a0f --- /dev/null +++ b/lib/migrations/versions/ac964de1c36d_add_freebies_table.py @@ -0,0 +1,28 @@ +"""add freebies table + +Revision ID: ac964de1c36d +Revises: cf2b7a97af0d +Create Date: 2026-01-02 11:25:42.038135 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'ac964de1c36d' +down_revision = 'cf2b7a97af0d' +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/cf2b7a97af0d_add_freebies_table.py b/lib/migrations/versions/cf2b7a97af0d_add_freebies_table.py new file mode 100644 index 000000000..0f6ad863e --- /dev/null +++ b/lib/migrations/versions/cf2b7a97af0d_add_freebies_table.py @@ -0,0 +1,37 @@ +"""add freebies table + +Revision ID: cf2b7a97af0d +Revises: 5f72c58bf48c +Create Date: 2026-01-02 11:04:49.715084 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'cf2b7a97af0d' +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'], ), + sa.ForeignKeyConstraint(['dev_id'], ['devs.id'], ), + 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/models.py b/lib/models.py index 2681bee5a..58655a2ea 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,6 +1,5 @@ -from sqlalchemy import ForeignKey, Column, Integer, String, MetaData -from sqlalchemy.orm import relationship, backref -from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy import Column, Integer, String, ForeignKey, func, MetaData +from sqlalchemy.orm import relationship, backref, declarative_base convention = { "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", @@ -16,6 +15,27 @@ class Company(Base): name = Column(String()) founding_year = Column(Integer()) + # Relationship to freebies + freebies = relationship('Freebie', back_populates='company') + + # Relationship to devs through freebies + devs = relationship('Dev', secondary='freebies', back_populates='companies', viewonly=True) + + def give_freebie(self, dev, item_name, value): + # Creates a new Freebie associated with THIS company and the GIVEN dev + new_freebie = Freebie( + item_name=item_name, + value=value, + dev=dev, + company=self + ) + return new_freebie + + @classmethod + def oldest_company(cls, session): + # Uses the session to find the company with the minimum founding_year + return session.query(cls).order_by(cls.founding_year).first() + def __repr__(self): return f'' @@ -23,7 +43,46 @@ class Dev(Base): __tablename__ = 'devs' id = Column(Integer(), primary_key=True) - name= Column(String()) + name = Column(String()) + + # Relationship to freebies + freebies = relationship('Freebie', back_populates='dev') + + # Relationship to companies through freebies + companies = relationship('Company', secondary='freebies', back_populates='devs', viewonly=True) + + def received_one(self, item_name): + # Returns True if any freebie name matches the input + return any(f.item_name == item_name for f in self.freebies) + + def give_away(self, dev, freebie): + # Only change owner if the freebie currently belongs to THIS dev instance + if freebie.dev == self: + freebie.dev = dev + else: + print(f"{self.name} does not own {freebie.item_name}!") def __repr__(self): return f'' + +class Freebie(Base): + __tablename__ = 'freebies' + + id = Column(Integer(), primary_key=True) + item_name = Column(String()) + value = Column(Integer()) + + # Foreign Keys + dev_id = Column(Integer(), ForeignKey('devs.id')) + company_id = Column(Integer(), ForeignKey('companies.id')) + + # Relationships + dev = relationship('Dev', back_populates='freebies') + company = relationship('Company', back_populates='freebies') + + def print_details(self): + # Accesses the related dev and company names through the relationships + return f"{self.dev.name} owns a {self.item_name} from {self.company.name}" + + def __repr__(self): + return f'' \ No newline at end of file diff --git a/lib/seed.py b/lib/seed.py index b16becbbb..0b6fd122f 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,56 @@ #!/usr/bin/env python3 -# Script goes here! +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +from models import Company, Dev, Freebie + +def seed_data(): + engine = create_engine('sqlite:///freebies.db') + Session = sessionmaker(bind=engine) + session = Session() + + # Clear existing data + session.query(Freebie).delete() + session.query(Dev).delete() + session.query(Company).delete() + session.commit() + + # Create sample companies + company1 = Company(name="TechCorp", founding_year=2000) + company2 = Company(name="InnoSoft", founding_year=2010) + + # Create sample developers + dev1 = Dev(name="Alice") + dev2 = Dev(name="Bob") + + session.add_all([company1, company2, dev1, dev2]) + session.commit() + + # Create sample freebies using the Freebie model + freebie1 = Freebie( + item_name='Sticker Pack', + value=5, + dev_id=dev1.id, + company_id=company1.id + ) + freebie2 = Freebie( + item_name='T-Shirt', + value=20, + dev_id=dev2.id, + company_id=company2.id + ) + freebie3 = Freebie( + item_name='Water Bottle', + value=15, + dev_id=dev1.id, + company_id=company2.id + ) + + session.add_all([freebie1, freebie2, freebie3]) + session.commit() + session.close() + + print("Seeding complete!") + +if __name__ == '__main__': + seed_data()