fix delete_alias: do not use IntegrityError
This commit is contained in:
parent
ef196c5b4a
commit
77bfa67402
|
@ -148,27 +148,21 @@ def delete_alias(alias: Alias, user: User):
|
||||||
"""
|
"""
|
||||||
# save deleted alias to either global or domain trash
|
# save deleted alias to either global or domain trash
|
||||||
if alias.custom_domain_id:
|
if alias.custom_domain_id:
|
||||||
try:
|
if DomainDeletedAlias.get_by(
|
||||||
|
email=alias.email, domain_id=alias.custom_domain_id
|
||||||
|
):
|
||||||
|
LOG.debug("add %s to domain %s trash", alias, alias.custom_domain_id)
|
||||||
db.session.add(
|
db.session.add(
|
||||||
DomainDeletedAlias(
|
DomainDeletedAlias(
|
||||||
user_id=user.id, email=alias.email, domain_id=alias.custom_domain_id
|
user_id=user.id, email=alias.email, domain_id=alias.custom_domain_id
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
except IntegrityError:
|
|
||||||
LOG.exception(
|
|
||||||
"alias %s domain %s has been added before to DeletedAlias",
|
|
||||||
alias.email,
|
|
||||||
alias.custom_domain_id,
|
|
||||||
)
|
|
||||||
db.session.rollback()
|
|
||||||
else:
|
else:
|
||||||
try:
|
if not DeletedAlias.get_by(email=alias.email):
|
||||||
|
LOG.d("add %s to global trash", alias)
|
||||||
db.session.add(DeletedAlias(email=alias.email))
|
db.session.add(DeletedAlias(email=alias.email))
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
except IntegrityError:
|
|
||||||
LOG.exception("alias %s has been added before to DeletedAlias", alias.email)
|
|
||||||
db.session.rollback()
|
|
||||||
|
|
||||||
Alias.query.filter(Alias.id == alias.id).delete()
|
Alias.query.filter(Alias.id == alias.id).delete()
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
from app.alias_utils import delete_alias
|
||||||
|
from app.extensions import db
|
||||||
|
from app.models import User, Alias, DeletedAlias
|
||||||
|
|
||||||
|
|
||||||
|
def test_delete_alias(flask_client):
|
||||||
|
user = User.create(
|
||||||
|
email="a@b.c", password="password", name="Test User", activated=True
|
||||||
|
)
|
||||||
|
db.session.commit()
|
||||||
|
alias = Alias.create(
|
||||||
|
user_id=user.id, email="first@d1.test", mailbox_id=user.default_mailbox_id
|
||||||
|
)
|
||||||
|
db.session.commit()
|
||||||
|
assert Alias.get_by(email="first@d1.test")
|
||||||
|
|
||||||
|
delete_alias(alias, user)
|
||||||
|
assert Alias.get_by(email="first@d1.test") is None
|
||||||
|
assert DeletedAlias.get_by(email=alias.email)
|
||||||
|
|
||||||
|
|
||||||
|
def test_delete_alias_already_in_trash(flask_client):
|
||||||
|
"""delete an alias that's already in alias trash"""
|
||||||
|
user = User.create(
|
||||||
|
email="a@b.c", password="password", name="Test User", activated=True
|
||||||
|
)
|
||||||
|
db.session.commit()
|
||||||
|
alias = Alias.create(
|
||||||
|
user_id=user.id, email="first@d1.test", mailbox_id=user.default_mailbox_id
|
||||||
|
)
|
||||||
|
db.session.commit()
|
||||||
|
|
||||||
|
# add the alias to global trash
|
||||||
|
db.session.add(DeletedAlias(email=alias.email))
|
||||||
|
db.session.commit()
|
||||||
|
|
||||||
|
delete_alias(alias, user)
|
||||||
|
assert Alias.get_by(email="first@d1.test") is None
|
Loading…
Reference in New Issue