0002-api-exclude-slots-already-booked-by-user-events-5134.patch

Lauréline Guérin, 25 février 2021 10:58

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

Subject: [PATCH 2/3] api: exclude slots already booked by user - events
 (#51341)

 chrono/agendas/models.py | 31 +++++++++++++++++++
 chrono/api/views.py      | 12 ++++++--
 tests/test_api.py        | 65 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 2 deletions(-)

             include_full=True,
             min_start=None,
             max_start=None,
             excluded_user_external_id=None,
         ):
             assert self.kind == 'events'
-...
                 else:
                     entries = entries.filter(start_datetime__lt=max_start)
             if excluded_user_external_id and not prefetched_queryset:
                 entries = Event.annotate_queryset_for_user(entries, excluded_user_external_id)
             if annotate_queryset and not prefetched_queryset:
                 entries = Event.annotate_queryset(entries)
-...
                     ),
+                )
         @staticmethod
         def annotate_queryset_for_user(qs, excluded_user_external_id):
             if django.VERSION < (2, 0):
                 return qs.annotate(
                     user_places_count=Count(
                         Case(
                             When(
                                 booking__cancellation_datetime__isnull=True,
                                 booking__in_waiting_list=False,
                                 booking__user_external_id=excluded_user_external_id,
                                 then='booking',
+                            )
+                        )
                     ),
+                )
             else:
                 return qs.annotate(
                     user_places_count=Count(
                         'booking',
                         filter=Q(
                             booking__cancellation_datetime__isnull=True,
                             booking__in_waiting_list=False,
                             booking__user_external_id=excluded_user_external_id,
                         ),
                     ),
+                )
         @property
         def booked_places(self):
             if hasattr(self, 'booked_places_count'):

             'description': event.description,
             'pricing': event.pricing,
             'url': event.url,
             'disabled': bool(event.full),
             'disabled': bool(event.full) or getattr(event, 'user_places_count', 0) > 0,
             'api': {
                 'bookings_url': request.build_absolute_uri(
                     reverse(
-...
             if date_end:
                 date_end = make_aware(datetime.datetime.combine(parse_date(date_end), datetime.time(0, 0)))
             entries = agenda.get_open_events(annotate_queryset=True, min_start=date_start, max_start=date_end)
             user_external_id = request.GET.get('exclude_user_external_id') or None
             entries = agenda.get_open_events(
                 annotate_queryset=True,
                 min_start=date_start,
                 max_start=date_end,
                 excluded_user_external_id=user_external_id,
+            )
             response = {
                 'data': [get_event_detail(request, x, agenda=agenda) for x in entries],
-...
                 'in_waiting_list': self.booking.in_waiting_list,
                 'user_was_present': self.booking.user_was_present,
                 'user_absence_reason': self.booking.user_absence_reason,
                 'user_external_id': self.booking.user_external_id,
+            }
             return Response(response)

+            )
     @pytest.mark.freeze_time('2021-02-23')
     def test_datetimes_api_exclude_slots(app):
         agenda = Agenda.objects.create(
             label='Foo bar', kind='events', minimal_booking_delay=0, maximal_booking_delay=7
+        )
         event = Event.objects.create(
             slug='event-slug',
             start_datetime=localtime().replace(hour=10, minute=0),
             places=5,
             agenda=agenda,
+        )
         Booking.objects.create(event=event, user_external_id='42')
         cancelled = Booking.objects.create(event=event, user_external_id='35')
         cancelled.cancel()
         resp = app.get('/api/agenda/%s/datetimes/' % agenda.slug)
         assert resp.json['data'][0]['disabled'] is False
         resp = app.get('/api/agenda/%s/datetimes/' % agenda.slug, params={'exclude_user_external_id': '35'})
         assert resp.json['data'][0]['disabled'] is False
         resp = app.get('/api/agenda/%s/datetimes/' % agenda.slug, params={'exclude_user_external_id': '42'})
         assert resp.json['data'][0]['disabled'] is True
         event.delete()
         # recurrent event
         event = Event.objects.create(
             slug='recurrent',
             start_datetime=localtime().replace(hour=12, minute=0),
             repeat='weekly',
             places=2,
             agenda=agenda,
+        )
         resp = app.get('/api/agenda/%s/datetimes/' % agenda.slug)
         assert resp.json['data'][0]['id'] == 'recurrent:2021-02-23-1200'
         assert resp.json['data'][0]['places']['full'] is False
         assert resp.json['data'][0]['disabled'] is False
         resp = app.get('/api/agenda/%s/datetimes/' % agenda.slug, params={'exclude_user_external_id': '42'})
         assert resp.json['data'][0]['id'] == 'recurrent:2021-02-23-1200'
         assert resp.json['data'][0]['places']['full'] is False
         assert resp.json['data'][0]['disabled'] is False
         first_recurrence = event.get_or_create_event_recurrence(event.start_datetime)
         Booking.objects.create(event=first_recurrence, user_external_id='42')
         resp = app.get('/api/agenda/%s/datetimes/' % agenda.slug)
         assert resp.json['data'][0]['id'] == 'recurrent--2021-02-23-1200'
         assert resp.json['data'][0]['places']['full'] is False
         assert resp.json['data'][0]['disabled'] is False
         resp = app.get('/api/agenda/%s/datetimes/' % agenda.slug, params={'exclude_user_external_id': '42'})
         assert resp.json['data'][0]['id'] == 'recurrent--2021-02-23-1200'
         assert resp.json['data'][0]['places']['full'] is False
         assert resp.json['data'][0]['disabled'] is True
         Booking.objects.create(event=first_recurrence)
         resp = app.get('/api/agenda/%s/datetimes/' % agenda.slug)
         assert resp.json['data'][0]['id'] == 'recurrent--2021-02-23-1200'
         assert resp.json['data'][0]['places']['full'] is True
         assert resp.json['data'][0]['disabled'] is True
         resp = app.get('/api/agenda/%s/datetimes/' % agenda.slug, params={'exclude_user_external_id': '42'})
         assert resp.json['data'][0]['id'] == 'recurrent--2021-02-23-1200'
         assert resp.json['data'][0]['places']['full'] is True
         assert resp.json['data'][0]['disabled'] is True
     def test_datetimes_api_meetings_agenda(app, meetings_agenda):
         meeting_type = MeetingType.objects.get(agenda=meetings_agenda)
         api_url = '/api/agenda/%s/meetings/%s/datetimes/' % (meeting_type.agenda.slug, meeting_type.slug)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0002-api-exclude-slots-already-booked-by-user-events-5134.patch