edx-enterprise-data 9.4.1__tar.gz → 9.5.1__tar.gz

{edx_enterprise_data-9.4.1 → edx_enterprise_data-9.5.1}/CHANGELOG.rst

@@ -15,6 +15,15 @@ Unreleased
 ----------
 
 =========================
+
+[9.5.1] - 2024-10-07
+---------------------
+  * fix: Added handling for edge cases while fetching data from database.
+
+[9.5.0] - 2024-10-07
+---------------------
+  * feat: Remove audit data filtering
+
 [9.4.1] - 2024-10-03
 ---------------------
   * fix: Added guard against empty data in leaderboard queries.

{edx_enterprise_data-9.4.1/edx_enterprise_data.egg-info → edx_enterprise_data-9.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edx-enterprise-data
-Version: 9.4.1
+Version: 9.5.1
 Summary: Enterprise Reporting
 Home-page: https://github.com/openedx/edx-enterprise-data
 Author: edX

{edx_enterprise_data-9.4.1 → edx_enterprise_data-9.5.1/edx_enterprise_data.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edx-enterprise-data
-Version: 9.4.1
+Version: 9.5.1
 Summary: Enterprise Reporting
 Home-page: https://github.com/openedx/edx-enterprise-data
 Author: edX

{edx_enterprise_data-9.4.1 → edx_enterprise_data-9.5.1}/enterprise_data/__init__.py

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

{edx_enterprise_data-9.4.1 → edx_enterprise_data-9.5.1}/enterprise_data/admin_analytics/database/queries/fact_engagement_admin_dash.py

@@ -175,8 +175,7 @@ class FactEngagementAdminDashQueries:
         """
         return """
             SELECT
-                COUNT(*) OVER () AS record_count,
-                sum(case when email is null then 1 else 0 end) null_count
+                COUNT(*) OVER () AS record_count
             FROM fact_enrollment_engagement_day_admin_dash
             WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
                 (activity_date BETWEEN %(start_date)s AND %(end_date)s) AND

{edx_enterprise_data-9.4.1 → edx_enterprise_data-9.5.1}/enterprise_data/admin_analytics/database/tables/fact_engagement_admin_dash.py

@@ -35,6 +35,9 @@ class FactEngagementAdminDashTable(BaseTable):
                 'end_date': end_date,
             }
         )
+        if not results:
+            return 0.0, 0
+
         return tuple(results[0])
 
     def get_engagement_count(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
@@ -57,6 +60,8 @@ class FactEngagementAdminDashTable(BaseTable):
                 'end_date': end_date,
             }
         )
+        if not results:
+            return 0
         return results[0][0]
 
     def get_all_engagements(
@@ -272,4 +277,6 @@ class FactEngagementAdminDashTable(BaseTable):
                 'end_date': end_date,
             }
         )
+        if not results:
+            return 0
         return results[0][0]

{edx_enterprise_data-9.4.1 → edx_enterprise_data-9.5.1}/enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py

@@ -35,6 +35,8 @@ class FactEnrollmentAdminDashTable(BaseTable):
                 'end_date': end_date,
             }
         )
+        if not results:
+            return 0
         return int(results[0][0] or 0)
 
     def get_all_enrollments(
@@ -79,6 +81,8 @@ class FactEnrollmentAdminDashTable(BaseTable):
             query=self.queries.get_enrollment_date_range_query(),
             params={'enterprise_customer_uuid': enterprise_customer_uuid}
         )
+        if not results:
+            return None, None
         min_date, max_date = results[0]
 
         # We should return date objects, not datetime objects
@@ -110,6 +114,8 @@ class FactEnrollmentAdminDashTable(BaseTable):
                 'end_date': end_date,
             }
         )
+        if not results:
+            return 0, 0
         return tuple(results[0])
 
     def get_completion_count(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
@@ -132,6 +138,9 @@ class FactEnrollmentAdminDashTable(BaseTable):
                 'end_date': end_date,
             }
         )
+        if not results:
+            return 0
+
         return int(results[0][0] or 0)
 
     def get_top_courses_by_enrollments(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):

{edx_enterprise_data-9.4.1 → edx_enterprise_data-9.5.1}/enterprise_data/api/v1/views/enterprise_learner.py

@@ -20,7 +20,6 @@ from django.utils import timezone
 
 from enterprise_data.admin_analytics.database.utils import LOGGER
 from enterprise_data.api.v1 import serializers
-from enterprise_data.filters import AuditEnrollmentsFilterBackend, AuditUsersEnrollmentFilterBackend
 from enterprise_data.models import EnterpriseLearner, EnterpriseLearnerEnrollment
 from enterprise_data.paginators import EnterpriseEnrollmentsPagination
 from enterprise_data.renderers import EnrollmentsCSVRenderer
@@ -38,7 +37,7 @@ class EnterpriseLearnerEnrollmentViewSet(EnterpriseViewSetMixin, viewsets.ReadOn
     """
     serializer_class = serializers.EnterpriseLearnerEnrollmentSerializer
     pagination_class = EnterpriseEnrollmentsPagination
-    filter_backends = (AuditEnrollmentsFilterBackend, filters.OrderingFilter,)
+    filter_backends = (filters.OrderingFilter,)
     ordering_fields = '__all__'
     ordering = ('-last_activity_date',)
     ENROLLMENT_MODE_FILTER = 'user_current_enrollment_mode'
@@ -297,7 +296,7 @@ class EnterpriseLearnerViewSet(EnterpriseViewSetMixin, viewsets.ReadOnlyModelVie
     """
     queryset = EnterpriseLearner.objects.all()
     serializer_class = serializers.EnterpriseLearnerSerializer
-    filter_backends = (filters.OrderingFilter, AuditUsersEnrollmentFilterBackend,)
+    filter_backends = (filters.OrderingFilter,)
     ordering_fields = '__all__'
     ordering = ('user_email',)