diff --git a/lib/__pycache__/models.cpython-310.pyc b/lib/__pycache__/models.cpython-310.pyc new file mode 100644 index 000000000..041e633fc 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..d7dff0ce5 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -1,9 +1,12 @@ #!/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() + import ipdb; ipdb.set_trace() diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c96..fccf6c3d2 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..ad572f80f Binary files /dev/null and b/lib/migrations/__pycache__/env.cpython-310.pyc differ diff --git a/lib/migrations/versions/29f5c04539c3_editted_models.py b/lib/migrations/versions/29f5c04539c3_editted_models.py new file mode 100644 index 000000000..e4955e73b --- /dev/null +++ b/lib/migrations/versions/29f5c04539c3_editted_models.py @@ -0,0 +1,28 @@ +"""Editted models + +Revision ID: 29f5c04539c3 +Revises: 9326f89afe90 +Create Date: 2023-12-27 14:12:26.039794 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '29f5c04539c3' +down_revision = '9326f89afe90' +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/31785c9690e0_freebies_class_table.py b/lib/migrations/versions/31785c9690e0_freebies_class_table.py new file mode 100644 index 000000000..6a11917bb --- /dev/null +++ b/lib/migrations/versions/31785c9690e0_freebies_class_table.py @@ -0,0 +1,33 @@ +"""Freebies class table + +Revision ID: 31785c9690e0 +Revises: 5f72c58bf48c +Create Date: 2023-12-27 12:31:22.687794 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '31785c9690e0' +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.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/9326f89afe90_tables_relationships_editted.py b/lib/migrations/versions/9326f89afe90_tables_relationships_editted.py new file mode 100644 index 000000000..fb354c8c9 --- /dev/null +++ b/lib/migrations/versions/9326f89afe90_tables_relationships_editted.py @@ -0,0 +1,28 @@ +"""Tables relationships editted + +Revision ID: 9326f89afe90 +Revises: 9cd8e4c0fac9 +Create Date: 2023-12-27 13:26:48.061328 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '9326f89afe90' +down_revision = '9cd8e4c0fac9' +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/9cd8e4c0fac9_tables_relationships.py b/lib/migrations/versions/9cd8e4c0fac9_tables_relationships.py new file mode 100644 index 000000000..caa0a3af9 --- /dev/null +++ b/lib/migrations/versions/9cd8e4c0fac9_tables_relationships.py @@ -0,0 +1,46 @@ +"""Tables relationships + +Revision ID: 9cd8e4c0fac9 +Revises: 31785c9690e0 +Create Date: 2023-12-27 13:23:35.803194 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '9cd8e4c0fac9' +down_revision = '31785c9690e0' +branch_labels = None +depends_on = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('company_dev', + sa.Column('company_id', sa.Integer(), nullable=False), + sa.Column('dev_id', sa.Integer(), nullable=False), + sa.ForeignKeyConstraint(['company_id'], ['companies.id'], name=op.f('fk_company_dev_company_id_companies')), + sa.ForeignKeyConstraint(['dev_id'], ['devs.id'], name=op.f('fk_company_dev_dev_id_devs')), + sa.PrimaryKeyConstraint('company_id', 'dev_id') + ) + with op.batch_alter_table('freebies', schema=None) as batch_op: + batch_op.add_column(sa.Column('company_id', sa.Integer(), nullable=True)) + batch_op.add_column(sa.Column('dev_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('dev_id') + batch_op.drop_column('company_id') + + op.drop_table('company_dev') + # ### end Alembic commands ### diff --git a/lib/migrations/versions/__pycache__/29f5c04539c3_editted_models.cpython-310.pyc b/lib/migrations/versions/__pycache__/29f5c04539c3_editted_models.cpython-310.pyc new file mode 100644 index 000000000..a1193cffe Binary files /dev/null and b/lib/migrations/versions/__pycache__/29f5c04539c3_editted_models.cpython-310.pyc differ diff --git a/lib/migrations/versions/__pycache__/31785c9690e0_freebies_class_table.cpython-310.pyc b/lib/migrations/versions/__pycache__/31785c9690e0_freebies_class_table.cpython-310.pyc new file mode 100644 index 000000000..69720e0f9 Binary files /dev/null and b/lib/migrations/versions/__pycache__/31785c9690e0_freebies_class_table.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..333c907b5 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..1305ffb05 Binary files /dev/null and b/lib/migrations/versions/__pycache__/7a71dbf71c64_create_db.cpython-310.pyc differ diff --git a/lib/migrations/versions/__pycache__/9326f89afe90_tables_relationships_editted.cpython-310.pyc b/lib/migrations/versions/__pycache__/9326f89afe90_tables_relationships_editted.cpython-310.pyc new file mode 100644 index 000000000..24e7c574b Binary files /dev/null and b/lib/migrations/versions/__pycache__/9326f89afe90_tables_relationships_editted.cpython-310.pyc differ diff --git a/lib/migrations/versions/__pycache__/9cd8e4c0fac9_tables_relationships.cpython-310.pyc b/lib/migrations/versions/__pycache__/9cd8e4c0fac9_tables_relationships.cpython-310.pyc new file mode 100644 index 000000000..c7870c5b3 Binary files /dev/null and b/lib/migrations/versions/__pycache__/9cd8e4c0fac9_tables_relationships.cpython-310.pyc differ diff --git a/lib/models.py b/lib/models.py index 2681bee5a..ea7a9b44a 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,4 +1,4 @@ -from sqlalchemy import ForeignKey, Column, Integer, String, MetaData +from sqlalchemy import ForeignKey, Column, Integer, String, MetaData, Table from sqlalchemy.orm import relationship, backref from sqlalchemy.ext.declarative import declarative_base @@ -9,6 +9,15 @@ Base = declarative_base(metadata=metadata) +#Relationship table model +company_dev= Table( + 'company_dev', + Base.metadata, + Column('company_id', ForeignKey('companies.id'), primary_key=True), + Column ('dev_id', ForeignKey('devs.id'), primary_key = True), + extend_existing=True, +) + class Company(Base): __tablename__ = 'companies' @@ -16,6 +25,9 @@ class Company(Base): name = Column(String()) founding_year = Column(Integer()) + freebies= relationship('Freebie', backref= backref('company')) + devs= relationship('Dev', secondary= company_dev, back_populates='companies') + def __repr__(self): return f'' @@ -25,5 +37,22 @@ class Dev(Base): id = Column(Integer(), primary_key=True) name= Column(String()) + freebies= relationship('Freebie', backref= backref('dev')) + companies = relationship('Company', secondary=company_dev, back_populates= 'devs') + def __repr__(self): return f'' + +#Freebies table +class Freebie(Base): + __tablename__ = 'freebies' + id= Column(Integer(), primary_key=True) + item_name= Column(String()) + value= Column(Integer()) + + company_id= Column(Integer(), ForeignKey('companies.id')) + dev_id= Column(Integer(), ForeignKey('devs.id')) + + def __repr__(self): + return f'Freebie(id={self.id}, '+ \ + f'itemname= {self.item_name})' diff --git a/lib/seed.py b/lib/seed.py index b16becbbb..4067dd010 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,66 @@ #!/usr/bin/env python3 # Script goes here! +from faker import Faker +import random + +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker + +from models import Company , Freebie , Dev + +if __name__ == '__main__': + engine = create_engine('sqlite:///freebies.db') + Session = sessionmaker(bind = engine) + session = Session() + + session.query(Company).delete() + session.query(Dev).delete() + session.query(Freebie).delete() + + fake = Faker() + + companies = [] + for i in range(30): + company = Company( + name=fake.unique.name(), + founding_year=random.randint(1980, 2023) + ) + + # add and commit individually to get IDs back + session.add(company) + session.commit() + + companies.append(company) + + devs = [] + for i in range(25): + dev = Dev( + name=fake.name(), + ) + + session.add(dev) + session.commit() + + devs.append(dev) + + freebies= [] + for company in companies: + for i in range (random.randint(1,5)): + dev = random.choice(devs) + if company not in dev.companies: + dev.companies.append(company) + session.add(dev) + session.commit() + + freebie= Freebie( + item_name = fake.name(), + value= random.randint(0,20), + company_id= company.id, + dev_id= dev.id, + ) + freebies.append(freebie) + + session.bulk_save_objects(freebies) + session.commit() + session.close()