make include_sender_in_reverse_alias non nullable

app/email_utils.py

@@ -877,7 +877,7 @@ def generate_reply_email(contact_email: str, user: User) -> str:
 
     include_sender_in_reverse_alias = False
 
-    # user has chosen an option explicitly
+    # user has set this option explicitly
     if user.include_sender_in_reverse_alias is not None:
         include_sender_in_reverse_alias = user.include_sender_in_reverse_alias
 

app/models.py

@@ -284,7 +284,7 @@ class User(db.Model, ModelMixin, UserMixin):
 
     # whether to include the sender address in reverse-alias
     include_sender_in_reverse_alias = db.Column(
-        db.Boolean, default=False, nullable=True
+        db.Boolean, default=False, nullable=False, server_default="0"
     )
 
     @classmethod

migrations/versions/2021_022415_e831a883153a_.py

@@ -0,0 +1,34 @@
+"""empty message
+
+Revision ID: e831a883153a
+Revises: de7aa5280210
+Create Date: 2021-02-24 15:39:50.029276
+
+"""
+import sqlalchemy_utils
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'e831a883153a'
+down_revision = 'de7aa5280210'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('users', 'include_sender_in_reverse_alias',
+                    server_default='0',
+               existing_type=sa.BOOLEAN(),
+               nullable=False)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('users', 'include_sender_in_reverse_alias',
+               existing_type=sa.BOOLEAN(),
+               nullable=True)
+    # ### end Alembic commands ###

server.py

@@ -212,7 +212,6 @@ def fake_data():
         intro_shown=True,
         fido_uuid=None,
     )
-    user.include_sender_in_reverse_alias = None
     user.trial_end = None
     db.session.commit()