Merge pull request #833 from openedx/iahmad/ENT-8867

fix: Added enterprise uuid to facet search filter for academy tags
openedx · May 20, 2024 · 718fa10 · 718fa10
2 parents 343fd5b + 91c0823
commit 718fa10
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/enterprise_catalog/apps/api/v1/serializers.py b/enterprise_catalog/apps/api/v1/serializers.py
@@ -398,9 +398,10 @@ def to_representation(self, obj):  # pylint: disable=arguments-renamed
         tags = super().to_representation(obj)
         algolia_client = get_initialized_algolia_client()
         academy_uuid = self.context.get('academy_uuid')
-        if academy_uuid:
+        enterprise_uuid = self.context.get('enterprise_uuid')
+        if academy_uuid and enterprise_uuid:
             search_query = {
-                'filters': f'academy_uuids:{academy_uuid}',
+                'filters': f'academy_uuids:{academy_uuid} AND enterprise_customer_uuids:{enterprise_uuid}',
                 'maxFacetHits': 50
             }
         else:

diff --git a/enterprise_catalog/apps/api/v1/views/academies.py b/enterprise_catalog/apps/api/v1/views/academies.py
@@ -26,7 +26,8 @@ def request_action(self):
     def get_serializer_context(self):
         context = super().get_serializer_context()
         academy_uuid = str(self.kwargs['uuid']) if 'uuid' in self.kwargs else None
-        context.update({'academy_uuid': academy_uuid})
+        enterprise_customer = self.request.GET.get('enterprise_customer', None)
+        context.update({'academy_uuid': academy_uuid, 'enterprise_uuid': enterprise_customer})
         return context
 
     def get_queryset(self):