Merge pull request #72 from diedpigs/feat-duplicate-report

Feature duplicate report tag

mail_config.py

@@ -31,6 +31,5 @@ Whole_mail = Head + Body
 
 UserReportHead = f"""From: {Sender_alias} <{Sender}>
 To: <{Admin_email}>
-Subject: RC Account Creation Report: {{{{ fullname }}}}, {{{{ username }}}}
-"""
+Subject: RC Account Creation Report: {{{{ fullname }}}}, {{{{ username }}}} """
 

task_manager.py

@@ -39,7 +39,8 @@ record = {
     },
     'notify': {
         'notify_user': None
-    }
+    },
+    'reported': False
 }
 
 # Currently tracking users
@@ -51,6 +52,8 @@ rc_rmq = RCRMQ({'exchange': 'RegUsr', 'exchange_type': 'topic'})
 def notify_admin(username, user_record):
     receivers = [user_record['email'], mail_cfg.Admin_email]
     message = Template(mail_cfg.UserReportHead).render(username=username, fullname=user_record['fullname'])
+    if user_record['reported']:
+        message += ' (Duplicate)'
     message += f""" \n
     User Creation Report for user {username}
     uid: {user_record["uid"]}, gid: {user_record["gid"]}
@@ -140,6 +143,8 @@ def task_manager(ch, method, properties, body):
             current['verify']['subscribe_mail_list'] = user_db['subscribe_mail_list']
             current['notify']['notify_user'] = user_db['notify_user']
 
+            current['reported'] = user_db['reported']
+
             for t in ['git_commit', 'dir_verify', 'subscribe_mail_list']:
                 if user_db[t] is None:
                     current['waiting'].add(t)