0001-api-list-bookings-of-somebody-51187.patch

Lauréline Guérin, 18 février 2021 15:57

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

Subject: [PATCH] api: list bookings of somebody (#51187)

 chrono/api/urls.py  |   1 +
 chrono/api/views.py |  83 ++++++++++++++++---
 chrono/settings.py  |   1 +
 setup.py            |   1 +
 tests/test_api.py   | 190 ++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 266 insertions(+), 10 deletions(-)

chrono/api/urls.py
55	55	views.meeting_datetimes,
56	56	name='api-agenda-meeting-datetimes',
57	57	),
	58	url(r'^bookings/$', views.bookings, name='api-bookings'),
58	59	url(r'^booking/(?P<booking_pk>\w+)/$', views.booking, name='api-booking'),
59	60	url(r'^booking/(?P<booking_pk>\w+)/cancel/$', views.cancel_booking, name='api-cancel-booking'),
60	61	url(r'^booking/(?P<booking_pk>\w+)/accept/$', views.accept_booking, name='api-accept-booking'),

     import itertools
     import uuid
     from django.db import transaction
     from django.db.models import Prefetch, Q
     from django.http import Http404, HttpResponse
-...
     from django.utils.translation import gettext_noop
     from django.utils.translation import ugettext_lazy as _
     from django_filters import rest_framework as filters
     from rest_framework import permissions, serializers, status
     from rest_framework.exceptions import ValidationError
     from rest_framework.generics import ListAPIView
     from rest_framework.views import APIView
     from chrono.api.utils import Response
-...
         class Meta:
             model = Booking
             fields = ['user_was_present', 'user_absence_reason']
             fields = ['id', 'in_waiting_list', 'user_was_present', 'user_absence_reason']
             read_only_fields = ['id', 'in_waiting_list']
         def validate_user_absence_reason(self, value):
             if value is None:
-...
             return value
     class BookingFilter(filters.FilterSet):
         agenda = filters.CharFilter(field_name='event__agenda__slug', lookup_expr='exact')
         category = filters.CharFilter(field_name='event__agenda__category__slug', lookup_expr='exact')
         date_start = filters.DateFilter(field_name='event__start_datetime', lookup_expr='gte')
         date_end = filters.DateFilter(field_name='event__start_datetime', method='filter_date_end')
         def filter_date_end(self, queryset, name, value):
             # we want to include all events starting during the targeted day
             lookup = '__'.join([name, 'lt'])
             return queryset.filter(**{lookup: value + datetime.timedelta(days=1)})
         class Meta:
             model = Booking
             fields = [
                 'user_external_id',
                 'agenda',
                 'category',
                 'date_start',
                 'date_end',
                 'user_was_present',
                 'user_absence_reason',
+            ]
     class BookingsAPI(ListAPIView):
         filter_backends = (filters.DjangoFilterBackend,)
         serializer_class = BookingSerializer
         filterset_class = BookingFilter
         def get(self, request, *args, **kwargs):
             if not request.GET.get('user_external_id'):
                 response = {
                     'err': 1,
                     'err_class': 'missing param user_external_id',
                     'err_desc': _('missing param user_external_id'),
+                }
                 return Response(response)
             try:
                 response = super().get(request, *args, **kwargs)
             except ValidationError as e:
                 return Response(
+                    {
                         'err': 1,
                         'err_class': 'invalid payload',
                         'err_desc': _('invalid payload'),
                         'errors': e.detail,
                     },
                     status=status.HTTP_400_BAD_REQUEST,
+                )
             return Response({'err': 0, 'data': response.data})
         def get_queryset(self):
             return Booking.objects.all().order_by('pk')
     bookings = BookingsAPI.as_view()
     class BookingAPI(APIView):
         permission_classes = (permissions.IsAuthenticated,)
         serializer_class = BookingSerializer
