Fix newsletter_handler.py

This commit is contained in:
JonnyWong16 2023-04-21 16:12:32 -07:00
commit de599e2e2e
No known key found for this signature in database
GPG key ID: B1F1F9807184697A

View file

@ -181,9 +181,9 @@ def set_notify_success(newsletter_log_id):
def get_last_newsletter_email_msg_id(newsletter_id, notify_action): def get_last_newsletter_email_msg_id(newsletter_id, notify_action):
db = database.MonitorDatabase() db = database.MonitorDatabase()
result = db.select_single('SELECT email_msg_id FROM newsletter_log ' result = db.select_single("SELECT email_msg_id FROM newsletter_log "
'WHERE newsletter_id = ? AND notify_action = ? AND success = 1 ' "WHERE newsletter_id = ? AND notify_action = ? AND success = 1 "
'ORDER BY timestamp DESC LIMIT 1', [newsletter_id, notify_action]) "ORDER BY timestamp DESC LIMIT 1", [newsletter_id, notify_action])
if result: if result:
return result['email_msg_id'] return result['email_msg_id']
@ -193,13 +193,13 @@ def get_newsletter(newsletter_uuid=None, newsletter_id_name=None):
db = database.MonitorDatabase() db = database.MonitorDatabase()
if newsletter_uuid: if newsletter_uuid:
result = db.select_single('SELECT start_date, end_date, uuid, filename FROM newsletter_log ' result = db.select_single("SELECT start_date, end_date, uuid, filename FROM newsletter_log "
'WHERE uuid = ?', [newsletter_uuid]) "WHERE uuid = ?", [newsletter_uuid])
elif newsletter_id_name: elif newsletter_id_name:
result = db.select_single('SELECT start_date, end_date, uuid, filename FROM newsletter_log ' result = db.select_single("SELECT start_date, end_date, uuid, filename FROM newsletter_log "
'JOIN newsletters ON newsletters.id = newsletter_log.newsletter_id ' "JOIN newsletters ON newsletters.id = newsletter_log.newsletter_id "
'WHERE id_name = ? AND notify_action != "test" ' "WHERE id_name = ? AND notify_action != 'test' "
'ORDER BY timestamp DESC LIMIT 1', [newsletter_id_name]) "ORDER BY timestamp DESC LIMIT 1", [newsletter_id_name])
else: else:
result = None result = None