LIL-683 Клиент должен видеть записи последней недели после окончания подписки

apps/school/views.py

@@ -166,11 +166,11 @@ class SchoolView(TemplateView):
             school_schedules_purchased = []
             school_purchased_future = False
         if is_previous:
-            prev_range = [yesterday - timedelta(days=7), yesterday]
+            prev_range = [yesterday - timedelta(days=7), date_now]
             live_lessons = []
             # берем все подписки, которые были в периоде
             for sp in SchoolPayment.objects.filter(
-                date_start__lte=prev_range[1],
+                date_start__lt=prev_range[1],
                 date_end__gte=prev_range[0],
                 user=self.request.user,
                 status__in=[
@@ -187,10 +187,12 @@ class SchoolView(TemplateView):
                     date__week_day__in=list(map(lambda x: 1 if x == 7 else x+1, sp.weekdays)),
                 ).values_list('id', flat=True)
             live_lessons = LiveLesson.objects.filter(id__in=set(live_lessons)).order_by('-date')
-            for ll in live_lessons:
-                ll.school_schedule = school_schedules_dict.get(ll.date.isoweekday())
             live_lessons_exists = live_lessons.exists()
-            live_lessons = live_lessons or None
+            if live_lessons_exists:
+                for ll in live_lessons:
+                    ll.school_schedule = school_schedules_dict.get(ll.date.isoweekday())
+            else:
+                live_lessons = None
 
         context.update({
             'online': online,