Issue-557 | fixing concept name/desc serialization

OpenConceptLab · Feb 8, 2021 · f057bc8 · f057bc8
1 parent a3c212e
commit f057bc8
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/core/concepts/models.py b/core/concepts/models.py
@@ -53,14 +53,22 @@ def build(cls, params, used_as='name'):
 
     @classmethod
     def build_name(cls, params):
-        name_type = params.pop('name_type', None) or params.pop('type', None)
+        _type = params.pop('type', None)
+        name_type = params.pop('name_type', None)
+        if (not name_type or name_type == 'ConceptName') and _type:
+            name_type = _type
+
         return cls(
             **{**params, 'type': name_type}
         )
 
     @classmethod
     def build_description(cls, params):
-        description_type = params.pop('description_type', None) or params.pop('type', None)
+        _type = params.pop('type', None)
+        description_type = params.pop('description_type', None)
+        if (not description_type or description_type == 'ConceptDescription') and _type:
+            description_type = _type
+
         description_name = params.pop('description', None) or params.pop('name', None)
         return cls(
             **{