0001-api-disable-event-only-if-excluded_user_external_id-.patch

Valentin Deniaud, 17 août 2021 16:26

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

Subject: [PATCH] api: disable event only if excluded_user_external_id is
 specified (#55369)

 chrono/api/views.py         | 17 +++++++++++++----
 tests/api/test_datetimes.py |  9 ++++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

         return places
     def is_event_disabled(event, min_places=1):
         if getattr(event, 'user_places_count', 0) > 0:
     def is_event_disabled(event, min_places=1, disable_booked=True):
         if disable_booked and getattr(event, 'user_places_count', 0) > 0:
             return True
         if event.start_datetime < now():
             # event is past => not disabled (always ok to book a past event)
-...
         booked_user_external_id=None,
         show_events=None,
         multiple_agendas=False,
         disable_booked=True,
     ):
         agenda = agenda or event.agenda
         details = {
-...
             'description': event.description,
             'pricing': event.pricing,
             'url': event.url,
             'disabled': is_event_disabled(event, min_places=min_places),
             'disabled': is_event_disabled(event, min_places=min_places, disable_booked=disable_booked),
             'api': {
                 'bookings_url': request.build_absolute_uri(
                     reverse(
-...
             payload = serializer.validated_data
             user_external_id = payload.get('user_external_id') or payload.get('exclude_user_external_id')
             disable_booked = bool(payload.get('exclude_user_external_id'))
             show_events_raw = payload.get('events')
             show_events = show_events_raw or 'future'
             show_past = show_events in ['all', 'past']
-...
+                )
             if payload['hide_disabled']:
                 entries = [e for e in entries if not is_event_disabled(e, payload['min_places'])]
                 entries = [
+                    e
                     for e in entries
                     if not is_event_disabled(e, payload['min_places'], disable_booked=disable_booked)
+                ]
             response = {
                 'data': [
-...
                         min_places=payload['min_places'],
                         booked_user_external_id=payload.get('user_external_id'),
                         show_events=show_events_raw,
                         disable_booked=disable_booked,
+                    )
                     for x in entries
                 ],
-...
             agendas = get_objects_from_slugs(agenda_slugs, qs=Agenda.objects.filter(kind='events'))
             user_external_id = payload.get('user_external_id') or payload.get('exclude_user_external_id')
             disable_booked = bool(payload.get('exclude_user_external_id'))
             agendas = Agenda.prefetch_events_and_exceptions(
                 agendas, annotate_events=True, user_external_id=user_external_id
+            )
-...
                         min_places=payload['min_places'],
                         booked_user_external_id=payload.get('user_external_id'),
                         multiple_agendas=True,
                         disable_booked=disable_booked,
+                    )
                     for x in entries
                 ],

         resp = app.get('/api/agenda/%s/datetimes/' % agenda.slug, params={'user_external_id': '42'})
         assert resp.json['data'][0]['booked_for_external_user'] == 'main-list'
         assert resp.json['data'][0]['disabled'] == False
         resp = app.get(
             '/api/agenda/%s/datetimes/' % agenda.slug,
             params={'user_external_id': '42', 'exclude_user_external_id': '42'},
+        )
         assert resp.json['data'][0]['disabled'] == True
         booking.in_waiting_list = True
         booking.save()
-...
         assert resp.json['data'][1]['places']['available'] == 3
         assert resp.json['data'][1]['booked_for_external_user'] == 'main-list'
         assert resp.json['data'][1]['disabled'] is True
         assert resp.json['data'][1]['disabled'] is False
         # check exclude_user_external_id
         resp = app.get(
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0001-api-disable-event-only-if-excluded_user_external_id-.patch