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

[Chris Johnston]

Add project app and read API

[Andy Doan (doanac)]

stuff like:

287 + resp = self.api_client.get('/api/v1/sourcepackage/', format='json')
288 + self.assertValidJSONResponse(resp)
289 + self.assertEqual(len(self.deserialize(resp)['objects']), 1)

could probably get folded into:

http://bazaar.launchpad.net/~canonical-ci-engineering/ubuntu-ci-services-itself/trunk/view/head:/ci-utils/ci_utils/tastypie/test.py

In particular it could probably work with the getResource method.

[Andy Doan (doanac)]

review: Approve

=== added directory 'ticket_system/project'
=== added file 'ticket_system/project/__init__.py'
--- ticket_system/project/__init__.py	1970-01-01 00:00:00 +0000
+++ ticket_system/project/__init__.py	2013-12-09 19:42:24 +0000
@@ -0,0 +1,14 @@
+# Ubuntu Continuous Integration Engine
+# Copyright 2013 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

=== added file 'ticket_system/project/admin.py'
--- ticket_system/project/admin.py	1970-01-01 00:00:00 +0000
+++ ticket_system/project/admin.py	2013-12-09 19:42:24 +0000
@@ -0,0 +1,31 @@
+# Ubuntu Continuous Integration Engine
+# Copyright 2013 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from django.contrib import admin
+from project.models import SourcePackage, BinaryPackage
+
+
+class SourcePackageAdmin(admin.ModelAdmin):
+    search_fields = ['name']
+    list_display = ('name',)
+
+
+class BinaryPackageAdmin(admin.ModelAdmin):
+    list_filter = ['seeded']
+    search_fields = ['name', 'sourcepackage']
+    list_display = ('name', 'sourcepackage', 'seeded')
+
+admin.site.register(SourcePackage, SourcePackageAdmin)
+admin.site.register(BinaryPackage, BinaryPackageAdmin)

=== added file 'ticket_system/project/api.py'
--- ticket_system/project/api.py	1970-01-01 00:00:00 +0000
+++ ticket_system/project/api.py	2013-12-09 19:42:24 +0000
@@ -0,0 +1,42 @@
+# Ubuntu Continuous Integration Engine
+# Copyright 2013 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from tastypie import fields
+from tastypie.resources import ModelResource
+from tastypie.constants import ALL
+from project.models import SourcePackage, BinaryPackage
+
+
+class SourcePackageResource(ModelResource):
+
+    class Meta:
+        queryset = SourcePackage.objects.all()
+        allowed_methods = ['get']
+        filtering = {
+            "name": ('exact', 'startswith'),
+        }
+
+
+class BinaryPackageResource(ModelResource):
+    sourcepackage = fields.ToOneField(SourcePackageResource, 'sourcepackage',
+                                      full=True)
+
+    class Meta:
+        queryset = BinaryPackage.objects.all()
+        allowed_methods = ['get']
+        filtering = {
+            "name": ('exact', 'startswith'),
+            "seeded": ALL,
+        }

=== added directory 'ticket_system/project/migrations'
=== added file 'ticket_system/project/migrations/0001_initial.py'
--- ticket_system/project/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
+++ ticket_system/project/migrations/0001_initial.py	2013-12-09 19:42:24 +0000
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'SourcePackage'
+        db.create_table('sourcepackage', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=4096)),
+        ))
+        db.send_create_signal(u'project', ['SourcePackage'])
+
+        # Adding model 'BinaryPackage'
+        db.create_table('binarypackage', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=4096)),
+            ('sourcepackage', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['project.SourcePackage'])),
+            ('seeded', self.gf('django.db.models.fields.BooleanField')(default=False)),
+        ))
+        db.send_create_signal(u'project', ['BinaryPackage'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'SourcePackage'
+        db.delete_table('sourcepackage')
+
+        # Deleting model 'BinaryPackage'
+        db.delete_table('binarypackage')
+
+
+    models = {
+        u'project.binarypackage': {
+            'Meta': {'object_name': 'BinaryPackage', 'db_table': "'binarypackage'"},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
+            'seeded': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'sourcepackage': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['project.SourcePackage']"})
+        },
+        u'project.sourcepackage': {
+            'Meta': {'object_name': 'SourcePackage', 'db_table': "'sourcepackage'"},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '4096'})
+        }
+    }
+
+    complete_apps = ['project']
\ No newline at end of file

