Merge branch 'dev' of https://github.com/joboy-dev/hng_boilerplate_py…

…thon_fastapi_web into fix/response-fixes

alembic/env.py

@@ -6,7 +6,7 @@
 from api.v1.models import *
 from api.v1.models.permissions.permissions import Permission
 from api.v1.models.permissions.role_permissions import role_permissions
-from api.v1.models.permissions.user_org_role import user_organization_roles
+from api.v1.models.permissions.user_org_role import user_organisation_roles
 from api.v1.models.permissions.role import Role
 from api.v1.models.associations import Base
 

alembic/versions/0c0978bc2925_fix_added_is_owner_to_org_user_role_.py

@@ -0,0 +1,32 @@
+"""fix: added is_owner to org_user_role table
+
+Revision ID: 0c0978bc2925
+Revises: 493877a22513
+Create Date: 2024-08-10 04:26:02.132975
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '0c0978bc2925'
+down_revision: Union[str, None] = '493877a22513'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('user_organisation_roles', sa.Column('is_owner', sa.Boolean(), server_default='false', nullable=True))
+    op.drop_column('user_organisation_roles', 'status')
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('user_organisation_roles', sa.Column('status', sa.VARCHAR(length=20), autoincrement=False, nullable=False))
+    op.drop_column('user_organisation_roles', 'is_owner')
+    # ### end Alembic commands ###

alembic/versions/1fc08cda8f3b_ensure_id_and_foreign_keys_are_of_type_.py

@@ -20,17 +20,17 @@
 
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('user_organization_roles', sa.Column('role_id', sa.String(), nullable=True))
-    op.drop_constraint('user_organization_roles_role_name_fkey', 'user_organization_roles', type_='foreignkey')
-    op.create_foreign_key(None, 'user_organization_roles', 'roles', ['role_id'], ['id'], ondelete='CASCADE')
-    op.drop_column('user_organization_roles', 'role_name')
+    op.add_column('user_organisation_roles', sa.Column('role_id', sa.String(), nullable=True))
+    op.drop_constraint('user_organisation_roles_role_name_fkey', 'user_organisation_roles', type_='foreignkey')
+    op.create_foreign_key(None, 'user_organisation_roles', 'roles', ['role_id'], ['id'], ondelete='CASCADE')
+    op.drop_column('user_organisation_roles', 'role_name')
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('user_organization_roles', sa.Column('role_name', sa.VARCHAR(), autoincrement=False, nullable=False))
-    op.drop_constraint(None, 'user_organization_roles', type_='foreignkey')
-    op.create_foreign_key('user_organization_roles_role_name_fkey', 'user_organization_roles', 'roles', ['role_name'], ['name'], ondelete='CASCADE')
-    op.drop_column('user_organization_roles', 'role_id')
+    op.add_column('user_organisation_roles', sa.Column('role_name', sa.VARCHAR(), autoincrement=False, nullable=False))
+    op.drop_constraint(None, 'user_organisation_roles', type_='foreignkey')
+    op.create_foreign_key('user_organisation_roles_role_name_fkey', 'user_organisation_roles', 'roles', ['role_name'], ['name'], ondelete='CASCADE')
+    op.drop_column('user_organisation_roles', 'role_id')
     # ### end Alembic commands ###

alembic/versions/224b03e9169c_product_comment_migration.py

@@ -41,9 +41,9 @@ def upgrade() -> None:
         if 'is_builtin' not in columns:
             op.add_column('roles', sa.Column('is_builtin', sa.Boolean(), nullable=True))
 
-    # Check if 'user_organization_roles' table exists
-    if 'user_organization_roles' in inspector.get_table_names():
-        op.alter_column('user_organization_roles', 'role_id',
+    # Check if 'user_organisation_roles' table exists
+    if 'user_organisation_roles' in inspector.get_table_names():
+        op.alter_column('user_organisation_roles', 'role_id',
                     existing_type=sa.VARCHAR(),
                     nullable=True)
     # ### end Alembic commands ###
@@ -52,7 +52,7 @@ def upgrade() -> None:
 
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    op.alter_column('user_organization_roles', 'role_id',
+    op.alter_column('user_organisation_roles', 'role_id',
                existing_type=sa.VARCHAR(),
                nullable=False)
     op.drop_column('roles', 'is_builtin')

alembic/versions/3b6d16e973a2_fix_resolved_naming_issues.py

@@ -20,33 +20,33 @@
 
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('organizations', sa.Column('name', sa.String(), nullable=False))
-    op.add_column('organizations', sa.Column('email', sa.String(), nullable=True))
-    op.add_column('organizations', sa.Column('type', sa.String(), nullable=True))
-    op.add_column('organizations', sa.Column('description', sa.String(), nullable=True))
-    op.drop_constraint('organizations_company_email_key', 'organizations', type_='unique')
-    op.drop_constraint('organizations_company_name_key', 'organizations', type_='unique')
-    op.create_unique_constraint(None, 'organizations', ['email'])
-    op.create_unique_constraint(None, 'organizations', ['name'])
-    op.drop_column('organizations', 'company_name')
-    op.drop_column('organizations', 'organization_type')
-    op.drop_column('organizations', 'lga')
-    op.drop_column('organizations', 'company_email')
+    op.add_column('organisations', sa.Column('name', sa.String(), nullable=False))
+    op.add_column('organisations', sa.Column('email', sa.String(), nullable=True))
+    op.add_column('organisations', sa.Column('type', sa.String(), nullable=True))
+    op.add_column('organisations', sa.Column('description', sa.String(), nullable=True))
+    op.drop_constraint('organisations_company_email_key', 'organisations', type_='unique')
+    op.drop_constraint('organisations_company_name_key', 'organisations', type_='unique')
+    op.create_unique_constraint(None, 'organisations', ['email'])
+    op.create_unique_constraint(None, 'organisations', ['name'])
+    op.drop_column('organisations', 'company_name')
+    op.drop_column('organisations', 'organisation_type')
+    op.drop_column('organisations', 'lga')
+    op.drop_column('organisations', 'company_email')
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('organizations', sa.Column('company_email', sa.VARCHAR(), autoincrement=False, nullable=True))
-    op.add_column('organizations', sa.Column('lga', sa.VARCHAR(), autoincrement=False, nullable=True))
-    op.add_column('organizations', sa.Column('organization_type', sa.VARCHAR(), autoincrement=False, nullable=True))
-    op.add_column('organizations', sa.Column('company_name', sa.VARCHAR(), autoincrement=False, nullable=False))
-    op.drop_constraint(None, 'organizations', type_='unique')
-    op.drop_constraint(None, 'organizations', type_='unique')
-    op.create_unique_constraint('organizations_company_name_key', 'organizations', ['company_name'])
-    op.create_unique_constraint('organizations_company_email_key', 'organizations', ['company_email'])
-    op.drop_column('organizations', 'description')
-    op.drop_column('organizations', 'type')
-    op.drop_column('organizations', 'email')
-    op.drop_column('organizations', 'name')
+    op.add_column('organisations', sa.Column('company_email', sa.VARCHAR(), autoincrement=False, nullable=True))
+    op.add_column('organisations', sa.Column('lga', sa.VARCHAR(), autoincrement=False, nullable=True))
+    op.add_column('organisations', sa.Column('organisation_type', sa.VARCHAR(), autoincrement=False, nullable=True))
+    op.add_column('organisations', sa.Column('company_name', sa.VARCHAR(), autoincrement=False, nullable=False))
+    op.drop_constraint(None, 'organisations', type_='unique')
+    op.drop_constraint(None, 'organisations', type_='unique')
+    op.create_unique_constraint('organisations_company_name_key', 'organisations', ['company_name'])
+    op.create_unique_constraint('organisations_company_email_key', 'organisations', ['company_email'])
+    op.drop_column('organisations', 'description')
+    op.drop_column('organisations', 'type')
+    op.drop_column('organisations', 'email')
+    op.drop_column('organisations', 'name')
     # ### end Alembic commands ###

alembic/versions/493877a22513_fix_replaced_organization_to_.py

@@ -0,0 +1,30 @@
+"""fix: replaced organization to organisation
+
+Revision ID: 493877a22513
+Revises: ff92a0037698
+Create Date: 2024-08-10 03:48:41.184522
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '493877a22513'
+down_revision: Union[str, None] = 'ff92a0037698'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = 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 ###

