Merge pull request #728 from WildMeOrg/es-sort-ordering-with-empty

Fix Sort Ordering with Empty Data
WildMeOrg · Jun 24, 2022 · 8dbe188 · 8dbe188
2 parents 5420a99 + 2cf611b
commit 8dbe188
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/app/extensions/elasticsearch/__init__.py b/app/extensions/elasticsearch/__init__.py
@@ -5,6 +5,7 @@
 import json
 import logging
 import pprint
+import sys
 import time
 import types
 import uuid
@@ -36,6 +37,8 @@
 
 ELASTICSEARCH_SORTING_PREFIX = 'elasticsearch.'
 
+MAX_UNICODE_CODE_POINT_CHAR = chr(int(hex(sys.maxunicode), 16))
+
 log = logging.getLogger('elasticsearch')  # pylint: disable=invalid-name
 
 # Global object session

diff --git a/app/modules/individuals/models.py b/app/modules/individuals/models.py
@@ -256,9 +256,11 @@ def get_first_name(self):
         return first_name
 
     def get_first_name_keyword(self):
+        from app.extensions.elasticsearch import MAX_UNICODE_CODE_POINT_CHAR
+
         first_name = self.get_first_name()
         if first_name is None:
-            first_name = ''
+            first_name = MAX_UNICODE_CODE_POINT_CHAR
         first_name_keyword = first_name.strip().lower()
         return first_name_keyword
 

diff --git a/app/modules/sightings/models.py b/app/modules/sightings/models.py
@@ -229,9 +229,11 @@ def get_location_id_value(self):
         return location_id_value
 
     def get_location_id_keyword(self):
+        from app.extensions.elasticsearch import MAX_UNICODE_CODE_POINT_CHAR
+
         location_id_value = self.get_location_id_value()
         if location_id_value is None:
-            location_id_value = ''
+            location_id_value = MAX_UNICODE_CODE_POINT_CHAR
         location_id_keyword = location_id_value.strip().lower()
         return location_id_keyword