0001-api-patch-booking-use_color_for-66382.patch

Lauréline Guérin, 19 juin 2022 20:18

Voir les différences: en ligne côte à côte

Subject: [PATCH] api: patch booking & use_color_for (#66382)

 chrono/api/serializers.py | 12 ++++++++++--
 chrono/api/views.py       |  3 ++-
 tests/api/test_booking.py | 27 ++++++++++++++++++++-------
 tests/api/test_event.py   |  6 +++---
 4 files changed, 35 insertions(+), 13 deletions(-)

     class BookingSerializer(serializers.ModelSerializer):
         user_absence_reason = serializers.CharField(required=False, allow_blank=True, allow_null=True)
         user_presence_reason = serializers.CharField(required=False, allow_blank=True, allow_null=True)
         color = serializers.SlugRelatedField(
         use_color_for = serializers.SlugRelatedField(
             many=False,
             slug_field='label',
             queryset=BookingColor.objects.all(),
             source='color',
+        )
         class Meta:
-...
                 'user_was_present',
                 'user_absence_reason',
                 'user_presence_reason',
                 'color',
                 'use_color_for',
                 'extra_data',
                 'creation_datetime',
                 'cancellation_datetime',
-...
                 'cancellation_datetime',
+            ]
         def to_internal_value(self, data):
             if 'color' in data:
                 # legacy
                 data['use_color_for'] = data['color']
                 del data['color']
             return super().to_internal_value(data)
         def to_representation(self, instance):
             ret = super().to_representation(instance)
             check_type_slug = self.instance.user_check_type.slug if self.instance.user_check_type else ''

                 'user_last_name',
                 'user_email',
                 'user_phone_number',
                 'color',
             ]:
                 if key in request.data:
                     secondary_bookings_update[key] = getattr(self.booking, key)
             if 'use_color_for' in request.data:
                 secondary_bookings_update['color'] = self.booking.color
             if 'user_absence_reason' in request.data or 'user_presence_reason' in request.data:
                 secondary_bookings_update['user_check_type'] = self.booking.user_check_type
             if extra_data:

                 'user_was_present': None,
                 'user_absence_reason': '',
                 'user_presence_reason': '',
                 'color': None,
                 'use_color_for': None,
                 'extra_data': None,
                 'cancellation_datetime': None,
                 'creation_datetime': localtime(meetings_booking1.creation_datetime).isoformat(),
-...
                 'user_was_present': None,
                 'user_absence_reason': '',
                 'user_presence_reason': '',
                 'color': None,
                 'use_color_for': None,
                 'extra_data': None,
                 'event': resp.json['data'][1]['event'],
                 'cancellation_datetime': None,
-...
                 'user_was_present': None,
                 'user_absence_reason': '',
                 'user_presence_reason': '',
                 'color': None,
                 'use_color_for': None,
                 'extra_data': None,
                 'event': resp.json['data'][1]['event'],
                 'cancellation_datetime': None,
-...
         agenda = Agenda.objects.create(kind='events')
         event = Event.objects.create(agenda=agenda, start_datetime=now(), places=10)
         BookingColor.objects.create(label='the warmest color')
         BookingColor.objects.create(label='the coolest color')
         color = BookingColor.objects.create(label='meh')
         booking = Booking.objects.create(event=event, color=color)
         # make secondary bookings
-...
             ('user_email', ''),
             ('user_phone_number', '0606'),
             ('user_phone_number', ''),
             ('color', 'the warmest color'),
             ('color', 'the warmest color'),  # legacy
             ('use_color_for', 'the coolest color'),
+        ]
         for key, value in to_test:
             params = {
-...
+            }
             app.patch_json('/api/booking/%s/' % booking.pk, params=params)
             booking.refresh_from_db()
             if key == 'use_color_for':
                 key = 'color'
             assert str(getattr(booking, key)) == value
             # all secondary bookings are updated
             for secondary_booking in booking.secondary_booking_set.all():
-...
+        }
         response = app.patch_json('/api/booking/%s/' % booking.pk, params=params, status=400)
         booking.refresh_from_db()
         assert booking.color.label == 'the warmest color'
         assert booking.color.label == 'the coolest color'
         assert response.json['err_desc'] == 'invalid payload'
         assert list(response.json['errors'].keys()) == ['color']
         assert response.json['errors']['color'] == ['Object with label=unicorn crimson does not exist.']
         assert list(response.json['errors'].keys()) == ['use_color_for']
         assert response.json['errors']['use_color_for'] == ['Object with label=unicorn crimson does not exist.']
         params = {
             'use_color_for': 'unicorn crimson',
+        }
         response = app.patch_json('/api/booking/%s/' % booking.pk, params=params, status=400)
         booking.refresh_from_db()
         assert booking.color.label == 'the coolest color'
         assert response.json['err_desc'] == 'invalid payload'
         assert list(response.json['errors'].keys()) == ['use_color_for']
         assert response.json['errors']['use_color_for'] == ['Object with label=unicorn crimson does not exist.']
     def test_booking_patch_api_extra_data(app, user):

             'user_was_present',
             'user_absence_reason',
             'user_presence_reason',
             'color',
             'use_color_for',
             'extra_data',
             'creation_datetime',
             'cancellation_datetime',
-...
                 'check_status': {'check_type': 'foo-reason', 'status': 'presence'},
                 'booking': {
                     'cancellation_datetime': None,
                     'color': None,
                     'use_color_for': None,
                     'creation_datetime': localtime(now()).isoformat(),
                     'extra_data': None,
                     'id': booking2.pk,
-...
                 'check_status': {'check_type': 'foo-reason', 'status': 'presence'},
                 'booking': {
                     'cancellation_datetime': None,
                     'color': None,
                     'use_color_for': None,
                     'creation_datetime': localtime(now()).isoformat(),
                     'extra_data': None,
                     'id': booking1.pk,
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0001-api-patch-booking-use_color_for-66382.patch