Remove nullsfirst as not compatible with sqlite. Add more logging

This commit is contained in:
Son NK 2021-05-19 12:46:55 +02:00
parent b3f8fd6789
commit d4e930c930
2 changed files with 6 additions and 1 deletions

View File

@ -167,6 +167,9 @@ class Hibp(db.Model, ModelMixin):
name = db.Column(db.String(), nullable=False, unique=True, index=True)
breached_aliases = db.relationship("Alias", secondary="alias_hibp")
def __repr__(self):
return f"<HIBP Breach {self.id} {self.name}>"
class Fido(db.Model, ModelMixin):
__tablename__ = "fido"

View File

@ -792,6 +792,8 @@ async def _hibp_check(api_key, queue):
alias.hibp_breaches = [
Hibp.get_by(name=entry["Name"]) for entry in r.json()
]
if len(alias.hibp_breaches) > 0:
LOG.w("%s appears in HIBP breaches %s", alias, alias.hibp_breaches)
elif r.status_code == 404:
# No breaches found
alias.hibp_breaches = []
@ -837,7 +839,7 @@ async def check_hibp():
Alias.query.filter(
or_(Alias.hibp_last_check.is_(None), Alias.hibp_last_check < max_date)
)
.order_by(Alias.hibp_last_check.asc().nullsfirst())
.order_by(Alias.id)
.all()
):
await queue.put(alias.id)