Fixed error that would occur when creation_action not specified. Also

added additional validation for empty values. Made it more clear in error
messages what the acceptable values are for creation_action. Made creation
action validator case insensitive. Also normalized the case for creation
action within the trigger. Now always has the first letter capitalized.

src/schema/schema_triggers.py

@@ -1907,8 +1907,8 @@ def get_upload_datasets(property_key, normalized_type, user_token, existing_data
 def set_activity_creation_action(property_key, normalized_type, user_token, existing_data_dict, new_data_dict):
     if 'normalized_entity_type' not in new_data_dict:
         raise KeyError("Missing 'normalized_entity_type' key in 'existing_data_dict' during calling 'set_activity_creation_action()' trigger method.")
-    if new_data_dict and new_data_dict['creation_action']:
-        return property_key, new_data_dict['creation_action']
+    if new_data_dict and new_data_dict.get('creation_action'):
+        return property_key, new_data_dict['creation_action'].title()
     return property_key, f"Create {new_data_dict['normalized_entity_type']} Activity"
 
 

src/schema/schema_validators.py

@@ -526,9 +526,12 @@ def validate_publication_date(property_key, normalized_entity_type, request, exi
     The json data in request body, already after the regular validations
 """
 def validate_creation_action(property_key, normalized_entity_type, request, existing_data_dict, new_data_dict):
-    creation_action = new_data_dict[property_key]
-    if creation_action and creation_action not in ["Central Process", "Lab Process", "Multi-Assay Split"]:
-        raise ValueError(f"Invalid {property_key} value")
+    accepted_creation_action_values = ["central process", "lab process", "multi-assay split"]
+    creation_action = new_data_dict[property_key].lower()
+    if creation_action and creation_action not in accepted_creation_action_values:
+        raise ValueError("Invalid {} value. Accepted values are: {}".format(property_key, ", ".join(accepted_creation_action_values)))
+    if creation_action == '':
+        raise ValueError(f"The property {property_key} cannot be empty, when specified.")
 
 
 ####################################################################################################