From e06fcca2971689f1ab0567767a510a84970bbd83 Mon Sep 17 00:00:00 2001 From: Anton Krytskyi Date: Tue, 2 Sep 2025 17:39:10 +0300 Subject: [PATCH 1/2] display only institution-specific user metrics reports --- api/institutions/views.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/api/institutions/views.py b/api/institutions/views.py index 9424a69fa10..9c6d1eab8fa 100644 --- a/api/institutions/views.py +++ b/api/institutions/views.py @@ -585,15 +585,15 @@ class _NewInstitutionUserMetricsList(InstitutionMixin, ElasticsearchListView): )) def get_default_search(self): - _yearmonth = InstitutionalUserReport.most_recent_yearmonth() - if _yearmonth is None: - return None - return ( - InstitutionalUserReport.search() - .filter('term', report_yearmonth=str(_yearmonth)) - .filter('term', institution_id=self.get_institution()._id) - .exclude('term', user_name='Deleted user') + base_search = InstitutionalUserReport.search().filter( + 'term', + institution_id=self.get_institution()._id, ) + yearmonth = InstitutionalUserReport.most_recent_yearmonth(base_search=base_search) + if yearmonth is None: + return None + + return base_search.filter('term', report_yearmonth=str(yearmonth)) class _NewInstitutionSummaryMetricsDetail(JSONAPIBaseView, generics.RetrieveAPIView, InstitutionMixin): From 2f0318f5a94967fd5188cfda6ba874f5674fb75f Mon Sep 17 00:00:00 2001 From: Anton Krytskyi Date: Thu, 18 Sep 2025 17:01:02 +0300 Subject: [PATCH 2/2] add missing exlude statement --- api/institutions/views.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/api/institutions/views.py b/api/institutions/views.py index 9c6d1eab8fa..b9709a15c80 100644 --- a/api/institutions/views.py +++ b/api/institutions/views.py @@ -593,7 +593,11 @@ def get_default_search(self): if yearmonth is None: return None - return base_search.filter('term', report_yearmonth=str(yearmonth)) + return ( + base_search + .filter('term', report_yearmonth=str(yearmonth)) + .exclude('term', user_name='Deleted user') + ) class _NewInstitutionSummaryMetricsDetail(JSONAPIBaseView, generics.RetrieveAPIView, InstitutionMixin):