Indexes API | can index resources by uri filter

Author: snyaggarwal

core/collections/models.py

@@ -67,6 +67,11 @@ class Meta:
     immutable = models.BooleanField(null=True, blank=True, default=None)
     locked_date = models.DateTimeField(null=True, blank=True)
 
+    @staticmethod
+    def get_search_document():
+        from core.collections.documents import CollectionDocument
+        return CollectionDocument
+
     @classmethod
     def get_base_queryset(cls, params):
         collection = params.pop('collection', None)

core/common/swagger_parameters.py

@@ -98,6 +98,9 @@
 ids_param = openapi.Parameter(
     'ids', openapi.IN_FORM, description="Resource Ids", type=openapi.TYPE_STRING
 )
+uri_param = openapi.Parameter(
+    'uri', openapi.IN_FORM, description="Relative URI", type=openapi.TYPE_STRING
+)
 resources_body_param = openapi.Parameter(
     'resource', openapi.IN_PATH, type=openapi.TYPE_STRING,
     enum=['mappings', 'concepts', 'sources', 'orgs', 'users', 'collections']

core/common/tasks.py

@@ -414,3 +414,14 @@ def delete_concept(concept_id):  # pragma: no cover
     concept.delete()
 
     return 1
+
+
+@app.task
+def batch_index_resources(resource, filters):
+    model = get_resource_class_from_resource_name(resource)
+    if not model:
+        return
+
+    model.batch_index(model.objects.filter(**filters), model.get_search_document())
+
+    return 1

core/concepts/models.py

@@ -175,6 +175,11 @@ class Meta:
         'external_id': {'sortable': False, 'filterable': True, 'facet': False, 'exact': False},
     }
 
+    @staticmethod
+    def get_search_document():
+        from core.concepts.documents import ConceptDocument
+        return ConceptDocument
+
     @property
     def concept(self):  # for url kwargs
         return self.mnemonic  # pragma: no cover

core/indexes/views.py

@@ -6,8 +6,8 @@
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from core.common.swagger_parameters import apps_param, ids_param, resources_body_param
-from core.common.tasks import rebuild_indexes, populate_indexes
+from core.common.swagger_parameters import apps_param, ids_param, resources_body_param, uri_param
+from core.common.tasks import rebuild_indexes, populate_indexes, batch_index_resources
 from core.common.utils import get_resource_class_from_resource_name
 
 
@@ -41,21 +41,24 @@ class ResourceIndexView(APIView):
     permission_classes = (IsAdminUser,)
     parser_classes = (MultiPartParser,)
 
-    @swagger_auto_schema(manual_parameters=[ids_param, resources_body_param])
+    @swagger_auto_schema(manual_parameters=[ids_param, uri_param, resources_body_param])
     def post(self, _, resource):
         model = get_resource_class_from_resource_name(resource)
 
         if not model:
             return Response(status=status.HTTP_404_NOT_FOUND)
 
         ids = self.request.data.get('ids', None)
+        uri = self.request.data.get('uri', None)
+
         if ids:
             ids = compact([i.strip() for i in compact(ids.split(','))])
-
-        if not ids:
+            filters = {"{}__in".format(model.mnemonic_attr): ids}
+        elif uri:
+            filters = dict(uri__icontains=uri)
+        else:
             return Response(status=status.HTTP_400_BAD_REQUEST)
 
-        for instance in model.objects.filter(**{"{}__in".format(model.mnemonic_attr): ids}):
-            instance.save()
+        batch_index_resources.delay(resource, filters)
 
         return Response(status=status.HTTP_202_ACCEPTED)

core/mappings/models.py

@@ -97,6 +97,11 @@ class Meta:
         'external_id': {'sortable': False, 'filterable': True, 'facet': False, 'exact': False},
     }
 
+    @staticmethod
+    def get_search_document():
+        from core.mappings.documents import MappingDocument
+        return MappingDocument
+
     @property
     def mapping(self):  # for url kwargs
         return self.mnemonic

core/orgs/models.py

@@ -36,6 +36,11 @@ class Meta:
     client_configs = GenericRelation(ClientConfig, object_id_field='resource_id', content_type_field='resource_type')
     text = models.TextField(null=True, blank=True)  # for about description (markup)
 
+    @staticmethod
+    def get_search_document():
+        from core.orgs.documents import OrganizationDocument
+        return OrganizationDocument
+
     @property
     def org(self):
         return self.mnemonic

core/sources/models.py

@@ -57,6 +57,11 @@ class Meta:
     OBJECT_TYPE = SOURCE_TYPE
     OBJECT_VERSION_TYPE = SOURCE_VERSION_TYPE
 
+    @staticmethod
+    def get_search_document():
+        from core.sources.documents import SourceDocument
+        return SourceDocument
+
     @classmethod
     def head_from_uri(cls, uri):
         queryset = cls.objects.none()

core/users/models.py

@@ -42,6 +42,11 @@ class Meta:
         'is_admin': {'sortable': False, 'filterable': False, 'exact': False, 'facet': True}
     }
 
+    @staticmethod
+    def get_search_document():
+        from core.users.documents import UserProfileDocument
+        return UserProfileDocument
+
     @property
     def user(self):
         return self.username