diff --git a/lib/__pycache__/models.cpython-312.pyc b/lib/__pycache__/models.cpython-312.pyc new file mode 100644 index 000000000..58f8b9c20 Binary files /dev/null and b/lib/__pycache__/models.cpython-312.pyc differ diff --git a/lib/alembic/README b/lib/alembic/README new file mode 100644 index 000000000..98e4f9c44 --- /dev/null +++ b/lib/alembic/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/lib/alembic/env.py b/lib/alembic/env.py new file mode 100644 index 000000000..3a8b93ced --- /dev/null +++ b/lib/alembic/env.py @@ -0,0 +1,78 @@ +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool +from models import Base +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +if config.config_file_name is not None: + fileConfig(config.config_file_name) + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +target_metadata = Base.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline() -> None: + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, + target_metadata=target_metadata, + literal_binds=True, + dialect_opts={"paramstyle": "named"}, + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online() -> None: + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + connectable = engine_from_config( + config.get_section(config.config_ini_section), + prefix="sqlalchemy.", + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, target_metadata=target_metadata + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/lib/alembic/script.py.mako b/lib/alembic/script.py.mako new file mode 100644 index 000000000..55df2863d --- /dev/null +++ b/lib/alembic/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade() -> None: + ${upgrades if upgrades else "pass"} + + +def downgrade() -> None: + ${downgrades if downgrades else "pass"} diff --git a/lib/debug.py b/lib/debug.py index 4f922eb69..fd9742a5e 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -1,9 +1,14 @@ #!/usr/bin/env python3 from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +from models import Base, Company, Dev, Freebie from models import Company, Dev 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..3bb33ddc5 100644 Binary files a/lib/freebies.db and b/lib/freebies.db differ diff --git a/lib/migrations/__pycache__/env.cpython-312.pyc b/lib/migrations/__pycache__/env.cpython-312.pyc new file mode 100644 index 000000000..eb99a8cb1 Binary files /dev/null and b/lib/migrations/__pycache__/env.cpython-312.pyc differ diff --git a/lib/migrations/versions/0da7779a6253_create_seed_py_for_test_parameters.py b/lib/migrations/versions/0da7779a6253_create_seed_py_for_test_parameters.py new file mode 100644 index 000000000..95b1bc12d --- /dev/null +++ b/lib/migrations/versions/0da7779a6253_create_seed_py_for_test_parameters.py @@ -0,0 +1,28 @@ +"""Create seed.py for test parameters + +Revision ID: 0da7779a6253 +Revises: 8e26b5ee0ada +Create Date: 2025-05-26 13:27:00.692602 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '0da7779a6253' +down_revision = '8e26b5ee0ada' +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/16d3bd88588f_create_tables.py b/lib/migrations/versions/16d3bd88588f_create_tables.py new file mode 100644 index 000000000..eb8723757 --- /dev/null +++ b/lib/migrations/versions/16d3bd88588f_create_tables.py @@ -0,0 +1,28 @@ +"""Create tables + +Revision ID: 16d3bd88588f +Revises: 349255ddbe32 +Create Date: 2025-05-26 13:10:57.060752 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '16d3bd88588f' +down_revision = '349255ddbe32' +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/349255ddbe32_initial_commit.py b/lib/migrations/versions/349255ddbe32_initial_commit.py new file mode 100644 index 000000000..d5eb9416a --- /dev/null +++ b/lib/migrations/versions/349255ddbe32_initial_commit.py @@ -0,0 +1,24 @@ +"""initial commit + +Revision ID: 349255ddbe32 +Revises: 5f72c58bf48c +Create Date: 2025-05-24 20:32:36.007700 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '349255ddbe32' +down_revision = '5f72c58bf48c' +branch_labels = None +depends_on = None + + +def upgrade() -> None: + pass + + +def downgrade() -> None: + pass diff --git a/lib/migrations/versions/4d687419ba60_revised_seed_py_for_test_parameters_in_.py b/lib/migrations/versions/4d687419ba60_revised_seed_py_for_test_parameters_in_.py new file mode 100644 index 000000000..2896d7ada --- /dev/null +++ b/lib/migrations/versions/4d687419ba60_revised_seed_py_for_test_parameters_in_.py @@ -0,0 +1,28 @@ +"""revised seed.py for test parameters in reverse + +Revision ID: 4d687419ba60 +Revises: 0da7779a6253 +Create Date: 2025-05-26 13:31:20.909756 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '4d687419ba60' +down_revision = '0da7779a6253' +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/6c61e603a123_added_aggregate_methods.py b/lib/migrations/versions/6c61e603a123_added_aggregate_methods.py new file mode 100644 index 000000000..511aa0eb2 --- /dev/null +++ b/lib/migrations/versions/6c61e603a123_added_aggregate_methods.py @@ -0,0 +1,28 @@ +"""added Aggregate Methods + +Revision ID: 6c61e603a123 +Revises: c28595cd3935 +Create Date: 2025-05-26 13:53:09.229066 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '6c61e603a123' +down_revision = 'c28595cd3935' +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/8e26b5ee0ada_create_seed_py_for_test_parameters.py b/lib/migrations/versions/8e26b5ee0ada_create_seed_py_for_test_parameters.py new file mode 100644 index 000000000..f1a282d4f --- /dev/null +++ b/lib/migrations/versions/8e26b5ee0ada_create_seed_py_for_test_parameters.py @@ -0,0 +1,28 @@ +"""Create seed.py for test parameters + +Revision ID: 8e26b5ee0ada +Revises: 9561701f4dee +Create Date: 2025-05-26 13:18:43.272155 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '8e26b5ee0ada' +down_revision = '9561701f4dee' +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/9561701f4dee_create_freebies_table.py b/lib/migrations/versions/9561701f4dee_create_freebies_table.py new file mode 100644 index 000000000..4e891bb69 --- /dev/null +++ b/lib/migrations/versions/9561701f4dee_create_freebies_table.py @@ -0,0 +1,37 @@ +"""Create freebies table + +Revision ID: 9561701f4dee +Revises: 16d3bd88588f +Create Date: 2025-05-26 13:13:58.993750 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '9561701f4dee' +down_revision = '16d3bd88588f' +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/__pycache__/0da7779a6253_create_seed_py_for_test_parameters.cpython-312.pyc b/lib/migrations/versions/__pycache__/0da7779a6253_create_seed_py_for_test_parameters.cpython-312.pyc new file mode 100644 index 000000000..dd6c6116d Binary files /dev/null and b/lib/migrations/versions/__pycache__/0da7779a6253_create_seed_py_for_test_parameters.cpython-312.pyc differ diff --git a/lib/migrations/versions/__pycache__/16d3bd88588f_create_tables.cpython-312.pyc b/lib/migrations/versions/__pycache__/16d3bd88588f_create_tables.cpython-312.pyc new file mode 100644 index 000000000..e8c438cb2 Binary files /dev/null and b/lib/migrations/versions/__pycache__/16d3bd88588f_create_tables.cpython-312.pyc differ diff --git a/lib/migrations/versions/__pycache__/349255ddbe32_initial_commit.cpython-312.pyc b/lib/migrations/versions/__pycache__/349255ddbe32_initial_commit.cpython-312.pyc new file mode 100644 index 000000000..fda739a34 Binary files /dev/null and b/lib/migrations/versions/__pycache__/349255ddbe32_initial_commit.cpython-312.pyc differ diff --git a/lib/migrations/versions/__pycache__/4d687419ba60_revised_seed_py_for_test_parameters_in_.cpython-312.pyc b/lib/migrations/versions/__pycache__/4d687419ba60_revised_seed_py_for_test_parameters_in_.cpython-312.pyc new file mode 100644 index 000000000..57e7c8b0a Binary files /dev/null and b/lib/migrations/versions/__pycache__/4d687419ba60_revised_seed_py_for_test_parameters_in_.cpython-312.pyc differ diff --git a/lib/migrations/versions/__pycache__/5f72c58bf48c_create_companies_devs.cpython-312.pyc b/lib/migrations/versions/__pycache__/5f72c58bf48c_create_companies_devs.cpython-312.pyc new file mode 100644 index 000000000..168308e0e Binary files /dev/null and b/lib/migrations/versions/__pycache__/5f72c58bf48c_create_companies_devs.cpython-312.pyc differ diff --git a/lib/migrations/versions/__pycache__/6c61e603a123_added_aggregate_methods.cpython-312.pyc b/lib/migrations/versions/__pycache__/6c61e603a123_added_aggregate_methods.cpython-312.pyc new file mode 100644 index 000000000..0bbd4036b Binary files /dev/null and b/lib/migrations/versions/__pycache__/6c61e603a123_added_aggregate_methods.cpython-312.pyc differ diff --git a/lib/migrations/versions/__pycache__/7a71dbf71c64_create_db.cpython-312.pyc b/lib/migrations/versions/__pycache__/7a71dbf71c64_create_db.cpython-312.pyc new file mode 100644 index 000000000..57622909a Binary files /dev/null and b/lib/migrations/versions/__pycache__/7a71dbf71c64_create_db.cpython-312.pyc differ diff --git a/lib/migrations/versions/__pycache__/8e26b5ee0ada_create_seed_py_for_test_parameters.cpython-312.pyc b/lib/migrations/versions/__pycache__/8e26b5ee0ada_create_seed_py_for_test_parameters.cpython-312.pyc new file mode 100644 index 000000000..620c04acb Binary files /dev/null and b/lib/migrations/versions/__pycache__/8e26b5ee0ada_create_seed_py_for_test_parameters.cpython-312.pyc differ diff --git a/lib/migrations/versions/__pycache__/9561701f4dee_create_freebies_table.cpython-312.pyc b/lib/migrations/versions/__pycache__/9561701f4dee_create_freebies_table.cpython-312.pyc new file mode 100644 index 000000000..469f54a42 Binary files /dev/null and b/lib/migrations/versions/__pycache__/9561701f4dee_create_freebies_table.cpython-312.pyc differ diff --git a/lib/migrations/versions/__pycache__/c28595cd3935_used_unique_lists_to_avoid_duplicates_.cpython-312.pyc b/lib/migrations/versions/__pycache__/c28595cd3935_used_unique_lists_to_avoid_duplicates_.cpython-312.pyc new file mode 100644 index 000000000..9a445b869 Binary files /dev/null and b/lib/migrations/versions/__pycache__/c28595cd3935_used_unique_lists_to_avoid_duplicates_.cpython-312.pyc differ diff --git a/lib/migrations/versions/__pycache__/f85d30582ce2_used_unique_lists_to_avoid_duplicates.cpython-312.pyc b/lib/migrations/versions/__pycache__/f85d30582ce2_used_unique_lists_to_avoid_duplicates.cpython-312.pyc new file mode 100644 index 000000000..dc347774e Binary files /dev/null and b/lib/migrations/versions/__pycache__/f85d30582ce2_used_unique_lists_to_avoid_duplicates.cpython-312.pyc differ diff --git a/lib/migrations/versions/c28595cd3935_used_unique_lists_to_avoid_duplicates_.py b/lib/migrations/versions/c28595cd3935_used_unique_lists_to_avoid_duplicates_.py new file mode 100644 index 000000000..ba23e436e --- /dev/null +++ b/lib/migrations/versions/c28595cd3935_used_unique_lists_to_avoid_duplicates_.py @@ -0,0 +1,28 @@ +"""used unique lists to avoid duplicates (FIXED) + +Revision ID: c28595cd3935 +Revises: f85d30582ce2 +Create Date: 2025-05-26 13:48:27.651695 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'c28595cd3935' +down_revision = 'f85d30582ce2' +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/f85d30582ce2_used_unique_lists_to_avoid_duplicates.py b/lib/migrations/versions/f85d30582ce2_used_unique_lists_to_avoid_duplicates.py new file mode 100644 index 000000000..525ceead4 --- /dev/null +++ b/lib/migrations/versions/f85d30582ce2_used_unique_lists_to_avoid_duplicates.py @@ -0,0 +1,28 @@ +"""used unique lists to avoid duplicates + +Revision ID: f85d30582ce2 +Revises: 4d687419ba60 +Create Date: 2025-05-26 13:43:49.700062 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'f85d30582ce2' +down_revision = '4d687419ba60' +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..b98a641dc 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,6 +1,6 @@ from sqlalchemy import ForeignKey, Column, Integer, String, MetaData from sqlalchemy.orm import relationship, backref -from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import declarative_base, Session convention = { "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", @@ -16,6 +16,32 @@ class Company(Base): name = Column(String()) founding_year = Column(Integer()) + @property + def devs(self): + return list({freebie.dev for freebie in self.freebies.all()}) + + + def give_freebie(self, dev, item_name, value): + """ + Create and return a Freebie given to a dev from this company. + Note: You need to add and commit the freebie in your session outside this method. + """ + new_freebie = Freebie( + item_name=item_name, + value=value, + dev=dev, + company=self + ) + return new_freebie + + @classmethod + def oldest_company(cls, session: Session): + """ + Return the company instance with the earliest founding year. + Requires a SQLAlchemy session as argument. + """ + return session.query(cls).order_by(cls.founding_year.asc()).first() + def __repr__(self): return f'' @@ -23,7 +49,39 @@ class Dev(Base): __tablename__ = 'devs' id = Column(Integer(), primary_key=True) - name= Column(String()) + name = Column(String()) + + @property + def companies(self): + return list({freebie.company for freebie in self.freebies.all()}) + + def received_one(self, item_name: str) -> bool: + return any(freebie.item_name == item_name for freebie in self.freebies.all()) + + def give_away(self, dev, freebie): + if freebie in self.freebies.all(): + freebie.dev = dev + return True + return False def __repr__(self): return f'' + +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')) + + dev = relationship("Dev", backref=backref("freebies", lazy="dynamic")) + company = relationship("Company", backref=backref("freebies", lazy="dynamic")) + + def __repr__(self): + 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..c7276282a 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,99 @@ #!/usr/bin/env python3 # Script goes here! +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +from models import Base, Company, Dev, Freebie # All models from models.py + +engine = create_engine('sqlite:///freebies.db') +Session = sessionmaker(bind=engine) +session = Session() + +# clear old data for testing +session.query(Freebie).delete() +session.query(Dev).delete() +session.query(Company).delete() + +# Create sample companies +company1 = Company(name="OpenAI", founding_year=2015) +company2 = Company(name="Google", founding_year=1998) + +# Create sample devs +dev1 = Dev(name="Alice") +dev2 = Dev(name="Bob") + +# Create sample freebies +freebie1 = Freebie(item_name="T-shirt", value=20, dev=dev1, company=company1) +freebie2 = Freebie(item_name="Mug", value=10, dev=dev2, company=company2) +freebie3 = Freebie(item_name="Sticker", value=5, dev=dev1, company=company2) + +# Add and commit +session.add_all([company1, company2, dev1, dev2, freebie1, freebie2, freebie3]) +session.commit() + +# Testing relationships +freebie = session.query(Freebie).first() +print(f"{freebie.item_name} was given by {freebie.company.name} to {freebie.dev.name}") + +dev = session.query(Dev).first() +print(f"{dev.name} has received the following freebies:") +for f in dev.freebies: + print("-", f.item_name) + +company = session.query(Company).first() +print(f"{company.name} has given out the following freebies:") +for f in company.freebies: + print("-", f.item_name) + + +# Testing relationships in reverse +company = session.query(Company).first() +print(f"{company.name} has given freebies to:") +for dev in company.devs: + print("-", dev.name) + +dev = session.query(Dev).first() +print(f"{dev.name} has received freebies from:") +for company in dev.companies: + print("-", company.name) + +#testing aggregate functions +freebie = session.query(Freebie).first() +print(freebie.print_details()) + +# Find a dev and a company +dev = session.query(Dev).filter_by(name="Alice").one() +company = session.query(Company).filter_by(name="OpenAI").one() + +# Give a freebie +freebie = company.give_freebie(dev, "Sticker Pack", 5) +session.add(freebie) +session.commit() + +# Get the oldest company +oldest = Company.oldest_company(session) +print(f"Oldest company is {oldest.name}, founded in {oldest.founding_year}") + +# Fetch two devs and one freebie owned by the first dev +dev1 = session.query(Dev).first() +dev2 = session.query(Dev).filter(Dev.id != dev1.id).first() +freebie_to_give = dev1.freebies.first() # Using .first() from lazy='dynamic' + +print(f"Before give_away:") +print(f"{dev1.name} has freebie: {freebie_to_give}") +print(f"Does {dev1.name} have 'Sticker'? {dev1.received_one('Sticker')}") + +# Dev1 gives away the freebie to dev2 +if freebie_to_give: + success = dev1.give_away(dev2, freebie_to_give) + if success: + session.commit() + print(f"\nAfter give_away:") + print(f"Freebie {freebie_to_give.item_name} now belongs to {freebie_to_give.dev.name}") + else: + print("Failed to give away freebie (ownership mismatch)") +else: + print("No freebies found for dev1") + +# Close the session +print("✅ Database seeded successfully!") \ No newline at end of file