Merge remote-tracking branch 'origin/main' into feature/TED-1057

Author: Kolea Plesco

ted_sws/core/model/transform.py

@@ -82,8 +82,8 @@ class ConceptualMappingDiffMetadata(MappingSuiteComponent):
 class ConceptualMappingDiffData(MappingSuiteComponent):
     """"""
     html: Optional[str]
-    original: Optional[dict]
     transformed: Optional[dict]
+    original: Optional[dict]
 
 
 class ConceptualMappingDiff(MappingSuiteComponent):

ted_sws/mapping_suite_processor/entrypoints/cli/cmd_conceptual_mapping_differ.py

@@ -10,7 +10,7 @@
 from ted_sws.mapping_suite_processor.entrypoints.cli import CONCEPTUAL_MAPPINGS_FILE_TEMPLATE
 from ted_sws.mapping_suite_processor.services.conceptual_mapping_differ import \
     mapping_suite_diff_files_conceptual_mappings, mapping_suite_diff_repo_conceptual_mappings, \
-    generate_conceptual_mappings_diff_html_report
+    generate_conceptual_mappings_diff_html_report, transform_conceptual_mappings_diff_data
 from ted_sws.core.model.transform import ConceptualMappingDiff
 
 CMD_NAME = "CMD_CONCEPTUAL_MAPPING_DIFFER"
@@ -59,16 +59,7 @@ def _report(self, diff, files: list):
         with open(report_file_file_name_html, 'w+') as report_file:
             report_file.write(
                 generate_conceptual_mappings_diff_html_report(
-                    ConceptualMappingDiff(
-                        metadata={
-                            "branches": self.branches,
-                            "mapping_suite_ids": self.mapping_suite_ids,
-                            "files": files,
-                            "defaults": diff['metadata']['defaults'],
-                            "metadata": diff['metadata']['metadata']
-                        },
-                        data=data
-                    ))
+                    ConceptualMappingDiff(**diff))
             )
 
     @classmethod

ted_sws/mapping_suite_processor/services/conceptual_mapping_differ.py

@@ -131,9 +131,12 @@ def mapping_suite_diff_conceptual_mappings(mappings: List[ConceptualMapping]) ->
             mappings[1].metadata.dict()
         ]
     )
-    mapping1: ConceptualMapping = mappings[0]
-    mapping2: ConceptualMapping = mappings[1]
-    diff.data = ConceptualMappingDiffData(original=DeepDiff(mapping1.dict(), mapping2.dict(), ignore_order=False))
+    mapping1: dict = mappings[0].dict()
+    mapping2: dict = mappings[1].dict()
+
+    diff.data = transform_conceptual_mappings_diff_data(ConceptualMappingDiffData(
+        original=DeepDiff(mapping1, mapping2, ignore_order=False)
+    ))
     return diff.dict()
 
 
@@ -207,25 +210,20 @@ def mapping_suite_diff_repo_conceptual_mappings(branch_or_tag_name: List[str], m
     return mapping_suite_diff_files_conceptual_mappings([filepath1, filepath2])
 
 
-def generate_conceptual_mappings_diff_html_report(diff: ConceptualMappingDiff):
-    def transform_diff_data(diff_data):
-        """"""
-        diff_data.html = json2html.convert(
-            json=diff_data.original,
-            table_attributes='class="display dataTable heading"',
-            clubbing=True
-        )
-
-        diff_transformer = ConceptualMappingDiffDataTransformer(data=diff_data.original)
-        diff_data.transformed = {
-            "labels": diff_transformer.labels,
-            "tabs": diff_transformer.tabs
-        }
-        return diff_data
+def transform_conceptual_mappings_diff_data(diff_data: ConceptualMappingDiffData):
+    diff_transformer = ConceptualMappingDiffDataTransformer(data=diff_data.original)
+    diff_data.transformed = {
+        "labels": diff_transformer.labels,
+        "tabs": diff_transformer.tabs
+    }
+    return diff_data
+
 
-    html_report = TEMPLATES.get_template(CONCEPTUAL_MAPPINGS_DIFF_HTML_REPORT_TEMPLATE).render({
-        "metadata": diff.metadata,
-        "created_at": diff.created_at,
-        "data": transform_diff_data(diff.data)
-    })
+def generate_conceptual_mappings_diff_html_report(diff: ConceptualMappingDiff):
+    diff.data.html = json2html.convert(
+        json=diff.data.original,
+        table_attributes='class="display dataTable heading"',
+        clubbing=True
+    )
+    html_report = TEMPLATES.get_template(CONCEPTUAL_MAPPINGS_DIFF_HTML_REPORT_TEMPLATE).render(diff)
     return html_report