simple-login/app
1
1
Fork 0
mirror of https://github.com/simple-login/app.git synced 2025-10-06 05:17:41 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix greylog query

Browse source
This commit is contained in:
Son NK 2020-04-04 18:07:05 +02:00
parent eccc8a71e9
commit 655090242e
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/greylisting.py
View file

@ -15,12 +15,9 @@ def greylisting_needed_for_alias(alias: Alias) -> bool:
# get the nb of activity on this alias # get the nb of activity on this alias
nb_activity = ( nb_activity = (
db.session.query(EmailLog, Contact) db.session.query(EmailLog)
.filter( .join(Contact, EmailLog.contact_id == Contact.id)
EmailLog.contact_id == Contact.id, .filter(Contact.alias_id == alias.id, EmailLog.created_at > min_time,)
Contact.alias_id == alias.id,
EmailLog.created_at > min_time,
)
.group_by(EmailLog.id) .group_by(EmailLog.id)
.count() .count()
) )
@ -39,13 +36,10 @@ def greylisting_needed_for_mailbox(alias: Alias) -> bool:
# get nb of activity on this mailbox # get nb of activity on this mailbox
nb_activity = ( nb_activity = (
db.session.query(EmailLog, Contact, Alias) db.session.query(EmailLog)
.filter( .join(Contact, EmailLog.contact_id == Contact.id)
EmailLog.contact_id == Contact.id, .join(Alias, Contact.alias_id == Alias.id)
Contact.alias_id == Alias.id, .filter(Alias.mailbox_id == alias.mailbox_id, EmailLog.created_at > min_time,)
Alias.mailbox_id == alias.mailbox_id,
EmailLog.created_at > min_time,
)
.group_by(EmailLog.id) .group_by(EmailLog.id)
.count() .count()
) )