From f0d0722b1ad5f099963f582b02e02f39cfc61188 Mon Sep 17 00:00:00 2001 From: Giselle Date: Mon, 7 Aug 2023 08:06:56 -0400 Subject: [PATCH] problem --- lib/debug.py | 5 +- lib/freebies.db | Bin 20480 -> 32768 bytes lib/freebies.db-journal | Bin 0 -> 4616 bytes .../versions/4edef77444f8_add_freebie.py | 37 ++++++++ ...7ee0f6_changed_misspelling_of_freebiese.py | 48 +++++++++++ .../ac3b650f0d8d_added_relationshipe.py | 28 ++++++ lib/models.py | 61 +++++++++++++ lib/seed.py | 80 +++++++++++++++++- 8 files changed, 257 insertions(+), 2 deletions(-) create mode 100644 lib/freebies.db-journal create mode 100644 lib/migrations/versions/4edef77444f8_add_freebie.py create mode 100644 lib/migrations/versions/67d1eb7ee0f6_changed_misspelling_of_freebiese.py create mode 100644 lib/migrations/versions/ac3b650f0d8d_added_relationshipe.py diff --git a/lib/debug.py b/lib/debug.py index 4f922eb69..9f85f7b32 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -1,9 +1,12 @@ #!/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 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 12beb1c963e832db481e7a7493e3029e691ac4dc..72e2f88da8ec009bf944000fa38d99c70dca37f6 100644 GIT binary patch literal 32768 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 diff --git a/lib/freebies.db-journal b/lib/freebies.db-journal new file mode 100644 index 0000000000000000000000000000000000000000..8d85c6dce46c3d858c2a2a868416982fce5228d1 GIT binary patch literal 4616 zcmeHIO>7%Q7+vprcV}j2cV~ATdp8^Zq;V40aU91X0n+l*778st0SXifp}6+8t_X2t zCqTu86H^zg88%go%yBtk@=4Kn)!m+GLMT4>M!c&^^^J$y`-n{ zANVJH4S$N?!*Af1a1*cLLwEsaG0?7Szi2;bUuz$0?`p4WFKcb>gmze~X`TkrZ)g{N zi>{&%&?WRL>Y{bDhE~xmvf-cbSNJ{r0)7JDf*0W?JOz)!I?O@;3X1??fG8&e0O`vQOst5zyU%E^o$}*_DicZ1nsEO(u2PCnXRFZeY_$CDvI^-l1F&=Utly{G z*(#1fYh4lYi3EJUv(xhnTa6Z|kf#|sr;?;kg*)4RqZMfBmF59G#rF^$#eOmXVKeG6 zUU{<)1tuUBYp_>E1!D-+dvOcApESI_wu&U6~x z7Of?nM}um}R~r&J!RVit6!HiYnd*u3VP3qM7x6=iK=nR#}wj;ZRn5))`wNhnN7G=X+Z8^%Fu#r-X0(~ zMj9h}TevTt%mt!Y2U+Rkb(tIpAb8`%$L6e6wy3(O&|7&CsFrkZ89qk2auVMhIW2)C zUWryBknwV~l7WP8idK~=K$m#Y2q#IMHS0jK$RMj3fNK%WR7$ZI0vZ^5uhnTaq>kgR zR+H}ha0~gWN-ANG!5smSWX-X;thkC>9=^XctSM_L~w^1r8W^S(v zCI(eGK(b6DcMjPToSc#)y54a0GKKaySMJCXb;H*2Ll6c5%?5~U#+Pf0e1Oq;O_0kIen@&q6xLQ%+(Lj-?$|q3pBwGo}ftnO3g#DX6RiR>75r;VgAx-dHpa?H}(qDfA@Fmyr literal 0 HcmV?d00001 diff --git a/lib/migrations/versions/4edef77444f8_add_freebie.py b/lib/migrations/versions/4edef77444f8_add_freebie.py new file mode 100644 index 000000000..8af88efe3 --- /dev/null +++ b/lib/migrations/versions/4edef77444f8_add_freebie.py @@ -0,0 +1,37 @@ +"""add Freebie + +Revision ID: 4edef77444f8 +Revises: 5f72c58bf48c +Create Date: 2023-08-05 07:54:40.125010 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '4edef77444f8' +down_revision = '5f72c58bf48c' +branch_labels = None +depends_on = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('freebnies', + 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_freebnies_company_id_companies')), + sa.ForeignKeyConstraint(['dev_id'], ['devs.id'], name=op.f('fk_freebnies_dev_id_devs')), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('freebnies') + # ### end Alembic commands ### diff --git a/lib/migrations/versions/67d1eb7ee0f6_changed_misspelling_of_freebiese.py b/lib/migrations/versions/67d1eb7ee0f6_changed_misspelling_of_freebiese.py new file mode 100644 index 000000000..8aec8dd3e --- /dev/null +++ b/lib/migrations/versions/67d1eb7ee0f6_changed_misspelling_of_freebiese.py @@ -0,0 +1,48 @@ +"""changed misspelling of freebiese + +Revision ID: 67d1eb7ee0f6 +Revises: 4edef77444f8 +Create Date: 2023-08-05 07:56:13.310894 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '67d1eb7ee0f6' +down_revision = '4edef77444f8' +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') + ) + op.drop_table('freebnies') + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('freebnies', + sa.Column('id', sa.INTEGER(), nullable=False), + sa.Column('item_name', sa.VARCHAR(), 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='fk_freebnies_company_id_companies'), + sa.ForeignKeyConstraint(['dev_id'], ['devs.id'], name='fk_freebnies_dev_id_devs'), + sa.PrimaryKeyConstraint('id') + ) + op.drop_table('freebies') + # ### end Alembic commands ### diff --git a/lib/migrations/versions/ac3b650f0d8d_added_relationshipe.py b/lib/migrations/versions/ac3b650f0d8d_added_relationshipe.py new file mode 100644 index 000000000..ee185026c --- /dev/null +++ b/lib/migrations/versions/ac3b650f0d8d_added_relationshipe.py @@ -0,0 +1,28 @@ +"""added relationshipe + +Revision ID: ac3b650f0d8d +Revises: 67d1eb7ee0f6 +Create Date: 2023-08-05 08:15:35.448906 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'ac3b650f0d8d' +down_revision = '67d1eb7ee0f6' +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..e25526d26 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,6 +1,14 @@ from sqlalchemy import ForeignKey, Column, Integer, String, MetaData from sqlalchemy.orm import relationship, backref from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.ext.associationproxy import association_proxy +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +from sqlalchemy import desc + +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", @@ -16,6 +24,23 @@ class Company(Base): name = Column(String()) founding_year = Column(Integer()) + freebies = relationship('Freebie', backref=backref('company')) + + devs = association_proxy('freebies', 'dev', + creator=lambda dev: Freebie(dev)) + + def give_freebie(self, dev, item_name, value): + new_freebie = Freebie(item_name=item_name, value=value) + new_freebie.company = self + new_freebie.dev = dev + print (f'{new_freebie.dev} {new_freebie.item_name} {new_freebie.value} {new_freebie.company}') + + @classmethod + def oldest_company(cls): + oldest_company = session.query(Company.name).order_by(desc( + Company.founding_year)).first() + return oldest_company + def __repr__(self): return f'' @@ -25,5 +50,41 @@ class Dev(Base): id = Column(Integer(), primary_key=True) name= Column(String()) + freebies = relationship('Freebie', backref=backref('dev')) + companies = association_proxy('freebies', 'company', + creator=lambda comp: Freebie(company=comp)) + + def received_one(self, item_name): + print(item_name) + print(self.freebies) + if item_name in self.freebies: + return True + return False + + def give_away(self, dev,freebie): + if freebie in self.freebies: + freebie.dev = dev + session.commit() + return freebie.dev + def __repr__(self): return f'' + +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')) + + def __repr__(self): + return f'{self.item_name}' + + def print_details(self): + freebies = session.query(Freebie).all() + for freebie in freebies: + print (f'{freebie.dev} owns a {freebie.item_name} from {freebie.company}') \ No newline at end of file diff --git a/lib/seed.py b/lib/seed.py index b16becbbb..b0fbf185b 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,81 @@ #!/usr/bin/env python3 -# Script goes here! +from faker import Faker +import random + +from random import choice as rc + +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker + +from models import Company, Dev, Freebie + +engine = create_engine('sqlite:///freebies.db') +Session = sessionmaker(bind=engine) +session = Session() + +fake = Faker() + +comp_name = ['SAS','Amazon','FlatIron','Google','Apple', + 'Accenture','Home Depot', 'Wagner LLC', + 'Campos PLC', 'Paramount'] +item = ['coffee cup', 't-shirt', 'phone case','pen','charger', + 'keyboard','cup holder','eyeglass cleaner','mouse pad', + 'headphones'] + +def delete_records(): + session.query(Company).delete() + session.query(Dev).delete() + session.query(Freebie).delete() + session.commit() + +def create_companies(): + companies = [] + for i in range(10): + company = Company( + name=random.choice(comp_name), + founding_year = fake.year() + ) + session.add(company) + session.commit + companies.append(company) + return companies + +def create_devs(): + devs = [] + for i in range (50): + dev = Dev( + name=fake.name() + ) + session.add(dev) + session.commit + devs.append(dev) + return devs + +def create_freebies(): + freebies = [] + for i in range (100): + freebie = Freebie( + item_name=random.choice(item), + value=random.randint(0,60) + ) + session.add(freebie) + session.commit + freebies.append(freebie) + return freebies + +def relate_one_to_many(companies, devs, freebies): + for freebie in freebies: + freebie.dev = rc(devs) + freebie.company = rc(companies) + + session.add_all(freebies) + session.commit() + return companies, devs, freebies + +if __name__ == '__main__': + delete_records() + companies = create_companies() + devs = create_devs() + freebies = create_freebies() + companies, devs, freebies = relate_one_to_many(companies, devs, freebies) \ No newline at end of file