fix: Add proper unique constraints and remove soft deletion from models

app/models/custom_form.py

@@ -5,7 +5,6 @@
 
 from app.api.helpers.utilities import to_snake_case
 from app.models import db
-from app.models.base import SoftDeletionModel
 
 SESSION_FORM = {
     "title": {"include": 1, "require": 1},
@@ -135,7 +134,7 @@
 }
 
 
-class CustomForms(SoftDeletionModel):
+class CustomForms(db.Model):
     """custom form model class"""
 
     __tablename__ = 'custom_forms'

app/models/discount_code.py

@@ -13,7 +13,7 @@
 class DiscountCode(SoftDeletionModel):
     __tablename__ = "discount_codes"
     __table_args__ = (
-        UniqueConstraint('event_id', 'code', name='uq_event_discount_code'),
+        UniqueConstraint('event_id', 'code', 'deleted_at', name='uq_event_discount_code'),
     )
 
     id = db.Column(db.Integer, primary_key=True)

app/models/event_sub_topic.py

@@ -2,10 +2,9 @@
 
 from app.api.helpers.db import get_new_slug
 from app.models import db
-from app.models.base import SoftDeletionModel
 
 
-class EventSubTopic(SoftDeletionModel):
+class EventSubTopic(db.Model):
     """Event sub topic object table"""
 
     __tablename__ = 'event_sub_topics'

app/models/permission.py

@@ -1,13 +1,17 @@
 from app.models import db
 
+from app.models.base import SoftDeletionModel
 
-class Permission(db.Model):
+
+class Permission(SoftDeletionModel):
     """Role-Service Permissions
     """
 
     __tablename__ = 'permissions'
     __table_args__ = (
-        db.UniqueConstraint('role_id', 'service_id', name='role_service_uc'),
+        db.UniqueConstraint(
+            'role_id', 'service_id', 'deleted_at', name='role_service_uc'
+        ),
     )
 
     id = db.Column(db.Integer, primary_key=True)

app/models/role_invite.py

@@ -17,7 +17,9 @@ def generate_hash():
 class RoleInvite(SoftDeletionModel):
     __tablename__ = 'role_invites'
     __table_args__ = (
-        UniqueConstraint('email', 'role_id', 'event_id', name='email_role_event_uc'),
+        UniqueConstraint(
+            'email', 'role_id', 'event_id', 'deleted_at', name='email_role_event_uc',
+        ),
     )
 
     id = db.Column(db.Integer, primary_key=True)

app/models/ticket_fee.py

@@ -1,12 +1,14 @@
 from sqlalchemy import desc
 from sqlalchemy.schema import UniqueConstraint
 
+from app.models.base import SoftDeletionModel
+
 from app.models import db
 
 DEFAULT_FEE = 0.0
 
 
-class TicketFees(db.Model):
+class TicketFees(SoftDeletionModel):
     """Persists service and maximum fees for a currency in a country"""
 
     __tablename__ = 'ticket_fees'

migrations/versions/rev-2020-06-30-20:07:55-f177c14710f1_.py

@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: f177c14710f1
+Revises: 64439b77fa6d
+Create Date: 2020-06-30 20:07:55.320285
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = 'f177c14710f1'
+down_revision = '64439b77fa6d'
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('custom_forms', 'deleted_at')
+    op.drop_column('event_sub_topics', 'deleted_at')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('event_sub_topics', sa.Column('deleted_at', postgresql.TIMESTAMP(timezone=True), autoincrement=False, nullable=True))
+    op.add_column('custom_forms', sa.Column('deleted_at', postgresql.TIMESTAMP(timezone=True), autoincrement=False, nullable=True))
+    # ### end Alembic commands ###

migrations/versions/rev-2020-06-30-23:53:04-600567d07668_.py

@@ -0,0 +1,42 @@
+"""empty message
+
+Revision ID: 600567d07668
+Revises: f177c14710f1
+Create Date: 2020-06-30 23:53:04.633840
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+
+
+# revision identifiers, used by Alembic.
+revision = '600567d07668'
+down_revision = 'f177c14710f1'
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint('uq_event_discount_code', 'discount_codes', type_='unique')
+    op.create_unique_constraint('uq_event_discount_code', 'discount_codes', ['event_id', 'code', 'deleted_at'])
+    op.add_column('permissions', sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True))
+    op.drop_constraint('role_service_uc', 'permissions', type_='unique')
+    op.create_unique_constraint('role_service_uc', 'permissions', ['role_id', 'service_id', 'deleted_at'])
+    op.drop_constraint('email_role_event_uc', 'role_invites', type_='unique')
+    op.create_unique_constraint('email_role_event_uc', 'role_invites', ['email', 'role_id', 'event_id', 'deleted_at'])
+    op.add_column('ticket_fees', sa.Column('deleted_at', sa.DateTime(timezone=True), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('ticket_fees', 'deleted_at')
+    op.drop_constraint('email_role_event_uc', 'role_invites', type_='unique')
+    op.create_unique_constraint('email_role_event_uc', 'role_invites', ['email', 'role_id', 'event_id'])
+    op.drop_constraint('role_service_uc', 'permissions', type_='unique')
+    op.create_unique_constraint('role_service_uc', 'permissions', ['role_id', 'service_id'])
+    op.drop_column('permissions', 'deleted_at')
+    op.drop_constraint('uq_event_discount_code', 'discount_codes', type_='unique')
+    op.create_unique_constraint('uq_event_discount_code', 'discount_codes', ['event_id', 'code'])
+    # ### end Alembic commands ###