Fixing errors

core/code_systems/serializers.py

@@ -3,6 +3,7 @@
 from collections import OrderedDict
 
 from rest_framework import serializers
+from rest_framework.exceptions import ValidationError
 from rest_framework.fields import CharField, BooleanField, SerializerMethodField, ChoiceField, \
     DateTimeField
 
@@ -288,6 +289,9 @@ def create(self, validated_data):
         else:
             owner = UserProfile.objects.filter(username=ident['owner_id']).first()
 
+        if not owner:
+            raise ValidationError(f"Cannot find owner of type {ident['owner_type']} and id {ident['owner_id']}")
+
         source.set_parent(owner)
         source.source_type = 'CodeSystem'
 

core/common/serializers.py

@@ -112,7 +112,7 @@ def convert_ocl_uri_to_fhir_url(uri, resource_type):
     @staticmethod
     def convert_fhir_url_to_ocl_uri(uri, resource_type):
         resource_type_uri = f"/{resource_type}/"
-        if uri.startswith('/orgs/') or uri.startswith('/users/'):
+        if uri and (uri.startswith('/orgs/') or uri.startswith('/users/')):
             # Recognize OCL FHIR relative URI
             uri = uri.replace('/ConceptMap/', resource_type_uri).replace('/CodeSystem/', resource_type_uri) \
                 .replace('/ValueSet/', resource_type_uri)

core/concept_maps/serializers.py

@@ -2,6 +2,7 @@
 from collections import OrderedDict
 
 from rest_framework import serializers
+from rest_framework.exceptions import ValidationError
 from rest_framework.fields import CharField, SerializerMethodField, \
     DateTimeField
 
@@ -164,6 +165,9 @@ def create(self, validated_data):
         else:
             owner = UserProfile.objects.filter(username=ident['owner_id']).first()
 
+        if not owner:
+            raise ValidationError(f"Cannot find owner of type {ident['owner_type']} and id {ident['owner_id']}")
+
         source.set_parent(owner)
         source.source_type = 'ConceptMap'