OpenConceptLab/ocl_issues#1583 | indexing API | can pass filters

Author: snyaggarwal

core/common/models.py

@@ -181,6 +181,7 @@ def batch_index(queryset, document):
         offset = 0
         limit = batch_size
         while offset < count:
+            print(f"Indexing {offset}-{limit}/{count}")
             document().update(queryset.order_by('-id')[offset:limit], parallel=True)
             offset = limit
             limit += batch_size

core/common/swagger_parameters.py

@@ -110,6 +110,9 @@
 uri_param = openapi.Parameter(
     'uri', openapi.IN_FORM, description="Relative URI", type=openapi.TYPE_STRING
 )
+filter_param = openapi.Parameter(
+    'filter', openapi.IN_FORM, description="Generic Filter", type=openapi.TYPE_OBJECT
+)
 resources_body_param = openapi.Parameter(
     'resource', openapi.IN_PATH, type=openapi.TYPE_STRING,
     enum=['mappings', 'concepts', 'sources', 'orgs', 'users', 'collections']

core/common/tasks.py

@@ -1,3 +1,4 @@
+import json
 from datetime import datetime
 from json import JSONDecodeError
 
@@ -477,6 +478,8 @@ def delete_concept(concept_id):  # pragma: no cover
 )
 def batch_index_resources(resource, filters, update_indexed=False):
     model = get_resource_class_from_resource_name(resource)
+    if isinstance(filters, str):
+        filters = json.loads(filters)
     if model:
         queryset = model.objects.filter(**filters)
         model.batch_index(queryset, model.get_search_document())

core/indexes/views.py

@@ -7,7 +7,7 @@
 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, uri_param
+from core.common.swagger_parameters import apps_param, ids_param, resources_body_param, uri_param, filter_param
 from core.common.tasks import rebuild_indexes, populate_indexes, batch_index_resources
 from core.common.utils import get_resource_class_from_resource_name
 
@@ -47,7 +47,7 @@ class ResourceIndexView(APIView):
     permission_classes = (IsAdminUser,)
     parser_classes = (MultiPartParser,)
 
-    @swagger_auto_schema(manual_parameters=[ids_param, uri_param, resources_body_param])
+    @swagger_auto_schema(manual_parameters=[ids_param, uri_param, filter_param, resources_body_param])
     def post(self, _, resource):
         model = get_resource_class_from_resource_name(resource)
 
@@ -56,6 +56,7 @@ def post(self, _, resource):
 
         ids = self.request.data.get('ids', None)
         uri = self.request.data.get('uri', None)
+        _filter = self.request.data.get('filter', None)
         update_indexed = self.request.data.get('update_indexed', False)
 
         filters = None
@@ -66,6 +67,8 @@ def post(self, _, resource):
                 filters = {f"{model.mnemonic_attr}__in": ids}
         elif uri:
             filters = {'uri__icontains': uri}
+        elif _filter:
+            filters = _filter
         if not filters:
             return Response(status=status.HTTP_400_BAD_REQUEST)