alembic/versions/a8eeee3dda1c_ensure_id_and_foreign_keys_are_of_type_.py

@@ -20,17 +20,17 @@
 
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('user_organization_roles', sa.Column('role_name', sa.String(), nullable=False))
-    op.drop_constraint('user_organization_roles_role_id_fkey', 'user_organization_roles', type_='foreignkey')
-    op.create_foreign_key(None, 'user_organization_roles', 'roles', ['role_name'], ['name'], ondelete='CASCADE')
-    op.drop_column('user_organization_roles', 'role_id')
+    op.add_column('user_organisation_roles', sa.Column('role_name', sa.String(), nullable=False))
+    op.drop_constraint('user_organisation_roles_role_id_fkey', 'user_organisation_roles', type_='foreignkey')
+    op.create_foreign_key(None, 'user_organisation_roles', 'roles', ['role_name'], ['name'], ondelete='CASCADE')
+    op.drop_column('user_organisation_roles', 'role_id')
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('user_organization_roles', sa.Column('role_id', sa.VARCHAR(), autoincrement=False, nullable=False))
-    op.drop_constraint(None, 'user_organization_roles', type_='foreignkey')
-    op.create_foreign_key('user_organization_roles_role_id_fkey', 'user_organization_roles', 'roles', ['role_id'], ['id'], ondelete='CASCADE')
-    op.drop_column('user_organization_roles', 'role_name')
+    op.add_column('user_organisation_roles', sa.Column('role_id', sa.VARCHAR(), autoincrement=False, nullable=False))
+    op.drop_constraint(None, 'user_organisation_roles', type_='foreignkey')
+    op.create_foreign_key('user_organisation_roles_role_id_fkey', 'user_organisation_roles', 'roles', ['role_id'], ['id'], ondelete='CASCADE')
+    op.drop_column('user_organisation_roles', 'role_name')
     # ### end Alembic commands ###

