Merge pull request #861 from hubmapconsortium/Derek-Furst/shortname-to-displayname

Derek furst/shortname to displayname

Author: yuanzhou

entity-api-spec.yaml

@@ -1,7 +1,7 @@
 openapi: 3.0.3
 info:
   description: 'The HuBMAP Entity API is a standard RESTful web service with create, update and read operations for the standard HuBMAP provenance graph entities.'
-  version: 2.4.6
+  version: 2.5.3
   title: HuBMAP Entity API
   contact:
     name: HuBMAP Help Desk
@@ -693,7 +693,7 @@ components:
               - Targeted-Shotgun-LC-MS
               - TMT-LC-MS
               - WGS
-          description: 'The data or assay types contained in this dataset as a json array of strings.  Each is an assay code from [assay types](https://github.com/hubmapconsortium/search-api/blob/main/src/search-schema/data/definitions/enums/assay_types.yaml).'
+          description: 'The data or assay types contained in this dataset as a json array of strings.'
         collections:
           readOnly: true
           type: array
@@ -1134,7 +1134,7 @@ components:
               - Targeted-Shotgun-LC-MS
               - TMT-LC-MS
               - WGS
-          description: 'The data or assay types contained in this dataset as a json array of strings.  Each is an assay code from [assay types](https://github.com/hubmapconsortium/search-api/blob/main/src/search-schema/data/definitions/enums/assay_types.yaml).'
+          description: 'The data or assay types contained in this dataset as a json array of strings.'
         collections:
           readOnly: true
           type: array

src/schema/provenance_schema.yaml

@@ -404,7 +404,7 @@ ENTITIES:
         type: list
         indexed: true
         required_on_create: false
-        description: "The data or assay types contained in this dataset as a json array of strings.  Each is an assay code from [assay types](https://github.com/hubmapconsortium/search-api/blob/main/src/search-schema/data/definitions/enums/assay_types.yaml)."
+        description: "The data or assay types contained in this dataset as a json array of strings."
       dataset_type:
         before_property_create_validators:
           - validate_recognized_dataset_type
@@ -1000,7 +1000,7 @@ ENTITIES:
         type: string
         indexed: true
         immutable: true
-        description: "Organ code specifier, only set if sample_type == organ.  Valid values found in: [organ types](https://github.com/hubmapconsortium/search-api/blob/main/src/search-schema/data/definitions/enums/organ_types.yaml)"
+        description: "Organ code specifier, only set if sample_category == organ"
       organ_other:
         type: string
         indexed: true

src/schema/schema_validators.py

@@ -812,7 +812,7 @@ def validate_in_admin_group(property_key, normalized_entity_type, request, exist
 def validate_group_name(property_key, normalized_entity_type, request, existing_data_dict, new_data_dict):
     assigned_to_group_name = new_data_dict['assigned_to_group_name']
     globus_groups = schema_manager.get_auth_helper_instance().getHuBMAPGroupInfo()
-    group_dict = next((entry for entry in globus_groups.values() if entry.get("shortname") == assigned_to_group_name), None)
+    group_dict = next((entry for entry in globus_groups.values() if entry.get("displayname") == assigned_to_group_name), None)
     if group_dict is None:
         raise ValueError("Invalid value for 'assigned_to_group_name'")
     is_data_provider = group_dict.get('data_provider')