Migrate from popit-django to django-popolo / multiple-django-popolo-sources

contactos/migrations/0002_contact_popolo_person.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('popolo', '0002_update_models_from_upstream'),
+        ('contactos', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='contact',
+            name='popolo_person',
+            field=models.ForeignKey(blank=True, to='popolo.Person', null=True),
+            preserve_default=True,
+        ),
+    ]

contactos/migrations/0003_denull_popolo_people.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contactos', '0002_contact_popolo_person'),
+        ('instance', '0004_add_django_popolo_people'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contact',
+            name='popolo_person',
+            field=models.ForeignKey(to='popolo.Person'),
+            preserve_default=True,
+        ),
+    ]

contactos/migrations/0004_remove_contact_person.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contactos', '0003_denull_popolo_people'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='contact',
+            name='person',
+        ),
+    ]

contactos/migrations/0005_rename_migrated_fields.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contactos', '0004_remove_contact_person'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='contact',
+            old_name='popolo_person',
+            new_name='person',
+        ),
+    ]

contactos/migrations/0006_remove_contact_popit_identifier.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contactos', '0005_rename_migrated_fields'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='contact',
+            name='popit_identifier',
+        ),
+    ]

contactos/models.py

@@ -1,5 +1,5 @@
 from django.db import models
-from popit.models import Person
+from popolo.models import Person as Person
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.models import User
 from django.db.models.signals import pre_save
@@ -26,7 +26,6 @@ class Contact(models.Model):
     is_bounced = models.BooleanField(default=False)
     owner = models.ForeignKey(User, related_name="contacts", null=True)
     writeitinstance = models.ForeignKey('instance.WriteItInstance', related_name="contacts", null=True)
-    popit_identifier = models.CharField(max_length=512, null=True)
     enabled = models.BooleanField(default=True)
 
     def __unicode__(self):

contactos/tests/contacts_tests.py

@@ -1,7 +1,7 @@
 from global_test_case import GlobalTestCase as TestCase
 from nuntium.user_section.tests.user_section_views_tests import UserSectionTestCase
 from contactos.models import ContactType, Contact
-from popit.models import Person
+from popolo.models import Person
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext as _
 from django.core import mail
@@ -74,14 +74,12 @@ def test_create_contact(self):
             value='contact point',
             person=self.person,
             writeitinstance=writeitinstance,
-            popit_identifier='12345'
             )
         self.assertTrue(contact1)
         self.assertFalse(contact1.is_bounced)
         self.assertEquals(contact1.contact_type, contact_type)
         self.assertEquals(contact1.value, 'contact point')
         self.assertEquals(contact1.person, self.person)
-        self.assertEquals(contact1.popit_identifier, '12345')
         self.assertTrue(contact1.enabled)
 
     def test_contact_with_writeitinstance(self):
@@ -96,34 +94,13 @@ def test_contact_with_writeitinstance(self):
             value='contact point',
             person=self.person,
             writeitinstance=writeitinstance,
-            popit_identifier='12345'
             )
         self.assertTrue(contact1)
         self.assertFalse(contact1.is_bounced)
         self.assertEquals(contact1.contact_type, contact_type)
         self.assertEquals(contact1.value, 'contact point')
         self.assertEquals(contact1.person, self.person)
         self.assertEquals(contact1.writeitinstance, writeitinstance)
-        self.assertEquals(contact1.popit_identifier, '12345')
-
-    def test_create_contact_without_popit_identifier(self):
-        '''Create a contact without any reference to popit'''
-        contact_type = ContactType.objects.create(
-            name='mental message',
-            label_name='mental address id',
-            )
-        writeitinstance = WriteItInstance.objects.get(id=1)
-        contact1 = Contact.objects.create(
-            contact_type=contact_type,
-            value='contact point',
-            person=self.person,
-            writeitinstance=writeitinstance,
-            )
-        self.assertTrue(contact1)
-        self.assertFalse(contact1.is_bounced)
-        self.assertEquals(contact1.contact_type, contact_type)
-        self.assertEquals(contact1.value, 'contact point')
-        self.assertEquals(contact1.person, self.person)
 
     def test_contacts_reverse_name(self):
         # Yeah I did another test just to say that I have one more

contactos/views.py

@@ -7,7 +7,7 @@
 from django.utils.decorators import method_decorator
 from subdomains.utils import reverse
 from instance.models import WriteItInstance
-from popit.models import Person
+from popolo.models import Person
 from django.http import Http404
 
 

example_data.yaml

@@ -2,14 +2,14 @@
   model: sites.site
   pk: 1
 - fields:
-    date_joined: 2013-04-26 21:09:22.224616+00:00
+    date_joined: '2013-04-26T21:09:22Z'
     email: admin@admines.cl
     first_name: 'Administrador del system'
     groups: []
     is_active: true
     is_staff: true
     is_superuser: true
-    last_login: 2013-06-10 16:06:46.989439+00:00
+    last_login: '2013-06-10T16:06:46Z'
     last_name: ''
     password: pbkdf2_sha256$10000$LoeTDV2yMCWT$fgkQ++r4O7wurfFSAtHT1/a9WTjb32cHq63dFgXU+rI=
     user_permissions: []
