diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c96..63a8ba6c6 100644 Binary files a/lib/freebies.db and b/lib/freebies.db differ diff --git a/lib/migrations/versions/0fa55f070921_adding_the_freebie_class.py b/lib/migrations/versions/0fa55f070921_adding_the_freebie_class.py new file mode 100644 index 000000000..a68518c42 --- /dev/null +++ b/lib/migrations/versions/0fa55f070921_adding_the_freebie_class.py @@ -0,0 +1,33 @@ +"""Adding the freebie class + +Revision ID: 0fa55f070921 +Revises: c8976d49a7bc +Create Date: 2025-03-05 17:11:55.381160 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '0fa55f070921' +down_revision = 'c8976d49a7bc' +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.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/3f9033ff1d8f_adding_the_the_sample_data.py b/lib/migrations/versions/3f9033ff1d8f_adding_the_the_sample_data.py new file mode 100644 index 000000000..2744686b2 --- /dev/null +++ b/lib/migrations/versions/3f9033ff1d8f_adding_the_the_sample_data.py @@ -0,0 +1,28 @@ +"""Adding the the sample data + +Revision ID: 3f9033ff1d8f +Revises: 79efe5d95dbf +Create Date: 2025-03-06 12:47:24.330671 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '3f9033ff1d8f' +down_revision = '79efe5d95dbf' +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/79efe5d95dbf_adding_the_dev_and_the_company_column_.py b/lib/migrations/versions/79efe5d95dbf_adding_the_dev_and_the_company_column_.py new file mode 100644 index 000000000..62660703b --- /dev/null +++ b/lib/migrations/versions/79efe5d95dbf_adding_the_dev_and_the_company_column_.py @@ -0,0 +1,38 @@ +"""Adding the dev and the company column in the freebie table + +Revision ID: 79efe5d95dbf +Revises: 0fa55f070921 +Create Date: 2025-03-05 19:03:59.225110 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '79efe5d95dbf' +down_revision = '0fa55f070921' +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.add_column(sa.Column('dev_id', sa.Integer(), nullable=True)) + batch_op.add_column(sa.Column('company_id', sa.Integer(), nullable=True)) + batch_op.create_foreign_key(batch_op.f('fk_freebies_dev_id_devs'), 'devs', ['dev_id'], ['id']) + batch_op.create_foreign_key(batch_op.f('fk_freebies_company_id_companies'), 'companies', ['company_id'], ['id']) + + # ### 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.drop_constraint(batch_op.f('fk_freebies_company_id_companies'), type_='foreignkey') + batch_op.drop_constraint(batch_op.f('fk_freebies_dev_id_devs'), type_='foreignkey') + batch_op.drop_column('company_id') + batch_op.drop_column('dev_id') + + # ### end Alembic commands ### diff --git a/lib/migrations/versions/c8976d49a7bc_starting_program.py b/lib/migrations/versions/c8976d49a7bc_starting_program.py new file mode 100644 index 000000000..01645cfc9 --- /dev/null +++ b/lib/migrations/versions/c8976d49a7bc_starting_program.py @@ -0,0 +1,28 @@ +"""Starting program + +Revision ID: c8976d49a7bc +Revises: 5f72c58bf48c +Create Date: 2025-03-05 16:54:25.783179 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'c8976d49a7bc' +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..d8fa3879e 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,12 +1,14 @@ from sqlalchemy import ForeignKey, Column, Integer, String, MetaData -from sqlalchemy.orm import relationship, backref +from sqlalchemy.orm import relationship, backref, session from sqlalchemy.ext.declarative import declarative_base +# Define naming conventions for foreign keys convention = { "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", } metadata = MetaData(naming_convention=convention) +# Create the base class Base = declarative_base(metadata=metadata) class Company(Base): @@ -16,14 +18,71 @@ class Company(Base): name = Column(String()) founding_year = Column(Integer()) + # One company has many freebies + freebies = relationship('Freebie', back_populates='company') + + # One company can give many freebies + + devs = relationship('Dev', secondary='freebies', back_populates='companies') + def __repr__(self): return f'' + # Class method to find the oldest company + @classmethod + def oldest_company(cls): + return session.query(cls).order_by(cls.founding_year).first() + + # Method to give a freebie to a dev + def give_freebie(self, dev, item_name, value): + freebie = Freebie(item_name=item_name, value=value, dev=dev, company=self) + session.add(freebie) + session.commit() + return freebie + class Dev(Base): __tablename__ = 'devs' id = Column(Integer(), primary_key=True) - name= Column(String()) + name = Column(String()) + + # One dev has many freebies + freebies = relationship('Freebie', back_populates='dev') + + # One dev has many companies through freebies + companies = relationship('Company', secondary='freebies', back_populates='devs') def __repr__(self): return f'' + + # Method to check if a dev received a specific freebie + def received_one(self, item_name): + return any(freebie.item_name == item_name for freebie in self.freebies) + + # Method to give away a freebie to another dev + def give_away(self, dev, freebie): + if freebie in self.freebies: + freebie.dev = dev + session.commit() + +class Freebie(Base): + __tablename__ = 'freebies' + + id = Column(Integer, primary_key=True) + item_name = Column(String) + value = Column(Integer) + + # Foreign keys to link to devs and companies + 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 __repr__(self): + return f"" + + # Method to print freebie details + def print_details(self): + 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..594878eb3 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,38 @@ #!/usr/bin/env python3 -# Script goes here! +# Import the necessary modules and classes +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +from models import Base, Company, Dev, Freebie + +engine = create_engine('sqlite:///freebies.db') + +# Bind the engine to the Base metadata +Base.metadata.bind = engine + +# Create a session +Session = sessionmaker(bind=engine) +session = Session() + + +# sample companies +company1 = Company(name="Moringa School", founding_year=2000) +company2 = Company(name="Anave beauty", founding_year=1995) + +# sample devs +dev1 = Dev(name="Edith") +dev2 = Dev(name="Bob") +dev3 = Dev(name = 'Lucy') + +# sample freebies +freebie1 = Freebie(item_name="Laptop", value=1000, dev=dev1, company=company1) +freebie2 = Freebie(item_name="Mouse", value=50, dev=dev2, company=company2) +freebie3 = Freebie(item_name = 'Water bottle', value = 250, dev= dev3, company = company1) + +# Add data to the session +session.add_all([company1, company2, dev1, dev2,dev3, freebie1, freebie2, freebie3]) + +# Commit the changes to the database +session.commit() + +