Merge lp:~cjohnston/ubuntu-ci-services-itself/ts-update-status into lp:ubuntu-ci-services-itself

[Chris Johnston]

Add ticket status APIs

Adds ticket status API for webui to consume. Adds ticket status update API for lander to use.

[Joe Talbott (joetalbott)]

+1

review: Approve

=== modified file 'ticket_system/ticket/api.py'
--- ticket_system/ticket/api.py	2013-12-20 21:12:13 +0000
+++ ticket_system/ticket/api.py	2014-01-07 01:03:48 +0000
@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from tastypie import fields
+from tastypie.constants import ALL
 from tastypie.authorization import Authorization
 from tastypie.resources import ModelResource
 from ticket.models import Ticket, SubTicket, SourcePackageUpload, Artifact
@@ -87,3 +88,29 @@
     class Meta:
         queryset = Ticket.objects.all()
         allowed_methods = ['get']
+
+
+class TicketUpdateStatusResource(ModelResource):
+
+    class Meta:
+        queryset = Ticket.objects.all()
+        fields = ['id', 'current_workflow_step', 'status']
+        allowed_methods = ['get', 'patch']
+        authorization = Authorization()
+        resource_name = 'updatestatus'
+        filtering = {
+            "id": ('exact'),
+        }
+
+
+class TicketStatusResource(ModelResource):
+
+    class Meta:
+        queryset = Ticket.objects.all()
+        fields = ['id', 'title', 'current_workflow_step', 'status', 'created',
+                  'updated']
+        allowed_methods = ['get']
+        resource_name = 'status'
+        filtering = {
+            "current_workflow_step": ALL,
+        }

=== modified file 'ticket_system/ticket/tests/test_read_api.py'
--- ticket_system/ticket/tests/test_read_api.py	2014-01-06 20:24:26 +0000
+++ ticket_system/ticket/tests/test_read_api.py	2014-01-07 01:03:48 +0000
@@ -28,7 +28,6 @@
         self.subticket = mommy.make('SubTicket', ticket=self.ticket,
                                     source_package_upload=self.spu)
         self.artifact = mommy.make('Artifact', subticket=self.subticket)
-        self.maxDiff = None
 
     def test_get_artifact_api(self):
         obj = self.getResource('artifact/')
@@ -149,3 +148,38 @@
             u'resource_uri':
             u'/api/v1/spu/{0}/'.format(self.spu.pk),
         })
+
+    def test_get_ticket_update_status_api(self):
+        obj = self.getResource('updatestatus/')
+        self.assertEqual(obj['objects'][0], {
+            u'id': self.ticket.pk,
+            u'resource_uri':
+            u'/api/v1/updatestatus/{0}/'.format(self.ticket.pk),
+            u'current_workflow_step': self.ticket.current_workflow_step,
+            u'status': self.ticket.status,
+        })
+
+    def test_get_single_ticket_update_status_api(self):
+        obj = self.getResource('updatestatus/?id={}'.format(self.ticket.pk))
+        self.assertEqual(obj['objects'][0], {
+            u'id': self.ticket.pk,
+            u'resource_uri':
+            u'/api/v1/updatestatus/{0}/'.format(self.ticket.pk),
+            u'current_workflow_step': self.ticket.current_workflow_step,
+            u'status': self.ticket.status,
+        })
+
+    def test_get_ticket_status_api(self):
+        obj = self.getResource('status/')
+        self.assertEqual(obj['objects'][0], {
+            u'created': unicode(self.ticket.created.strftime(
+                "%Y-%m-%dT%H:%M:%S.%f")),
+            u'current_workflow_step': self.ticket.current_workflow_step,
+            u'id': self.ticket.pk,
+            u'status': self.ticket.status,
+            u'title': self.ticket.title,
+            u'resource_uri':
+            u'/api/v1/status/{0}/'.format(self.ticket.pk),
+            u'updated': unicode(self.ticket.updated.strftime(
+                "%Y-%m-%dT%H:%M:%S.%f")),
+        })

=== modified file 'ticket_system/ticket/tests/test_write_api.py'
--- ticket_system/ticket/tests/test_write_api.py	2013-12-20 21:12:13 +0000
+++ ticket_system/ticket/tests/test_write_api.py	2014-01-07 01:03:48 +0000
@@ -190,3 +190,23 @@
     def test_delete_artifact_not_allowed(self):
         resp = self.delete(resource=self.detail_url)
         self.assertHttpMethodNotAllowed(resp)
+
+
+class APIUpdateTicketStatuses(TastypieTestCase):
+
+    def setUp(self):
+        super(APIUpdateTicketStatuses, self).setUp('/api/v1')
+        self.ticket = mommy.make('Ticket')
+        self.ticket_detail_url = 'updatestatus/{0}/'.format(self.ticket.pk)
+
+    def test_patch_ticket_status(self):
+        new_data = {'current_workflow_step': '200', 'status': '210'}
+        self.assertEqual(Ticket.objects.count(), 1)
+        self.patch('/api/v1/' + self.ticket_detail_url,
+                   new_data)
+        # Make sure the count hasn't changed & we did an update.
+        self.assertEqual(Ticket.objects.count(), 1)
+        # Check for updated data.
+        self.assertEqual(Ticket.objects.get(
+                         pk=self.ticket.pk).current_workflow_step, 200)
+        self.assertEqual(Ticket.objects.get(pk=self.ticket.pk).status, 210)

=== modified file 'ticket_system/ticket_system/urls.py'
--- ticket_system/ticket_system/urls.py	2013-12-13 04:56:17 +0000
+++ ticket_system/ticket_system/urls.py	2014-01-07 01:03:48 +0000
@@ -20,7 +20,8 @@
 from project.api import SourcePackageResource, BinaryPackageResource
 from ticket.api import (TicketResource, SubTicketResource, ArtifactResource,
                         SourcePackageUploadResource, FullSubTicketResource,
-                        FullTicketResource, FullArtifactResource)
+                        FullTicketResource, FullArtifactResource,
+                        TicketStatusResource, TicketUpdateStatusResource)
 
 admin.autodiscover()
 v1_api = Api(api_name='v1')
@@ -34,6 +35,8 @@
 v1_api.register(FullArtifactResource())
 v1_api.register(FullSubTicketResource())
 v1_api.register(FullTicketResource())
+v1_api.register(TicketUpdateStatusResource())
+v1_api.register(TicketStatusResource())
 
 urlpatterns = patterns(
     '',