@@ -60,32 +60,52 @@
 - fields: {contact: 1, message: 4, site: 1}
   model: nuntium.outboundmessage
   pk: 5
-- fields: {url: 'http://popit.org/api/v1'}
-  model: popit.apiinstance
+- fields:
+    url: 'http://popit.org/api/v1'
+  model: popolo_sources.popolosource
   pk: 1
-- fields: {url: 'http://popit.mysociety.org/api/v1/'}
-  model: popit.apiinstance
+- fields:
+    url: 'http://popit.mysociety.org/api/v1/'
+  model: popolo_sources.popolosource
   pk: 2
-- fields: {api_instance: 1, name: Pedro, popit_url: 'http://popit.mysociety.org/api/v1/persons/1', popit_id: '52bc7asdasd34567'}
-  model: popit.person
+
+- model: popolo_sources.linktopopolosource
+  fields:
+    popolo_source: 1
+    deleted_from_source: false
+    content_type: [popolo, person]
+    object_id: 1
   pk: 1
-- fields: {api_instance: 2, name: Marcel, popit_url: 'http://popit.mysociety.org/api/v1/persons/2', popit_id: '52bc7asdasd34568'}
-  model: popit.person
+- model: popolo_sources.linktopopolosource
+  fields:
+    popolo_source: 2
+    deleted_from_source: false
+    content_type: [popolo, person]
+    object_id: 2
   pk: 2
-- fields: {api_instance: 2, name: Felipe, popit_url: 'http://popit.mysociety.org/api/v1/persons/3', popit_id: '52bc7asdasd34569'}
-  model: popit.person
-  pk: 3
-- fields: {content: Public Answer,message: 2,person: 1}
-  model: nuntium.answer
+- model: popolo_sources.linktopopolosource
+  fields:
+    popolo_source: 2
+    deleted_from_source: false
+    content_type: [popolo, person]
+    object_id: 3
+  pk: 2
+
+
+- fields: {name: Pedro}
+  model: popolo.person
   pk: 1
-- fields: {content: Private Answer,message: 3,person: 1}
-  model: nuntium.answer
+- fields: {name: Marcel}
+  model: popolo.person
   pk: 2
+- fields: {name: Felipe}
+  model: popolo.person
+  pk: 3
 - fields: {person: 1, writeitinstance: 1}
-  model: instance.membership
+  model: instance.instancemembership
   pk: 1
 - fields: {person: 1, writeitinstance: 2}
-  model: instance.membership
+  model: instance.instancemembership
   pk: 2
 - fields: {label_name: Electronic Mail, name: e-mail}
   model: contactos.contacttype
@@ -102,3 +122,72 @@
 - fields: {contact_type: 1, person: 3, value: falvarez@ciudadanointeligente.cl, writeitinstance: 1}
   model: contactos.contact
   pk: 4
+- fields:
+    content_type: [popolo, person]
+    identifier: 52bc7asdasd34567
+    object_id: 1
+    scheme: popit_id
+  model: popolo.identifier
+  pk: 1
+- fields:
+    content_type: [popolo, person]
+    identifier: http://popit.mysociety.org/api/v1/persons/1
+    object_id: 1
+    scheme: popit_url
+  model: popolo.identifier
+  pk: 2
+- fields:
+    content_type: [popolo, person]
+    identifier: 52bc7asdasd34567
+    object_id: 1
+    scheme: popolo:person
+  model: popolo.identifier
+  pk: 3
+- fields:
+    content_type: [popolo, person]
+    identifier: 52bc7asdasd34568
+    object_id: 2
+    scheme: popit_id
+  model: popolo.identifier
+  pk: 4
+- fields:
+    content_type: [popolo, person]
+    identifier: http://popit.mysociety.org/api/v1/persons/2
+    object_id: 2
+    scheme: popit_url
+  model: popolo.identifier
+  pk: 5
+- fields:
+    content_type: [popolo, person]
+    identifier: 52bc7asdasd34568
+    object_id: 2
+    scheme: popolo:person
+  model: popolo.identifier
+  pk: 6
+- fields:
+    content_type: [popolo, person]
+    identifier: 52bc7asdasd34569
+    object_id: 3
+    scheme: popit_id
+  model: popolo.identifier
+  pk: 7
+- fields:
+    content_type: [popolo, person]
+    identifier: http://popit.mysociety.org/api/v1/persons/3
+    object_id: 3
+    scheme: popit_url
+  model: popolo.identifier
+  pk: 8
+- fields:
+    content_type: [popolo, person]
+    identifier: 52bc7asdasd34569
+    object_id: 3
+    scheme: popolo:person
+  model: popolo.identifier
+  pk: 9
+- fields: {content: Public Answer,message: 2,person: 1}
+  model: nuntium.answer
+  pk: 1
+- fields: {content: Private Answer,message: 3,person: 1}
+  model: nuntium.answer
+  pk: 2

global_test_case.py

@@ -6,7 +6,6 @@
 from tastypie.test import ResourceTestCase
 from django.conf import settings
 from django.contrib.sites.models import Site
-from popit.tests import instance_helpers
 import os
 import subprocess
 import threading