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

handle case where alias does not have any activity in get_alias_infos_with_pagination_v3

This commit is contained in:
Son NK 2020-08-21 20:39:18 +02:00
parent 30fe09185f
commit d7583f1733
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/api/serializer.py
View File

@ -232,13 +232,16 @@ def get_alias_infos_with_pagination_v3(
.subquery()
)
q = db.session.query(
Alias, Contact, EmailLog, sub.c.nb_reply, sub.c.nb_blocked, sub.c.nb_forward
).filter(
Alias.id == sub.c.id,
Alias.id == Contact.alias_id,
Contact.id == EmailLog.contact_id,
EmailLog.created_at == sub.c.latest,
q = (
db.session.query(
Alias, Contact, EmailLog, sub.c.nb_reply, sub.c.nb_blocked, sub.c.nb_forward
)
.join(Contact, Alias.id == Contact.alias_id, isouter=True)
.join(EmailLog, Contact.id == EmailLog.contact_id, isouter=True)
.filter(Alias.id == sub.c.id)
.filter(
or_(EmailLog.created_at == sub.c.latest, Alias.created_at == sub.c.latest)
)
)
if query: