Merge pull request #984 from edx/vkaracic/SOL-2074

[SOL-2074] Omit expired professional courses from offer landing page.

ecommerce/coupons/tests/mixins.py

@@ -34,6 +34,7 @@ class CourseCatalogMockMixin(object):
                 "image": {
                     "src": "/path/to/image.jpg",
                 },
+                'enrollment_end': None
             }
 
         course_run_info_json = json.dumps(course_run_info)
@@ -61,10 +62,12 @@ class CourseCatalogMockMixin(object):
                     'start': '2016-05-01T00:00:00Z',
                     'image': {
                         'src': 'path/to/the/course/image'
-                    }
+                    },
+                    'enrollment_end': None
                 }] if course_run else [{
                     'key': 'test',
                     'title': 'Test course',
+                    'enrollment_end': None
                 }],
             }
         course_run_info_json = json.dumps(course_run_info)

ecommerce/extensions/api/v2/tests/views/test_vouchers.py

@@ -9,6 +9,7 @@ import httpretty
 import pytz
 from django.core.urlresolvers import reverse
 from django.http import Http404
+from django.utils.timezone import now
 from opaque_keys.edx.keys import CourseKey
 from oscar.core.loading import get_model
 from oscar.test.factories import (
@@ -93,6 +94,7 @@ class VoucherViewSetTests(CourseCatalogMockMixin, CourseCatalogTestMixin, LmsApi
                     'key': seat.course_id,
                     'start': '2016-05-01T00:00:00Z',
                     'title': seat.title,
+                    'enrollment_end': None
                 })
                 new_range.add_product(seat)
         else:
@@ -105,6 +107,7 @@ class VoucherViewSetTests(CourseCatalogMockMixin, CourseCatalogTestMixin, LmsApi
                     'key': course.id,
                     'start': '2016-05-01T00:00:00Z',
                     'title': course.name,
+                    'enrollment_end': None
                 })
                 new_range.add_product(seat)
                 products.append(seat)
@@ -180,6 +183,28 @@ class VoucherViewSetTests(CourseCatalogMockMixin, CourseCatalogTestMixin, LmsApi
             self.assertTrue(offer['multiple_credit_providers'])
             self.assertIsNone(offer['credit_provider_price'])
 
+    def test_omitting_expired_courses(self):
+        """Verify professional courses who's enrollment end datetime have passed are omitted."""
+        no_date_seat = CourseFactory().create_or_update_seat('professional', False, 100, partner=self.partner)
+        valid_seat = CourseFactory().create_or_update_seat('professional', False, 100, partner=self.partner)
+        expired_seat = CourseFactory().create_or_update_seat('professional', False, 100, partner=self.partner)
+
+        course_discovery_results = [{
+            'key': no_date_seat.attr.course_key,
+            'enrollment_end': None,
+        }, {
+            'key': valid_seat.attr.course_key,
+            'enrollment_end': str(now() + datetime.timedelta(days=1)),
+        }, {
+            'key': expired_seat.attr.course_key,
+            'enrollment_end': str(now() - datetime.timedelta(days=1)),
+        }]
+
+        products, __ = VoucherViewSet().retrieve_course_objects(course_discovery_results, 'professional')
+        self.assertIn(no_date_seat, products)
+        self.assertIn(valid_seat, products)
+        self.assertNotIn(expired_seat, products)
+
 
 @ddt.ddt
 @httpretty.activate

ecommerce/extensions/api/v2/views/vouchers.py

@@ -2,8 +2,10 @@
 import logging
 from urlparse import urlparse
 
-from django.shortcuts import get_object_or_404
 import django_filters
+from dateutil import parser
+from django.shortcuts import get_object_or_404
+from django.utils.timezone import now
 from opaque_keys.edx.keys import CourseKey
 from oscar.core.loading import get_model
 from requests.exceptions import ConnectionError, Timeout
@@ -91,7 +93,8 @@ class VoucherViewSet(NonDestroyableModelViewSet):
 
     def retrieve_course_objects(self, results, course_seat_types):
         """ Helper method to retrieve all the courses, products and stock records
-        from course IDs in course catalog response results.
+        from course IDs in course catalog response results. Professional courses
+        which have a set enrollment end date and which has passed are omitted.
 
         Args:
             results(dict): Course catalog response results.
@@ -100,12 +103,22 @@ class VoucherViewSet(NonDestroyableModelViewSet):
         Returns:
             Querysets of products and stock records retrieved from results.
         """
-        course_ids = [result['key'] for result in results]
-        products = Product.objects.filter(
-            course_id__in=course_ids,
-            attributes__name='certificate_type',
-            attribute_values__value_text__in=course_seat_types.split(',')
-        )
+        all_course_ids = []
+        nonexpired_course_ids = []
+        for result in results:
+            all_course_ids.append(result['key'])
+            if not result['enrollment_end'] or (
+                    result['enrollment_end'] and parser.parse(result['enrollment_end']) > now()
+            ):
+                nonexpired_course_ids.append(result['key'])
+
+        products = []
+        for seat_type in course_seat_types.split(','):
+            products.extend(Product.objects.filter(
+                course_id__in=nonexpired_course_ids if seat_type == 'professional' else all_course_ids,
+                attributes__name='certificate_type',
+                attribute_values__value_text=seat_type
+            ))
         stock_records = StockRecord.objects.filter(product__in=products)
         return products, stock_records