Merge branch 'enrollment-filter' of 'https://github.com/evamillan/grimoirelab-sortinghat'

Merges #789
Closes #789

Author: sduenas

releases/unreleased/filter-by-org-full-name.yml

@@ -0,0 +1,10 @@
+---
+title: Enrollment filter on organizations view
+category: fixed
+author: Eva Millan <[email protected]>
+issue: null
+notes: >
+  Filtering individuals by their affiliation to an organization
+  also returned results of organizations that contained that name.
+  The filter now only returns organizations that match the exact
+  name.

sortinghat/core/schema.py

@@ -1594,7 +1594,7 @@ def resolve_individuals(self, info, filters=None,
                                                  .values_list('individual__mk')))
         if filters and 'enrollment' in filters:
             query = query.filter(mk__in=Subquery(Enrollment.objects
-                                                 .filter(group__name__icontains=filters['enrollment'])
+                                                 .filter(group__name=filters['enrollment'])
                                                  .values_list('individual__mk')))
             if 'enrollment_parent_org' in filters:
                 query = query.filter(mk__in=Subquery(Enrollment.objects

tests/test_schema.py

@@ -3659,12 +3659,12 @@ def test_filter_enrollment(self):
         enrollment = indv['enrollments'][0]
         self.assertEqual(enrollment['group']['name'], 'Bitergia')
 
-        # Test partial organization name match
+        # Test no results for partial organization name match
         executed = client.execute(SH_INDIVIDUALS_ENROLLMENT_FILTER % 'bit',
                                   context_value=self.context_value)
 
         individuals = executed['data']['individuals']['entities']
-        self.assertEqual(len(individuals), 2)
+        self.assertEqual(len(individuals), 0)
 
         # Test organization name with spaces
         executed = client.execute(SH_INDIVIDUALS_ENROLLMENT_FILTER % 'bit company',
@@ -3709,12 +3709,12 @@ def test_filter_team_enrollment(self):
         self.assertEqual(enrollment['group']['name'], 'Team 1')
         self.assertEqual(enrollment['group']['type'], 'team')
 
-        # Test partial team name match
+        # Test no results for partial team name match
         executed = client.execute(SH_INDIVIDUALS_ENROLLMENT_FILTER % 'tea',
                                   context_value=self.context_value)
 
         individuals = executed['data']['individuals']['entities']
-        self.assertEqual(len(individuals), 2)
+        self.assertEqual(len(individuals), 0)
 
         # Test no results for enrollment
         executed = client.execute(SH_INDIVIDUALS_ENROLLMENT_FILTER % 'Organization',