Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

optimize get_alias_infos_with_pagination_v3 when searching on mailbox email

This commit is contained in:
Son Nguyen Kim 2021-08-06 09:18:14 +02:00
parent 12150a3656
commit 2e9b288d7b
1 changed files with 19 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
app/api/serializer.py
View File

@ -172,34 +172,6 @@ def get_alias_infos_with_pagination_v3(
.subquery() .subquery()
) )
if query:
mailboxes_sub = (
db.session.query(
Alias.id,
func.count(Mailbox.id).label("nb_matched_mailboxes"),
)
.join(AliasMailbox, Alias.id == AliasMailbox.alias_id, isouter=True)
.join(
Mailbox,
and_(
AliasMailbox.mailbox_id == Mailbox.id,
Mailbox.email.ilike(f"%{query}%"),
),
isouter=True,
)
)
else:
mailboxes_sub = (
db.session.query(
Alias.id,
func.count(Mailbox.id).label("nb_matched_mailboxes"),
)
.join(AliasMailbox, Alias.id == AliasMailbox.alias_id, isouter=True)
.join(Mailbox, AliasMailbox.mailbox_id == Mailbox.id, isouter=True)
)
mailboxes_sub = mailboxes_sub.group_by(Alias.id).subquery()
latest_activity = case( latest_activity = case(
[ [
(Alias.created_at > EmailLog.created_at, Alias.created_at), (Alias.created_at > EmailLog.created_at, Alias.created_at),
@ -222,10 +194,8 @@ def get_alias_infos_with_pagination_v3(
.join(Contact, Alias.id == Contact.alias_id, isouter=True) .join(Contact, Alias.id == Contact.alias_id, isouter=True)
.join(CustomDomain, Alias.custom_domain_id == CustomDomain.id, isouter=True) .join(CustomDomain, Alias.custom_domain_id == CustomDomain.id, isouter=True)
.join(EmailLog, Contact.id == EmailLog.contact_id, isouter=True) .join(EmailLog, Contact.id == EmailLog.contact_id, isouter=True)
.join(Mailbox, Alias.mailbox_id == Mailbox.id, isouter=True)
.filter(Alias.id == alias_activity_subquery.c.id) .filter(Alias.id == alias_activity_subquery.c.id)
.filter(Alias.id == alias_contact_subquery.c.id) .filter(Alias.id == alias_contact_subquery.c.id)
.filter(Alias.id == mailboxes_sub.c.id)
.filter( .filter(
or_( or_(
EmailLog.created_at EmailLog.created_at
@ -244,15 +214,25 @@ def get_alias_infos_with_pagination_v3(
) )
if query: if query:
q = q.filter( q = (
or_( # to find mailbox whose email match the query
Alias.email.ilike(f"%{query}%"), q.join(AliasMailbox, Alias.id == AliasMailbox.alias_id, isouter=True)
# can't use match() here as it uses to_tsquery that expected a tsquery input .join(
# Alias.ts_vector.match(query), Mailbox,
Alias.ts_vector.op("@@")(func.plainto_tsquery(query)), or_(
Alias.name.ilike(f"%{query}%"), Mailbox.id == Alias.mailbox_id,
mailboxes_sub.c.nb_matched_mailboxes > 0, Mailbox.id == AliasMailbox.mailbox_id,
Mailbox.email.ilike(f"%{query}%"), ),
)
.filter(
or_(
Alias.email.ilike(f"%{query}%"),
# can't use match() here as it uses to_tsquery that expected a tsquery input
# Alias.ts_vector.match(query),
Alias.ts_vector.op("@@")(func.plainto_tsquery(query)),
Alias.name.ilike(f"%{query}%"),
Mailbox.email.ilike(f"%{query}%"),
)
) )
) )