diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c96..c2bf589a7 100644 Binary files a/lib/freebies.db and b/lib/freebies.db differ diff --git a/lib/migrations/versions/285cab923bba_create_freebies_table.py b/lib/migrations/versions/285cab923bba_create_freebies_table.py new file mode 100644 index 000000000..99cba9273 --- /dev/null +++ b/lib/migrations/versions/285cab923bba_create_freebies_table.py @@ -0,0 +1,24 @@ +from alembic import op +import sqlalchemy as sa + +# revision identifiers, used by Alembic. +revision = '285cab923bba' +down_revision = '5f72c58bf48c' +branch_labels = None +depends_on = None + +def upgrade() -> None: + # Create the 'freebies' table + op.create_table( + 'freebies', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('item_name', sa.String(), nullable=False), + sa.Column('value', sa.Integer(), nullable=False), + sa.Column('company_id', sa.Integer(), sa.ForeignKey('companies.id'), nullable=False), + sa.Column('dev_id', sa.Integer(), sa.ForeignKey('devs.id'), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + +def downgrade() -> None: + # Drop the 'freebies' table + op.drop_table('freebies') diff --git a/lib/models.py b/lib/models.py index 2681bee5a..d623f9759 100644 --- a/lib/models.py +++ b/lib/models.py @@ -2,6 +2,7 @@ from sqlalchemy.orm import relationship, backref from sqlalchemy.ext.declarative import declarative_base +# Naming convention for foreign keys convention = { "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", } @@ -12,9 +13,12 @@ class Company(Base): __tablename__ = 'companies' - id = Column(Integer(), primary_key=True) - name = Column(String()) - founding_year = Column(Integer()) + id = Column(Integer, primary_key=True) + name = Column(String, nullable=False) + founding_year = Column(Integer) + + # Establish relationship with Freebie + freebies = relationship('Freebie', back_populates='company') def __repr__(self): return f'' @@ -22,8 +26,27 @@ def __repr__(self): class Dev(Base): __tablename__ = 'devs' - id = Column(Integer(), primary_key=True) - name= Column(String()) + id = Column(Integer, primary_key=True) + name = Column(String, nullable=False) + + # Establish relationship with Freebie + freebies = relationship('Freebie', back_populates='dev') def __repr__(self): return f'' + +class Freebie(Base): + __tablename__ = 'freebies' + + id = Column(Integer, primary_key=True) + item_name = Column(String, nullable=False) + value = Column(Integer, nullable=False) + company_id = Column(Integer, ForeignKey('companies.id'), nullable=False) + dev_id = Column(Integer, ForeignKey('devs.id'), nullable=False) + + # Establish relationships with Company and Dev + company = relationship('Company', back_populates='freebies') + dev = relationship('Dev', back_populates='freebies') + + def __repr__(self): + return f'' diff --git a/lib/seed.py b/lib/seed.py index b16becbbb..d19833de0 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,31 @@ #!/usr/bin/env python3 # Script goes here! +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +from models import Base, Company, Dev, Freebie + +engine = create_engine('sqlite:///freebies.db') +Base.metadata.create_all(engine) +Session = sessionmaker(bind=engine) +session = Session() + +# Create sample companies +company1 = Company(name='TechCorp', founding_year=2000) +company2 = Company(name='Innovate Inc.', founding_year=2010) +session.add_all([company1, company2]) +session.commit() + +# Create sample devs +dev1 = Dev(name='Alice') +dev2 = Dev(name='Bob') +session.add_all([dev1, dev2]) +session.commit() + +# Create sample freebies +freebie1 = Freebie(item_name='T-shirt', value=10, company=company1, dev=dev1) +freebie2 = Freebie(item_name='Sticker', value=1, company=company2, dev=dev2) +session.add_all([freebie1, freebie2]) +session.commit() + +print("Database seeded with sample data.") diff --git a/script_test.py b/script_test.py new file mode 100644 index 000000000..414b969b3 --- /dev/null +++ b/script_test.py @@ -0,0 +1,60 @@ +import unittest +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +from lib.models import Base, Company, Dev, Freebie + +class TestDatabase(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.engine = create_engine('sqlite:///lib/freebies.db', echo=True) + Base.metadata.create_all(cls.engine) + cls.Session = sessionmaker(bind=cls.engine) + cls.session = cls.Session() + + def setUp(self): + self.session.query(Freebie).delete() + self.session.query(Dev).delete() + self.session.query(Company).delete() + self.session.commit() + + def tearDown(self): + self.session.query(Freebie).delete() + self.session.query(Dev).delete() + self.session.query(Company).delete() + self.session.commit() + + def test_add_company_and_dev(self): + company = Company(name="Tech Corp", founding_year=2000) + dev = Dev(name="Tim") + + self.session.add(company) + self.session.add(dev) + self.session.commit() + + self.assertEqual(len(self.session.query(Company).all()), 1) + self.assertEqual(len(self.session.query(Dev).all()), 1) + self.assertEqual(self.session.query(Company).first().name, "Tech Corp") + self.assertEqual(self.session.query(Dev).first().name, "Tim") + + def test_add_freebie(self): + company = Company(name="Tech Corp", founding_year=2000) + dev = Dev(name="Tim") + freebie = Freebie(item_name="T-Shirt", value=10, dev=dev, company=company) + + self.session.add(company) + self.session.add(dev) + self.session.add(freebie) + self.session.commit() + + retrieved_freebie = self.session.query(Freebie).first() + self.assertEqual(retrieved_freebie.item_name, "T-Shirt") + self.assertEqual(retrieved_freebie.dev.name, "Tim") + self.assertEqual(retrieved_freebie.company.name, "Tech Corp") + + @classmethod + def tearDownClass(cls): + Base.metadata.drop_all(cls.engine) + +if __name__ == '__main__': + unittest.main()