ES sorting on users fields

OpenConceptLab · Oct 23, 2020 · ee22992 · ee22992
1 parent 2828633
commit ee22992
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/core/common/management/commands/import_lookup_values.py b/core/common/management/commands/import_lookup_values.py
@@ -93,7 +93,7 @@ def create_concepts(source, file, user):
                 data['mnemonic'] = mnemonic
                 data['name'] = mnemonic
                 data['parent'] = source
-                Concept.persist_new(data, user, False)
+                Concept.persist_new(data, user)
                 if not created:
                     created = True
         return created
diff --git a/core/users/documents.py b/core/users/documents.py
@@ -11,12 +11,13 @@ class Index:
         settings = {'number_of_shards': 1, 'number_of_replicas': 0}
 
     date_joined = fields.DateField(attr='created_at')
+    username = fields.KeywordField(attr='username', normalizer='lowercase')
+    location = fields.KeywordField(attr='location', normalizer='lowercase')
+    company = fields.KeywordField(attr='company', normalizer='lowercase')
+    name = fields.KeywordField(attr='name', normalizer='lowercase')
 
     class Django:
         model = UserProfile
         fields = [
-            'username',
-            'company',
-            'location',
             'is_active'
         ]
diff --git a/core/users/views.py b/core/users/views.py
@@ -20,8 +20,8 @@ class UserBaseView(BaseAPIView):
     es_fields = {
         'username': {'sortable': True, 'filterable': True, 'exact': True},
         'date_joined': {'sortable': True, 'default': 'asc', 'filterable': True},
-        'company': {'sortable': False, 'filterable': True, 'exact': True},
-        'location': {'sortable': False, 'filterable': True, 'exact': True},
+        'company': {'sortable': True, 'filterable': True, 'exact': True},
+        'location': {'sortable': True, 'filterable': True, 'exact': True},
     }
     document_model = UserProfileDocument
     is_searchable = True