Merge pull request #25 from edx/dsego/SOL-958

Add feature flag to skip Enrollment_Start_Date filtering for course s…

search/api.py

@@ -77,7 +77,8 @@ def course_discovery_search(search_term=None, size=20, from_=0, field_dictionary
     use_field_dictionary.update({field: search_fields[field] for field in search_fields if field in use_search_fields})
     if field_dictionary:
         use_field_dictionary.update(field_dictionary)
-    use_field_dictionary["enrollment_start"] = DateRange(None, datetime.utcnow())
+    if not getattr(settings, "SEARCH_SKIP_ENROLLMENT_START_DATE_FILTERING", False):
+        use_field_dictionary["enrollment_start"] = DateRange(None, datetime.utcnow())
 
     searcher = SearchEngine.get_search_engine(getattr(settings, "COURSEWARE_INDEX_NAME", "courseware_index"))
     if not searcher:

search/tests/test_course_discovery.py

@@ -173,6 +173,18 @@ def test_enroll_date(self):
         results = course_discovery_search()
         self.assertEqual(results["total"], 1)
 
+    @override_settings(SEARCH_SKIP_ENROLLMENT_START_DATE_FILTERING=True)
+    def test_enroll_date_skipped(self):
+        """
+        Test feature flag to skip enrollment start date filtering for course search
+        """
+        DemoCourse.get_and_index(self.searcher, {"enrollment_start": datetime(2014, 1, 1)})
+        DemoCourse.get_and_index(self.searcher, {"enrollment_start": None})
+        DemoCourse.get_and_index(self.searcher, {"enrollment_start": datetime(2114, 1, 1)})
+        DemoCourse.get_and_index(self.searcher, {}, ["enrollment_start"])
+        results = course_discovery_search()
+        self.assertEqual(results["total"], 4)
+
     def test_discovery_field_matching(self):
         """ Test that field specifications only show those results with the desired field values """
         DemoCourse.get_and_index(self.searcher, {"org": "OrgA"})