Merge pull request #774 from openedx/asheehan-edx/updating-metadata-q…

…ueryset

fix: properly fetching querysets for content metadata api endpoint

enterprise_catalog/apps/api/v1/tests/test_views.py

@@ -2377,7 +2377,8 @@ def setUp(self):
         super().setUp()
         self.set_up_staff()
         self.content_metadata_object = ContentMetadataFactory(
-            content_type='course'
+            content_type='course',
+            content_uuid=uuid.uuid4(),
         )
 
     def test_list_success(self):
@@ -2395,7 +2396,10 @@ def test_list_with_content_keys(self):
         Test a successful, expected api response for the metadata list endpoint with a supplied content keys query
         param
         """
-        query_param_string = f"?content_identifiers={self.content_metadata_object.content_key}"
+        ContentMetadataFactory(content_type='course')
+        junk_identifier = urlencode({'content_identifiers': 'edx+101'})
+        encoded_key = urlencode({'content_identifiers': self.content_metadata_object.content_key})
+        query_param_string = f"?{encoded_key}&{junk_identifier}"
         url = reverse('api:v1:content-metadata-list') + query_param_string
         response = self.client.get(url)
         response_json = response.json()

enterprise_catalog/apps/api/v1/views/content_metadata.py

@@ -1,4 +1,5 @@
-from django.db.models import Q
+import uuid
+
 from edx_rest_framework_extensions.auth.jwt.authentication import (
     JwtAuthentication,
 )
@@ -14,6 +15,27 @@
 from enterprise_catalog.apps.catalog.models import ContentMetadata
 
 
+# https://stackoverflow.com/questions/53847404/how-to-check-uuid-validity-in-python
+def is_valid_uuid(val):
+    try:
+        uuid.UUID(str(val))
+        return True
+    except ValueError:
+        return False
+
+
+# https://stackoverflow.com/questions/4578590/python-equivalent-of-filter-getting-two-output-lists-i-e-partition-of-a-list
+def partition(pred, iterable):
+    trues = []
+    falses = []
+    for item in iterable:
+        if pred(item):
+            trues.append(item)
+        else:
+            falses.append(item)
+    return trues, falses
+
+
 class ContentMetadataView(viewsets.ReadOnlyModelViewSet):
     """
     View for retrieving and listing base content metadata.
@@ -29,8 +51,12 @@ def get_queryset(self, **kwargs):
         """
         Returns all content metadata objects filtered by an optional request query param (LIST) ``content_identifiers``
         """
-        content_filter = kwargs.get('content_identifiers')
+        content_filters = self.request.query_params.getlist('content_identifiers')
         queryset = self.queryset
-        if content_filter:
-            return queryset.filter(Q(content_key__in=content_filter) | Q(uuid__in=content_filter))
+        if content_filters:
+            content_uuids, content_keys = partition(is_valid_uuid, content_filters)
+            if content_keys:
+                queryset = queryset.filter(content_key__in=content_filters)
+            if content_uuids:
+                queryset = queryset.filter(content_uuid__in=content_filters)
         return queryset