diff --git a/app/api/views/setting.py b/app/api/views/setting.py index a2e6de64..ea7d4405 100644 --- a/app/api/views/setting.py +++ b/app/api/views/setting.py @@ -78,7 +78,7 @@ def update_setting(): # make sure only default_random_alias_domain_id or default_random_alias_public_domain_id is set user.default_random_alias_public_domain_id = sl_domain.id - user.default_random_alias_domain_id = None + user.default_alias_custom_domain_id = None else: custom_domain = CustomDomain.get_by(domain=default_domain) if not custom_domain: @@ -91,7 +91,7 @@ def update_setting(): else: # make sure only default_random_alias_domain_id or # default_random_alias_public_domain_id is set - user.default_random_alias_domain_id = custom_domain.id + user.default_alias_custom_domain_id = custom_domain.id user.default_random_alias_public_domain_id = None db.session.commit() diff --git a/app/dashboard/views/custom_alias.py b/app/dashboard/views/custom_alias.py index 03fffa62..328390aa 100644 --- a/app/dashboard/views/custom_alias.py +++ b/app/dashboard/views/custom_alias.py @@ -41,7 +41,7 @@ def available_suffixes(user: User) -> [bool, str, str]: suffix_info = (True, suffix, signer.sign(suffix).decode()) # put the default domain to top - if user.default_random_alias_domain_id == alias_domain.id: + if user.default_alias_custom_domain_id == alias_domain.id: suffixes.insert(0, suffix_info) else: suffixes.append(suffix_info) @@ -97,7 +97,7 @@ def available_suffixes_more_info(user: User) -> [SuffixInfo]: suffix = "." + random_word() + "@" + alias_domain.domain suffix_info = SuffixInfo(True, suffix, signer.sign(suffix).decode(), False) # put the default domain to top - if user.default_random_alias_domain_id == alias_domain.id: + if user.default_alias_custom_domain_id == alias_domain.id: suffixes.insert(0, suffix_info) else: suffixes.append(suffix_info) diff --git a/app/dashboard/views/setting.py b/app/dashboard/views/setting.py index 27131035..578419ed 100644 --- a/app/dashboard/views/setting.py +++ b/app/dashboard/views/setting.py @@ -209,7 +209,7 @@ def setting(): # make sure only default_random_alias_domain_id or default_random_alias_public_domain_id is set current_user.default_random_alias_public_domain_id = sl_domain.id - current_user.default_random_alias_domain_id = None + current_user.default_alias_custom_domain_id = None else: custom_domain = CustomDomain.get_by(domain=default_domain) if custom_domain: @@ -224,13 +224,13 @@ def setting(): else: # make sure only default_random_alias_domain_id or # default_random_alias_public_domain_id is set - current_user.default_random_alias_domain_id = ( + current_user.default_alias_custom_domain_id = ( custom_domain.id ) current_user.default_random_alias_public_domain_id = None else: - current_user.default_random_alias_domain_id = None + current_user.default_alias_custom_domain_id = None current_user.default_random_alias_public_domain_id = None db.session.commit() diff --git a/app/models.py b/app/models.py index db0afaac..ba707f6c 100644 --- a/app/models.py +++ b/app/models.py @@ -205,7 +205,7 @@ class User(db.Model, ModelMixin, UserMixin): # the default domain that's used when user creates a new random alias # default_random_alias_domain_id XOR default_random_alias_public_domain_id - default_random_alias_domain_id = db.Column( + default_alias_custom_domain_id = db.Column( db.ForeignKey("custom_domain.id", ondelete="SET NULL"), nullable=True, default=None, @@ -546,8 +546,8 @@ class User(db.Model, ModelMixin, UserMixin): def default_random_alias_domain(self) -> str: """return the domain used for the random alias""" - if self.default_random_alias_domain_id: - custom_domain = CustomDomain.get(self.default_random_alias_domain_id) + if self.default_alias_custom_domain_id: + custom_domain = CustomDomain.get(self.default_alias_custom_domain_id) # sanity check if ( not custom_domain @@ -572,7 +572,7 @@ class User(db.Model, ModelMixin, UserMixin): self, sl_domain, ) - self.default_random_alias_domain_id = None + self.default_alias_custom_domain_id = None self.default_random_alias_public_domain_id = None db.session.commit() return FIRST_ALIAS_DOMAIN @@ -1045,8 +1045,8 @@ class Alias(db.Model, ModelMixin): random_email = None - if user.default_random_alias_domain_id: - custom_domain = CustomDomain.get(user.default_random_alias_domain_id) + if user.default_alias_custom_domain_id: + custom_domain = CustomDomain.get(user.default_alias_custom_domain_id) random_email = generate_email( scheme=scheme, in_hex=in_hex, alias_domain=custom_domain.domain ) diff --git a/migrations/versions/2020_123114_f66ca777f409_.py b/migrations/versions/2020_123114_f66ca777f409_.py new file mode 100644 index 00000000..07ce0f03 --- /dev/null +++ b/migrations/versions/2020_123114_f66ca777f409_.py @@ -0,0 +1,26 @@ +"""empty message + +Revision ID: f66ca777f409 +Revises: 1919f1859215 +Create Date: 2020-12-31 14:01:54.065360 + +""" +import sqlalchemy_utils +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'f66ca777f409' +down_revision = '1919f1859215' +branch_labels = None +depends_on = None + + +def upgrade(): + op.alter_column('users', 'default_random_alias_domain_id', new_column_name='default_alias_custom_domain_id') + + + +def downgrade(): + op.alter_column('users', 'default_alias_custom_domain_id', new_column_name='default_random_alias_domain_id')