From 857f1f29d3453b5d1b42cd401d1d15cceedb9996 Mon Sep 17 00:00:00 2001 From: chrisngili Date: Sun, 25 May 2025 00:49:40 +0300 Subject: [PATCH 1/5] populated models and seed --- lib/models.py | 39 ++++++++++++++++++++++++++++++++++++++- lib/seed.py | 4 ++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/lib/models.py b/lib/models.py index 2681bee5a..30b06102f 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,5 +1,5 @@ from sqlalchemy import ForeignKey, Column, Integer, String, MetaData -from sqlalchemy.orm import relationship, backref +from sqlalchemy.orm import relationship, backref, sessionmaker from sqlalchemy.ext.declarative import declarative_base convention = { @@ -18,6 +18,21 @@ class Company(Base): def __repr__(self): return f'' + freebies = relationship('Freebie', backref='company') + devs = relationship('Dev', secondary='freebies', backref='companies') + + def give_freebie(self, dev, item_name, value): + freebie = Freebie( + item_name = item_name, + value=value, + company_id=self.id + dev_id=dev.id + ) + return freebie + + @classmethod + def oldest_company(cls): + return session.query(cls).order_by(cls.founding_year).first() class Dev(Base): __tablename__ = 'devs' @@ -27,3 +42,25 @@ class Dev(Base): 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, other_dev, freebie): + if freebie.dev_id == self.id: + freebie.dev_id == other_dev.id + +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', backref='freebies') + dev = relationship('Dev', backref='freebies') + + def printer(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..14123dedd 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,7 @@ #!/usr/bin/env python3 # Script goes here! + +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +from models import Base, Company, Dev, Freebie From 4147b5463cb23fe782733e4c1e46eb462051ee57 Mon Sep 17 00:00:00 2001 From: chrisngili Date: Sun, 25 May 2025 18:26:42 +0300 Subject: [PATCH 2/5] populating seed.py --- lib/models.py | 19 +++++++++++-------- lib/seed.py | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/lib/models.py b/lib/models.py index 30b06102f..97d520e96 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,5 +1,5 @@ from sqlalchemy import ForeignKey, Column, Integer, String, MetaData -from sqlalchemy.orm import relationship, backref, sessionmaker +from sqlalchemy.orm import relationship, backref from sqlalchemy.ext.declarative import declarative_base convention = { @@ -16,22 +16,23 @@ class Company(Base): name = Column(String()) founding_year = Column(Integer()) + freebies = relationship('Freebie', backref='company') + def __repr__(self): return f'' - freebies = relationship('Freebie', backref='company') - devs = relationship('Dev', secondary='freebies', backref='companies') + def give_freebie(self, dev, item_name, value): - freebie = Freebie( + freebie = Freebie ( item_name = item_name, value=value, - company_id=self.id + company_id=self.id, dev_id=dev.id ) return freebie @classmethod - def oldest_company(cls): + def oldest_company(cls, session): return session.query(cls).order_by(cls.founding_year).first() class Dev(Base): @@ -40,6 +41,8 @@ class Dev(Base): id = Column(Integer(), primary_key=True) name= Column(String()) + freebies = relationship('Freebie', backref='dev') + def __repr__(self): return f'' @@ -59,8 +62,8 @@ class Freebie(Base): company_id = Column(Integer, ForeignKey('companies.id')) dev_id = Column(Integer, ForeignKey('devs.id')) - company = relationship('Company', backref='freebies') - dev = relationship('Dev', backref='freebies') + # company = relationship('Company', backref='freebies') + # dev = relationship('Dev', backref='freebies') def printer(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 14123dedd..ae3109e4a 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -5,3 +5,37 @@ from sqlalchemy import create_engine from sqlalchemy.orm import sessionmaker from models import Base, Company, Dev, Freebie + +engine = create_engine('sqlite:///freebies.db') + +Base.metadata.creaet_all(engine) + +Session = sessionmaker(bind=engine) +session = Session() + +if __name__ == '__main__': + company = Company(name="Safaricom", founding_year = 1997) + session.add(company) + + dev = Dev(name = "Mike") + session.add(dev) + + freebie = company.give_freebie(dev, "Laptop", 1500 ) + session.add(freebie) + + session.commit() + + print(freebie.printer()) + + oldest = Company.oldest_company(session) + print(f'The oldest company is {oldest.name} founded in {oldest.founding_year}') + + has_laptop = dev.received_one('Laptop') + print(f'Did {dev.name} receive a Laptop? {has_laptop}') + + new_dev = Dev(name='Jane Smith') + session.add(new_dev) + session.commit() + dev.give_away(new_dev, freebie) + session.commit() + print(freebie.printer()) From 40a4516e8958a93624500d4a1c3af594fbaaea0f Mon Sep 17 00:00:00 2001 From: chrisngili Date: Sun, 25 May 2025 20:44:36 +0300 Subject: [PATCH 3/5] all deliverables satisfied --- lib/freebies.db | Bin 20480 -> 32768 bytes lib/migrations/versions/52061ccfa385_first.py | 28 +++++++++++++ lib/migrations/versions/aae5e6efadd3_first.py | 37 ++++++++++++++++++ lib/models.py | 36 ++++++++++------- lib/seed.py | 27 +++++++------ 5 files changed, 102 insertions(+), 26 deletions(-) create mode 100644 lib/migrations/versions/52061ccfa385_first.py create mode 100644 lib/migrations/versions/aae5e6efadd3_first.py diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c963e832db481e7a7493e3029e691ac4dc..f47d1d6dc90b9e8e28e54465d369c64db2f8bb1f 100644 GIT binary patch literal 32768 zcmeI)&rj1}7zgn8?T?j>!OLY?G$FhRAz^`tKrmiRoTT7%3@KB?!8B#-Ov8TQ7(`A6 z)IZ3hUi=3z@#Kkk^QzvIoA0}=&{n4*F;U>#ua@MPEsZrZ>>brK?-3f%oyk%yKCNE}h zvu>GCn4u0&FyP@Z9@r7l}%q{~il9!5@_!=)o&aTeIs<&E*fW*8J_PB|UeX>bC1QN)GrH zoFw_VYjPyitY500Izz00bZa0SG_<0uX?}IT0A7%Glh@ z)oatGQpK6QK9>;Jh57$EX)Z1U0uX=z1Rwwb2tWV=5P$##AkYR3ED|CgWt>+BU_ zU)V?Xp1lra4X=FrMbt+EN z6Awoi?~-b0vl7|NXkeG&l{2tWV=5P$##AOHafKmY;|fB*!}lz^eB zB(>yixQ6NniXYH!Am{%oI}p$Ri_iZL&eY|hSO`D>0uX=z1Rwwb2tWV=5P-mi6c|!t z;$H(O%{!Z|#-@I#sY6P5L{SE*9Er#MeLCO&cSP9Hg(Sm8LjVF0fB*y_009U<00Izz x00hprfKF9Pb*=OLf0+ND?`GrbAOHafKmY;|fB*y_009U<;KB;TG)m*T_5-XN%{Bl4 delta 118 zcmZo@U}{*vI6+#Fm4Sf)gkgYrqK>gBD}!FVEHD2L1{OXk27X@toqY9tQkw+@mhohFC0vZAU diff --git a/lib/migrations/versions/52061ccfa385_first.py b/lib/migrations/versions/52061ccfa385_first.py new file mode 100644 index 000000000..ddfb7c051 --- /dev/null +++ b/lib/migrations/versions/52061ccfa385_first.py @@ -0,0 +1,28 @@ +"""first + +Revision ID: 52061ccfa385 +Revises: aae5e6efadd3 +Create Date: 2025-05-25 18:31:45.854663 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '52061ccfa385' +down_revision = 'aae5e6efadd3' +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/aae5e6efadd3_first.py b/lib/migrations/versions/aae5e6efadd3_first.py new file mode 100644 index 000000000..9726c0d12 --- /dev/null +++ b/lib/migrations/versions/aae5e6efadd3_first.py @@ -0,0 +1,37 @@ +"""first + +Revision ID: aae5e6efadd3 +Revises: 5f72c58bf48c +Create Date: 2025-05-25 18:27:35.448085 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'aae5e6efadd3' +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 97d520e96..de3c6f958 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,13 @@ Base = declarative_base(metadata=metadata) +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) +) + class Company(Base): __tablename__ = 'companies' @@ -16,21 +23,21 @@ class Company(Base): name = Column(String()) founding_year = Column(Integer()) - freebies = relationship('Freebie', backref='company') + freebies = relationship('Freebie', back_populates='company') + devs = relationship('Dev', secondary='company_dev', back_populates='companies') def __repr__(self): return f'' - def give_freebie(self, dev, item_name, value): - freebie = Freebie ( - item_name = item_name, + freebie = Freebie( + item_name=item_name, value=value, company_id=self.id, dev_id=dev.id ) return freebie - + @classmethod def oldest_company(cls, session): return session.query(cls).order_by(cls.founding_year).first() @@ -39,22 +46,23 @@ class Dev(Base): __tablename__ = 'devs' id = Column(Integer(), primary_key=True) - name= Column(String()) + name = Column(String()) - freebies = relationship('Freebie', backref='dev') + freebies = relationship('Freebie', back_populates='dev') + companies = relationship('Company', secondary='company_dev', 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, other_dev, freebie): if freebie.dev_id == self.id: - freebie.dev_id == other_dev.id + freebie.dev_id = other_dev.id class Freebie(Base): - __tablename__='freebies' + __tablename__ = 'freebies' id = Column(Integer, primary_key=True) item_name = Column(String) @@ -62,8 +70,8 @@ class Freebie(Base): company_id = Column(Integer, ForeignKey('companies.id')) dev_id = Column(Integer, ForeignKey('devs.id')) - # company = relationship('Company', backref='freebies') - # dev = relationship('Dev', backref='freebies') + company = relationship('Company', back_populates='freebies') + dev = relationship('Dev', back_populates='freebies') def printer(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 ae3109e4a..6e7c7e631 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -8,7 +8,7 @@ engine = create_engine('sqlite:///freebies.db') -Base.metadata.creaet_all(engine) +Base.metadata.create_all(engine) Session = sessionmaker(bind=engine) session = Session() @@ -16,26 +16,29 @@ if __name__ == '__main__': company = Company(name="Safaricom", founding_year = 1997) session.add(company) + session.commit() dev = Dev(name = "Mike") session.add(dev) + session.commit() freebie = company.give_freebie(dev, "Laptop", 1500 ) session.add(freebie) session.commit() - print(freebie.printer()) + # print(freebie.printer()) - oldest = Company.oldest_company(session) - print(f'The oldest company is {oldest.name} founded in {oldest.founding_year}') + # oldest = Company.oldest_company(session) + # print(f'The oldest company is {oldest.name} founded in {oldest.founding_year}') - has_laptop = dev.received_one('Laptop') - print(f'Did {dev.name} receive a Laptop? {has_laptop}') + # has_laptop = dev.received_one('Laptop') + # print(f'Did {dev.name} receive a Laptop? {has_laptop}') + + # new_dev = Dev(name='Jane Smith') + # session.add(new_dev) + # session.commit() + # dev.give_away(new_dev, freebie) + # session.commit() + # print(freebie.printer()) - new_dev = Dev(name='Jane Smith') - session.add(new_dev) - session.commit() - dev.give_away(new_dev, freebie) - session.commit() - print(freebie.printer()) From 1494a6023c8e8d0ca062bb18e70b72ec6d238aab Mon Sep 17 00:00:00 2001 From: chrisngili Date: Sun, 25 May 2025 23:13:55 +0300 Subject: [PATCH 4/5] complete --- lib/freebies.db | Bin 32768 -> 0 bytes lib/seed.py | 5 +++++ 2 files changed, 5 insertions(+) delete mode 100644 lib/freebies.db diff --git a/lib/freebies.db b/lib/freebies.db deleted file mode 100644 index f47d1d6dc90b9e8e28e54465d369c64db2f8bb1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmeI)&rj1}7zgn8?T?j>!OLY?G$FhRAz^`tKrmiRoTT7%3@KB?!8B#-Ov8TQ7(`A6 z)IZ3hUi=3z@#Kkk^QzvIoA0}=&{n4*F;U>#ua@MPEsZrZ>>brK?-3f%oyk%yKCNE}h zvu>GCn4u0&FyP@Z9@r7l}%q{~il9!5@_!=)o&aTeIs<&E*fW*8J_PB|UeX>bC1QN)GrH zoFw_VYjPyitY500Izz00bZa0SG_<0uX?}IT0A7%Glh@ z)oatGQpK6QK9>;Jh57$EX)Z1U0uX=z1Rwwb2tWV=5P$##AkYR3ED|CgWt>+BU_ zU)V?Xp1lra4X=FrMbt+EN z6Awoi?~-b0vl7|NXkeG&l{2tWV=5P$##AOHafKmY;|fB*!}lz^eB zB(>yixQ6NniXYH!Am{%oI}p$Ri_iZL&eY|hSO`D>0uX=z1Rwwb2tWV=5P-mi6c|!t z;$H(O%{!Z|#-@I#sY6P5L{SE*9Er#MeLCO&cSP9Hg(Sm8LjVF0fB*y_009U<00Izz x00hprfKF9Pb*=OLf0+ND?`GrbAOHafKmY;|fB*y_009U<;KB;TG)m*T_5-XN%{Bl4 diff --git a/lib/seed.py b/lib/seed.py index 6e7c7e631..5c2399952 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -27,6 +27,11 @@ session.commit() + + # Tests(Uncomment them then run seed.py in the terminal) + + + # print(freebie.printer()) # oldest = Company.oldest_company(session) From f83c70f2b6fb1f1a0e33214b40ef417cacd66254 Mon Sep 17 00:00:00 2001 From: chrisngili Date: Mon, 26 May 2025 00:10:47 +0300 Subject: [PATCH 5/5] Final touches done --- lib/models.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/models.py b/lib/models.py index de3c6f958..dbd283671 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,5 +1,5 @@ -from sqlalchemy import ForeignKey, Column, Integer, String, MetaData, Table -from sqlalchemy.orm import relationship, backref +from sqlalchemy import ForeignKey, Column, Integer, String, MetaData +from sqlalchemy.orm import relationship from sqlalchemy.ext.declarative import declarative_base convention = { @@ -9,12 +9,11 @@ Base = declarative_base(metadata=metadata) -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) -) +class CompanyDev(Base): + __tablename__ = 'company_dev' + + company_id = Column(Integer, ForeignKey('companies.id'), primary_key=True) + dev_id = Column(Integer, ForeignKey('devs.id'), primary_key=True) class Company(Base): __tablename__ = 'companies'