Showing only recorded webinars on index page

renzon · renzon · commit 325229b42e6d · 2020-03-13T10:03:41.000-03:00
part of #1681
diff --git a/pythonpro/cohorts/facade.py b/pythonpro/cohorts/facade.py
@@ -46,11 +46,20 @@ def calculate_most_recent_cohort_path() -> str:
 def find_webinars():
     """
     Retrieve Webinars from database ordered by date desc
-    :return: List of webinars
+    :return: Tuple of webinars
     """
     return tuple(_Webinar.objects.order_by('-start'))
 
 
+def find_recorded_webinars():
+    """
+    Retrieve recorded Webinars from database ordered by date desc.
+    A recorded Webinar has vimeo_id not empty
+    :return: Tuple of webinars
+    """
+    return tuple(_Webinar.objects.order_by('-start').exclude(vimeo_id__exact=''))
+
+
 def find_webinar(slug):
     """
     Retrieve Webinar by its slug
diff --git a/pythonpro/cohorts/tests/test_live_class_detail.py b/pythonpro/cohorts/tests/test_live_class_detail.py
@@ -57,11 +57,10 @@ def test_pending_live_class_msg(resp_video_not_recorded):
         'Ainda não temos máquina do tempo, essa aula ainda não foi gravada'
     )
 
-
-dj_assert_contains(
-    resp_video_not_recorded,
-    'Retornar à página da turma'
-)
+    dj_assert_contains(
+        resp_video_not_recorded,
+        'Retornar à página da turma'
+    )
 
 
 def test_vimeo_player_not_present(resp_video_not_recorded):
diff --git a/pythonpro/cohorts/tests/test_webinar_detail.py b/pythonpro/cohorts/tests/test_webinar_detail.py
@@ -12,7 +12,7 @@
 def webinar(cohort) -> Webinar:
     image = SimpleUploadedFile(name='renzo-nuccitelli.jpeg', content=open(img_path, 'rb').read(),
                                content_type='image/png')
-    return mommy.make(Webinar, cohort=cohort, image=image)
+    return mommy.make(Webinar, cohort=cohort, image=image, vimeo_id='1')
 
 
 @pytest.fixture
diff --git a/pythonpro/cohorts/tests/test_webinars.py b/pythonpro/cohorts/tests/test_webinars.py
@@ -32,3 +32,22 @@ def test_basic_contents(resp, webinars, property_name):
 def test_absolute_url(resp, webinars):
     for webinar in webinars:
         dj_assert_contains(resp, webinar.get_absolute_url())
+
+
+@pytest.fixture
+def not_recorded_webinars(webinars):
+    first_two_webinars = webinars[:2]
+    for w in first_two_webinars:
+        w.vimeo_id = ''
+        w.save()
+    return first_two_webinars
+
+
+@pytest.fixture
+def resp_not_recorded_webinars(client_with_user, not_recorded_webinars):
+    return client_with_user.get(reverse('cohorts:webinars'), secure=True)
+
+
+def test_not_recorded_webinar_url_not_present(resp_not_recorded_webinars, not_recorded_webinars):
+    for webinar in not_recorded_webinars:
+        dj_assert_not_contains(resp_not_recorded_webinars, webinar.get_absolute_url())
diff --git a/pythonpro/cohorts/views.py b/pythonpro/cohorts/views.py
@@ -14,7 +14,7 @@ def detail(request, slug):
 
 @login_required
 def webinars(request):
-    return render(request, 'cohorts/webinars.html', {'webinars': facade.find_webinars()})
+    return render(request, 'cohorts/webinars.html', {'webinars': facade.find_recorded_webinars()})
 
 
 @login_required
