fix: make Discovery service dependency optional for discussion notifications

test: patch CatalogIntegration.is_enabled in expiration tests to restore mock behavior

test: patch CatalogIntegration.is_enabled in setUp/tearDown

feat: make course duration limits configurable

refactor: clears ambigous name

fix: remove unsued env vars

Author: asajjad2

lms/envs/common.py

@@ -709,6 +709,18 @@
 # .. setting_description: Sets the number of days after which the gradebook will freeze following the course's end.
 GRADEBOOK_FREEZE_DAYS = 30
 
+# .. setting_name: COURSE_ACCESS_DURATION_MIN_WEEKS
+# .. setting_default: 4
+# .. setting_description: Minimum course duration in weeks when Discovery service data is unavailable or course has no
+# .. weeks_to_complete value. Used as fallback for course access duration calculations.
+COURSE_ACCESS_DURATION_MIN_WEEKS = 4
+
+# .. setting_name: COURSE_ACCESS_DURATION_MAX_WEEKS
+# .. setting_default: 18
+# .. setting_description: Maximum course duration in weeks. Course access duration is bounded by this upper limit
+# .. regardless of Discovery service data.
+COURSE_ACCESS_DURATION_MAX_WEEKS = 18
+
 RETRY_CALENDAR_SYNC_EMAIL_MAX_ATTEMPTS = 5
 
 ############################# SET PATH INFORMATION #############################

openedx/core/djangoapps/course_date_signals/utils.py

@@ -6,11 +6,24 @@
 
 from datetime import timedelta
 
+from django.conf import settings
 from openedx.core.djangoapps.catalog.utils import get_course_run_details
+from openedx.core.djangoapps.catalog.models import CatalogIntegration
 
+MIN_DURATION = timedelta(
+    weeks=getattr(settings, 'COURSE_DURATION_MIN_WEEKS', 4)
+)
+MAX_DURATION = timedelta(
+    weeks=getattr(settings, 'COURSE_DURATION_MAX_WEEKS', 18)
+)
 
-MIN_DURATION = timedelta(weeks=4)
-MAX_DURATION = timedelta(weeks=18)
+
+def catalog_integration_enabled():
+    """
+    Check if catalog integration is enabled
+    """
+    catalog_integration = CatalogIntegration.current()
+    return catalog_integration.is_enabled()
 
 
 def get_expected_duration(course_id):
@@ -20,12 +33,13 @@ def get_expected_duration(course_id):
 
     access_duration = MIN_DURATION
 
-    # The user course expiration date is the content availability date
-    # plus the weeks_to_complete field from course-discovery.
-    discovery_course_details = get_course_run_details(course_id, ['weeks_to_complete'])
-    expected_weeks = discovery_course_details.get('weeks_to_complete')
-    if expected_weeks:
-        access_duration = timedelta(weeks=expected_weeks)
+    if catalog_integration_enabled():
+        discovery_course_details = get_course_run_details(
+            course_id, ['weeks_to_complete']
+        )
+        expected_weeks = discovery_course_details.get('weeks_to_complete')
+        if expected_weeks:
+            access_duration = timedelta(weeks=expected_weeks)
 
     # Course access duration is bounded by the min and max duration.
     access_duration = max(MIN_DURATION, min(MAX_DURATION, access_duration))

openedx/core/djangoapps/notifications/tests/test_filters.py

@@ -3,6 +3,7 @@
 """
 from datetime import timedelta
 from unittest import mock
+from unittest.mock import patch
 
 import ddt
 from django.utils.timezone import now
@@ -43,6 +44,12 @@ class CourseExpirationTestCase(ModuleStoreTestCase):
 
     def setUp(self):
         super().setUp()  # lint-amnesty, pylint: disable=super-with-arguments
+        self.catalog_patch = patch(
+            'openedx.core.djangoapps.catalog.models.CatalogIntegration.is_enabled',
+            return_value=True
+        )
+        self.catalog_patch.start()
+
         self.course = CourseFactory(
             start=now() - timedelta(weeks=10),
         )
@@ -58,6 +65,10 @@ def setUp(self):
         expired_audit.created = now() - timedelta(weeks=6)
         expired_audit.save()
 
+    def tearDown(self):
+        self.catalog_patch.stop()
+        super().tearDown()
+
     @mock.patch("openedx.core.djangoapps.course_date_signals.utils.get_course_run_details")
     def test_audit_expired_filter_with_no_role(
         self,

openedx/features/course_duration_limits/tests/test_course_expiration.py

@@ -4,6 +4,7 @@
 
 from datetime import timedelta
 from unittest import mock
+from unittest.mock import patch
 
 import ddt
 from django.conf import settings
@@ -46,6 +47,11 @@ class CourseExpirationTestCase(ModuleStoreTestCase, MasqueradeMixin):
     """Tests to verify the get_user_course_expiration_date function is working correctly"""
     def setUp(self):
         super().setUp()  # lint-amnesty, pylint: disable=super-with-arguments
+        self.catalog_patch = patch(
+            'openedx.core.djangoapps.catalog.models.CatalogIntegration.is_enabled',
+            return_value=True
+        )
+        self.catalog_patch.start()
         self.course = CourseFactory(
             start=now() - timedelta(weeks=10),
         )
@@ -72,6 +78,7 @@ def setUp(self):
         add_course_mode(self.course)
 
     def tearDown(self):
+        self.catalog_patch.stop()
         CourseEnrollment.unenroll(self.user, self.course.id)
         super().tearDown()  # lint-amnesty, pylint: disable=super-with-arguments