Restructure project

app/settings/forms.py

@@ -1,5 +1,3 @@
-from app.auth import USERNAME_REGEX
-from app.models import User, UserSettingJobStatusMailNotificationLevel
 from flask_wtf import FlaskForm
 from wtforms import (
     BooleanField,
@@ -9,14 +7,35 @@ from wtforms import (
     SubmitField,
     ValidationError
 )
-from wtforms.validators import DataRequired, InputRequired, Email, EqualTo, Length, Regexp
+from wtforms.validators import (
+    DataRequired,
+    InputRequired,
+    Email,
+    EqualTo,
+    Length,
+    Regexp
+)
+from app.models import User, UserSettingJobStatusMailNotificationLevel
+from app.auth import USERNAME_REGEX
 
 
 class ChangePasswordForm(FlaskForm):
     password = PasswordField('Old password', validators=[DataRequired()])
-    new_password = PasswordField('New password', validators=[DataRequired(), EqualTo('new_password_confirmation', message='Passwords must match')])
-    new_password_confirmation = PasswordField('Confirm new password', validators=[DataRequired(), EqualTo('new_password', message='Passwords must match')])
-    submit = SubmitField('Submit')
+    new_password = PasswordField(
+        'New password',
+        validators=[
+            DataRequired(),
+            EqualTo('new_password_2', message='Passwords must match')
+        ]
+    )
+    new_password_2 = PasswordField(
+        'New password confirmation',
+        validators=[
+            DataRequired(),
+            EqualTo('new_password', message='Passwords must match')
+        ]
+    )
+    submit = SubmitField()
 
     def __init__(self, user, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -28,43 +47,51 @@ class ChangePasswordForm(FlaskForm):
 
 
 class EditGeneralSettingsForm(FlaskForm):
-    email = StringField('E-Mail', validators=[DataRequired(), Length(1, 254), Email()])
+    email = StringField(
+        'E-Mail',
+        validators=[InputRequired(), Length(max=254), Email()]
+    )
     username = StringField(
         'Username',
         validators=[
             InputRequired(),
-            Length(1, 64),
+            Length(max=64),
             Regexp(
                 USERNAME_REGEX,
-                message='Usernames must have only letters, numbers, dots or underscores'  # noqa
+                message=(
+                    'Usernames must have only letters, numbers, dots or '
+                    'underscores'
+                )
             )
         ]
     )
-    submit = SubmitField('Submit')
+    submit = SubmitField()
 
     def __init__(self, user, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.user = user
 
+    def prefill(self, user):
+        self.email.data = user.email
+        self.username.data = user.username
+
     def validate_email(self, field):
-        if (
-            field.data != self.user.email
-            and User.query.filter_by(email=field.data).first()
-        ):
+        if (field.data != self.user.email
+                and User.query.filter_by(email=field.data).first()):
             raise ValidationError('Email already registered')
 
     def validate_username(self, field):
-        if (
-            field.data != self.user.username
-            and User.query.filter_by(username=field.data).first()
-        ):
+        if (field.data != self.user.username
+                and User.query.filter_by(username=field.data).first()):
             raise ValidationError('Username already in use')
 
 
 class EditInterfaceSettingsForm(FlaskForm):
     dark_mode = BooleanField('Dark mode')
-    submit = SubmitField('Submit')
+    submit = SubmitField()
 
+    def prefill(self, user):
+        self.dark_mode.data = user.setting_dark_mode
 
 class EditNotificationSettingsForm(FlaskForm):
     job_status_mail_notification_level = SelectField(
@@ -72,11 +99,15 @@ class EditNotificationSettingsForm(FlaskForm):
         choices=[('', 'Choose your option')],
         validators=[DataRequired()]
     )
-    submit = SubmitField('Submit')
+    submit = SubmitField()
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.job_status_mail_notification_level.choices += [
-            (enum_member.name, enum_member.name.capitalize())
-            for enum_member in UserSettingJobStatusMailNotificationLevel
+            (x.name, x.name.capitalize())
+            for x in UserSettingJobStatusMailNotificationLevel
         ]
+
+    def prefill(self, user):
+        self.job_status_mail_notification_level.data = \
+            user.setting_job_status_mail_notification_level.name

app/settings/routes.py

@@ -1,32 +1,32 @@
 from flask import flash, redirect, render_template, url_for
-from flask_login import current_user, login_required, logout_user
-from . import bp, tasks
+from flask_login import current_user, login_required
+from app import db
+from app.models import UserSettingJobStatusMailNotificationLevel
+from . import bp
 from .forms import (
     ChangePasswordForm,
     EditGeneralSettingsForm,
     EditInterfaceSettingsForm,
     EditNotificationSettingsForm
 )
-from .. import db
-from ..models import UserSettingJobStatusMailNotificationLevel
 
 
 @bp.route('', methods=['GET', 'POST'])
 @login_required
-def index():
+def settings():
     change_password_form = ChangePasswordForm(
-        current_user._get_current_object(),
-        prefix='change_password_form'
+        current_user,
+        prefix='change-password-form'
     )
     edit_general_settings_form = EditGeneralSettingsForm(
-        current_user._get_current_object(),
-        prefix='edit_general_settings_form'
+        current_user,
+        prefix='edit-general-settings-form'
     )
     edit_interface_settings_form = EditInterfaceSettingsForm(
-        prefix='edit_interface_settings_form'
+        prefix='edit-interface-settings-form'
     )
     edit_notification_settings_form = EditNotificationSettingsForm(
-        prefix='edit_notification_settings_form'
+        prefix='edit-notification-settings-form'
     )
 
     if change_password_form.submit.data and change_password_form.validate():
@@ -34,58 +34,38 @@ def index():
         db.session.commit()
         flash('Your changes have been saved')
         return redirect(url_for('.index'))
-    if (
-        edit_general_settings_form.submit.data
-        and edit_general_settings_form.validate()
-    ):
+    if (edit_general_settings_form.submit.data
+            and edit_general_settings_form.validate()):
         current_user.email = edit_general_settings_form.email.data
         current_user.username = edit_general_settings_form.username.data
         db.session.commit()
         flash('Your changes have been saved')
-        return redirect(url_for('.index'))
-    if (
-        edit_interface_settings_form.submit.data
-        and edit_interface_settings_form.validate()
-    ):
-        current_user.setting_dark_mode = \
-            edit_interface_settings_form.dark_mode.data
+        return redirect(url_for('.settings'))
+    if (edit_interface_settings_form.submit.data
+            and edit_interface_settings_form.validate()):
+        current_user.setting_dark_mode = (
+            edit_interface_settings_form.dark_mode.data)
         db.session.commit()
         flash('Your changes have been saved')
-        return redirect(url_for('.index'))
-    if (
-        edit_notification_settings_form.submit.data
-        and edit_notification_settings_form.validate()
-    ):
-        current_user.setting_job_status_mail_notification_level = \
+        return redirect(url_for('.settings'))
+    if (edit_notification_settings_form.submit.data
+            and edit_notification_settings_form.validate()):
+        current_user.setting_job_status_mail_notification_level = (
             UserSettingJobStatusMailNotificationLevel[
                 edit_notification_settings_form.job_status_mail_notification_level.data  # noqa
             ]
+        )
         db.session.commit()
         flash('Your changes have been saved')
-        return redirect(url_for('.index'))
-    edit_general_settings_form.email.data = current_user.email
-    edit_general_settings_form.username.data = current_user.username
-    edit_interface_settings_form.dark_mode.data = \
-        current_user.setting_dark_mode
-    edit_notification_settings_form.job_status_mail_notification_level.data = \
-        current_user.setting_job_status_mail_notification_level.name
+        return redirect(url_for('.settings'))
+    edit_general_settings_form.prefill(current_user)
+    edit_interface_settings_form.prefill(current_user)
+    edit_notification_settings_form.prefill(current_user)
     return render_template(
-        'settings/index.html.j2',
+        'settings/settings.html.j2',
         change_password_form=change_password_form,
         edit_general_settings_form=edit_general_settings_form,
         edit_interface_settings_form=edit_interface_settings_form,
         edit_notification_settings_form=edit_notification_settings_form,
         title='Settings'
     )
-
-
-@bp.route('/delete')
-@login_required
-def delete():
-    """
-    View to delete current_user and all associated data.
-    """
-    tasks.delete_user(current_user.id)
-    logout_user()
-    flash('Your account has been marked for deletion')
-    return redirect(url_for('main.index'))

app/settings/tasks.py

@@ -1,13 +0,0 @@
-from app import db
-from app.decorators import background
-from app.models import User
-
-
-@background
-def delete_user(user_id, *args, **kwargs):
-    with kwargs['app'].app_context():
-        user = User.query.get(user_id)
-        if user is None:
-            raise Exception(f'User {user_id} not found')
-        user.delete()
-        db.session.commit()