Remove DeletedAlias.user_id column

app/alias_utils.py

@@ -136,7 +136,7 @@ def delete_alias(alias: Alias, user: User):
 
     # try to save deleted alias
     try:
-        DeletedAlias.create(user_id=user.id, email=email)
+        DeletedAlias.create(email=email)
         db.session.commit()
     # this can happen when a previously deleted alias is re-created via catch-all or directory feature
     except IntegrityError:

app/models.py

@@ -999,7 +999,6 @@ class AppleSubscription(db.Model, ModelMixin):
 class DeletedAlias(db.Model, ModelMixin):
     """Store all deleted alias to make sure they are NOT reused"""
 
-    user_id = db.Column(db.ForeignKey(User.id, ondelete="cascade"), nullable=False)
     email = db.Column(db.String(256), unique=True, nullable=False)
 
 

migrations/versions/2020_050722_0cfbb70ce235_.py

@@ -0,0 +1,31 @@
+"""empty message
+
+Revision ID: 0cfbb70ce235
+Revises: 925b93d92809
+Create Date: 2020-05-07 22:40:06.773148
+
+"""
+import sqlalchemy_utils
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '0cfbb70ce235'
+down_revision = '925b93d92809'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint('deleted_alias_user_id_fkey', 'deleted_alias', type_='foreignkey')
+    op.drop_column('deleted_alias', 'user_id')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('deleted_alias', sa.Column('user_id', sa.INTEGER(), autoincrement=False, nullable=False))
+    op.create_foreign_key('deleted_alias_user_id_fkey', 'deleted_alias', 'users', ['user_id'], ['id'], ondelete='CASCADE')
+    # ### end Alembic commands ###

server.py

@@ -213,8 +213,8 @@ def fake_data():
 
     ClientUser.create(user_id=user.id, client_id=client1.id, name="Fake Name")
 
-    DeletedAlias.create(user_id=user.id, email="d1@ab.cd")
+    DeletedAlias.create(email="d1@ab.cd")
-    DeletedAlias.create(user_id=user.id, email="d2@ab.cd")
+    DeletedAlias.create(email="d2@ab.cd")
     db.session.commit()
 
     referral = Referral.create(user_id=user.id, code="REFCODE", name="First referral")