From f3d7fb0eea6c5f8f04c02cc4b8dfd674136bf771 Mon Sep 17 00:00:00 2001 From: Matthew Elwell Date: Wed, 7 Jul 2021 17:16:41 +0100 Subject: [PATCH] Optimise list identities endpoint (#170) * Optimise list identities endpoint * Remove temporary logging --- api/environments/identities/views.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/api/environments/identities/views.py b/api/environments/identities/views.py index dfb4b7f8d803..adbc7e743a8e 100644 --- a/api/environments/identities/views.py +++ b/api/environments/identities/views.py @@ -27,16 +27,12 @@ class IdentityViewSet(viewsets.ModelViewSet): pagination_class = CustomPagination def get_queryset(self): - environment = self.get_environment_from_request() - user_permitted_identities = self.request.user.get_permitted_identities() - queryset = user_permitted_identities.filter( - environment__api_key=environment.api_key - ) + environment_api_key = self.kwargs["environment_api_key"] + queryset = Identity.objects.filter(environment__api_key=environment_api_key) - if self.request.query_params.get("q"): - queryset = queryset.filter( - identifier__icontains=self.request.query_params.get("q") - ) + search_query = self.request.query_params.get("q") + if search_query: + queryset = queryset.filter(identifier__icontains=search_query) return queryset