=== added file 'ticket_system/project/migrations/__init__.py'
=== added file 'ticket_system/project/models.py'
--- ticket_system/project/models.py	1970-01-01 00:00:00 +0000
+++ ticket_system/project/models.py	2013-12-09 19:42:24 +0000
@@ -0,0 +1,38 @@
+# Ubuntu Continuous Integration Engine
+# Copyright 2013 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from django.db import models
+
+
+class SourcePackage(models.Model):
+    class Meta:
+        db_table = "sourcepackage"
+
+    name = models.CharField(max_length=4096)
+
+    def __unicode__(self):
+        return self.name
+
+
+class BinaryPackage(models.Model):
+    class Meta:
+        db_table = "binarypackage"
+
+    name = models.CharField(max_length=4096)
+    sourcepackage = models.ForeignKey("SourcePackage")
+    seeded = models.BooleanField(default=False)
+
+    def __unicode__(self):
+        return self.name

=== added file 'ticket_system/project/tests.py'
--- ticket_system/project/tests.py	1970-01-01 00:00:00 +0000
+++ ticket_system/project/tests.py	2013-12-09 19:42:24 +0000
@@ -0,0 +1,136 @@
+# Ubuntu Continuous Integration Engine
+# Copyright 2013 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from django.test import TestCase
+from tastypie.test import ResourceTestCase
+from project.models import SourcePackage, BinaryPackage
+
+
+def create_sourcepackage(name="awesome-package"):
+    package = SourcePackage()
+    package.name = name
+    package.save()
+    return package
+
+
+def create_binarypackage(name="awesome-binary", sourcepackage=None,
+                         seeded=False):
+    binary = BinaryPackage()
+    binary.name = name
+    binary.sourcepackage = sourcepackage
+    binary.seeded = seeded
+    binary.save()
+    return binary
+
+
+class SourcePackageModelTest(TestCase):
+
+    def test_creating_a_sourcepackage(self):
+        package = create_sourcepackage()
+        package_in_database = SourcePackage.objects.all()
+        self.assertEquals(len(package_in_database), 1)
+        only_package_in_database = package_in_database[0]
+        self.assertEquals(only_package_in_database, package)
+
+        self.assertEquals(only_package_in_database.name, "awesome-package")
+
+
+class BinaryPackageModelTest(TestCase):
+
+    def setUp(self):
+        self.sourcepackage = create_sourcepackage()
+        self.binarypackage = create_binarypackage(
+            sourcepackage=self.sourcepackage)
+
+    def test_creating_a_binarypackage(self):
+        binarypackage_in_database = BinaryPackage.objects.all()
+        self.assertEquals(len(binarypackage_in_database), 1)
+        only_binarypackage_in_database = binarypackage_in_database[0]
+        self.assertEquals(only_binarypackage_in_database, self.binarypackage)
+
+        self.assertEquals(only_binarypackage_in_database.name,
+                          "awesome-binary")
+
+
+class SourcePackageResourceTest(ResourceTestCase):
+
+    def setUp(self):
+        super(SourcePackageResourceTest, self).setUp()
+        create_sourcepackage()
+        self.sourcepackage_1 = SourcePackage.objects.get(
+            name='awesome-package')
+        self.detail_url = '/api/v1/sourcepackage/{0}/'.format(
+            self.sourcepackage_1.pk)
+
+    def test_get_sourcepackage_list_json(self):
+        resp = self.api_client.get('/api/v1/sourcepackage/', format='json')
+        self.assertValidJSONResponse(resp)
+        self.assertEqual(len(self.deserialize(resp)['objects']), 1)
+        self.assertEqual(self.deserialize(resp)['objects'][0], {
+            u'id': self.sourcepackage_1.pk,
+            u'name': u'awesome-package',
+            u'resource_uri': u'/api/v1/sourcepackage/{0}/'.format(
+                self.sourcepackage_1.pk)
+        })
+
+    def test_get_sourcepackage_detail_json(self):
+        resp = self.api_client.get(self.detail_url)
+        self.assertValidJSONResponse(resp)
+
+        # We use ``assertKeys`` here to just verify the keys, not all the data.
+        self.assertKeys(self.deserialize(resp),
+                        ['id', 'name', 'resource_uri'])
+        self.assertEqual(self.deserialize(resp)['name'], 'awesome-package')
+
+
+class BinaryPackageResourceTest(ResourceTestCase):
+
+    def setUp(self):
+        super(BinaryPackageResourceTest, self).setUp()
+        create_sourcepackage()
+        self.sourcepackage_1 = SourcePackage.objects.get(
+            name='awesome-package')
+        create_binarypackage(sourcepackage=self.sourcepackage_1)
+        self.binarypackage_1 = BinaryPackage.objects.get(
+            name='awesome-binary')
+        self.detail_url = '/api/v1/binarypackage/{0}/'.format(
+            self.binarypackage_1.pk)
+
+    def test_get_binarypackage_list_json(self):
+        resp = self.api_client.get('/api/v1/binarypackage/', format='json')
+        self.assertValidJSONResponse(resp)
+        self.assertEqual(len(self.deserialize(resp)['objects']), 1)
+        self.assertEqual(self.deserialize(resp)['objects'][0], {
+            u'id': self.binarypackage_1.pk,
+            u'name': u'awesome-binary',
+            u'seeded': False,
+            u'sourcepackage': {
+                u'id': self.sourcepackage_1.pk,
+                u'name': u'awesome-package',
+                u'resource_uri': u'/api/v1/sourcepackage/{0}/'.format(
+                    self.sourcepackage_1.pk)},
+            u'resource_uri': u'/api/v1/binarypackage/{0}/'.format(
+                self.binarypackage_1.pk)
+        })
+
+    def test_get_binarypackage_detail_json(self):
+        resp = self.api_client.get(self.detail_url)
+        self.assertValidJSONResponse(resp)
+
+        # We use ``assertKeys`` here to just verify the keys, not all the data.
+        self.assertKeys(self.deserialize(resp),
+                        ['id', 'name', 'resource_uri', 'seeded',
+                            'sourcepackage'])
+        self.assertEqual(self.deserialize(resp)['name'], 'awesome-binary')

=== modified file 'ticket_system/ticket_system/settings.py'
--- ticket_system/ticket_system/settings.py	2013-12-09 17:43:12 +0000
+++ ticket_system/ticket_system/settings.py	2013-12-09 19:42:24 +0000
@@ -140,6 +140,7 @@
 
 LOCAL_APPS = (
     'people',
+    'project',
 )
 
 INSTALLED_APPS = LOCAL_APPS + INSTALLED_APPS

=== modified file 'ticket_system/ticket_system/urls.py'
--- ticket_system/ticket_system/urls.py	2013-12-09 17:43:12 +0000
+++ ticket_system/ticket_system/urls.py	2013-12-09 19:42:24 +0000
@@ -17,10 +17,13 @@
 from django.contrib import admin
 from tastypie.api import Api
 from people.api import PersonResource
+from project.api import SourcePackageResource, BinaryPackageResource
 
 admin.autodiscover()
 v1_api = Api(api_name='v1')
 v1_api.register(PersonResource())
+v1_api.register(SourcePackageResource())
+v1_api.register(BinaryPackageResource())
 
 urlpatterns = patterns(
     '',