Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(admin): show better info for alias mailboxes #2253

Merged
merged 2 commits into from
Oct 8, 2024
Merged

feat(admin): show better info for alias mailboxes #2253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df7de3a
feat(admin): show better info for alias mailboxes
cquintana92 Oct 8, 2024
e473427
fix: limit the amount of alias mailboxes shown
cquintana92 Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions app/admin_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
DeletedAlias,
DomainDeletedAlias,
PartnerUser,
AliasMailbox,
)
from app.newsletter_utils import send_newsletter_to_user, send_newsletter_to_address

Expand Down Expand Up @@ -785,6 +786,25 @@ def mailbox_list(user: User) -> list[Mailbox]:
def mailbox_count(user: User) -> int:
return Mailbox.filter_by(user_id=user.id).order_by(Mailbox.id.desc()).count()

@staticmethod
def alias_mailboxes(alias: Alias) -> list[Mailbox]:
return (
Session.query(Mailbox)
.filter(Mailbox.id == Alias.mailbox_id, Alias.id == alias.id)
.union(
Session.query(Mailbox)
.join(AliasMailbox, Mailbox.id == AliasMailbox.mailbox_id)
.filter(AliasMailbox.alias_id == alias.id)
)
.order_by(Mailbox.id)
.limit(10)
.all()
)

@staticmethod
def alias_mailbox_count(alias: Alias) -> int:
return len(alias.mailboxes)

@staticmethod
def alias_list(user: User) -> list[Alias]:
return (
Expand Down
Loading
Loading