From 501c625ddf5c37e8cdaa1e5f957f6d5906d343ae Mon Sep 17 00:00:00 2001 From: Son Nguyen Kim Date: Tue, 27 Jun 2023 11:07:02 +0200 Subject: [PATCH] set default alias suffix to word (#1765) Co-authored-by: Son NK --- app/models.py | 2 +- tests/api/test_setting.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/models.py b/app/models.py index 7c143d49..3b4df673 100644 --- a/app/models.py +++ b/app/models.py @@ -445,7 +445,7 @@ class User(Base, ModelMixin, UserMixin, PasswordOracle): random_alias_suffix = sa.Column( sa.Integer, nullable=False, - default=AliasSuffixEnum.random_string.value, + default=AliasSuffixEnum.word.value, server_default=str(AliasSuffixEnum.random_string.value), ) diff --git a/tests/api/test_setting.py b/tests/api/test_setting.py index 3f545b3d..199a8409 100644 --- a/tests/api/test_setting.py +++ b/tests/api/test_setting.py @@ -17,7 +17,7 @@ def test_get_setting(flask_client): "notification": True, "random_alias_default_domain": "sl.local", "sender_format": "AT", - "random_alias_suffix": "random_string", + "random_alias_suffix": "word", } @@ -95,11 +95,13 @@ def test_get_setting_domains_v2(flask_client): def test_update_settings_random_alias_suffix(flask_client): user = login(flask_client) # default random_alias_suffix is random_string - assert user.random_alias_suffix == AliasSuffixEnum.random_string.value + assert user.random_alias_suffix == AliasSuffixEnum.word.value r = flask_client.patch("/api/setting", json={"random_alias_suffix": "invalid"}) assert r.status_code == 400 - r = flask_client.patch("/api/setting", json={"random_alias_suffix": "word"}) + r = flask_client.patch( + "/api/setting", json={"random_alias_suffix": "random_string"} + ) assert r.status_code == 200 - assert user.random_alias_suffix == AliasSuffixEnum.word.value + assert user.random_alias_suffix == AliasSuffixEnum.random_string.value