From 8bfa72d64a1690e2a1a10dac40d97a0351bf78ee Mon Sep 17 00:00:00 2001 From: Mark Nosal Date: Mon, 26 Jun 2023 07:27:43 -0500 Subject: [PATCH 1/2] finished lab --- lib/debug.py | 8 +- lib/freebies.db | Bin 20480 -> 24576 bytes ...4ef43ed00_updated_freebies_in_seed_file.py | 28 +++++++ ...e_added_freebie_table_with_association_.py | 37 +++++++++ ...b0_finished_oldest_company_class_method.py | 28 +++++++ ...finished_relationships_and_added_print_.py | 28 +++++++ ...b7a2aa58e1_finished_give_freebie_method.py | 28 +++++++ ...52cca555f4_finished_received_one_method.py | 28 +++++++ lib/models.py | 71 +++++++++++++++++- lib/seed.py | 52 ++++++++++++- 10 files changed, 303 insertions(+), 5 deletions(-) create mode 100644 lib/migrations/versions/73f4ef43ed00_updated_freebies_in_seed_file.py create mode 100644 lib/migrations/versions/7db35e22400e_added_freebie_table_with_association_.py create mode 100644 lib/migrations/versions/85f062e901b0_finished_oldest_company_class_method.py create mode 100644 lib/migrations/versions/c02b98b61be6_finished_relationships_and_added_print_.py create mode 100644 lib/migrations/versions/fab7a2aa58e1_finished_give_freebie_method.py create mode 100644 lib/migrations/versions/fe52cca555f4_finished_received_one_method.py diff --git a/lib/debug.py b/lib/debug.py index 4f922eb69..ea0c1779b 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -1,9 +1,13 @@ #!/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, session if __name__ == '__main__': - engine = create_engine('sqlite:///freebies.db') + # 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..52faea0709c1af09aa4a38e42fe902601294fa22 100644 GIT binary patch literal 24576 zcmeI4&2Jk;6u@V_8#{LEog_`_Bvr^nRn%CiTiYSD5kkT-PTItAQ`;r#0l5=&K zhVeSB#R0X51L7~B9Jq7fhy)ina77&91UI-L#EAI%D>1aZiHgX%f{nyHyiGV=Dw^}j)ZDS&mH<2IF;FuQs>t%eTVYzSsR;8FrQ$ z5}0tKjp~~%3Wq^|CGf$91dsp{Kmter2_OL^fCP{L57*pU6$pp z-%cmf$wV@pNUmN8TjbKhYr>T+!8YZ7%X8C7(4>-y)ar#%t;{Jf+mU{?Ash#k*R*B& z`dr8&%L{qlR-9!$*H=RE7O1Z$lBq=M+HBAwiwk+#;;bZ_hh4v^l?13$>DdvjD|>E- zl^O!xwTGCgHBcmyE3=l?m3Xr)9JcQ8>iup$No_iBTIA}&7QB4mH@M3-gsQi}acXVt zrEbD&a{-;xj;HFN-fc+7k%u}b@SRGeSLO|EuTvH-E6Qqvt6DEHNO~2frR)D0J45I% z^auJ4{gQq{pU@BJ+f>jyG)t3o0rmp^uz$9{x4*VOwV&AU+ikmMm%#)Z5B_b>dCnwPvkfI%zIO<9 zG~4k!B_<|dWXTtYP$Emg_8Rame01C-3tO_uHWhF1=HwU{W*qU5yEO&wiW1(Y=VR0) zmv(vEfqI@R2NE2!L6WOIfHIlA)^;6!7>$A>kU(B}&#jN2)zjsW0hIX#(X}}PHW?`C zYmg?d!(8l$2B5@|r`R_9^}u8pqHl=<_{)b5yCL9>eFd@XQ5cnR>q3Wz)T1GYl=qZm z>&koJ+Cfkky?qG0E0pS-8!<^@M_mC2RUaJhb-3@JwM;T!Z2Jv}Tocp;hT9!Sz;v2I zL5KkO*n)nGt#herV+N$!0}qP*8U2VprVU!4*XRo%#D)Zr01`j~ zNB{{S0VIF~kN^@u0!ZMwB5*zuB$o`s=vV%mjtAQV8EZTi4w5*?`{gvd0Tr`sy=+ZQ zjRwggDEei8sVV)&USxDS6eP=9+}~+{Ujk^&y^u8>>}y=V(ft*G&t2Fm35UjGBfS`z zzNWWlk}^kUtRP8%GhOrN+p@*-ytyxwpA3d$X3u6_xNpKfi+;2Z&Z5@DRG^pFx)R)V dIlBSdCU$6Y+UP~^ZJl)3hT?8jw(dm&e*!bII4S@D delta 122 zcmZoTz}T>Wae|Z(11kdq7y~IVV4kRBBnA}GiD7T^ULBmh)>pMT;6X*N_Y0GA*d3jhEB diff --git a/lib/migrations/versions/73f4ef43ed00_updated_freebies_in_seed_file.py b/lib/migrations/versions/73f4ef43ed00_updated_freebies_in_seed_file.py new file mode 100644 index 000000000..7c6f57675 --- /dev/null +++ b/lib/migrations/versions/73f4ef43ed00_updated_freebies_in_seed_file.py @@ -0,0 +1,28 @@ +"""updated freebies in seed file + +Revision ID: 73f4ef43ed00 +Revises: 7db35e22400e +Create Date: 2023-06-26 03:33:05.482714 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '73f4ef43ed00' +down_revision = '7db35e22400e' +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/7db35e22400e_added_freebie_table_with_association_.py b/lib/migrations/versions/7db35e22400e_added_freebie_table_with_association_.py new file mode 100644 index 000000000..ef44c0d5b --- /dev/null +++ b/lib/migrations/versions/7db35e22400e_added_freebie_table_with_association_.py @@ -0,0 +1,37 @@ +"""Added freebie table with association proxy and relationships + +Revision ID: 7db35e22400e +Revises: 5f72c58bf48c +Create Date: 2023-06-22 14:28:59.835993 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '7db35e22400e' +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/migrations/versions/85f062e901b0_finished_oldest_company_class_method.py b/lib/migrations/versions/85f062e901b0_finished_oldest_company_class_method.py new file mode 100644 index 000000000..ddd29fdeb --- /dev/null +++ b/lib/migrations/versions/85f062e901b0_finished_oldest_company_class_method.py @@ -0,0 +1,28 @@ +"""finished oldest_company class method + +Revision ID: 85f062e901b0 +Revises: c02b98b61be6 +Create Date: 2023-06-26 06:05:17.771046 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '85f062e901b0' +down_revision = 'c02b98b61be6' +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/c02b98b61be6_finished_relationships_and_added_print_.py b/lib/migrations/versions/c02b98b61be6_finished_relationships_and_added_print_.py new file mode 100644 index 000000000..e59471cf4 --- /dev/null +++ b/lib/migrations/versions/c02b98b61be6_finished_relationships_and_added_print_.py @@ -0,0 +1,28 @@ +"""finished relationships and added print_details instance method to Freebie class in models + +Revision ID: c02b98b61be6 +Revises: 73f4ef43ed00 +Create Date: 2023-06-26 05:16:14.089370 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'c02b98b61be6' +down_revision = '73f4ef43ed00' +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/fab7a2aa58e1_finished_give_freebie_method.py b/lib/migrations/versions/fab7a2aa58e1_finished_give_freebie_method.py new file mode 100644 index 000000000..c3f18c030 --- /dev/null +++ b/lib/migrations/versions/fab7a2aa58e1_finished_give_freebie_method.py @@ -0,0 +1,28 @@ +"""finished give_freebie method + +Revision ID: fab7a2aa58e1 +Revises: 85f062e901b0 +Create Date: 2023-06-26 06:26:57.454988 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'fab7a2aa58e1' +down_revision = '85f062e901b0' +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/fe52cca555f4_finished_received_one_method.py b/lib/migrations/versions/fe52cca555f4_finished_received_one_method.py new file mode 100644 index 000000000..5ba730f2e --- /dev/null +++ b/lib/migrations/versions/fe52cca555f4_finished_received_one_method.py @@ -0,0 +1,28 @@ +"""finished received_one method + +Revision ID: fe52cca555f4 +Revises: fab7a2aa58e1 +Create Date: 2023-06-26 06:42:30.301719 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'fe52cca555f4' +down_revision = 'fab7a2aa58e1' +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..1fca757ce 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,6 +1,8 @@ -from sqlalchemy import ForeignKey, Column, Integer, String, MetaData -from sqlalchemy.orm import relationship, backref +from sqlalchemy import ForeignKey, Column, Integer, String, MetaData, create_engine +from sqlalchemy.orm import relationship, backref, sessionmaker, Session from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.ext.associationproxy import association_proxy + convention = { "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", @@ -9,15 +11,43 @@ Base = declarative_base(metadata=metadata) +engine = create_engine('sqlite:///freebies.db') +Session = sessionmaker(bind = engine) +session = Session() + class Company(Base): __tablename__ = 'companies' + + id = Column(Integer(), primary_key=True) name = Column(String()) founding_year = Column(Integer()) + freebies = relationship('Freebie', back_populates='company', cascade='all, delete-orphan') + devs = association_proxy('freebies', 'dev', creator=lambda de: Freebie(dev=de)) + + session = None + + def __repr__(self): return f'' + + def give_freebie(self, dev, item_name, value): + new_freebie = Freebie( + item_name=item_name, + value=value, + company = self, + dev=dev + ) + session.add(new_freebie) + session.commit() + + @classmethod + def oldest_company(cls): + return session.query(cls).order_by(cls.founding_year).first() + + class Dev(Base): __tablename__ = 'devs' @@ -25,5 +55,42 @@ class Dev(Base): id = Column(Integer(), primary_key=True) name= Column(String()) + freebies = relationship('Freebie', back_populates='dev') + companies = association_proxy('freebies', 'company', creator=lambda co: Freebie(company=co)) + def __repr__(self): return f'' + + def received_one(self, item_name): + for fb in self.freebies: + if fb.item_name == item_name: + return True + return False + + def give_away(self, dev, freebie): + if self.received_one(freebie.item_name): + freebie.dev = dev + session.add(freebie) + session.commit() + return f'{self.name} gave {freebie.id} to {dev.name}' + return 'I don\'t have that freebie!' + +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')) + + company = relationship('Company', back_populates='freebies') + dev = relationship('Dev', back_populates='freebies') + + def __repr__(self): + return f'' + + def print_details(self): + return f'{self.dev.name} owns a {self.item_name} from {self.company.name}' + diff --git a/lib/seed.py b/lib/seed.py index b16becbbb..0c02211ab 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,53 @@ #!/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 Dev, Company, Freebie + +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() + + devs = [] + for i in range(25): + dev = Dev( + name = fake.unique.name() + ) + session.add(dev) + session.commit() + devs.append(dev) + + companies = [] + for i in range(10): + company = Company( + name = fake.unique.name(), + founding_year = fake.date_between('-30y', 'today') + ) + session.add(company) + session.commit() + companies.append(company) + + freebies = [] + for i in range(10): + random_company = random.choice(companies) + random_dev = random.choice(devs) + freebie = Freebie( + item_name = fake.unique.name(), + value = random.randint(0, 100), + company = random_company, + dev = random_dev + ) + session.add(freebie) + session.commit() + session.close() From 860fda3c5e3dcd77851ffad1325c71c4f704098c Mon Sep 17 00:00:00 2001 From: Mark Nosal Date: Mon, 26 Jun 2023 07:29:09 -0500 Subject: [PATCH 2/2] made final migration --- lib/freebies.db | Bin 24576 -> 24576 bytes .../48a8b9d484b1_finished_give_away_method.py | 28 ++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 lib/migrations/versions/48a8b9d484b1_finished_give_away_method.py diff --git a/lib/freebies.db b/lib/freebies.db index 52faea0709c1af09aa4a38e42fe902601294fa22..7649410ce66e7cc9a0a4927fa0648e1f3610fe22 100644 GIT binary patch delta 52 xcmZoTz}Rqrae_4CtcfztjI%Z-Op)g?u}HK?vP?0tFiA4pr0|6wMPQME0RYZx5On|m delta 52 xcmZoTz}Rqrae_4C%!xA2j59YTOp)hFOEoo0PEIs6HBB?wr0|6wMPQME0RY`U5h(xw diff --git a/lib/migrations/versions/48a8b9d484b1_finished_give_away_method.py b/lib/migrations/versions/48a8b9d484b1_finished_give_away_method.py new file mode 100644 index 000000000..20f3f173c --- /dev/null +++ b/lib/migrations/versions/48a8b9d484b1_finished_give_away_method.py @@ -0,0 +1,28 @@ +"""finished give_away method + +Revision ID: 48a8b9d484b1 +Revises: fe52cca555f4 +Create Date: 2023-06-26 07:28:39.655985 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '48a8b9d484b1' +down_revision = 'fe52cca555f4' +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 ###