Add URL to retrieve latest scheduled newsletter

This commit is contained in:
JonnyWong16 2018-05-07 19:42:04 -07:00
parent 76122bea5d
commit 8af697a157
4 changed files with 42 additions and 16 deletions

View file

@ -86,7 +86,8 @@ def notify(newsletter_id=None, notify_action=None, **kwargs):
body = newsletter_config['body']
message = newsletter_config['message']
newsletter_agent = newsletters.get_agent_class(agent_id=newsletter_config['agent_id'],
newsletter_agent = newsletters.get_agent_class(newsletter_id=newsletter_id,
agent_id=newsletter_config['agent_id'],
config=newsletter_config['config'],
email_config=newsletter_config['email_config'],
subject=subject,
@ -149,13 +150,22 @@ def set_notify_success(newsletter_log_id):
db.upsert(table_name='newsletter_log', key_dict=keys, value_dict=values)
def get_newsletter(newsletter_uuid):
def get_newsletter(newsletter_uuid=None, newsletter_id=None):
db = database.MonitorDatabase()
result = db.select_single('SELECT newsletter_id, start_date, end_date FROM newsletter_log '
'WHERE uuid = ?', [newsletter_uuid])
if newsletter_uuid:
result = db.select_single('SELECT newsletter_id, start_date, end_date, uuid, filename FROM newsletter_log '
'WHERE uuid = ?', [newsletter_uuid])
elif newsletter_id:
result = db.select_single('SELECT newsletter_id, start_date, end_date, uuid, filename FROM newsletter_log '
'WHERE newsletter_id = ? AND notify_action != "test" '
'ORDER BY timestamp DESC LIMIT 1', [newsletter_id])
else:
result = None
if result:
newsletter_id = result['newsletter_id']
newsletter_uuid = result['uuid']
start_date = result['start_date']
end_date = result['end_date']