Merge pull request #498 from openedx/saleem-latif/9420-fixes

fix: Remove hyphens from enterprise customer UUID before database query.

CHANGELOG.rst

@@ -15,6 +15,10 @@ Unreleased
 ----------
 
 =========================
+[8.12.1] - 2024-09-16
+---------------------
+  * fix: Remove hyphens from enterprise customer UUID before database query.
+
 [8.12.0] - 2024-09-06
 ---------------------
   * refactor: Performance optimizations for enrollments related API endpoints.

enterprise_data/__init__.py

@@ -2,4 +2,4 @@
 Enterprise data api application. This Django app exposes API endpoints used by enterprises.
 """
 
-__version__ = "8.12.0"
+__version__ = "8.12.1"

enterprise_data/admin_analytics/database/queries/fact_enrollment_admin_dash.py

@@ -96,10 +96,8 @@ def get_top_courses_enrollments_query(record_count=20):
         """
         # Some local environments raise error when course_title is added in SELECT without GROUP BY.
         # If you face this issue, you can remove course_title from SELECT.
-
-        # TODO: Re-add course_title after testing.
         return f"""
-            SELECT course_key, enroll_type, count(course_key) as enrollment_count
+            SELECT course_key, course_title , enroll_type, count(course_key) as enrollment_count
             FROM fact_enrollment_admin_dash
             WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
                 enterprise_enrollment_date BETWEEN %(start_date)s AND %(end_date)s

enterprise_data/api/v1/views/analytics_enrollments.py

@@ -43,6 +43,9 @@ def list(self, request, enterprise_uuid):
         """
         Get individual enrollments data for the enterprise.
         """
+        # Remove hyphens from the UUID
+        enterprise_uuid = enterprise_uuid.replace('-', '')
+
         serializer = AdvanceAnalyticsQueryParamSerializer(data=request.GET)
         serializer.is_valid(raise_exception=True)
         min_enrollment_date, _ = FactEnrollmentAdminDashTable().get_enrollment_date_range(
@@ -122,6 +125,9 @@ def stats(self, request, enterprise_uuid):
         2. `top_courses_by_enrollments`: This will show the top courses by enrollments.
         3. `top_subjects_by_enrollments`: This will show the top subjects by enrollments.
         """
+        # Remove hyphens from the UUID
+        enterprise_uuid = enterprise_uuid.replace('-', '')
+
         serializer = AdvanceAnalyticsEnrollmentStatsSerializer(data=request.GET)
         serializer.is_valid(raise_exception=True)
 

enterprise_data/api/v1/views/base.py

@@ -92,7 +92,7 @@ def get_paginated_response(self, request, records, page, page_size, total_count)
             (Response): The pagination data.
         """
         page_count = math.ceil(total_count / page_size)
-        if page <= 0 or page > page_count:
+        if page_count > 0 and (page <= 0 or page > page_count):
             raise NotFound('Invalid page.')
 
         return Response({