alembic/versions/aeb162769644_added_sales_model_relate_sales_with_.py

@@ -1,4 +1,4 @@
-"""Added sales model, relate sales with product, organization, and payments
+"""Added sales model, relate sales with product, organisation, and payments
 
 Revision ID: aeb162769644
 Revises: 854472eb449d
@@ -24,12 +24,12 @@ def upgrade() -> None:
     sa.Column('quantity', sa.Integer(), nullable=False),
     sa.Column('amount', sa.Float(), nullable=False),
     sa.Column('product_id', sa.String(), nullable=False),
-    sa.Column('organization_id', sa.String(), nullable=False),
+    sa.Column('organisation_id', sa.String(), nullable=False),
     sa.Column('payment_id', sa.String(), nullable=True),
     sa.Column('id', sa.String(), nullable=False),
     sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
     sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
-    sa.ForeignKeyConstraint(['organization_id'], ['organizations.id'], ondelete='CASCADE'),
+    sa.ForeignKeyConstraint(['organisation_id'], ['organisations.id'], ondelete='CASCADE'),
     sa.ForeignKeyConstraint(['payment_id'], ['payments.id'], ondelete='CASCADE'),
     sa.ForeignKeyConstraint(['product_id'], ['products.id'], ondelete='CASCADE'),
     sa.PrimaryKeyConstraint('id')

alembic/versions/bb0905b42300_ensure_id_and_foreign_keys_are_of_type_.py

@@ -45,22 +45,22 @@ def upgrade() -> None:
     sa.ForeignKeyConstraint(['role_id'], ['roles.id'], ondelete='CASCADE'),
     sa.PrimaryKeyConstraint('role_id', 'permission_id')
     )
