diff --git a/.github/workflows/canvas-sync-ruby-update.yml b/.github/workflows/canvas-sync-ruby-update.yml deleted file mode 100644 index f8818dc0c..000000000 --- a/.github/workflows/canvas-sync-ruby-update.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Sync with Canvas Ruby v2.7 - -on: - push: - branches: [master, main] - paths: - - 'README.md' - -jobs: - sync: - name: Sync with Canvas - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: 2.7 - - - name: Install github-to-canvas - run: gem install github-to-canvas - - # Secret stored in learn-co-curriculum Settings/Secrets - - name: Sync from .canvas file - run: github-to-canvas -a -lr - env: - CANVAS_API_KEY: ${{ secrets.CANVAS_API_KEY }} - CANVAS_API_PATH: ${{ secrets.CANVAS_API_PATH }} diff --git a/lib/__pycache__/models.cpython-310.pyc b/lib/__pycache__/models.cpython-310.pyc new file mode 100644 index 000000000..d8efd1555 Binary files /dev/null and b/lib/__pycache__/models.cpython-310.pyc differ diff --git a/lib/debug.py b/lib/debug.py index 4f922eb69..1b30f66ac 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -1,9 +1,43 @@ #!/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, Base if __name__ == '__main__': engine = create_engine('sqlite:///freebies.db') - import ipdb; ipdb.set_trace() + Session = sessionmaker(bind=engine) + session = Session() + + # Test relationships + rick = session.query(Dev).filter_by(name="Rick").first() + print("Rick's freebies:", rick.freebies) + print("Rick's companies:", rick.companies) + + google = session.query(Company).filter_by(name="Google").first() + print("Google's freebies:", google.freebies) + print("Google's devs:", google.devs) + + freebie = session.query(Freebie).first() + print("Freebie details:", freebie.print_details()) + + print("Oldest company:", Company.oldest_company()) + + print("Rick received MacBook:", rick.received_one("MacBook")) + + # Test give_freebie + new_freebie = google.give_freebie(rick, "Laptop", 2000) + session.add(new_freebie) + session.commit() + + print("Rick's freebies after give_freebie:", rick.freebies) + + # Test give_away + rick.give_away(morty, new_freebie) + session.add(new_freebie) + session.commit() + + print("Morty received Laptop:", morty.received_one("Laptop")) + + session.close() diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c96..7ad3da6c0 100644 Binary files a/lib/freebies.db and b/lib/freebies.db differ diff --git a/lib/migrations/__pycache__/env.cpython-310.pyc b/lib/migrations/__pycache__/env.cpython-310.pyc new file mode 100644 index 000000000..71161a746 Binary files /dev/null and b/lib/migrations/__pycache__/env.cpython-310.pyc differ diff --git a/lib/migrations/versions/__pycache__/5f72c58bf48c_create_companies_devs.cpython-310.pyc b/lib/migrations/versions/__pycache__/5f72c58bf48c_create_companies_devs.cpython-310.pyc new file mode 100644 index 000000000..6fd3c94ab Binary files /dev/null and b/lib/migrations/versions/__pycache__/5f72c58bf48c_create_companies_devs.cpython-310.pyc differ diff --git a/lib/migrations/versions/__pycache__/7a71dbf71c64_create_db.cpython-310.pyc b/lib/migrations/versions/__pycache__/7a71dbf71c64_create_db.cpython-310.pyc new file mode 100644 index 000000000..484a61479 Binary files /dev/null and b/lib/migrations/versions/__pycache__/7a71dbf71c64_create_db.cpython-310.pyc differ diff --git a/lib/migrations/versions/__pycache__/abc123def456_create_freebies.cpython-310.pyc b/lib/migrations/versions/__pycache__/abc123def456_create_freebies.cpython-310.pyc new file mode 100644 index 000000000..a4daa8b0b Binary files /dev/null and b/lib/migrations/versions/__pycache__/abc123def456_create_freebies.cpython-310.pyc differ diff --git a/lib/migrations/versions/abc123def456_create_freebies.py b/lib/migrations/versions/abc123def456_create_freebies.py new file mode 100644 index 000000000..7951d8a01 --- /dev/null +++ b/lib/migrations/versions/abc123def456_create_freebies.py @@ -0,0 +1,37 @@ +"""create freebies + +Revision ID: abc123def456 +Revises: 5f72c58bf48c +Create Date: 2023-12-02 18:43:00.000000 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'abc123def456' +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'], 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 ### \ No newline at end of file diff --git a/lib/models.py b/lib/models.py index 2681bee5a..caa25138e 100644 --- a/lib/models.py +++ b/lib/models.py @@ -16,14 +16,64 @@ class Company(Base): name = Column(String()) founding_year = Column(Integer()) + freebies = relationship('Freebie', back_populates='company') + devs = relationship('Dev', secondary='freebies', back_populates='companies', overlaps="freebies,dev,company") + def __repr__(self): return f'' + def give_freebie(self, dev, item_name, value): + # I decided to assume the database session is managed externally, so this method just creates a new Freebie object and returns it without handling the commit - that's up to the caller. + freebie = Freebie(item_name=item_name, value=value, dev=dev, company=self) + return freebie + + @classmethod + def oldest_company(cls): + # I assumed the session is managed externally, but for testing this method, I set up a direct database connection here to query and find the company with the earliest founding year. + from sqlalchemy.orm import sessionmaker + from sqlalchemy import create_engine + engine = create_engine('sqlite:///freebies.db') + Session = sessionmaker(bind=engine) + session = Session() + oldest = session.query(cls).order_by(cls.founding_year).first() + session.close() + return oldest + class Dev(Base): __tablename__ = 'devs' id = Column(Integer(), primary_key=True) name= Column(String()) + freebies = relationship('Freebie', back_populates='dev') + companies = relationship('Company', secondary='freebies', back_populates='devs', overlaps="freebies,dev,company") + 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.dev == self: + freebie.dev = dev + # I assumed the session is managed externally again, so I'm just updating the freebie's dev without committing the change. + +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', back_populates='freebies') + company = relationship('Company', back_populates='freebies') + + 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..e0f93bb24 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,32 @@ #!/usr/bin/env python3 -# Script goes here! +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +from models import Company, Dev, Freebie, Base + +if __name__ == '__main__': + engine = create_engine('sqlite:///freebies.db') + Base.metadata.create_all(engine) + Session = sessionmaker(bind=engine) + session = Session() + + # I'm creating some sample companies here to populate the database with initial data for testing and development. + google = Company(name="Google", founding_year=1998) + facebook = Company(name="Facebook", founding_year=2004) + + # Now I'm adding developers to the mix, creating instances for Rick and Morty. + rick = Dev(name="Rick") + morty = Dev(name="Morty") + + session.add_all([google, facebook, rick, morty]) + session.commit() + + # Finally, I'm setting up some freebies that connect devs to companies, like perks or swag they received. + freebie1 = Freebie(item_name="MacBook", value=1000, dev=rick, company=google) + freebie2 = Freebie(item_name="Sticker", value=1, dev=rick, company=facebook) + freebie3 = Freebie(item_name="T-shirt", value=10, dev=morty, company=google) + + session.add_all([freebie1, freebie2, freebie3]) + session.commit() + + session.close()