From 655090242e055cb0c19b352aed1451533f0ba511 Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Sat, 4 Apr 2020 18:07:05 +0200
Subject: [PATCH] Fix greylog query

---
 app/greylisting.py | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/greylisting.py b/app/greylisting.py
index 53b246c9..87c36464 100644
--- a/app/greylisting.py
+++ b/app/greylisting.py
@@ -15,12 +15,9 @@ def greylisting_needed_for_alias(alias: Alias) -> bool:
 
     # get the nb of activity on this alias
     nb_activity = (
-        db.session.query(EmailLog, Contact)
-        .filter(
-            EmailLog.contact_id == Contact.id,
-            Contact.alias_id == alias.id,
-            EmailLog.created_at > min_time,
-        )
+        db.session.query(EmailLog)
+        .join(Contact, EmailLog.contact_id == Contact.id)
+        .filter(Contact.alias_id == alias.id, EmailLog.created_at > min_time,)
         .group_by(EmailLog.id)
         .count()
     )
@@ -39,13 +36,10 @@ def greylisting_needed_for_mailbox(alias: Alias) -> bool:
 
     # get nb of activity on this mailbox
     nb_activity = (
-        db.session.query(EmailLog, Contact, Alias)
-        .filter(
-            EmailLog.contact_id == Contact.id,
-            Contact.alias_id == Alias.id,
-            Alias.mailbox_id == alias.mailbox_id,
-            EmailLog.created_at > min_time,
-        )
+        db.session.query(EmailLog)
+        .join(Contact, EmailLog.contact_id == Contact.id)
+        .join(Alias, Contact.alias_id == Alias.id)
+        .filter(Alias.mailbox_id == alias.mailbox_id, EmailLog.created_at > min_time,)
         .group_by(EmailLog.id)
         .count()
     )