Merge pull request #486 from openedx/saleem-latif/ENT-9372-fixes

fix: Fixed a datetime conversion error appearing on production.

CHANGELOG.rst

@@ -15,6 +15,10 @@ Unreleased
 ----------
 
 =========================
+[8.11.1] - 2024-08-29
+---------------------
+  * fix: Fixed a datetime conversion error appearing on production.
+
 [8.11.0] - 2024-08-29
 ---------------------
   * perf: Performance enhancements for admin analytics aggregates endpoint.

enterprise_data/__init__.py

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

enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py

@@ -1,7 +1,7 @@
 """
 Module for interacting with the fact_enrollment_admin_dash table.
 """
-from datetime import date
+from datetime import date, datetime
 from uuid import UUID
 
 from ..queries import FactEnrollmentAdminDashQueries
@@ -23,13 +23,22 @@ def get_enrollment_date_range(self, enterprise_customer_uuid: UUID):
             enterprise_customer_uuid (UUID): The UUID of the enterprise customer.
 
         Returns:
-            (tuple<int, int>): The minimum and maximum enrollment dates.
+            (tuple<date, date>): The minimum and maximum enrollment dates.
         """
         results = run_query(
             query=self.queries.get_enrollment_date_range_query(),
             params={'enterprise_customer_uuid': enterprise_customer_uuid}
         )
-        return tuple(results[0])
+        min_date, max_date = results[0]
+
+        # We should return date objects, not datetime objects
+        # This is done to counter cases where database values are datetime objects.
+        if min_date and isinstance(min_date, datetime):
+            min_date = min_date.date()
+        if max_date and isinstance(max_date, datetime):
+            max_date = max_date.date()
+
+        return min_date, max_date
 
     def get_enrollment_and_course_count(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
         """

enterprise_data/api/v1/views/enterprise_admin.py

@@ -95,6 +95,8 @@ def get(self, request, enterprise_id):
         """
         HTTP GET endpoint to retrieve the enterprise admin aggregate data.
         """
+        # Validate the enterprise_id
+        enterprise_id = enterprise_id.replace('-', '')
         serializer = serializers.AdminAnalyticsAggregatesQueryParamsSerializer(
             data=request.GET
         )
@@ -106,7 +108,7 @@ def get(self, request, enterprise_id):
         )
 
         start_date = serializer.data.get(
-            'start_date', min_enrollment_date.date()
+            'start_date', min_enrollment_date
         )
         end_date = serializer.data.get('end_date', datetime.today())
 
@@ -128,8 +130,8 @@ def get(self, request, enterprise_id):
                 'hours': hours,
                 'sessions': sessions,
                 'last_updated_at': last_updated_at.date() if last_updated_at else None,
-                'min_enrollment_date': min_enrollment_date.date(),
-                'max_enrollment_date': max_enrollment_date.date(),
+                'min_enrollment_date': min_enrollment_date,
+                'max_enrollment_date': max_enrollment_date,
             },
             status=HTTP_200_OK,
         )