edx-enterprise-data 9.7.2__tar.gz → 9.7.6__tar.gz

{edx_enterprise_data-9.7.2 → edx_enterprise_data-9.7.6}/CHANGELOG.rst

@@ -16,6 +16,31 @@ Unreleased
 
 =========================
 
+[10.6.1] - 2024-12-10
+---------------------
+  * feat: add course_title in top courses in enrollments csv
+
+[10.6.0] - 2024-12-09
+---------------------
+  * chore: upgrade python requirements
+
+[10.5.1] - 2024-11-14
+---------------------
+  * chore: upgrade python requirements
+
+[10.5.0] - 2024-11-14
+---------------------
+  * Fix CSV file names
+  * Fix ordering of skills charts data
+
+[10.4.0] - 2024-11-14
+---------------------
+  * Updated text for null emails record of leaderboard.
+
+[10.3.0] - 2024-11-13
+---------------------
+  * Re-write top 10 charts queries for Enrollments, Engagements and Completions
+
 [10.2.0] - 2024-11-12
 ---------------------
   * Fixed null email issue for leaderboard.
@@ -27,8 +52,8 @@ Unreleased
 
 [10.0.1] - 2024-10-25
 ---------------------
-  * Same as ``10.0.0`` 
-  * Bumping the version so a new tag can be created in the GitHub 
+  * Same as ``10.0.0``
+  * Bumping the version so a new tag can be created in the GitHub
 
 [10.0.0] - 2024-10-25
 ---------------------

{edx_enterprise_data-9.7.2/edx_enterprise_data.egg-info → edx_enterprise_data-9.7.6}/PKG-INFO

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

{edx_enterprise_data-9.7.2 → edx_enterprise_data-9.7.6/edx_enterprise_data.egg-info}/PKG-INFO

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

{edx_enterprise_data-9.7.2 → edx_enterprise_data-9.7.6}/enterprise_data/__init__.py

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

{edx_enterprise_data-9.7.2 → edx_enterprise_data-9.7.6}/enterprise_data/admin_analytics/database/queries/fact_enrollment_admin_dash.py

@@ -124,6 +124,7 @@ class FactEnrollmentAdminDashQueries:
 
             SELECT
                 d.course_key,
+                MAX(d.course_title) AS course_title,
                 d.enroll_type,
                 COUNT(*) AS enrollment_count
             FROM filtered_data d

{edx_enterprise_data-9.7.2 → edx_enterprise_data-9.7.6}/enterprise_data/admin_analytics/database/queries/skills_daily_rollup_admin_dash.py

@@ -38,7 +38,8 @@ class SkillsDailyRollupAdminDashQueries:
             WITH TopSkills AS (
                 -- Get top 10 skills by total enrollments
                 SELECT
-                    skill_name
+                    skill_name,
+                    SUM(enrolls) AS total_enrollment_count
                 FROM
                     skills_daily_rollup_admin_dash
                 WHERE
@@ -47,7 +48,7 @@ class SkillsDailyRollupAdminDashQueries:
                 GROUP BY
                     skill_name
                 ORDER BY
-                    SUM(enrolls) DESC
+                    total_enrollment_count DESC
                 LIMIT 10
             )
             SELECT
@@ -70,7 +71,7 @@ class SkillsDailyRollupAdminDashQueries:
             GROUP BY
                 sd.skill_name, subject_name
             ORDER BY
-                subject_name;
+                total_enrollment_count DESC;
         """
 
     @staticmethod
@@ -82,7 +83,8 @@ class SkillsDailyRollupAdminDashQueries:
             WITH TopSkills AS (
                 -- Get top 10 skills by total completions
                 SELECT
-                    skill_name
+                    skill_name,
+                    SUM(completions) AS total_completion_count
                 FROM
                     skills_daily_rollup_admin_dash
                 WHERE
@@ -91,7 +93,7 @@ class SkillsDailyRollupAdminDashQueries:
                 GROUP BY
                     skill_name
                 ORDER BY
-                    SUM(completions) DESC
+                    total_completion_count DESC
                 LIMIT 10
             )
             SELECT
@@ -114,5 +116,5 @@ class SkillsDailyRollupAdminDashQueries:
             GROUP BY
                 sd.skill_name, subject_name
             ORDER BY
-                subject_name;
+                total_completion_count DESC;
         """

{edx_enterprise_data-9.7.2 → edx_enterprise_data-9.7.6}/enterprise_data/admin_analytics/database/tables/fact_engagement_admin_dash.py

@@ -11,6 +11,8 @@ from ..queries import FactEngagementAdminDashQueries
 from ..utils import run_query
 from .base import BaseTable
 
+NULL_EMAIL_TEXT = 'learners who have not shared consent'
+
 
 class FactEngagementAdminDashTable(BaseTable):
     """
@@ -327,8 +329,9 @@ class FactEngagementAdminDashTable(BaseTable):
         if include_null_email:
             engagement_data_dict['None'] = find_first(engagement_data, lambda x: x['email'] is None) or {}
             completion = find_first(completion_data, lambda x: x['email'] is None) or \
-                {'course_completion_count': 'Unknown'}
+                {'course_completion_count': ''}
             engagement_data_dict['None']['course_completion_count'] = completion['course_completion_count']
+            engagement_data_dict['None']['email'] = NULL_EMAIL_TEXT
 
         return list(engagement_data_dict.values())
 

{edx_enterprise_data-9.7.2 → edx_enterprise_data-9.7.6}/enterprise_data/api/v1/views/analytics_completions.py

@@ -75,7 +75,7 @@ class AdvanceAnalyticsCompletionsView(AnalyticsPaginationMixin, ViewSet):
         )
 
         if response_type == ResponseType.CSV.value:
-            filename = f"""individual_completions, {start_date} - {end_date}.csv"""
+            filename = f"""Individual Completions, {start_date} - {end_date}.csv"""
 
             return StreamingHttpResponse(
                 IndividualCompletionsCSVRenderer().render(self._stream_serialized_data(

{edx_enterprise_data-9.7.2 → edx_enterprise_data-9.7.6}/enterprise_data/api/v1/views/analytics_engagements.py

@@ -75,7 +75,7 @@ class AdvanceAnalyticsEngagementView(AnalyticsPaginationMixin, ViewSet):
         )
 
         if response_type == ResponseType.CSV.value:
-            filename = f"""individual_engagements, {start_date} - {end_date}.csv"""
+            filename = f"""Individual Engagements, {start_date} - {end_date}.csv"""
 
             return StreamingHttpResponse(
                 IndividualEngagementsCSVRenderer().render(self._stream_serialized_data(

{edx_enterprise_data-9.7.2 → edx_enterprise_data-9.7.6}/enterprise_data/api/v1/views/analytics_enrollments.py

@@ -74,7 +74,7 @@ class AdvanceAnalyticsEnrollmentsView(AnalyticsPaginationMixin, ViewSet):
         )
 
         if response_type == ResponseType.CSV.value:
-            filename = f"""individual_enrollments, {start_date} - {end_date}.csv"""
+            filename = f"""Individual Enrollments, {start_date} - {end_date}.csv"""
 
             return StreamingHttpResponse(
                 IndividualEnrollmentsCSVRenderer().render(self._stream_serialized_data(