Projet

Général

Profil

0001-agendas-add-new-attributes-to-Booking-45293.patch

Valentin Deniaud, 15 septembre 2020 14:25

Télécharger (4,65 ko)

Voir les différences:

Subject: [PATCH 1/3] agendas: add new attributes to Booking (#45293)

 .../migrations/0061_auto_20200909_1752.py     | 22 +++++++++++++++++++
 chrono/agendas/models.py                      |  3 +++
 chrono/api/views.py                           |  6 +++++
 tests/test_api.py                             |  6 +++++
 4 files changed, 37 insertions(+)
 create mode 100644 chrono/agendas/migrations/0061_auto_20200909_1752.py
chrono/agendas/migrations/0061_auto_20200909_1752.py
1
# -*- coding: utf-8 -*-
2
# Generated by Django 1.11.18 on 2020-09-09 15:52
3
from __future__ import unicode_literals
4

  
5
from django.db import migrations, models
6

  
7

  
8
class Migration(migrations.Migration):
9

  
10
    dependencies = [
11
        ('agendas', '0060_auto_20200903_1041'),
12
    ]
13

  
14
    operations = [
15
        migrations.AddField(model_name='booking', name='form_url', field=models.URLField(blank=True),),
16
        migrations.AddField(
17
            model_name='booking', name='user_email', field=models.EmailField(blank=True, max_length=254),
18
        ),
19
        migrations.AddField(
20
            model_name='booking', name='user_phone_number', field=models.CharField(blank=True, max_length=16),
21
        ),
22
    ]
chrono/agendas/models.py
1006 1006
    )
1007 1007
    user_external_id = models.CharField(max_length=250, blank=True)
1008 1008
    user_name = models.CharField(max_length=250, blank=True)
1009
    user_email = models.EmailField(blank=True)
1010
    user_phone_number = models.CharField(max_length=16, blank=True)
1011
    form_url = models.URLField(blank=True)
1009 1012
    backoffice_url = models.URLField(blank=True)
1010 1013
    cancel_callback_url = models.URLField(blank=True)
1011 1014

  
chrono/api/views.py
638 638
    user_external_id = serializers.CharField(max_length=250, allow_blank=True)
639 639
    user_name = serializers.CharField(max_length=250, allow_blank=True)
640 640
    user_display_label = serializers.CharField(max_length=250, allow_blank=True)
641
    user_email = serializers.CharField(max_length=250, allow_blank=True)
642
    user_phone_number = serializers.CharField(max_length=16, allow_blank=True)
643
    form_url = serializers.CharField(max_length=250, allow_blank=True)
641 644
    backoffice_url = serializers.URLField(allow_blank=True)
642 645
    cancel_callback_url = serializers.URLField(allow_blank=True)
643 646
    count = serializers.IntegerField(min_value=1)
......
973 976
                        label=payload.get('label', ''),
974 977
                        user_external_id=payload.get('user_external_id', ''),
975 978
                        user_name=payload.get('user_name', ''),
979
                        user_email=payload.get('user_email', ''),
980
                        user_phone_number=payload.get('user_phone_number', ''),
981
                        form_url=payload.get('form_url', ''),
976 982
                        backoffice_url=payload.get('backoffice_url', ''),
977 983
                        cancel_callback_url=payload.get('cancel_callback_url', ''),
978 984
                        user_display_label=payload.get('user_display_label', ''),
tests/test_api.py
774 774
            'user_name': 'bar',
775 775
            'backoffice_url': 'http://example.net/',
776 776
            'cancel_callback_url': 'http://example.net/jump/trigger/',
777
            'user_email': 'bar@bar.com',
778
            'user_phone_number': '+33123456789',
779
            'form_url': 'http://example.net/',
777 780
        },
778 781
    )
779 782
    booking = Booking.objects.get(id=resp.json['booking_id'])
......
781 784
    assert booking.user_name == 'bar'
782 785
    assert booking.backoffice_url == 'http://example.net/'
783 786
    assert booking.cancel_callback_url == 'http://example.net/jump/trigger/'
787
    assert booking.user_email == 'bar@bar.com'
788
    assert booking.user_phone_number == '+33123456789'
789
    assert booking.form_url == 'http://example.net/'
784 790

  
785 791
    # blank data are OK
786 792
    resp = app.post_json(
787
-