-    op.create_table('user_organization_roles',
+    op.create_table('user_organisation_roles',
     sa.Column('user_id', sa.String(), nullable=False),
-    sa.Column('organization_id', sa.String(), nullable=False),
+    sa.Column('organisation_id', sa.String(), nullable=False),
     sa.Column('role_id', sa.String(), nullable=False),
     sa.Column('status', sa.String(length=20), nullable=False),
-    sa.ForeignKeyConstraint(['organization_id'], ['organizations.id'], ondelete='CASCADE'),
+    sa.ForeignKeyConstraint(['organisation_id'], ['organisations.id'], ondelete='CASCADE'),
     sa.ForeignKeyConstraint(['role_id'], ['roles.id'], ondelete='CASCADE'),
     sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
-    sa.PrimaryKeyConstraint('user_id', 'organization_id')
+    sa.PrimaryKeyConstraint('user_id', 'organisation_id')
     )
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table('user_organization_roles')
+    op.drop_table('user_organisation_roles')
     op.drop_table('role_permissions')
     op.drop_index(op.f('ix_roles_id'), table_name='roles')
     op.drop_table('roles')

alembic/versions/d8da7731f0aa_initial_migration.py

@@ -50,11 +50,11 @@ def upgrade() -> None:
     sa.PrimaryKeyConstraint('id')
     )
     op.create_index(op.f('ix_newsletters_id'), 'newsletters', ['id'], unique=False)
-    op.create_table('organizations',
+    op.create_table('organisations',
     sa.Column('company_name', sa.String(), nullable=False),
     sa.Column('company_email', sa.String(), nullable=True),
     sa.Column('industry', sa.String(), nullable=True),
-    sa.Column('organization_type', sa.String(), nullable=True),
+    sa.Column('organisation_type', sa.String(), nullable=True),
     sa.Column('country', sa.String(), nullable=True),
     sa.Column('state', sa.String(), nullable=True),
     sa.Column('address', sa.String(), nullable=True),
@@ -66,7 +66,7 @@ def upgrade() -> None:
     sa.UniqueConstraint('company_email'),
     sa.UniqueConstraint('company_name')
     )
-    op.create_index(op.f('ix_organizations_id'), 'organizations', ['id'], unique=False)
+    op.create_index(op.f('ix_organisations_id'), 'organisations', ['id'], unique=False)
     op.create_table('product_categories',
     sa.Column('name', sa.String(), nullable=False),
     sa.Column('id', sa.String(), nullable=False),
@@ -125,7 +125,7 @@ def upgrade() -> None:
     )
     op.create_index(op.f('ix_activity_logs_id'), 'activity_logs', ['id'], unique=False)
     op.create_table('billing_plans',
-    sa.Column('organization_id', sa.String(), nullable=False),
+    sa.Column('organisation_id', sa.String(), nullable=False),
     sa.Column('name', sa.String(), nullable=False),
     sa.Column('price', sa.Numeric(), nullable=False),
     sa.Column('currency', sa.String(), nullable=False),
@@ -135,7 +135,7 @@ def upgrade() -> None:
     sa.Column('id', sa.String(), nullable=False),
     sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
     sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
-    sa.ForeignKeyConstraint(['organization_id'], ['organizations.id'], ondelete='CASCADE'),
+    sa.ForeignKeyConstraint(['organisation_id'], ['organisations.id'], ondelete='CASCADE'),
     sa.PrimaryKeyConstraint('id')
     )
     op.create_index(op.f('ix_billing_plans_id'), 'billing_plans', ['id'], unique=False)
@@ -156,13 +156,13 @@ def upgrade() -> None:
     op.create_index(op.f('ix_blogs_id'), 'blogs', ['id'], unique=False)
     op.create_table('invitations',
     sa.Column('user_id', sa.String(), nullable=False),
-    sa.Column('organization_id', sa.String(), nullable=False),
+    sa.Column('organisation_id', sa.String(), nullable=False),
     sa.Column('expires_at', sa.DateTime(timezone=True), nullable=False),
     sa.Column('is_valid', sa.Boolean(), nullable=True),
     sa.Column('id', sa.String(), nullable=False),
     sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
     sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
-    sa.ForeignKeyConstraint(['organization_id'], ['organizations.id'], ondelete='CASCADE'),
+    sa.ForeignKeyConstraint(['organisation_id'], ['organisations.id'], ondelete='CASCADE'),
     sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
     sa.PrimaryKeyConstraint('id')
     )
@@ -278,7 +278,7 @@ def upgrade() -> None:
     sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
     sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
     sa.ForeignKeyConstraint(['category_id'], ['product_categories.id'], ondelete='CASCADE'),
-    sa.ForeignKeyConstraint(['org_id'], ['organizations.id'], ondelete='CASCADE'),
+    sa.ForeignKeyConstraint(['org_id'], ['organisations.id'], ondelete='CASCADE'),
     sa.PrimaryKeyConstraint('id')
     )
     op.create_index(op.f('ix_products_id'), 'products', ['id'], unique=False)
