minor(release): ontology performance & content updates (#1772)

CodeListLibrary_project/clinicalcode/api/views/GenericEntity.py

@@ -272,7 +272,7 @@ def get_generic_entities(request):
 
         groups = list(user.groups.all().values_list('id', flat=True))
         if len(groups) > 0:
-            group_ids = [ gen_utils.parse_int(group) for group in groups ]
+            group_ids = [ int(group) for group in groups if gen_utils.parse_int(group, default=None) ]
             user_clause = f'''{user_clause} or (entity.group_id = any(%(group_ids)s) and entity.group_access = any(array[2, 3]))'''
 
     accessible_clauses.append(f'({user_clause})')

CodeListLibrary_project/clinicalcode/api/views/Ontology.py

@@ -14,7 +14,7 @@
 
 @api_view(['GET'])
 @permission_classes([IsAuthenticatedOrReadOnly])
-@cache_page(60 * 60 * 2)
+@cache_page(60 * 60 * 8)
 def get_ontologies(request):
     """
         Get all ontology groups and their root
@@ -29,7 +29,7 @@ def get_ontologies(request):
 
 @api_view(['GET'])
 @permission_classes([IsAuthenticatedOrReadOnly])
-@cache_page(60 * 60 * 2)
+@cache_page(60 * 60 * 8)
 def get_ontology_detail(request, ontology_id):
     """
         Get specified ontology group type detail by the given `ontology_id`
@@ -61,7 +61,6 @@ def get_ontology_detail(request, ontology_id):
 
 @api_view(['GET'])
 @permission_classes([IsAuthenticatedOrReadOnly])
-@cache_page(60 * 60 * 2)
 def get_ontology_node(request, node_id):
     """
         Gets an Ontology node by the given request
@@ -86,7 +85,6 @@ def get_ontology_node(request, node_id):
 
 @api_view(['GET'])
 @permission_classes([IsAuthenticatedOrReadOnly])
-@cache_page(60 * 60 * 2)
 def get_ontology_nodes(request):
     """
         Queries Ontology nodes by the given request

CodeListLibrary_project/clinicalcode/entity_utils/api_utils.py

@@ -373,7 +373,7 @@ def build_template_subquery_from_string(param, data, top_ref, sub_ref, validatio
             ltype = '::bigint'
             datatype = '::bigint'
         elif sub_type == 'string_array':
-            data = [ str(x).lower() for x in data.split(',') if gen_utils.try_value_as_type(x, 'string') ]
+            data = [ str(x).lower() for x in data.split(',') if gen_utils.try_value_as_type(x, 'string') is not None ]
             ltype = '::text'
             datatype = ''
             processor = 'lower'
@@ -520,7 +520,7 @@ def build_template_subquery_from_string(param, data, top_ref, sub_ref, validatio
         data = [ int(x) for x in data.split(',') if isinstance(gen_utils.parse_int(x, default=None), int) ]
         datatype = 'bigint'
     elif sub_type == 'string_array':
-        data = [ str(x).lower() for x in data.split(',') if gen_utils.try_value_as_type(x, 'string') ]
+        data = [ str(x).lower() for x in data.split(',') if gen_utils.try_value_as_type(x, 'string') is not None ]
         datatype = 'text'
         processor = 'lower'
 
@@ -651,7 +651,7 @@ def build_query_string_from_param(param, data, validation, field_type, is_dynami
             source = validation.get('source')
             trees = source.get('trees') if source and 'trees' in validation.get('source') else None
             if trees:
-                data = [ str(x) for x in data.split(',') if gen_utils.try_value_as_type(x, 'string') ]
+                data = [ str(x) for x in data.split(',') if gen_utils.try_value_as_type(x, 'string') is not None ]
                 model = source.get('model') if isinstance(source.get('model'), str) else None
 
                 if model:

CodeListLibrary_project/clinicalcode/entity_utils/concept_utils.py

@@ -29,7 +29,7 @@ def is_concept_published(concept_id, version_id):
         version_id (int): the Concept's history_id
 
     Returns:
-        bool: Reflects published status
+        bool: Reflects publish status
 
     """
     concept_id = gen_utils.parse_int(concept_id, None)
@@ -95,7 +95,7 @@ def was_concept_ever_published(concept_id, version_id=None):
         version_id (int|null): the Concept's history_id
 
     Returns:
-        bool: Reflects all-time published status
+        bool: Reflects all-time publish status
 
     """
     concept_id = gen_utils.parse_int(concept_id, None)
@@ -298,7 +298,7 @@ def get_concept_headers(concept_information, default=None):
         columns = [col[0] for col in cursor.description]
         results = [dict(zip(columns, row)) for row in cursor.fetchall()]
 
-    if len(results) < 0:
+    if len(results) < 1:
         return default
 
     return results
@@ -377,7 +377,7 @@ def get_concept_dataset(packet, field_name='concept_information', default=None):
         columns = [col[0] for col in cursor.description]
         results = [dict(zip(columns, row)) for row in cursor.fetchall()]
 
-    if len(results) < 0:
+    if len(results) < 1:
         return default
 
     return results