From 0268e6a0be9b02d846f04bffc50db43b30bdfb75 Mon Sep 17 00:00:00 2001
From: Bo-Chun Louis Chen <louistw@uab.edu>
Date: Fri, 12 Mar 2021 17:45:25 -0600
Subject: [PATCH] Add result of create to email subject
---
mail_config.py.example | 2 +-
prod_rmq_agents/task_manager.py | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/mail_config.py.example b/mail_config.py.example
index 434cb44..e699d8b 100644
--- a/mail_config.py.example
+++ b/mail_config.py.example
@@ -25,5 +25,5 @@ Whole_mail = Head + Body
UserReportHead = f"""From: {rcfg.Sender_alias} <{rcfg.Sender}>
To: <{rcfg.Admin_email}>
-Subject: RC Account Creation Report: {{{{ fullname }}}}, {{{{ username }}}} """
+Subject: [{{{{ result }}}}]RC Account Creation Report: {{{{ fullname }}}}, {{{{ username }}}} """
diff --git a/prod_rmq_agents/task_manager.py b/prod_rmq_agents/task_manager.py
index 795f7c3..c48a40a 100644
--- a/prod_rmq_agents/task_manager.py
+++ b/prod_rmq_agents/task_manager.py
@@ -52,7 +52,15 @@ rc_rmq = RCRMQ({'exchange': 'RegUsr', 'exchange_type': 'topic'})
def notify_admin(username, user_record):
receivers = [rcfg.Admin_email]
- message = Template(mail_cfg.UserReportHead).render(username=username, fullname=user_record['fullname'])
+
+ result = "SUCCESS" if user_record["request"]["create_account"] and\
+ user_record["verify"]["git_commit"] and\
+ user_record["verify"]["dir_verify"] and\
+ user_record["verify"]["subscribe_mail_list"] and\
+ user_record["notify"]["notify_user"]\
+ else "FAILED"
+
+ message = Template(mail_cfg.UserReportHead).render(username=username, fullname=user_record['fullname'], result=result)
if user_record['reported']:
message += ' (Duplicate)'
message += f""" \n
--
GitLab