entrouvert
/
chrono
14
1
Fork 0
Code Issues Pull Requests 5 Releases Wiki Activity

api: include agenda details to fillslot response (#42360)

This commit is contained in:
Frédéric Péters 2020-05-01 09:21:56 +02:00
parent 9d0b76c82a
commit 746e027573
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chrono/api/views.py
View File

@ -757,6 +757,10 @@ class Fillslots(APIView):
'in_waiting_list': in_waiting_list,
'booking_id': primary_booking.id,
'datetime': format_response_datetime(events[0].start_datetime),
'agenda': {
'label': primary_booking.event.agenda.label,
'slug': primary_booking.event.agenda.slug,
},
'api': {
'cancel_url': request.build_absolute_uri(
reverse('api-cancel-booking', kwargs={'booking_pk': primary_booking.id})

5
tests/test_api.py
View File

@ -3003,7 +3003,7 @@ def test_virtual_agendas_meetings_booking(app, mock_now, user):
label='Bar Meeting', kind='meetings', minimal_booking_delay=1, maximal_booking_delay=5
)
MeetingType.objects.create(agenda=bar_agenda, label='Meeting Type', duration=30)
bar_desk_1 = Desk.objects.create(agenda=foo_agenda, label='Bar desk 1')
bar_desk_1 = Desk.objects.create(agenda=bar_agenda, label='Bar desk 1')
TimePeriod.objects.create(
weekday=0, start_time=datetime.time(10, 0), end_time=datetime.time(12, 0), desk=bar_desk_1,
@ -3034,6 +3034,7 @@ def test_virtual_agendas_meetings_booking(app, mock_now, user):
== localtime(booking.event.start_datetime).strftime('%Y-%m-%d %H:%M:%S')
== resp.json['data'][0]['datetime']
)
first_booking_agenda = resp_booking.json['agenda']['slug']
assert resp_booking.json['end_datetime'] == localtime(
Booking.objects.all()[0].event.end_datetime
@ -3049,6 +3050,8 @@ def test_virtual_agendas_meetings_booking(app, mock_now, user):
== localtime(booking.event.start_datetime).strftime('%Y-%m-%d %H:%M:%S')
== resp.json['data'][0]['datetime']
)
second_booking_agenda = resp_booking.json['agenda']['slug']
assert set([first_booking_agenda, second_booking_agenda]) == {'foo-meeting', 'bar-meeting'}
# try booking the same timeslot a third time: full
resp_booking = app.post(fillslot_url)