OpenConceptLab/ocl_issues#1814 | task result needs to be JSON

OpenConceptLab · May 9, 2024 · 4bc30ec · 4bc30ec
1 parent 8cfd72f
commit 4bc30ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/core/common/checksums.py b/core/common/checksums.py
@@ -419,7 +419,7 @@ def process(self):  # pylint: disable=too-many-locals,too-many-branches,too-many
                     traversed_concepts.add(concept_id)
                     concept_db_id = self.concepts_diff.get_db_id_for(key, concept_id)
                     concept = Concept.objects.filter(id=concept_db_id).first()
-                    summary = {'id': concept_id, 'display_name': concept.display_name}
+                    summary = {'id': concept_id, 'display_name': concept.display_name.replace('"', "'")}
                     mappings_diff_summary = {}
                     for mapping_diff_key in diff_keys:
                         mapping_ids = get(self.mappings_diff.result, f'{mapping_diff_key}.{self.identity}')
@@ -461,7 +461,8 @@ def process(self):  # pylint: disable=too-many-locals,too-many-branches,too-many
                             if concept_id not in concepts_result['changed_mappings_only']:
                                 concepts_result['changed_mappings_only'][concept_id] = {
                                     'id': concept_id,
-                                    'display_name': get(mapping.from_concept, 'display_name'),
+                                    'display_name': get(
+                                        mapping.from_concept, 'display_name', '').replace('"', "'"),
                                     'mappings': {}
                                 }
                             if key not in concepts_result['changed_mappings_only'][concept_id]['mappings']:

diff --git a/core/tasks/models.py b/core/tasks/models.py
@@ -1,3 +1,4 @@
+import ast
 import json
 import traceback
 import uuid
@@ -47,7 +48,7 @@ class Meta:
     def json_result(self):
         if self.result:
             try:
-                return json.loads(self.result.replace("'", '"'))
+                return json.loads(json.dumps(ast.literal_eval(self.result)))
             except json.JSONDecodeError:
                 return self.result
         return self.result