parent
f173618477
commit
3774f2ceb1
9 changed files with 151 additions and 17 deletions
@ -0,0 +1,28 @@ |
|||||||
|
# -*- coding: utf-8 -*- |
||||||
|
# Generated by Django 1.11.1 on 2017-05-27 02:53 |
||||||
|
from __future__ import unicode_literals |
||||||
|
|
||||||
|
from django.conf import settings |
||||||
|
import django.core.validators |
||||||
|
from django.db import migrations, models |
||||||
|
import django.db.models.deletion |
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration): |
||||||
|
|
||||||
|
initial = True |
||||||
|
|
||||||
|
dependencies = [ |
||||||
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL), |
||||||
|
] |
||||||
|
|
||||||
|
operations = [ |
||||||
|
migrations.CreateModel( |
||||||
|
name='UserInfo', |
||||||
|
fields=[ |
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), |
||||||
|
('phone_number', models.CharField(blank=True, max_length=16, validators=[django.core.validators.RegexValidator(message="Phone number must be entered in the format: '+999999999'. Up to 15 digits allowed.", regex='^\\+?1?\\d{9,15}$')])), |
||||||
|
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), |
||||||
|
], |
||||||
|
), |
||||||
|
] |
@ -0,0 +1,22 @@ |
|||||||
|
# -*- coding: utf-8 -*- |
||||||
|
# Generated by Django 1.11.1 on 2017-05-27 03:38 |
||||||
|
from __future__ import unicode_literals |
||||||
|
|
||||||
|
from django.conf import settings |
||||||
|
from django.db import migrations, models |
||||||
|
import django.db.models.deletion |
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration): |
||||||
|
|
||||||
|
dependencies = [ |
||||||
|
('api', '0001_initial'), |
||||||
|
] |
||||||
|
|
||||||
|
operations = [ |
||||||
|
migrations.AlterField( |
||||||
|
model_name='userinfo', |
||||||
|
name='user', |
||||||
|
field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='user_info', to=settings.AUTH_USER_MODEL), |
||||||
|
), |
||||||
|
] |
@ -0,0 +1,22 @@ |
|||||||
|
# -*- coding: utf-8 -*- |
||||||
|
# Generated by Django 1.11.1 on 2017-05-27 04:39 |
||||||
|
from __future__ import unicode_literals |
||||||
|
|
||||||
|
from django.conf import settings |
||||||
|
from django.db import migrations, models |
||||||
|
import django.db.models.deletion |
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration): |
||||||
|
|
||||||
|
dependencies = [ |
||||||
|
('api', '0002_auto_20170527_0338'), |
||||||
|
] |
||||||
|
|
||||||
|
operations = [ |
||||||
|
migrations.AlterField( |
||||||
|
model_name='userinfo', |
||||||
|
name='user', |
||||||
|
field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), |
||||||
|
), |
||||||
|
] |
@ -0,0 +1,34 @@ |
|||||||
|
# -*- coding: utf-8 -*- |
||||||
|
# Generated by Django 1.11.1 on 2017-05-27 07:30 |
||||||
|
from __future__ import unicode_literals |
||||||
|
|
||||||
|
from django.conf import settings |
||||||
|
from django.db import migrations, models |
||||||
|
import django.db.models.deletion |
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration): |
||||||
|
|
||||||
|
dependencies = [ |
||||||
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL), |
||||||
|
('api', '0003_auto_20170527_0439'), |
||||||
|
] |
||||||
|
|
||||||
|
operations = [ |
||||||
|
migrations.CreateModel( |
||||||
|
name='Client', |
||||||
|
fields=[ |
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), |
||||||
|
('business_number', models.CharField(blank=True, max_length=16)), |
||||||
|
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), |
||||||
|
], |
||||||
|
), |
||||||
|
migrations.CreateModel( |
||||||
|
name='Provider', |
||||||
|
fields=[ |
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), |
||||||
|
('sin', models.CharField(blank=True, max_length=16)), |
||||||
|
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), |
||||||
|
], |
||||||
|
), |
||||||
|
] |
@ -1,3 +1,18 @@ |
|||||||
|
from django.contrib.auth.models import User |
||||||
from django.db import models |
from django.db import models |
||||||
|
from django.core.validators import RegexValidator |
||||||
|
|
||||||
# Create your models here. |
# Create your models here. |
||||||
|
class UserInfo(models.Model): |
||||||
|
user = models.OneToOneField(User, on_delete=models.CASCADE) |
||||||
|
phone_regex = RegexValidator(regex=r'^\+?1?\d{9,15}$', message="Phone number must be entered in the format: '+999999999'. Up to 15 digits allowed.") |
||||||
|
phone_number = models.CharField(validators=[phone_regex], max_length=16, blank=True) |
||||||
|
|
||||||
|
class Client(models.Model): |
||||||
|
user = models.OneToOneField(User, on_delete=models.CASCADE) |
||||||
|
business_number = models.CharField(max_length=16, blank=True) |
||||||
|
|
||||||
|
class Provider(models.Model): |
||||||
|
user = models.OneToOneField(User, on_delete=models.CASCADE) |
||||||
|
sin = models.CharField(max_length=16, blank=True) |
||||||
|
|
||||||
|
@ -1,14 +1,23 @@ |
|||||||
from django.contrib.auth.models import User, Group |
from django.contrib.auth.models import User, Group |
||||||
from rest_framework import serializers |
from rest_framework import serializers |
||||||
|
from caremyway.api.models import UserInfo, Client, Provider |
||||||
|
|
||||||
class UserSerializer(serializers.HyperlinkedModelSerializer): |
class UserSerializer(serializers.HyperlinkedModelSerializer): |
||||||
class Meta: |
class Meta: |
||||||
model = User |
model = User |
||||||
fields = ('url', 'username', 'email', 'groups') |
fields = ('url', 'username', 'first_name', 'last_name', 'email') |
||||||
|
|
||||||
|
class UserInfoSerializer(serializers.HyperlinkedModelSerializer): |
||||||
|
class Meta: |
||||||
|
model = UserInfo |
||||||
|
fields = ('url', 'user', 'phone_number') |
||||||
|
|
||||||
|
class ClientSerializer(serializers.HyperlinkedModelSerializer): |
||||||
|
class Meta: |
||||||
|
model = Client |
||||||
|
fields = ('url', 'user', 'business_number') |
||||||
|
|
||||||
class GroupSerializer(serializers.HyperlinkedModelSerializer): |
class ProviderSerializer(serializers.HyperlinkedModelSerializer): |
||||||
class Meta: |
class Meta: |
||||||
model = Group |
model = Provider |
||||||
fields = ('url', 'name') |
fields = ('url', 'user', 'sin') |
||||||
|
Loading…
Reference in new issue