display only institution-specific user metrics reports

Author: antkryt

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):

api_tests/users/views/test_user_settings.py

@@ -7,13 +7,7 @@
     AuthUserFactory,
     UserFactory,
 )
-<<<<<<< HEAD
 from osf.models import Email, NotableDomain, NotificationType
-=======
-from django.middleware import csrf
-from django.core.cache import cache
-from osf.models import Email, NotableDomain
->>>>>>> 7a53306cea (reset throttle cache)
 from framework.auth.views import auth_email_logout
 from tests.utils import capture_notifications