refactor: [AXM-40] refactor enrollment caching optimization

lms/djangoapps/mobile_api/users/views.py

@@ -325,7 +325,7 @@ class UserCourseEnrollmentsList(generics.ListAPIView):
           certified).
         * url: URL to the downloadable version of the certificate, if exists.
     """
-    queryset = CourseEnrollment.objects.all().select_related('course', 'user')
+
     lookup_field = 'username'
 
     # In Django Rest Framework v3, there is a default pagination
@@ -353,9 +353,16 @@ def get_serializer_class(self):
             return CourseEnrollmentSerializerv05
         return CourseEnrollmentSerializer
 
+    @cached_property
+    def queryset(self):
+        return CourseEnrollment.objects.all().select_related('course', 'user').filter(
+            user__username=self.kwargs['username'],
+            is_active=True
+        ).order_by('created').reverse()
+
     def get_queryset(self):
         api_version = self.kwargs.get('api_version')
-        mobile_available = self.mobile_available_enrollments
+        mobile_available = self.get_mobile_available_enrollments()
 
         not_duration_limited = (
             enrollment for enrollment in mobile_available
@@ -374,19 +381,14 @@ def get_queryset(self):
             # return all courses, with associated expiration
             return mobile_available
 
-    @cached_property
-    def mobile_available_enrollments(self) -> List[Optional[CourseEnrollment]]:
+    def get_mobile_available_enrollments(self) -> List[Optional[CourseEnrollment]]:
         """
         Gets list with `CourseEnrollment` for mobile available courses.
         """
-        enrollments = self.queryset.filter(
-            user__username=self.kwargs['username'],
-            is_active=True
-        ).order_by('created').reverse()
         org = self.request.query_params.get('org', None)
 
         same_org = (
-            enrollment for enrollment in enrollments
+            enrollment for enrollment in self.queryset
             if enrollment.course_overview and self.is_org(org, enrollment.course_overview.org)
         )
         mobile_available = (
@@ -421,7 +423,7 @@ def get_primary_enrollment_by_latest_enrollment_or_progress(self) -> Optional[Co
         """
         Gets primary enrollment obj by latest enrollment or latest progress on the course.
         """
-        mobile_available = self.mobile_available_enrollments
+        mobile_available = self.get_mobile_available_enrollments()
         if not mobile_available:
             return None
 

openedx/core/djangoapps/theming/storage.py

@@ -192,11 +192,9 @@ def converter(matchobj):
             This requires figuring out which files the matched URL resolves
             to and calling the url() method of the storage.
             """
-            matched, url = matchobj.groups()
-            #matches = matchobj.groupdict()
-            # matched = matches["matched"]
-            # url = matches["url"]
-
+            matches = matchobj.groupdict()
+            matched = matches["matched"]
+            url = matches["url"]
 
             # Ignore absolute/protocol-relative and data-uri URLs.
             if re.match(r"^[a-z]+:", url):