@@ -327,14 +327,14 @@ def upgrade() -> None:
     sa.UniqueConstraint('user_id')
     )
     op.create_index(op.f('ix_token_logins_id'), 'token_logins', ['id'], unique=False)
-    op.create_table('user_organization',
+    op.create_table('user_organisation',
     sa.Column('user_id', sa.String(), nullable=False),
-    sa.Column('organization_id', sa.String(), nullable=False),
+    sa.Column('organisation_id', sa.String(), nullable=False),
     sa.Column('role', sa.Enum('admin', 'user', 'guest', 'owner', name='user_org_role'), nullable=False),
     sa.Column('status', sa.Enum('member', 'suspended', 'left', name='user_org_status'), nullable=False),
-    sa.ForeignKeyConstraint(['organization_id'], ['organizations.id'], ondelete='CASCADE'),
+    sa.ForeignKeyConstraint(['organisation_id'], ['organisations.id'], ondelete='CASCADE'),
     sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
-    sa.PrimaryKeyConstraint('user_id', 'organization_id')
+    sa.PrimaryKeyConstraint('user_id', 'organisation_id')
     )
     op.create_table('blog_dislikes',
     sa.Column('blog_id', sa.String(), nullable=False),
@@ -425,7 +425,7 @@ def downgrade() -> None:
     op.drop_table('blog_likes')
     op.drop_index(op.f('ix_blog_dislikes_id'), table_name='blog_dislikes')
     op.drop_table('blog_dislikes')
-    op.drop_table('user_organization')
+    op.drop_table('user_organisation')
     op.drop_index(op.f('ix_token_logins_id'), table_name='token_logins')
     op.drop_table('token_logins')
     op.drop_index(op.f('ix_testimonials_id'), table_name='testimonials')
@@ -464,8 +464,8 @@ def downgrade() -> None:
     op.drop_table('topics')
     op.drop_index(op.f('ix_product_categories_id'), table_name='product_categories')
     op.drop_table('product_categories')
-    op.drop_index(op.f('ix_organizations_id'), table_name='organizations')
-    op.drop_table('organizations')
+    op.drop_index(op.f('ix_organisations_id'), table_name='organisations')
+    op.drop_table('organisations')
     op.drop_index(op.f('ix_newsletters_id'), table_name='newsletters')
     op.drop_table('newsletters')
     op.drop_index(op.f('ix_faqs_id'), table_name='faqs')

alembic/versions/eb6fe394d75b_added_region_timezone_and_language_table.py

@@ -33,7 +33,7 @@ def upgrade() -> None:
     )
     op.create_index(op.f('ix_regions_id'), 'regions', ['id'], unique=False)
     op.add_column('contact_us', sa.Column('org_id', sa.String(), nullable=False))
-    op.create_foreign_key(None, 'contact_us', 'organizations', ['org_id'], ['id'], ondelete='CASCADE')
+    op.create_foreign_key(None, 'contact_us', 'organisations', ['org_id'], ['id'], ondelete='CASCADE')
     # ### end Alembic commands ###