From 9961cea151daa2c4262b4ae6a3c05598dd88b3ab Mon Sep 17 00:00:00 2001 From: Nikolai Kristiansen Date: Fri, 18 Oct 2013 02:37:51 +0200 Subject: [PATCH] Change member.phone_number to string --- dusken/fixtures/apikey.json | 1 - dusken/fixtures/auth.json | 1 - dusken/fixtures/member.json | 2 +- dusken/models.py | 2 +- dusken/tests/member.py | 4 ++-- 5 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 dusken/fixtures/apikey.json delete mode 100644 dusken/fixtures/auth.json diff --git a/dusken/fixtures/apikey.json b/dusken/fixtures/apikey.json deleted file mode 100644 index 53f7411..0000000 --- a/dusken/fixtures/apikey.json +++ /dev/null @@ -1 +0,0 @@ -[{"pk": 1, "model": "tastypie.apikey", "fields": {"user": 2, "key": "0593572687d43fa8d86c1663e5ddf826bace073a", "created": "2013-09-11T19:17:16.036Z"}}] \ No newline at end of file diff --git a/dusken/fixtures/auth.json b/dusken/fixtures/auth.json deleted file mode 100644 index 3fbb07b..0000000 --- a/dusken/fixtures/auth.json +++ /dev/null @@ -1 +0,0 @@ -[{"pk": 1, "model": "auth.permission", "fields": {"codename": "add_permission", "name": "Can add permission", "content_type": 1}}, {"pk": 2, "model": "auth.permission", "fields": {"codename": "change_permission", "name": "Can change permission", "content_type": 1}}, {"pk": 3, "model": "auth.permission", "fields": {"codename": "delete_permission", "name": "Can delete permission", "content_type": 1}}, {"pk": 4, "model": "auth.permission", "fields": {"codename": "add_group", "name": "Can add group", "content_type": 2}}, {"pk": 5, "model": "auth.permission", "fields": {"codename": "change_group", "name": "Can change group", "content_type": 2}}, {"pk": 6, "model": "auth.permission", "fields": {"codename": "delete_group", "name": "Can delete group", "content_type": 2}}, {"pk": 7, "model": "auth.permission", "fields": {"codename": "add_user", "name": "Can add user", "content_type": 3}}, {"pk": 8, "model": "auth.permission", "fields": {"codename": "change_user", "name": "Can change user", "content_type": 3}}, {"pk": 9, "model": "auth.permission", "fields": {"codename": "delete_user", "name": "Can delete user", "content_type": 3}}, {"pk": 10, "model": "auth.permission", "fields": {"codename": "add_contenttype", "name": "Can add content type", "content_type": 4}}, {"pk": 11, "model": "auth.permission", "fields": {"codename": "change_contenttype", "name": "Can change content type", "content_type": 4}}, {"pk": 12, "model": "auth.permission", "fields": {"codename": "delete_contenttype", "name": "Can delete content type", "content_type": 4}}, {"pk": 13, "model": "auth.permission", "fields": {"codename": "add_session", "name": "Can add session", "content_type": 5}}, {"pk": 14, "model": "auth.permission", "fields": {"codename": "change_session", "name": "Can change session", "content_type": 5}}, {"pk": 15, "model": "auth.permission", "fields": {"codename": "delete_session", "name": "Can delete session", "content_type": 5}}, {"pk": 16, "model": "auth.permission", "fields": {"codename": "add_site", "name": "Can add site", "content_type": 6}}, {"pk": 17, "model": "auth.permission", "fields": {"codename": "change_site", "name": "Can change site", "content_type": 6}}, {"pk": 18, "model": "auth.permission", "fields": {"codename": "delete_site", "name": "Can delete site", "content_type": 6}}, {"pk": 19, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 7}}, {"pk": 20, "model": "auth.permission", "fields": {"codename": "change_logentry", "name": "Can change log entry", "content_type": 7}}, {"pk": 21, "model": "auth.permission", "fields": {"codename": "delete_logentry", "name": "Can delete log entry", "content_type": 7}}, {"pk": 22, "model": "auth.permission", "fields": {"codename": "add_country", "name": "Can add country", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": {"codename": "change_country", "name": "Can change country", "content_type": 8}}, {"pk": 24, "model": "auth.permission", "fields": {"codename": "delete_country", "name": "Can delete country", "content_type": 8}}, {"pk": 25, "model": "auth.permission", "fields": {"codename": "add_address", "name": "Can add address", "content_type": 9}}, {"pk": 26, "model": "auth.permission", "fields": {"codename": "change_address", "name": "Can change address", "content_type": 9}}, {"pk": 27, "model": "auth.permission", "fields": {"codename": "delete_address", "name": "Can delete address", "content_type": 9}}, {"pk": 28, "model": "auth.permission", "fields": {"codename": "add_institution", "name": "Can add institution", "content_type": 10}}, {"pk": 29, "model": "auth.permission", "fields": {"codename": "change_institution", "name": "Can change institution", "content_type": 10}}, {"pk": 30, "model": "auth.permission", "fields": {"codename": "delete_institution", "name": "Can delete institution", "content_type": 10}}, {"pk": 31, "model": "auth.permission", "fields": {"codename": "add_placeofstudy", "name": "Can add place of study", "content_type": 11}}, {"pk": 32, "model": "auth.permission", "fields": {"codename": "change_placeofstudy", "name": "Can change place of study", "content_type": 11}}, {"pk": 33, "model": "auth.permission", "fields": {"codename": "delete_placeofstudy", "name": "Can delete place of study", "content_type": 11}}, {"pk": 34, "model": "auth.permission", "fields": {"codename": "add_member", "name": "Can add user", "content_type": 12}}, {"pk": 35, "model": "auth.permission", "fields": {"codename": "change_member", "name": "Can change user", "content_type": 12}}, {"pk": 36, "model": "auth.permission", "fields": {"codename": "delete_member", "name": "Can delete user", "content_type": 12}}, {"pk": 37, "model": "auth.permission", "fields": {"codename": "add_facebookauth", "name": "Can add facebook auth", "content_type": 13}}, {"pk": 38, "model": "auth.permission", "fields": {"codename": "change_facebookauth", "name": "Can change facebook auth", "content_type": 13}}, {"pk": 39, "model": "auth.permission", "fields": {"codename": "delete_facebookauth", "name": "Can delete facebook auth", "content_type": 13}}, {"pk": 40, "model": "auth.permission", "fields": {"codename": "add_googleauth", "name": "Can add google auth", "content_type": 14}}, {"pk": 41, "model": "auth.permission", "fields": {"codename": "change_googleauth", "name": "Can change google auth", "content_type": 14}}, {"pk": 42, "model": "auth.permission", "fields": {"codename": "delete_googleauth", "name": "Can delete google auth", "content_type": 14}}, {"pk": 43, "model": "auth.permission", "fields": {"codename": "add_extendedmemberdetail", "name": "Can add extended member detail", "content_type": 15}}, {"pk": 44, "model": "auth.permission", "fields": {"codename": "change_extendedmemberdetail", "name": "Can change extended member detail", "content_type": 15}}, {"pk": 45, "model": "auth.permission", "fields": {"codename": "delete_extendedmemberdetail", "name": "Can delete extended member detail", "content_type": 15}}, {"pk": 46, "model": "auth.permission", "fields": {"codename": "add_paymenttype", "name": "Can add payment type", "content_type": 16}}, {"pk": 47, "model": "auth.permission", "fields": {"codename": "change_paymenttype", "name": "Can change payment type", "content_type": 16}}, {"pk": 48, "model": "auth.permission", "fields": {"codename": "delete_paymenttype", "name": "Can delete payment type", "content_type": 16}}, {"pk": 49, "model": "auth.permission", "fields": {"codename": "add_payment", "name": "Can add payment", "content_type": 17}}, {"pk": 50, "model": "auth.permission", "fields": {"codename": "change_payment", "name": "Can change payment", "content_type": 17}}, {"pk": 51, "model": "auth.permission", "fields": {"codename": "delete_payment", "name": "Can delete payment", "content_type": 17}}, {"pk": 52, "model": "auth.permission", "fields": {"codename": "add_membershiptype", "name": "Can add membership type", "content_type": 18}}, {"pk": 53, "model": "auth.permission", "fields": {"codename": "change_membershiptype", "name": "Can change membership type", "content_type": 18}}, {"pk": 54, "model": "auth.permission", "fields": {"codename": "delete_membershiptype", "name": "Can delete membership type", "content_type": 18}}, {"pk": 55, "model": "auth.permission", "fields": {"codename": "add_membership", "name": "Can add membership", "content_type": 19}}, {"pk": 56, "model": "auth.permission", "fields": {"codename": "change_membership", "name": "Can change membership", "content_type": 19}}, {"pk": 57, "model": "auth.permission", "fields": {"codename": "delete_membership", "name": "Can delete membership", "content_type": 19}}, {"pk": 58, "model": "auth.permission", "fields": {"codename": "add_group", "name": "Can add group", "content_type": 20}}, {"pk": 59, "model": "auth.permission", "fields": {"codename": "change_group", "name": "Can change group", "content_type": 20}}, {"pk": 60, "model": "auth.permission", "fields": {"codename": "delete_group", "name": "Can delete group", "content_type": 20}}, {"pk": 61, "model": "auth.permission", "fields": {"codename": "add_migrationhistory", "name": "Can add migration history", "content_type": 21}}, {"pk": 62, "model": "auth.permission", "fields": {"codename": "change_migrationhistory", "name": "Can change migration history", "content_type": 21}}, {"pk": 63, "model": "auth.permission", "fields": {"codename": "delete_migrationhistory", "name": "Can delete migration history", "content_type": 21}}, {"pk": 64, "model": "auth.permission", "fields": {"codename": "add_apiaccess", "name": "Can add api access", "content_type": 22}}, {"pk": 65, "model": "auth.permission", "fields": {"codename": "change_apiaccess", "name": "Can change api access", "content_type": 22}}, {"pk": 66, "model": "auth.permission", "fields": {"codename": "delete_apiaccess", "name": "Can delete api access", "content_type": 22}}, {"pk": 67, "model": "auth.permission", "fields": {"codename": "add_apikey", "name": "Can add api key", "content_type": 23}}, {"pk": 68, "model": "auth.permission", "fields": {"codename": "change_apikey", "name": "Can change api key", "content_type": 23}}, {"pk": 69, "model": "auth.permission", "fields": {"codename": "delete_apikey", "name": "Can delete api key", "content_type": 23}}, {"pk": 1, "model": "auth.user", "fields": {"username": "mark", "first_name": "", "last_name": "", "is_active": true, "is_superuser": true, "is_staff": true, "last_login": "2013-08-21T19:53:07.653Z", "groups": [], "user_permissions": [], "password": "pbkdf2_sha256$10000$8NUVcwCrxbai$5gri/57kESD/t8ZhpZxueVGQcPCW8l3PSCjSuxDp4AI=", "email": "mark@thedutchies.com", "date_joined": "2013-08-21T19:53:07.653Z"}}] \ No newline at end of file diff --git a/dusken/fixtures/member.json b/dusken/fixtures/member.json index faac92c..ba17acb 100644 --- a/dusken/fixtures/member.json +++ b/dusken/fixtures/member.json @@ -6,7 +6,7 @@ "username": "robert", "first_name": "Robert", "last_name": "Kolner", - "phone_number": null, + "phone_number": "+4790567268", "updated": "2013-09-11T18:45:06.354Z", "groups": [], "created": "2013-09-11T18:45:06.354Z", diff --git a/dusken/models.py b/dusken/models.py index a5403c9..ee4d82a 100644 --- a/dusken/models.py +++ b/dusken/models.py @@ -18,7 +18,7 @@ class Member(django.contrib.auth.models.AbstractUser): username=self.username) return u"{username}".format(username=self.username) - phone_number = models.IntegerField(unique=True, null=True, blank=True) + phone_number = models.CharField(max_length=30, unique=True, null=True, blank=True) date_of_birth = models.DateField(blank=True, null=True) legacy_id = models.IntegerField(unique=True, null=True, blank=True) address = models.ForeignKey('dusken.Address', null=True, blank=True) diff --git a/dusken/tests/member.py b/dusken/tests/member.py index ed2f8f9..c0b7ad0 100644 --- a/dusken/tests/member.py +++ b/dusken/tests/member.py @@ -105,7 +105,7 @@ class MemberTest(MemberTestBase): 'username' : 'testmemberUno', 'password' : 'unodostres', 'email' : 'kak-edb@studentersamfundet.no', - 'phone_number' : 90567260 + 'phone_number' : "+4790567260" } resp = self.api_client.post(self.all_members_url, @@ -148,7 +148,7 @@ class MemberTest(MemberTestBase): data = { 'password' : 'unodostres', 'email' : 'kak-edb@studentersamfundet.no', - 'phone_number' : 90541242 + 'phone_number' : "+4790541242" } resp = self.api_client.patch(self.member_url.format(self.member.pk),