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

[Chris Johnston]

Add people app to ticket-system with read api

[Andy Doan (doanac)]

157 + email = models.EmailField(max_length=200)

Can you document why that's a shorter length than the name field?

Since this is a "get-only" api, should we add a unit-test to confirm that or will this become a read-write very soon?

[Chris Johnston (cjohnston)]

It will become read-write soon.

review: Needs Resubmitting

[Andy Doan (doanac)]

LGTM

review: Approve

[Chris Johnston (cjohnston)]

The prerequisite https://code.launchpad.net/~cjohnston/ubuntu-ci-services-itself/ticket-system has not yet been merged into https://code.launchpad.net/~canonical-ci-engineering/ubuntu-ci-services-itself/trunk.

=== added directory 'ticket_system/people'
=== added file 'ticket_system/people/__init__.py'
--- ticket_system/people/__init__.py	1970-01-01 00:00:00 +0000
+++ ticket_system/people/__init__.py	2013-12-09 18:58:11 +0000
@@ -0,0 +1,15 @@
+# Houston
+# 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/people/admin.py'
--- ticket_system/people/admin.py	1970-01-01 00:00:00 +0000
+++ ticket_system/people/admin.py	2013-12-09 18:58:11 +0000
@@ -0,0 +1,26 @@
+# Houston
+# 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 people.models import Person
+
+
+class PersonAdmin(admin.ModelAdmin):
+    list_filter = ['is_team']
+    search_fields = ['name', 'email']
+    list_display = ('name', 'email', 'is_team')
+
+admin.site.register(Person, PersonAdmin)

=== added file 'ticket_system/people/api.py'
--- ticket_system/people/api.py	1970-01-01 00:00:00 +0000
+++ ticket_system/people/api.py	2013-12-09 18:58:11 +0000
@@ -0,0 +1,30 @@
+# Houston
+# 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.resources import ModelResource
+from tastypie.constants import ALL
+from people.models import Person
+
+
+class PersonResource(ModelResource):
+    class Meta:
+        queryset = Person.objects.all()
+        allowed_methods = ['get']
+        filtering = {
+            "name": ('exact', 'startswith'),
+            "email": ('exact', 'startswith'),
+            "is_team": ALL,
+        }

=== added directory 'ticket_system/people/migrations'
=== added file 'ticket_system/people/migrations/0001_initial.py'
--- ticket_system/people/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
+++ ticket_system/people/migrations/0001_initial.py	2013-12-09 18:58:11 +0000
@@ -0,0 +1,36 @@
+# -*- 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 'Person'
+        db.create_table('person', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=4096)),
+            ('email', self.gf('django.db.models.fields.EmailField')(max_length=4096)),
+            ('is_team', self.gf('django.db.models.fields.BooleanField')(default=False)),
+        ))
+        db.send_create_signal(u'people', ['Person'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'Person'
+        db.delete_table('person')
+
+
+    models = {
+        u'people.person': {
+            'Meta': {'object_name': 'Person', 'db_table': "'person'"},
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '4096'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_team': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '4096'})
+        }
+    }
+
+    complete_apps = ['people']
\ No newline at end of file

=== added file 'ticket_system/people/migrations/__init__.py'
=== added file 'ticket_system/people/models.py'
--- ticket_system/people/models.py	1970-01-01 00:00:00 +0000
+++ ticket_system/people/models.py	2013-12-09 18:58:11 +0000
@@ -0,0 +1,29 @@
+# Houston
+# 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 Person(models.Model):
+    class Meta:
+        db_table = 'person'
+
+    name = models.CharField(max_length=4096)
+    email = models.EmailField(max_length=4096)
+    is_team = models.BooleanField(default=False)
+
+    def __unicode__(self):
+        return self.name

=== added file 'ticket_system/people/tests.py'
--- ticket_system/people/tests.py	1970-01-01 00:00:00 +0000
+++ ticket_system/people/tests.py	2013-12-09 18:58:11 +0000
@@ -0,0 +1,72 @@
+# Houston
+# 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 people.models import Person
+
+
+def create_person(name="Chris Johnston",
+                  email="[e-mail]", is_team=False):
+    person = Person()
+    person.name = name
+    person.email = email
+    person.is_team = is_team
+    person.save()
+    return person
+
+
+class PersonModelTest(TestCase):
+
+    def test_creating_a_person(self):
+        person = create_person()
+        people_in_database = Person.objects.all()
+        self.assertEquals(len(people_in_database), 1)
+        only_person_in_database = people_in_database[0]
+        self.assertEquals(only_person_in_database, person)
+
+        self.assertEquals(only_person_in_database.name, "Chris Johnston")
+        self.assertEquals(only_person_in_database.email,
+                          "[e-mail]")
+
+
+class PersonResourceTest(ResourceTestCase):
+
+    def setUp(self):
+        super(PersonResourceTest, self).setUp()
+        create_person()
+        self.person_1 = Person.objects.get(name='Chris Johnston')
+        self.detail_url = '/api/v1/person/{0}/'.format(self.person_1.pk)
+
+    def test_get_person_list_json(self):
+        resp = self.api_client.get('/api/v1/person/', format='json')
+        self.assertValidJSONResponse(resp)
+        self.assertEqual(len(self.deserialize(resp)['objects']), 1)
+        self.assertEqual(self.deserialize(resp)['objects'][0], {
+            u'email': u'[e-mail]',
+            u'id': self.person_1.pk,
+            u'is_team': False,
+            u'name': u'Chris Johnston',
+            u'resource_uri': u'/api/v1/person/{0}/'.format(self.person_1.pk)
+        })
+
+    def test_get_person_detail_json(self):
+        resp = self.api_client.get(self.detail_url)
+        self.assertValidJSONResponse(resp)
+
+        self.assertKeys(self.deserialize(resp),
+                        ['email', 'id', 'is_team', 'name', 'resource_uri'])
+        self.assertEqual(self.deserialize(resp)['name'], 'Chris Johnston')

=== modified file 'ticket_system/setup.py'
--- ticket_system/setup.py	2013-12-09 18:58:11 +0000
+++ ticket_system/setup.py	2013-12-09 18:58:11 +0000
@@ -14,6 +14,10 @@
 # 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/>.
 
+
+# TODO make this probe from changelog or bzr
+__version__ = '0.1'
+
 import os
 import sys
 

=== modified file 'ticket_system/ticket_system/settings.py'
--- ticket_system/ticket_system/settings.py	2013-12-09 18:58:11 +0000
+++ ticket_system/ticket_system/settings.py	2013-12-09 18:58:11 +0000
@@ -140,8 +140,6 @@
 
 LOCAL_APPS = (
     'people',
-    'project',
-    'ticket',
 )
 
 INSTALLED_APPS = LOCAL_APPS + INSTALLED_APPS

=== modified file 'ticket_system/ticket_system/urls.py'
--- ticket_system/ticket_system/urls.py	2013-12-09 18:58:11 +0000
+++ ticket_system/ticket_system/urls.py	2013-12-09 18:58:11 +0000
@@ -15,10 +15,15 @@
 
 from django.conf.urls import patterns, include, url
 from django.contrib import admin
+from tastypie.api import Api
+from people.api import PersonResource
 
 admin.autodiscover()
+v1_api = Api(api_name='v1')
+v1_api.register(PersonResource())
 
 urlpatterns = patterns(
     '',
+    (r'^api/', include(v1_api.urls)),
     url(r'^admin/', include(admin.site.urls)),
 )