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

app/api/custom/orders.py

@@ -229,9 +229,7 @@ def complete_order(order_id):
         )
     form_fields = (
         db.session.query(CustomForms)
-        .filter_by(
-            event_id=order.event_id, form='attendee', is_included=True, deleted_at=None
-        )
+        .filter_by(event_id=order.event_id, form='attendee', is_included=True)
         .all()
     )
     for attendee, updated_attendee in zip(attendees, updated_attendees):

app/api/event_copy.py

@@ -51,7 +51,7 @@ def create_event_copy(identifier):
         event_id=event.id, deleted_at=None
     ).all()
     tracks = Track.query.filter_by(event_id=event.id, deleted_at=None).all()
-    custom_forms = CustomForms.query.filter_by(event_id=event.id, deleted_at=None).all()
+    custom_forms = CustomForms.query.filter_by(event_id=event.id).all()
     discount_codes = DiscountCode.query.filter_by(
         event_id=event.id, deleted_at=None
     ).all()

app/api/helpers/custom_forms.py

@@ -31,7 +31,7 @@ def get_schema(form_fields):
 
 def validate_custom_form_constraints(form, obj):
     form_fields = CustomForms.query.filter_by(
-        form=form, event_id=obj.event_id, is_included=True, deleted_at=None,
+        form=form, event_id=obj.event_id, is_included=True,
     ).all()
     required_form_fields = filter(lambda field: field.is_required, form_fields)
     missing_required_fields = []

app/api/schema/custom_forms.py

@@ -1,14 +1,13 @@
 from marshmallow import validate as validate
 from marshmallow_jsonapi import fields
-from marshmallow_jsonapi.flask import Relationship
+from marshmallow_jsonapi.flask import Relationship, Schema
 
 from app.api.helpers.utilities import dasherize
-from app.api.schema.base import SoftDeletionSchema
 from utils.common import use_defaults
 
 
 @use_defaults()
-class CustomFormSchema(SoftDeletionSchema):
+class CustomFormSchema(Schema):
     """
     API Schema for Custom Forms database model
     """

app/api/schema/event_sub_topics.py

@@ -1,11 +1,10 @@
 from marshmallow_jsonapi import fields
-from marshmallow_jsonapi.flask import Relationship
+from marshmallow_jsonapi.flask import Relationship, Schema
 
 from app.api.helpers.utilities import dasherize
-from app.api.schema.base import SoftDeletionSchema
 
 
-class EventSubTopicSchema(SoftDeletionSchema):
+class EventSubTopicSchema(Schema):
     """
     Api Schema for event sub topic model
     """

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)

docs/api/blueprint/custom_forms.apib

@@ -72,7 +72,6 @@ Create a new Custom Form with event_id.
                     "field-identifier": "name",
                     "is-included": false,
                     "is-fixed": false,
-                    "deleted-at": null,
                     "type": "text"
                 },
                 "type": "custom-form",
@@ -123,7 +122,6 @@ Get a single custom form.
                     "field-identifier": "name",
                     "is-fixed": false,
                     "is-included": false,
-                    "deleted-at": null,
                     "type": "text"
                 },
                 "type": "custom-form",
@@ -187,7 +185,6 @@ Update a single custom form with `id`.
                     "form": "speaker",
                     "field-identifier": "name",
                     "is-fixed": false,
-                    "deleted-at": null,
                     "is-included": false,
                     "type": "text"
                 },
@@ -271,7 +268,6 @@ Get a list of Custom Forms for an event.
                         "field-identifier": "name",
                         "is-included": false,
                         "is-fixed": false,
-                        "deleted-at": null,
                         "type": "text"
                     },
                     "type": "custom-form",

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

@@ -0,0 +1,33 @@
+"""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.execute('DELETE FROM custom_forms WHERE deleted_at IS NOT NULL')
+    op.execute('DELETE FROM event_sub_topics WHERE deleted_at IS NOT NULL')
+
+    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-07-03-01:29:29-4e9450c16147_.py

@@ -0,0 +1,40 @@
+"""empty message
+
+Revision ID: 4e9450c16147
+Revises: f177c14710f1
+Create Date: 2020-07-03 01:29:29.959740
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+
+
+# revision identifiers, used by Alembic.
+revision = '4e9450c16147'
+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'])
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    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 ###