diff --git a/Pipfile b/Pipfile index 63c79cd98..f31991967 100644 --- a/Pipfile +++ b/Pipfile @@ -9,6 +9,7 @@ importlib-metadata = "6.0.0" importlib-resources = "5.10.0" ipdb = "0.13.9" sqlalchemy = "1.4.42" +faker = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index 3923f4a97..e892f77dc 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "fa62c636b7ae5acb4993fc7b007a651c55b562aa29962a9a8585ec314b352ae6" + "sha256": "e6c61c0f5c1b795f874456f2c675d57c67594f1614a5e1eb4bc37717a41b1762" }, "pipfile-spec": 6, "requires": { @@ -61,6 +61,15 @@ ], "version": "==1.2.0" }, + "faker": { + "hashes": [ + "sha256:0a79ebe8f0ea803f7bd288d51e2d445b86035a2480e048daee1bffbd4d69b32b", + "sha256:94216ce3d8affdc0a8fd0ea8219c184c346a1dcf07b03f193e52f3116186621e" + ], + "index": "pypi", + "markers": "python_version >= '3.8'", + "version": "==35.2.2" + }, "importlib-metadata": { "hashes": [ "sha256:7efb448ec9a5e313a57655d35aa54cd3e01b7e1fbcf72dce1bf06119420f5bad", @@ -226,13 +235,21 @@ "markers": "python_version >= '3.6'", "version": "==2.14.0" }, + "python-dateutil": { + "hashes": [ + "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", + "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", + "version": "==2.9.0.post0" + }, "six": { "hashes": [ - "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", - "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" + "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", + "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==1.16.0" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", + "version": "==1.17.0" }, "sqlalchemy": { "hashes": [ @@ -304,6 +321,14 @@ "markers": "python_version >= '3.7'", "version": "==5.8.1" }, + "typing-extensions": { + "hashes": [ + "sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c", + "sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef" + ], + "markers": "python_version >= '3.8'", + "version": "==4.13.2" + }, "wcwidth": { "hashes": [ "sha256:795b138f6875577cd91bba52baf9e445cd5118fd32723b460e30a0af30ea230e", diff --git a/lib/debug.py b/lib/debug.py index 4f922eb69..4a78416aa 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -1,9 +1,69 @@ #!/usr/bin/env python3 from sqlalchemy import create_engine - -from models import Company, Dev +from sqlalchemy.orm import sessionmaker +from models import Company, Dev, Freebie if __name__ == '__main__': engine = create_engine('sqlite:///freebies.db') + Session = sessionmaker(bind=engine) + session = Session() + + companies = session.query(Company).all() + devs = session.query(Dev).all() + freebies = session.query(Freebie).all() + + print("\n" + "=" * 60) + print("TESTING FREEBIE TRACKER") + print("=" * 60) + + # Test Company methods + print("\n COMPANY TESTS") + print("-" * 60) + company = companies[0] + print(f"Company: {company.name}") + print(f" Freebies given: {len(company.freebies)}") + print(f" Devs reached: {len(company.devs)}") + + new_freebie = company.give_freebie(devs[0], "Hoodie", 35) + session.add(new_freebie) + session.commit() + print(f" ✓ Gave new freebie: {new_freebie.item_name} to {devs[0].name}") + + oldest = Company.oldest_company() + print(f" Oldest company: {oldest.name} (founded {oldest.founding_year})") + + # Test Dev methods + print("\n DEV TESTS") + print("-" * 60) + dev = devs[0] + print(f"Dev: {dev.name}") + print(f" Freebies collected: {len(dev.freebies)}") + print(f" Companies visited: {len(dev.companies)}") + + if len(dev.freebies) > 0: + actual_item = dev.freebies[0].item_name + print(f" Has '{actual_item}'? {dev.received_one(actual_item)}") + print(f" Has 'Unicorn'? {dev.received_one('Unicorn')}") + + if len(dev.freebies) > 0: + freebie_to_give = dev.freebies[0] + dev.give_away(devs[1], freebie_to_give) + session.commit() + print(f" ✓ Gave away {freebie_to_give.item_name} to {devs[1].name}") + + # Test Freebie methods + print("\n FREEBIE TESTS") + print("-" * 60) + freebie = freebies[0] + print(f"Freebie: {freebie.item_name}") + print(f" Dev: {freebie.dev.name}") + print(f" Company: {freebie.company.name}") + print(f" Details: {freebie.print_details()}") + + print("\n" + "=" * 60) + print("✓ ALL TESTS COMPLETED") + print("=" * 60 + "\n") + + import ipdb; ipdb.set_trace() diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c96..0e2fe7c8b 100644 Binary files a/lib/freebies.db and b/lib/freebies.db differ diff --git a/lib/migrations/versions/0420e2b0bcf6_update_dev_model_with_relationships.py b/lib/migrations/versions/0420e2b0bcf6_update_dev_model_with_relationships.py new file mode 100644 index 000000000..4d551b17d --- /dev/null +++ b/lib/migrations/versions/0420e2b0bcf6_update_dev_model_with_relationships.py @@ -0,0 +1,28 @@ +"""Update Dev model with relationships + +Revision ID: 0420e2b0bcf6 +Revises: bd3a1c6d4871 +Create Date: 2025-11-30 12:45:59.948988 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '0420e2b0bcf6' +down_revision = 'bd3a1c6d4871' +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/69b12ccff2b8_add_freebie_model.py b/lib/migrations/versions/69b12ccff2b8_add_freebie_model.py new file mode 100644 index 000000000..6cae7fa4c --- /dev/null +++ b/lib/migrations/versions/69b12ccff2b8_add_freebie_model.py @@ -0,0 +1,37 @@ +"""Add Freebie model + +Revision ID: 69b12ccff2b8 +Revises: 0420e2b0bcf6 +Create Date: 2025-11-30 12:48:49.259429 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '69b12ccff2b8' +down_revision = '0420e2b0bcf6' +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/bd3a1c6d4871_update_company_model_with_relationships.py b/lib/migrations/versions/bd3a1c6d4871_update_company_model_with_relationships.py new file mode 100644 index 000000000..29ef5635d --- /dev/null +++ b/lib/migrations/versions/bd3a1c6d4871_update_company_model_with_relationships.py @@ -0,0 +1,28 @@ +"""Update Company model with relationships + +Revision ID: bd3a1c6d4871 +Revises: 5f72c58bf48c +Create Date: 2025-11-30 12:42:08.339370 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'bd3a1c6d4871' +down_revision = '5f72c58bf48c' +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..127dbfefb 100644 --- a/lib/models.py +++ b/lib/models.py @@ -16,8 +16,35 @@ class Company(Base): name = Column(String()) founding_year = Column(Integer()) + #returns a collection of all the freebies for the Company. + freebies = relationship('Freebie', back_populates='company') + def __repr__(self): return f'' + + @property + def devs(self): + #returns a collection of all devs who collected freebies from this company + return [freebie.dev for freebie in self.freebies] + + 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): + #returns the Company instance with the earliest founding year + from sqlalchemy.orm import Session + from sqlalchemy import create_engine + engine = create_engine('sqlite:///freebies.db') + session = Session(engine) + return session.query(cls).order_by(cls.founding_year.asc()).first() class Dev(Base): __tablename__ = 'devs' @@ -25,5 +52,44 @@ class Dev(Base): id = Column(Integer(), primary_key=True) name= Column(String()) + #returns a collection of all the freebies that the Dev has collected + freebies = relationship('Freebie', back_populates='dev') + def __repr__(self): return f'' + + @property + def companies(self): + #returns a collection of all companies that this dev has collected freebies from + return [freebie.company for freebie in self.freebies] + + def received_one(self, item_name): + #returns True if any freebie has the given item_name, otherwise False + return any(freebie.item_name == item_name for freebie in self.freebies) + + def give_away(self, dev, freebie): + #changes the freebie's dev to the given dev if it belongs to this dev + 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(Integer(), ForeignKey('devs.id')) + company_id = Column(Integer(), ForeignKey('companies.id')) + + #returns the Dev instance for this Freebie + dev = relationship('Dev', back_populates='freebies') + #returns the Company instance for this Freebie + company = relationship('Company', back_populates='freebies') + + def __repr__(self): + return f'' + + def print_details(self): + #returns formatted string: {dev name} owns a {item_name} from {company name}""" + 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..40cd9e2c6 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,69 @@ #!/usr/bin/env python3 +from faker import Faker +import random +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker + +from models import Company, Dev, Freebie # Script goes here! + +if __name__ == '__main__': + engine = create_engine('sqlite:///freebies.db') + Session = sessionmaker(bind=engine) + session = Session() + + # clear existing data + session.query(Freebie).delete() + session.query(Company).delete() + session.query(Dev).delete() + session.commit() + + fake = Faker() + + print("Seeding companies...") + companies = [ + Company( + name=fake.company(), + founding_year=random.randint(1990, 2023) + ) + for i in range(20) + ] + session.bulk_save_objects(companies) + session.commit() + + print("Seeding devs...") + devs = [ + Dev( + name=fake.name() + ) + for i in range(30) + ] + session.bulk_save_objects(devs) + session.commit() + + # fetch companies and devs from database to get their IDs + companies = session.query(Company).all() + devs = session.query(Dev).all() + + print("Seeding freebies...") + freebie_items = [ + "T-shirt", "Sticker", "Water Bottle", "Laptop Sleeve", + "Pen", "Notebook", "USB Drive", "Hat", "Keychain", + "Tote Bag", "Mug", "Mousepad", "Lanyard", "Backpack", + "Hoodie", "Socks", "Phone Stand", "Cable Organizer" + ] + + freebies = [ + Freebie( + item_name=random.choice(freebie_items), + value=random.randint(1, 50), + dev_id=random.choice(devs).id, + company_id=random.choice(companies).id + ) + for i in range(100) + ] + session.bulk_save_objects(freebies) + session.commit() + + print("Seeding complete!") \ No newline at end of file