Merge pull request #931 from helgi/ordering

fix(models): add more sensible ordering to various API responses

Author: helgi

rootfs/api/models/app.py

@@ -87,6 +87,7 @@ class App(UuidAuditedModel):
 
     class Meta:
         permissions = (('use_app', 'Can use app'),)
+        ordering = ['id']
 
     def save(self, *args, **kwargs):
         if not self.id:

rootfs/api/models/certificate.py

@@ -91,6 +91,9 @@ class Certificate(AuditedModel):
     issuer = models.TextField(editable=False)
     subject = models.TextField(editable=False)
 
+    class Meta:
+        ordering = ['name', 'common_name', 'expires']
+
     @property
     def domains(self):
         domains = []

rootfs/api/models/domain.py

@@ -20,6 +20,9 @@ class Domain(AuditedModel):
         null=True
     )
 
+    class Meta:
+        ordering = ['domain', 'certificate']
+
     def save(self, *args, **kwargs):
         app = str(self.app)
         domain = str(self.domain)

rootfs/api/models/key.py

@@ -32,6 +32,7 @@ class Key(UuidAuditedModel):
     class Meta:
         verbose_name = 'SSH Key'
         unique_together = (('owner', 'fingerprint'))
+        ordering = ['public']
 
     def __str__(self):
         return "{}...{}".format(self.public[:18], self.public[-31:])

rootfs/api/tests/deployments/test_domain.py

@@ -75,7 +75,7 @@ def test_strip_dot(self):
         url = '/v2/apps/{app_id}/domains'.format(app_id=self.app_id)
         response = self.client.get(url)
         expected = [data['domain'] for data in response.data['results']]
-        self.assertEqual([self.app_id, domain], expected, msg)
+        self.assertEqual(sorted([self.app_id, domain]), expected, msg)
 
     def test_manage_idn_domain(self):
         url = '/v2/apps/{app_id}/domains'.format(app_id=self.app_id)

rootfs/api/tests/test_app.py

@@ -523,6 +523,21 @@ def _raise_exception(request, ctx):
         self.assertEqual(mr.called, True)
         self.assertEqual(mr.call_count, 10)
 
+    def test_list_ordering(self, mock_requests):
+        """
+        Test that a list of apps is sorted by name
+        """
+        for name in ['zulu', 'tango', 'alpha', 'foxtrot']:
+            response = self.client.post('/v2/apps', {'id': name})
+            self.assertEqual(response.status_code, 201, response.data)
+
+        response = self.client.get('/v2/apps')
+        apps = response.data['results']
+        self.assertEqual(apps[0]['id'], 'alpha')
+        self.assertEqual(apps[1]['id'], 'foxtrot')
+        self.assertEqual(apps[2]['id'], 'tango')
+        self.assertEqual(apps[3]['id'], 'zulu')
+
 FAKE_LOG_DATA = """
 2013-08-15 12:41:25 [33454] [INFO] Starting gunicorn 17.5
 2013-08-15 12:41:25 [33454] [INFO] Listening at: http://0.0.0.0:5000 (33454)

rootfs/api/tests/test_domain.py

@@ -73,7 +73,7 @@ def test_strip_dot(self):
         url = '/v2/apps/{app_id}/domains'.format(app_id=self.app_id)
         response = self.client.get(url)
         expected = [data['domain'] for data in response.data['results']]
-        self.assertEqual([self.app_id, domain], expected, msg)
+        self.assertEqual(sorted([self.app_id, domain]), expected, msg)
 
     def test_manage_idn_domain(self):
         url = '/v2/apps/{app_id}/domains'.format(app_id=self.app_id)