fix mailbox.nb_alias(): take into account multiple mailboxes per alias case

This commit is contained in:
Son NK 2020-06-03 09:06:38 +02:00
parent f852bc508b
commit acac06188c
1 changed files with 6 additions and 1 deletions

View File

@ -1323,7 +1323,10 @@ class Mailbox(db.Model, ModelMixin):
__table_args__ = (db.UniqueConstraint("user_id", "email", name="uq_mailbox_user"),)
def nb_alias(self):
return Alias.filter_by(mailbox_id=self.id).count()
return (
AliasMailbox.filter_by(mailbox_id=self.id).count()
+ Alias.filter_by(mailbox_id=self.id).count()
)
@classmethod
def delete(cls, obj_id):
@ -1405,6 +1408,8 @@ class Referral(db.Model, ModelMixin):
code = db.Column(db.String(128), unique=True, nullable=False)
user = db.relationship(User, foreign_keys=[user_id])
def nb_user(self):
return User.filter_by(referral_id=self.id, activated=True).count()