SIENTIAPDE-1172
refactor: simplify EmailBuilder parameters and remove unused templates - Removed unused template file attributes from EmailBuilder class. - Updated parameters method to eliminate report_data argument, streamlining the function for better clarity and efficiency.
This commit is contained in:
@@ -12,11 +12,6 @@ class EmailBuilder:
|
||||
self.report_template_file = './orchestrator/utils/templates/email_template.html'
|
||||
self.general_template_file = './orchestrator/utils/templates/general_template.html'
|
||||
|
||||
self.tag_template_file = './orchestrator/utils/templates/opc_tag_report_template.html'
|
||||
self.opc_template_file = './orchestrator/utils/templates/opc_connection_report_template.html'
|
||||
|
||||
self.partition_manager_template_file = './orchestrator/utils/templates/partition_manager_report_template.html'
|
||||
|
||||
with open(self.report_template_file, 'r') as file:
|
||||
self.report_template = file.read()
|
||||
with open(self.general_template_file, 'r') as file:
|
||||
@@ -28,9 +23,8 @@ class EmailBuilder:
|
||||
|
||||
return template.render(parameters)
|
||||
|
||||
def parameters(self, report_data: dict, general_events: dict, mail_type: str) -> dict:
|
||||
def parameters(self, general_events: dict, mail_type: str) -> dict:
|
||||
return {
|
||||
'project_name': report_data[0]['project'],
|
||||
'mail_type': mail_type,
|
||||
'error_events': self.replace_parameters(self.general_template,
|
||||
general_events['ERROR']) if general_events['ERROR']['models'] else '',
|
||||
@@ -66,10 +60,10 @@ class EmailBuilder:
|
||||
general_events[level]['models'][model_name]['events'].append(
|
||||
report)
|
||||
|
||||
print(general_events)
|
||||
for _type, content in general_events.items():
|
||||
content['models'] = list(content['models'].values())
|
||||
|
||||
return self.replace_parameters(self.report_template, self.parameters(
|
||||
report_data, general_events, mail_type
|
||||
))
|
||||
return self.replace_parameters(
|
||||
self.report_template, self.parameters(
|
||||
general_events, mail_type
|
||||
))
|
||||
|
||||
Reference in New Issue
Block a user