diff --git a/lib/__pycache__/models.cpython-310.pyc b/lib/__pycache__/models.cpython-310.pyc new file mode 100644 index 000000000..fbac677bd Binary files /dev/null and b/lib/__pycache__/models.cpython-310.pyc differ diff --git a/lib/debug.py b/lib/debug.py index 4f922eb69..fb4e791b7 100644 --- a/lib/debug.py +++ b/lib/debug.py @@ -1,9 +1,37 @@ -#!/usr/bin/env python3 +# !/usr/bin/env python3 from sqlalchemy import create_engine - -from models import Company, Dev +from sqlalchemy.orm import sessionmaker +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() + +# engine = create_engine('sqlite:///freebies.db') + + +# dev1 = Dev(name="Michael") +# session.add(dev1) +# session.commit() + + +# company1 = Company("The star", 2022) +# session.add(company1) +# session.commit() + +# freebie1 = Freebie(item_name="hat",value=10,dev_id=dev1.id,company_id=company1.id) +# session.add(freebie1) +# session.commit() + +# Script goes here! +# print(dev1) +# print(company1) +# print(dev1.freebies) +# print(dev1.companies) +# print(company1.freebies) +# print(company1.devs) +# print(freebie1.dev) +# print(freebie1.company) \ No newline at end of file diff --git a/lib/freebies.db b/lib/freebies.db index 12beb1c96..96ec831de 100644 Binary files a/lib/freebies.db and b/lib/freebies.db differ diff --git a/lib/migrations/__pycache__/env.cpython-310.pyc b/lib/migrations/__pycache__/env.cpython-310.pyc new file mode 100644 index 000000000..d3083b28f Binary files /dev/null and b/lib/migrations/__pycache__/env.cpython-310.pyc differ diff --git a/lib/migrations/versions/06a54de47aba_freebie_model_migration.py b/lib/migrations/versions/06a54de47aba_freebie_model_migration.py new file mode 100644 index 000000000..e3f9db711 --- /dev/null +++ b/lib/migrations/versions/06a54de47aba_freebie_model_migration.py @@ -0,0 +1,37 @@ +"""Freebie model migration + +Revision ID: 06a54de47aba +Revises: 5f72c58bf48c +Create Date: 2023-11-08 12:10:43.740612 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '06a54de47aba' +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/migrations/versions/185656d1de72_freebie_model_update.py b/lib/migrations/versions/185656d1de72_freebie_model_update.py new file mode 100644 index 000000000..15da1d618 --- /dev/null +++ b/lib/migrations/versions/185656d1de72_freebie_model_update.py @@ -0,0 +1,28 @@ +"""Freebie model update + +Revision ID: 185656d1de72 +Revises: 06a54de47aba +Create Date: 2023-11-08 14:45:29.134340 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '185656d1de72' +down_revision = '06a54de47aba' +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/474dba8664eb_freebie_model_update.py b/lib/migrations/versions/474dba8664eb_freebie_model_update.py new file mode 100644 index 000000000..73f37a08f --- /dev/null +++ b/lib/migrations/versions/474dba8664eb_freebie_model_update.py @@ -0,0 +1,28 @@ +"""Freebie model update + +Revision ID: 474dba8664eb +Revises: 185656d1de72 +Create Date: 2023-11-08 14:47:38.340270 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '474dba8664eb' +down_revision = '185656d1de72' +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/56cf58cdaa23_model_many2many_relationships.py b/lib/migrations/versions/56cf58cdaa23_model_many2many_relationships.py new file mode 100644 index 000000000..bc77eb71d --- /dev/null +++ b/lib/migrations/versions/56cf58cdaa23_model_many2many_relationships.py @@ -0,0 +1,34 @@ +"""Model many2many relationships + +Revision ID: 56cf58cdaa23 +Revises: b58f9a01c202 +Create Date: 2023-11-09 01:33:50.594986 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '56cf58cdaa23' +down_revision = 'b58f9a01c202' +branch_labels = None +depends_on = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('dev_companies', + sa.Column('dev_id', sa.Integer(), nullable=False), + sa.Column('company_id', sa.Integer(), nullable=False), + sa.ForeignKeyConstraint(['company_id'], ['companies.id'], ), + sa.ForeignKeyConstraint(['dev_id'], ['devs.id'], ), + sa.PrimaryKeyConstraint('dev_id', 'company_id') + ) + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('dev_companies') + # ### end Alembic commands ### diff --git a/lib/migrations/versions/6574410a6f8e_freebie_model_update.py b/lib/migrations/versions/6574410a6f8e_freebie_model_update.py new file mode 100644 index 000000000..0f00c738f --- /dev/null +++ b/lib/migrations/versions/6574410a6f8e_freebie_model_update.py @@ -0,0 +1,28 @@ +"""Freebie model update + +Revision ID: 6574410a6f8e +Revises: a11d64f52796 +Create Date: 2023-11-08 16:34:57.296093 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '6574410a6f8e' +down_revision = 'a11d64f52796' +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/__pycache__/06a54de47aba_freebie_model_migration.cpython-310.pyc b/lib/migrations/versions/__pycache__/06a54de47aba_freebie_model_migration.cpython-310.pyc new file mode 100644 index 000000000..48a4e767d Binary files /dev/null and b/lib/migrations/versions/__pycache__/06a54de47aba_freebie_model_migration.cpython-310.pyc differ diff --git a/lib/migrations/versions/__pycache__/185656d1de72_freebie_model_update.cpython-310.pyc b/lib/migrations/versions/__pycache__/185656d1de72_freebie_model_update.cpython-310.pyc new file mode 100644 index 000000000..4b3de35ea Binary files /dev/null and b/lib/migrations/versions/__pycache__/185656d1de72_freebie_model_update.cpython-310.pyc differ diff --git a/lib/migrations/versions/__pycache__/474dba8664eb_freebie_model_update.cpython-310.pyc b/lib/migrations/versions/__pycache__/474dba8664eb_freebie_model_update.cpython-310.pyc new file mode 100644 index 000000000..3593d46e0 Binary files /dev/null and b/lib/migrations/versions/__pycache__/474dba8664eb_freebie_model_update.cpython-310.pyc differ diff --git a/lib/migrations/versions/__pycache__/5f72c58bf48c_create_companies_devs.cpython-310.pyc b/lib/migrations/versions/__pycache__/5f72c58bf48c_create_companies_devs.cpython-310.pyc new file mode 100644 index 000000000..90fa9e746 Binary files /dev/null and b/lib/migrations/versions/__pycache__/5f72c58bf48c_create_companies_devs.cpython-310.pyc differ diff --git a/lib/migrations/versions/__pycache__/6574410a6f8e_freebie_model_update.cpython-310.pyc b/lib/migrations/versions/__pycache__/6574410a6f8e_freebie_model_update.cpython-310.pyc new file mode 100644 index 000000000..1c5d9d5ca Binary files /dev/null and b/lib/migrations/versions/__pycache__/6574410a6f8e_freebie_model_update.cpython-310.pyc differ diff --git a/lib/migrations/versions/__pycache__/7a71dbf71c64_create_db.cpython-310.pyc b/lib/migrations/versions/__pycache__/7a71dbf71c64_create_db.cpython-310.pyc new file mode 100644 index 000000000..3d18e34af Binary files /dev/null and b/lib/migrations/versions/__pycache__/7a71dbf71c64_create_db.cpython-310.pyc differ diff --git a/lib/migrations/versions/__pycache__/a11d64f52796_freebie_model_update.cpython-310.pyc b/lib/migrations/versions/__pycache__/a11d64f52796_freebie_model_update.cpython-310.pyc new file mode 100644 index 000000000..e7b8e84ad Binary files /dev/null and b/lib/migrations/versions/__pycache__/a11d64f52796_freebie_model_update.cpython-310.pyc differ diff --git a/lib/migrations/versions/__pycache__/b58f9a01c202_models_update.cpython-310.pyc b/lib/migrations/versions/__pycache__/b58f9a01c202_models_update.cpython-310.pyc new file mode 100644 index 000000000..33291daf1 Binary files /dev/null and b/lib/migrations/versions/__pycache__/b58f9a01c202_models_update.cpython-310.pyc differ diff --git a/lib/migrations/versions/a11d64f52796_freebie_model_update.py b/lib/migrations/versions/a11d64f52796_freebie_model_update.py new file mode 100644 index 000000000..a1cd80237 --- /dev/null +++ b/lib/migrations/versions/a11d64f52796_freebie_model_update.py @@ -0,0 +1,28 @@ +"""Freebie model update + +Revision ID: a11d64f52796 +Revises: 474dba8664eb +Create Date: 2023-11-08 16:34:32.647038 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'a11d64f52796' +down_revision = '474dba8664eb' +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/b58f9a01c202_models_update.py b/lib/migrations/versions/b58f9a01c202_models_update.py new file mode 100644 index 000000000..5a92f25df --- /dev/null +++ b/lib/migrations/versions/b58f9a01c202_models_update.py @@ -0,0 +1,28 @@ +"""Models Update + +Revision ID: b58f9a01c202 +Revises: 6574410a6f8e +Create Date: 2023-11-09 00:36:36.277845 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'b58f9a01c202' +down_revision = '6574410a6f8e' +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/b9a7820dd107_model_many2many_relationships_update.py b/lib/migrations/versions/b9a7820dd107_model_many2many_relationships_update.py new file mode 100644 index 000000000..3d2666ac6 --- /dev/null +++ b/lib/migrations/versions/b9a7820dd107_model_many2many_relationships_update.py @@ -0,0 +1,28 @@ +"""Model many2many relationships update + +Revision ID: b9a7820dd107 +Revises: 56cf58cdaa23 +Create Date: 2023-11-09 01:37:34.120917 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'b9a7820dd107' +down_revision = '56cf58cdaa23' +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..26f9848d1 100644 --- a/lib/models.py +++ b/lib/models.py @@ -1,13 +1,20 @@ -from sqlalchemy import ForeignKey, Column, Integer, String, MetaData -from sqlalchemy.orm import relationship, backref -from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy import ForeignKey, Column, Integer, String, MetaData, Table, func +from sqlalchemy.orm import relationship, backref, declarative_base convention = { "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s", } metadata = MetaData(naming_convention=convention) -Base = declarative_base(metadata=metadata) +Base = declarative_base() + +dev_company = Table( + 'dev_companies', + Base.metadata, + Column('dev_id', ForeignKey('devs.id'), primary_key=True), + Column('company_id', ForeignKey('companies.id'), primary_key=True), + extend_existing=True +) class Company(Base): __tablename__ = 'companies' @@ -16,6 +23,18 @@ class Company(Base): name = Column(String()) founding_year = Column(Integer()) + freebies = relationship('Freebie', back_populates='company') + devs = relationship('Dev', secondary=dev_company, back_populates='companies') + + 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 + + def oldest_company(self): + company_years = [] + company_years.append(self.founding_year) + pass + def __repr__(self): return f'' @@ -25,5 +44,26 @@ class Dev(Base): id = Column(Integer(), primary_key=True) name= Column(String()) + freebies = relationship('Freebie', back_populates='dev') + companies = relationship('Company', secondary=dev_company, back_populates='devs') + 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')) + + company = relationship('Company', back_populates='freebies') + dev = relationship('Dev', back_populates='freebies') + + def print_details(self): + return f'{self.dev} owns a {self.item_name} from {self.company}' + + def __repr__(self): + return f'' \ No newline at end of file diff --git a/lib/seed.py b/lib/seed.py index b16becbbb..832f24baa 100644 --- a/lib/seed.py +++ b/lib/seed.py @@ -1,3 +1,5 @@ #!/usr/bin/env python3 +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker +from models import Dev, Company, Freebie -# Script goes here!