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

Valentin Deniaud, 04 août 2021 10:40

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         | 20 +++++++++++++++-----
 tests/api/test_datetimes.py |  7 +++++++
 2 files changed, 22 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)
-...
     def get_event_detail(
         request, event, agenda=None, min_places=1, booked_user_external_id=None, show_events=None
         request,
         event,
         agenda=None,
         min_places=1,
         booked_user_external_id=None,
         show_events=None,
         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(
-...
             start_datetime, end_datetime = get_start_and_end_datetime_from_request(request)
             booked_user_external_id = request.GET.get('user_external_id') or None
             excluded_user_external_id = request.GET.get('exclude_user_external_id') or None
             disable_booked = bool(excluded_user_external_id)
             if (
                 booked_user_external_id
                 and excluded_user_external_id
-...
+                )
             if request.GET.get('hide_disabled'):
                 entries = [e for e in entries if not is_event_disabled(e, min_places)]
                 entries = [
                     e for e in entries if not is_event_disabled(e, min_places, disable_booked=disable_booked)
+                ]
             response = {
                 'data': [
-...
                         min_places=min_places,
                         booked_user_external_id=booked_user_external_id,
                         show_events=show_events_raw,
                         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()
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

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