[graphene] Fix default order_by handling in queries

In newer versions of Graphene, when an input is passed as
null, it overwrites the argument’s default value as None.
This commit updates the code to fix this issue and support a
future change that will be made in a future version in which
the value will be Undefined when the filter is not defined.

Signed-off-by: Jose Javier Merchante <[email protected]>

Author: jjmerchante

sortinghat/core/schema.py

@@ -1754,6 +1754,9 @@ def resolve_organizations(self, info, filters=None,
                               page_size=settings.SORTINGHAT_API_PAGE_SIZE,
                               order_by='name',
                               **kwargs):
+        if not order_by:
+            order_by = 'name'
+
         query = Organization.objects.all_organizations().annotate(enrollments_count=Count('enrollments')
                                                                   ).order_by(to_snake_case(order_by))
 
@@ -1817,6 +1820,9 @@ def resolve_individuals(self, info, filters=None,
                             page_size=settings.SORTINGHAT_API_PAGE_SIZE,
                             order_by='mk',
                             **kwargs):
+        if not order_by:
+            order_by = 'mk'
+
         query = Individual.objects.annotate(identities_count=Count('identities')).order_by(to_snake_case(order_by))
 
         if filters and 'uuid' in filters:

tests/test_schema.py

@@ -1924,6 +1924,38 @@ def test_order_by_enrollments(self):
         org = orgs[2]
         self.assertEqual(org['name'], org3.name)
 
+    def test_order_by_null(self):
+        """Check whether it returns the organizations ordered by default (name)"""
+
+        indv1 = Individual.objects.create(mk='a9b403e150dd4af8953a52a4bb841051e4b705d9')
+        indv2 = Individual.objects.create(mk='0010a5211c03c46d340ada434b9f5b5072a8d491')
+        indv3 = Individual.objects.create(mk='86172d829d61adabde125d2442093213f745fbfd')
+
+        org1 = Organization.add_root(name='Example')
+        Enrollment.objects.create(individual=indv1, group=org1)
+        Enrollment.objects.create(individual=indv2, group=org1)
+        Enrollment.objects.create(individual=indv3, group=org1)
+
+        org2 = Organization.add_root(name='Bitergia')
+        Enrollment.objects.create(individual=indv1, group=org2)
+        Enrollment.objects.create(individual=indv2, group=org2)
+
+        org3 = Organization.add_root(name='LibreSoft')
+
+        # Test default order by null
+        client = graphene.test.Client(schema)
+        executed = client.execute("""{ organizations (orderBy: null){ entities { name } } }""",
+                                  context_value=self.context_value)
+
+        orgs = executed['data']['organizations']['entities']
+
+        org = orgs[0]
+        self.assertEqual(org['name'], org2.name)
+        org = orgs[1]
+        self.assertEqual(org['name'], org1.name)
+        org = orgs[2]
+        self.assertEqual(org['name'], org3.name)
+
     def test_pagination(self):
         """Check whether it returns the organizations searched when using pagination"""
 
@@ -4295,6 +4327,29 @@ def test_order_by_identities_count(self):
         indv = individuals[2]
         self.assertEqual(indv['mk'], indv1.mk)
 
+    def test_order_by_null(self):
+        """Check whether it returns the indifiduals sorted by default (mk) when ordering by null"""
+
+        indv1 = Individual.objects.create(mk='aaaa03e150dd4af8953a52a4bb841051e4b705d9')
+        indv2 = Individual.objects.create(mk='cccc4b709e5446d250b4fde0e34b78a2b4fde0e3')
+        indv3 = Individual.objects.create(mk='bbbbde0e34b78a185c4b709e5442d045451c')
+        Profile.objects.create(name='AA', individual=indv1)
+        Profile.objects.create(name='ZZ', individual=indv2)
+        Profile.objects.create(name='MM', individual=indv3)
+
+        client = graphene.test.Client(schema)
+        executed = client.execute("""{ individuals(orderBy: null) { entities { mk } } }""",
+                                  context_value=self.context_value)
+
+        individuals = executed['data']['individuals']['entities']
+
+        indv = individuals[0]
+        self.assertEqual(indv['mk'], indv1.mk)
+        indv = individuals[1]
+        self.assertEqual(indv['mk'], indv3.mk)
+        indv = individuals[2]
+        self.assertEqual(indv['mk'], indv2.mk)
+
     def test_pagination(self):
         """Check whether it returns the individuals searched when using pagination"""