-...
             if response:
                 return response
             response = {
                 'err': 0,
                 'booking_id': self.booking.pk,
                 'in_waiting_list': self.booking.in_waiting_list,
                 'user_was_present': self.booking.user_was_present,
                 'user_absence_reason': self.booking.user_absence_reason,
+            }
             serializer = self.serializer_class(self.booking)
             response = serializer.data
             response.update(
+                {
                     'err': 0,
                     'booking_id': self.booking.pk,
+                }
+            )
             return Response(response)
         def patch(self, request, *args, **kwargs):

chrono/settings.py
56	56	'chrono.api',
57	57	'chrono.manager',
58	58	'rest_framework',
	59	'django_filters',
59	60	)
60	61
61	62	MIDDLEWARE = (

setup.py
164	164	'django>=1.11, <2.3',
165	165	'gadjo',
166	166	'djangorestframework>=3.4',
	167	'django-filter',
167	168	'django-jsonfield >= 0.9.3',
168	169	'vobject',
169	170	'python-dateutil',

         assert Booking.objects.count() == 6
     def test_bookings_api(app, user):
         events_agenda = Agenda.objects.create(kind='events')
         events_event = Event.objects.create(agenda=events_agenda, start_datetime=now(), places=10)
         events_booking1 = Booking.objects.create(event=events_event, user_external_id='enfant-1234')
         events_booking2 = Booking.objects.create(event=events_event, user_external_id='enfant-1234')
         Booking.objects.create(event=events_event, user_external_id='foobar')
         Booking.objects.create(event=events_event)
         meetings_agenda = Agenda.objects.create(kind='meetings')
         meetings_event = Event.objects.create(agenda=meetings_agenda, start_datetime=now(), places=1)
         meetings_booking1 = Booking.objects.create(event=meetings_event, user_external_id='enfant-1234')
         Booking.objects.create(event=meetings_event, user_external_id='baz')
         Booking.objects.create(event=meetings_event, user_external_id='baz')
         Booking.objects.create(event=meetings_event)
         app.authorization = ('Basic', ('john.doe', 'password'))
         resp = app.get('/api/bookings/')
         assert resp.json['err'] == 1
         assert resp.json['err_class'] == 'missing param user_external_id'
         assert resp.json['err_desc'] == 'missing param user_external_id'
         resp = app.get('/api/bookings/', params={'user_external_id': ''})
         assert resp.json['err'] == 1
         assert resp.json['err_class'] == 'missing param user_external_id'
         assert resp.json['err_desc'] == 'missing param user_external_id'
         resp = app.get('/api/bookings/', params={'user_external_id': 'enfant-1234'})
         assert resp.json['err'] == 0
         assert resp.json['data'] == [
+            {
                 'id': events_booking1.pk,
                 'in_waiting_list': False,
                 'user_was_present': None,
                 'user_absence_reason': '',
             },
+            {
                 'id': events_booking2.pk,
                 'in_waiting_list': False,
                 'user_was_present': None,
                 'user_absence_reason': '',
             },
+            {
                 'id': meetings_booking1.pk,
                 'in_waiting_list': False,
                 'user_was_present': None,
                 'user_absence_reason': '',
             },
+        ]
     def test_bookings_api_filter_agenda(app, user):
         bookings = []
         for label in ['foobar', 'foobaz']:
             agenda = Agenda.objects.create(label='foobar')
             event = Event.objects.create(agenda=agenda, start_datetime=now(), places=10)
             bookings.append(Booking.objects.create(event=event, user_external_id='42'))
         app.authorization = ('Basic', ('john.doe', 'password'))
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'agenda': 'foo'})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == []
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'agenda': 'foobar'})
         assert [b['id'] for b in resp.json['data']] == [bookings[0].pk]
     def test_bookings_api_filter_category(app, user):
         bookings = []
         for label in ['foobar', 'foobaz']:
             category = Category.objects.create(label=label)
             agenda = Agenda.objects.create(category=category)
             event = Event.objects.create(agenda=agenda, start_datetime=now(), places=10)
             bookings.append(Booking.objects.create(event=event, user_external_id='42'))
         app.authorization = ('Basic', ('john.doe', 'password'))
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'category': 'foo'})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == []
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'category': 'foobar'})
         assert [b['id'] for b in resp.json['data']] == [bookings[0].pk]
     def test_bookings_api_filter_date_start(app, user):
         agenda = Agenda.objects.create()
         event = Event.objects.create(
             agenda=agenda, start_datetime=make_aware(datetime.datetime(2017, 5, 22, 0, 0)), places=10
+        )
         booking = Booking.objects.create(event=event, user_external_id='42')
         app.authorization = ('Basic', ('john.doe', 'password'))
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'date_start': 'foo'}, status=400)
         assert resp.json['err'] == 1
         assert resp.json['err_class'] == "invalid payload"
         assert resp.json['err_desc'] == "invalid payload"
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'date_start': '2017-05-21'})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == [booking.pk]
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'date_start': '2017-05-22'})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == [booking.pk]
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'date_start': '2017-05-23'})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == []
         event.start_datetime = make_aware(datetime.datetime(2017, 5, 22, 23, 59))
         event.save()
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'date_start': '2017-05-21'})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == [booking.pk]
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'date_start': '2017-05-22'})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == [booking.pk]
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'date_start': '2017-05-23'})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == []
     def test_bookings_api_filter_date_end(app, user):
         agenda = Agenda.objects.create()
         event = Event.objects.create(
             agenda=agenda, start_datetime=make_aware(datetime.datetime(2017, 5, 22, 0, 0)), places=10
+        )
         booking = Booking.objects.create(event=event, user_external_id='42')
         app.authorization = ('Basic', ('john.doe', 'password'))
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'date_end': 'foo'}, status=400)
         assert resp.json['err'] == 1
         assert resp.json['err_class'] == "invalid payload"
         assert resp.json['err_desc'] == "invalid payload"
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'date_end': '2017-05-21'})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == []
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'date_end': '2017-05-22'})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == [booking.pk]
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'date_end': '2017-05-23'})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == [booking.pk]
         event.start_datetime = make_aware(datetime.datetime(2017, 5, 22, 23, 59))
         event.save()
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'date_end': '2017-05-21'})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == []
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'date_end': '2017-05-22'})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == [booking.pk]
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'date_end': '2017-05-23'})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == [booking.pk]
     def test_bookings_api_filter_user_was_present(app, user):
         agenda = Agenda.objects.create()
         event = Event.objects.create(
             agenda=agenda, start_datetime=make_aware(datetime.datetime(2017, 5, 22, 0, 0)), places=10
+        )
         Booking.objects.create(event=event, user_external_id='42')
         booking2 = Booking.objects.create(event=event, user_external_id='42', user_was_present=True)
         booking3 = Booking.objects.create(event=event, user_external_id='42', user_was_present=False)
         app.authorization = ('Basic', ('john.doe', 'password'))
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'user_was_present': True})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == [booking2.pk]
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'user_was_present': False})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == [booking3.pk]
     def test_bookings_api_filter_user_absence_reason(app, user):
         agenda = Agenda.objects.create()
         event = Event.objects.create(
             agenda=agenda, start_datetime=make_aware(datetime.datetime(2017, 5, 22, 0, 0)), places=10
+        )
         Booking.objects.create(event=event, user_external_id='42')
         booking2 = Booking.objects.create(event=event, user_external_id='42', user_absence_reason='foo-bar')
         app.authorization = ('Basic', ('john.doe', 'password'))
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'user_absence_reason': 'foo'})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == []
         resp = app.get('/api/bookings/', params={'user_external_id': '42', 'user_absence_reason': 'foo-bar'})
         assert resp.json['err'] == 0
         assert [b['id'] for b in resp.json['data']] == [booking2.pk]
     @pytest.mark.parametrize('flag', [True, False, None])
     def test_booking_api_present(app, user, flag):
         agenda = Agenda.objects.create(kind='events')
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0001-api-list-bookings-of-somebody-51187.patch