From 969616d671962a1997fb87beb9569f9b64646bd0 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Mon, 17 May 2021 18:15:12 +0200
Subject: [PATCH] Date compare in DB instead of model function

---
 app/models.py |  6 ------
 cron.py       | 16 ++++++++++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/models.py b/app/models.py
index ff776ff3..129b5d79 100644
--- a/app/models.py
+++ b/app/models.py
@@ -25,7 +25,6 @@ from app.config import (
     FIRST_ALIAS_DOMAIN,
     DISABLE_ONBOARDING,
     UNSUBSCRIBER,
-    HIBP_SCAN_INTERVAL_DAYS,
 )
 from app.errors import AliasInTrashError
 from app.extensions import db
@@ -1088,11 +1087,6 @@ class Alias(db.Model, ModelMixin):
             return True
         return False
 
-    def needs_hibp_scan(self):
-        return self.hibp_last_check is None or (
-            self.hibp_last_check < arrow.now().shift(days=-HIBP_SCAN_INTERVAL_DAYS)
-        )
-
     @classmethod
     def create(cls, **kw):
         # whether should call db.session.commit
diff --git a/cron.py b/cron.py
index 22b4496f..a8896c5f 100644
--- a/cron.py
+++ b/cron.py
@@ -7,7 +7,7 @@ from typing import List, Tuple
 
 import arrow
 import requests
-from sqlalchemy import func, desc
+from sqlalchemy import func, desc, or_
 
 from app import s3
 from app.alias_utils import nb_email_log_for_mailbox
@@ -20,6 +20,7 @@ from app.config import (
     URL,
     AlERT_WRONG_MX_RECORD_CUSTOM_DOMAIN,
     HIBP_API_KEYS,
+    HIBP_SCAN_INTERVAL_DAYS,
 )
 from app.dns_utils import get_mx_domains
 from app.email_utils import (
@@ -830,9 +831,16 @@ def check_hibp():
 
     LOG.d("Preparing list of aliases to check")
     queue = multiprocessing.Queue()
-    for alias in Alias.query.order_by(Alias.hibp_last_check.asc().nullsfirst()).all():
-        if alias.needs_hibp_scan():
-            queue.put(alias.id)
+    max_date = arrow.now().shift(days=-HIBP_SCAN_INTERVAL_DAYS)
+    for alias in (
+        Alias.query.filter(
+            or_(Alias.hibp_last_check.is_(None), Alias.hibp_last_check < max_date)
+        )
+        .order_by(Alias.hibp_last_check.asc().nullsfirst())
+        .all()
+    ):
+        queue.put(alias.id)
+
     LOG.d("Need to check about %s aliases", queue.qsize())
 
     # Start one checking process per API key