From 5d9215b6bfb3ea5278ebfd4dd0d616d2da565235 Mon Sep 17 00:00:00 2001 From: Valerie Date: Fri, 7 Mar 2025 10:28:11 +0300 Subject: [PATCH 1/2] changes added --- lib/freebies.db | Bin 20480 -> 24576 bytes lib/migrations/versions/67a56926ba22_.py | 37 +++++++++++++++++++ lib/models.py | 43 ++++++++++++++++++++++- 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 lib/migrations/versions/67a56926ba22_.py diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c963e832db481e7a7493e3029e691ac4dc..398630076f896fe3b7ecb00cbc7467a3a5fc6834 100644 GIT binary patch delta 406 zcmZozz}Rqrae}lUI|Bm)8xX?)%S0Vxadrm1vQA$99}KKKyBPR+`FHZw^GWgS+SusA zW6~7M$}TP|%h<|Wl9-f}npTvWnv|JZ45QhcgIpa$TopnboqSvsprVr<`DC0jOHy;= z^AdAY6~Y{YoIMvb$LYY8!DY*Fuxq7<$DR{d^Y9JJ7Dg?Q@xdyrVIlBfc zK!ibxH8N8)@mK(KoH5WH@jx2YV2GWae}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/67a56926ba22_.py b/lib/migrations/versions/67a56926ba22_.py new file mode 100644 index 000000000..d5681f1bc --- /dev/null +++ b/lib/migrations/versions/67a56926ba22_.py @@ -0,0 +1,37 @@ +"""empty message + +Revision ID: 67a56926ba22 +Revises: 5f72c58bf48c +Create Date: 2025-03-07 10:26:58.353457 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '67a56926ba22' +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('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') + ) + # ### 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 2681bee5a..dfbfe653e 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 + convention = { "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", } @@ -16,14 +17,54 @@ class Company(Base): name = Column(String()) founding_year = Column(Integer()) + + freebies = relationship("Freebie", backref="company") + devs = relationship("Dev", secondary="freebies", backref="companies") + def __repr__(self): return f'' + def give_freebie(self, dev, item_name, value): + freebie = Freebie(item_name=item_name, value=value, dev_id=dev.id, company_id=self.id) + return freebie + + @classmethod + def oldest_company(cls, session): + + return session.query(cls).order_by(cls.founding_year).first() + + class Dev(Base): __tablename__ = 'devs' id = Column(Integer(), primary_key=True) - name= Column(String()) + name = Column(String()) + + + freebies = relationship("Freebie", backref="dev") def __repr__(self): return f'' + + def received_one(self, item_name): + return any(freebie.item_name == item_name for freebie in self.freebies) + + def give_away(self, dev, freebie): + if freebie.dev == self: + freebie.dev = dev + + +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'' + + def print_details(self): + return f"{self.dev.name} owns a {self.item_name} from {self.company.name}" From 1efcea222a78e3d38f9485d2e076bdb6f212b189 Mon Sep 17 00:00:00 2001 From: Valerie Date: Fri, 7 Mar 2025 10:38:27 +0300 Subject: [PATCH 2/2] changes added --- lib/freebies.db | Bin 24576 -> 24576 bytes lib/models.py | 41 ++++++++++++----------------------------- 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/lib/freebies.db b/lib/freebies.db index 398630076f896fe3b7ecb00cbc7467a3a5fc6834..1448263bc667428180d8bf6f3136b752536c18a4 100644 GIT binary patch delta 771 zcmZvZ!D|yi7)NJjXJ>Y2r~BJdHX?~o5%JXe2bhbElp+d3dKH?kg9(jn*ro*$Nsk3V zTIjJ#b&8O@o{1A zeo3QD@CWDkjxRXC4&LJpUg0?&qkJ?Tl+e+dlbh_3S)E&1lo#V3CwEvSeqm;7Q9Djv z%QIhba*NHIs9uSamORyNPH_GgD{a zz$w1sGY+wjZERsZUA2ym(iSOJ>b0cVFv7FQ#7w;CD2v>9*la{bxf$y8sl1{hL+w80 zSJcW-)~9qpyRQrUliS^&_=#`$gk8MDTNqSP#xx4x{xAQ+KS`hY!S56TLGDpXpVV6I zxHVaA8nbGY@-zgQNas&iUP`S)Uy!@$soHKtOD36oR*ROH=LKVe6w~qi)N;L%v~8sd zdQ?t2+8gFvH&laMC)0DBz|HrhEI6Zj+}3i~6CxCYUM6STft}BB9`bI^9d7%ew=UDx TFlSjI8`$QRMM)r*fOZ1r-1U3r_+~=P-L7I)10SIt$0rD#kWB>pF diff --git a/lib/models.py b/lib/models.py index dfbfe653e..0e554156f 100644 --- a/lib/models.py +++ b/lib/models.py @@ -2,7 +2,6 @@ from sqlalchemy.orm import relationship, backref from sqlalchemy.ext.declarative import declarative_base - convention = { "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", } @@ -16,44 +15,23 @@ class Company(Base): id = Column(Integer(), primary_key=True) name = Column(String()) founding_year = Column(Integer()) - - - freebies = relationship("Freebie", backref="company") - devs = relationship("Dev", secondary="freebies", backref="companies") + freebies = relationship("Freebie", back_populates="company") + devs = relationship("Dev", secondary="freebies", back_populates="companies") def __repr__(self): return f'' - def give_freebie(self, dev, item_name, value): - freebie = Freebie(item_name=item_name, value=value, dev_id=dev.id, company_id=self.id) - return freebie - - @classmethod - def oldest_company(cls, session): - - return session.query(cls).order_by(cls.founding_year).first() - - class Dev(Base): __tablename__ = 'devs' id = Column(Integer(), primary_key=True) name = Column(String()) - - - freebies = relationship("Freebie", backref="dev") + freebies = relationship("Freebie", back_populates="dev") + companies = relationship("Company", secondary="freebies", back_populates="devs") def __repr__(self): return f'' - def received_one(self, item_name): - return any(freebie.item_name == item_name for freebie in self.freebies) - - def give_away(self, dev, freebie): - if freebie.dev == self: - freebie.dev = dev - - class Freebie(Base): __tablename__ = 'freebies' @@ -62,9 +40,14 @@ class Freebie(Base): value = Column(Integer()) dev_id = Column(Integer(), ForeignKey('devs.id')) company_id = Column(Integer(), ForeignKey('companies.id')) + dev = relationship("Dev", back_populates="freebies") + company = relationship("Company", back_populates="freebies") def __repr__(self): - return f'' + return f'' + + + + + - def print_details(self): - return f"{self.dev.name} owns a {self.item_name} from {self.company.name}"