(feat): Added machine to email reports

Author: ArneTR

lib/job/email_report.py

@@ -28,10 +28,12 @@ def _process(self):
                 SELECT r.name,
                     (SELECT array_agg(t.name) FROM unnest(r.category_ids) as elements
                     LEFT JOIN categories as t on t.id = elements) as categories,
+                    m.description as machine_description, m.id as machine_id,
                     r.uri, r.filename, r.branch, r.usage_scenario_variables, r.created_at
                 FROM runs r
+                LEFT JOIN machines m ON m.id = r.machine_id
                 WHERE r.id = %s
-                GROUP BY r.id
+                GROUP BY r.id, m.id
             ''',
             params=(self._run_id, ),
             fetch_mode='dict')
@@ -112,6 +114,7 @@ def replace_variables(template, run_id, run):
     template = template.replace('{{__GMT_RUN_REPO__}}', run['uri'])
     template = template.replace('{{__GMT_RUN_FILENAME__}}', run['filename'])
     template = template.replace('{{__GMT_RUN_BRANCH__}}', run['branch'])
+    template = template.replace('{{__GMT_RUN_MACHINE__}}', f"{run['machine_description']} ({run['machine_id']})")
     template = template.replace('{{__GMT_RUN_DATE__}}', datetime.fromisoformat(str(run['created_at'])).astimezone().strftime("%Y-%m-%d %H:%M %z"))
 
     # optionals

templates/emails/email_report_general.html

@@ -54,6 +54,7 @@ <h1>Green Metrics Tool Report</h1>
       <p>Repository: <strong>{{__GMT_RUN_REPO__}}</strong></p>
       <p>Filename: <strong>{{__GMT_RUN_FILENAME__}}</strong></p>
       <p>Branch: <strong>{{__GMT_RUN_BRANCH__}}</strong></p>
+      <p>Machine: <strong>{{__GMT_RUN_MACHINE__}}</strong></p>
       <p>Report Date: <strong>{{__GMT_RUN_DATE__}}</strong></p>
     </div>
     <br>

templates/emails/email_report_general.txt

@@ -4,6 +4,7 @@ Run Name: {{__GMT_RUN_NAME__}}
 Repository: {{__GMT_RUN_REPO__}}
 Filename: {{__GMT_RUN_FILENAME__}}
 Branch: {{__GMT_RUN_BRANCH__}}
+Machine: {{__GMT_RUN_MACHINE__}}
 Report Date: {{__GMT_RUN_DATE__}}