0002-agendas-make-returning-a-queryset-in-get_open_events.patch

Valentin Deniaud, 12 janvier 2021 16:33

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

Subject: [PATCH 2/5] agendas: make returning a queryset in get_open_events
 useless (#41663)

 chrono/agendas/models.py | 36 ++++++++++++++++++++++++++----------
 chrono/api/views.py      | 22 +++++++---------------
 chrono/manager/views.py  |  2 +-
 3 files changed, 34 insertions(+), 26 deletions(-)

                     for weektime_interval in IntervalSet.simple(*time_period_interval) - closed_hours_by_days:
                         yield SharedTimePeriod.from_weektime_interval(weektime_interval, desks=desks)
         def get_open_events(self, prefetched_queryset=False):
         def get_open_events(
             self,
             prefetched_queryset=False,
             annotate_queryset=False,
             include_full=True,
             min_start=None,
             max_start=None,
         ):
             assert self.kind == 'events'
             if prefetched_queryset:
-...
                 entries = entries.filter(
                     Q(publication_date__isnull=True) | Q(publication_date__lte=localtime(now()).date())
+                )
                 if not include_full:
                     entries = entries.filter(Q(full=False) | Q(primary_event__isnull=False))
             min_booking_time = localtime(now() + datetime.timedelta(days=self.minimal_booking_delay)).replace(
                 hour=0, minute=0
+            )
             min_start = max(min_start, min_booking_time) if min_start else min_booking_time
             if prefetched_queryset:
                 entries = [e for e in entries if e.start_datetime >= min_start]
             else:
                 entries = entries.filter(start_datetime__gte=min_start)
             if self.minimal_booking_delay:
                 min_start = localtime(now() + datetime.timedelta(days=self.minimal_booking_delay)).replace(
                     hour=0, minute=0
+                )
                 if prefetched_queryset:
                     entries = [e for e in entries if e.start_datetime >= min_start]
                 else:
                     entries = entries.filter(start_datetime__gte=min_start)
             if self.maximal_booking_delay:
                 max_start = localtime(now() + datetime.timedelta(days=self.maximal_booking_delay)).replace(
                 max_booking_time = localtime(now() + datetime.timedelta(days=self.maximal_booking_delay)).replace(
                     hour=0, minute=0
+                )
                 max_start = min(max_start, max_booking_time) if max_start else max_booking_time
             if max_start:
                 if prefetched_queryset:
                     entries = [e for e in entries if e.start_datetime < max_start]
                 else:
                     entries = entries.filter(start_datetime__lt=max_start)
             if annotate_queryset:
                 entries = Event.annotate_queryset(entries)
             return entries
         def get_booking_form_url(self):

+                )
+            }
             if check_events:
                 agenda_detail['opened_events_available'] = agenda.get_open_events().filter(full=False).exists()
                 agenda_detail['opened_events_available'] = bool(agenda.get_open_events(include_full=False))
         elif agenda.accept_meetings():
             agenda_detail['api'] = {
                 'meetings_url': request.build_absolute_uri(
-...
             if agenda.kind != 'events':
                 raise Http404('agenda found, but it was not an events agenda')
             entries = Event.annotate_queryset(agenda.get_open_events())
             date_start, date_end = request.GET.get('date_start'), request.GET.get('date_end')
             if date_start:
                 date_start = make_aware(datetime.datetime.combine(parse_date(date_start), datetime.time(0, 0)))
             if date_end:
                 date_end = make_aware(datetime.datetime.combine(parse_date(date_end), datetime.time(0, 0)))
             if 'date_start' in request.GET:
                 entries = entries.filter(
                     start_datetime__gte=make_aware(
                         datetime.datetime.combine(parse_date(request.GET['date_start']), datetime.time(0, 0))
+                    )
+                )
             if 'date_end' in request.GET:
                 entries = entries.filter(
                     start_datetime__lt=make_aware(
                         datetime.datetime.combine(parse_date(request.GET['date_end']), datetime.time(0, 0))
+                    )
+                )
             entries = agenda.get_open_events(annotate_queryset=True, min_start=date_start, max_start=date_end)
             response = {'data': [get_event_detail(request, x, agenda=agenda) for x in entries]}
             return Response(response)

         def get_context_data(self, **kwargs):
             context = super().get_context_data(**kwargs)
             context['user_can_manage'] = self.agenda.can_be_managed(self.request.user)
             context['open_events'] = Event.annotate_queryset(self.agenda.get_open_events())
             context['open_events'] = self.agenda.get_open_events(annotate_queryset=True)
             return context
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0002-agendas-make-returning-a-queryset-in-get_open_events.patch