From 960108e388aa8185b8c50e3d1c41c2e627f1285b Mon Sep 17 00:00:00 2001 From: Yisel Cintora Vega Date: Sun, 24 Mar 2024 14:27:20 -0400 Subject: [PATCH 1/3] attempts generating freebie table --- lib/models.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/lib/models.py b/lib/models.py index 2681bee5a..3d36366c2 100644 --- a/lib/models.py +++ b/lib/models.py @@ -25,5 +25,20 @@ class Dev(Base): id = Column(Integer(), primary_key=True) name= Column(String()) + def __repr__(self): return f'' + + +class Freebie(Base): + __tablename__ = 'freebies' + + id = Column(Integer(), primary_key=True) + item_name= Column(String()) + value = Column(Integer()) + company_id = Column(Integer(), ForeignKey("company.id")) + dev_id = Column(Integer(), ForeignKey("dev.id")) + + def __repr__(self): + return f'' + From 71dfe237a8761bb198d86fbcd0ccf402ec7637cc Mon Sep 17 00:00:00 2001 From: Yisel Cintora Vega Date: Sun, 24 Mar 2024 14:41:29 -0400 Subject: [PATCH 2/3] creates Freebies table --- lib/freebies.db | Bin 20480 -> 24576 bytes .../c001d5a4d251_create_freebi_model.py | 37 ++++++++++++++++++ lib/models.py | 4 +- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 lib/migrations/versions/c001d5a4d251_create_freebi_model.py diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c963e832db481e7a7493e3029e691ac4dc..c8899e446f90fd1387ef3b12baf8e0d870bbc471 100644 GIT binary patch delta 406 zcmZozz}Rqrae}lUI|Bm)8xX?)%S0Vxadrm1a4%l|9}KKKyBPR+`FHZw^GWgS+SusA zW6~7M$}TP|%h<|Wl9-f}npTvWnv|JZ45QhcgIpa$TopnboqSvsprVr<`DC0jOHy;= z^AdAY6~Y{YoIMvdsLYY8!DY*Fuxq7<$DR{d^Y9JJ7Dg?Q@xdyrVIlBfc zK!ibxH8N8)@mK(KhB43`@jx2YV2Jxr3Q% delta 94 zcmZoTz}T>Wae}lUD+2=q2*UvLL>*&MRtCLzSzi7h3@m(74E((OJNfGQq&5o*EaTlQ e#dk}P$285{DB08^Db2(pd6U8yeiVU41_}T{Q53rX diff --git a/lib/migrations/versions/c001d5a4d251_create_freebi_model.py b/lib/migrations/versions/c001d5a4d251_create_freebi_model.py new file mode 100644 index 000000000..e7861220a --- /dev/null +++ b/lib/migrations/versions/c001d5a4d251_create_freebi_model.py @@ -0,0 +1,37 @@ +"""Create Freebi model + +Revision ID: c001d5a4d251 +Revises: 5f72c58bf48c +Create Date: 2024-03-24 14:33:53.974125 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'c001d5a4d251' +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('company_id', sa.Integer(), nullable=True), + sa.Column('dev_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/models.py b/lib/models.py index 3d36366c2..347dd0d99 100644 --- a/lib/models.py +++ b/lib/models.py @@ -36,8 +36,8 @@ class Freebie(Base): id = Column(Integer(), primary_key=True) item_name= Column(String()) value = Column(Integer()) - company_id = Column(Integer(), ForeignKey("company.id")) - dev_id = Column(Integer(), ForeignKey("dev.id")) + company_id = Column(Integer(), ForeignKey("companies.id")) + dev_id = Column(Integer(), ForeignKey("devs.id")) def __repr__(self): return f'' From d1162a74ad632d2af6d12f5f2f53d67e69e1fcea Mon Sep 17 00:00:00 2001 From: Yisel Cintora Vega Date: Tue, 26 Mar 2024 20:59:53 -0400 Subject: [PATCH 3/3] adds required methods for each model --- lib/debug.py | 8 ++- lib/freebies.db | Bin 24576 -> 24576 bytes ...f_add_relationship_betwween_frebie_and_.py | 28 ++++++++ lib/models.py | 40 ++++++++++- lib/seed.py | 66 ++++++++++++++++++ 5 files changed, 140 insertions(+), 2 deletions(-) create mode 100644 lib/migrations/versions/bc4d62f681ef_add_relationship_betwween_frebie_and_.py diff --git a/lib/debug.py b/lib/debug.py index 4f922eb69..385b82dd7 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -2,8 +2,14 @@ from sqlalchemy import create_engine -from models import Company, Dev +from models import Company, Dev, Freebie +from sqlalchemy.orm import sessionmaker if __name__ == '__main__': engine = create_engine('sqlite:///freebies.db') + Session = sessionmaker(bind=engine) + session = Session() + + f1=session.query(Freebie).first() + import ipdb; ipdb.set_trace() diff --git a/lib/freebies.db b/lib/freebies.db index c8899e446f90fd1387ef3b12baf8e0d870bbc471..da557805d7516df436bfe7ea16f2db452bd9b163 100644 GIT binary patch literal 24576 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 diff --git a/lib/migrations/versions/bc4d62f681ef_add_relationship_betwween_frebie_and_.py b/lib/migrations/versions/bc4d62f681ef_add_relationship_betwween_frebie_and_.py new file mode 100644 index 000000000..c3d3a865f --- /dev/null +++ b/lib/migrations/versions/bc4d62f681ef_add_relationship_betwween_frebie_and_.py @@ -0,0 +1,28 @@ +"""Add Relationship betwween frebie and developer + +Revision ID: bc4d62f681ef +Revises: c001d5a4d251 +Create Date: 2024-03-26 12:51:09.206234 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'bc4d62f681ef' +down_revision = 'c001d5a4d251' +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 347dd0d99..5753d74b1 100644 --- a/lib/models.py +++ b/lib/models.py @@ -2,6 +2,13 @@ from sqlalchemy.orm import relationship, backref from sqlalchemy.ext.declarative import declarative_base + +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker + +engine = create_engine('sqlite:///freebies.db') +Session = sessionmaker(bind=engine) +session = Session() convention = { "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", } @@ -15,22 +22,44 @@ class Company(Base): id = Column(Integer(), primary_key=True) name = Column(String()) founding_year = Column(Integer()) + _freebies = relationship('Freebie', backref=backref('company')) + def __repr__(self): return f'' + + def freebies(self): + print(session.query(Freebie).filter(Freebie.company_id == self.id).all()) + return session.query(Freebie).filter(Freebie.company_id == self.id).all() + + def devs(self): + company_freebies= Company.freebies(self) + for freebie in company_freebies: + print( session.query(Dev).filter(Dev.id == freebie.dev_id).all()) class Dev(Base): __tablename__ = 'devs' id = Column(Integer(), primary_key=True) name= Column(String()) - + _freebies = relationship('Freebie', backref=backref('dev')) def __repr__(self): return f'' + def freebies(self): + return session.query(Freebie).filter(Freebie.dev_id == self.id).all() + + def companies(self): + dev_freebies= Dev.freebies(self) + for freebie in dev_freebies: + print( session.query(Company).filter(Company.id == freebie.company_id).all()) + + + class Freebie(Base): + __tablename__ = 'freebies' id = Column(Integer(), primary_key=True) @@ -41,4 +70,13 @@ class Freebie(Base): def __repr__(self): return f'' + + def dev(self, dev_id): + print(session.query(Freebie).filter(Freebie.dev_id == dev_id).all()) + return session.query(Freebie).filter(Freebie.dev_id == dev_id).all() + + def company(self, company_id): + print(session.query(Freebie).filter(Freebie.company_id == company_id).all()) + return session.query(Freebie).filter(Freebie.company_id == company_id).all() + diff --git a/lib/seed.py b/lib/seed.py index b16becbbb..3c7fdbfa1 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,69 @@ #!/usr/bin/env python3 # Script goes here! +import random +from random import choice as rc + + +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker + +from models import Freebie, Company, Dev +from faker import Faker + +engine = create_engine('sqlite:///freebies.db') +Session = sessionmaker(bind=engine) +session = Session() +fake = Faker() + +def delete_records(): + session.query(Freebie).delete() + session.query(Company).delete() + session.query(Dev).delete() + session.commit() + + +def create_companies(): + companies = [Company( + name=fake.company(), + founding_year=random.randint(1800,2023) + ) for i in range(10)] + session.add_all(companies) + session.commit() + return companies + +def create_devs(): + developers = [Dev( + name = fake.name() + ) for i in range(50)] + session.add_all(developers) + session.commit() + return developers + +def create_freebies(): + + freebies = [ Freebie( + item_name =fake.word(), + value =random.randint(0, 60), + ) for i in range(100)] + + session.add_all(freebies) + session.commit() + return freebies + +def relate_one_to_many(freebies, companies,devs): + for freebie in freebies: + freebie.dev = rc(devs) + freebie.company= rc(companies) + + + session.add_all(freebies) + session.commit() + return freebies,companies, devs + +if __name__ == '__main__': + delete_records() + companies= create_companies() + devs = create_devs() + freebies = create_freebies() + relate_one_to_many(freebies,companies,devs) \ No newline at end of file