edx-enterprise-data 10.11.1__py3-none-any.whl → 10.13.0__py3-none-any.whl

enterprise_data/management/commands/pre_warm_analytics_cache.py

@@ -56,6 +56,7 @@ class Command(BaseCommand):
         )
         enterprise_enrollment_table.get_completion_count(
             enterprise_customer_uuid=enterprise_customer_uuid,
+            group_uuid=None,
             start_date=start_date,
             end_date=end_date,
         )
@@ -95,6 +96,7 @@ class Command(BaseCommand):
         page_size = 100
         enterprise_enrollment_table.get_all_completions(
             enterprise_customer_uuid=enterprise_customer_uuid,
+            group_uuid=None,
             start_date=start_date,
             end_date=end_date,
             limit=page_size,
@@ -102,21 +104,25 @@ class Command(BaseCommand):
         )
         enterprise_enrollment_table.get_completion_count(
             enterprise_customer_uuid=enterprise_customer_uuid,
+            group_uuid=None,
             start_date=start_date,
             end_date=end_date,
         )
         enterprise_enrollment_table.get_top_courses_by_completions(
             enterprise_customer_uuid=enterprise_customer_uuid,
+            group_uuid=None,
             start_date=start_date,
             end_date=end_date,
         )
         enterprise_enrollment_table.get_top_subjects_by_completions(
             enterprise_customer_uuid=enterprise_customer_uuid,
+            group_uuid=None,
             start_date=start_date,
             end_date=end_date,
         )
         enterprise_enrollment_table.get_completions_time_series_data(
             enterprise_customer_uuid=enterprise_customer_uuid,
+            group_uuid=None,
             start_date=start_date,
             end_date=end_date,
         )
@@ -141,12 +147,14 @@ class Command(BaseCommand):
         )
         enterprise_engagement_table.get_engagement_count(
             enterprise_customer_uuid=enterprise_customer_uuid,
+            group_uuid=None,
             start_date=start_date,
             end_date=end_date,
         )
         page_size = 100
         enterprise_engagement_table.get_all_engagements(
             enterprise_customer_uuid=enterprise_customer_uuid,
+            group_uuid=None,
             start_date=start_date,
             end_date=end_date,
             limit=page_size,
@@ -154,16 +162,19 @@ class Command(BaseCommand):
         )
         enterprise_engagement_table.get_top_courses_by_engagement(
             enterprise_customer_uuid=enterprise_customer_uuid,
+            group_uuid=None,
             start_date=start_date,
             end_date=end_date,
         )
         enterprise_engagement_table.get_top_subjects_by_engagement(
             enterprise_customer_uuid=enterprise_customer_uuid,
+            group_uuid=None,
             start_date=start_date,
             end_date=end_date,
         )
         enterprise_engagement_table.get_engagement_time_series_data(
             enterprise_customer_uuid=enterprise_customer_uuid,
+            group_uuid=None,
             start_date=start_date,
             end_date=end_date,
         )

enterprise_data/tests/api/v1/views/test_enterprise_admin.py

@@ -62,6 +62,10 @@ class TestEnterpriseAdminAnalyticsAggregatesView(JWTTestMixin, APITransactionTes
         """
         mock implementation of run_query.
         """
+        # Check if this is the completion_count_query being called with query_filters
+        if hasattr(query, '__name__') and query.__name__ == 'get_completion_count_query':
+            return [[50]]
+
         mock_responses = {
             self.enrollment_queries.get_enrollment_date_range_query(): [[
                 datetime.strptime('2021-01-01', "%Y-%m-%d"),
@@ -70,15 +74,12 @@ class TestEnterpriseAdminAnalyticsAggregatesView(JWTTestMixin, APITransactionTes
             self.enrollment_queries.get_enrollment_and_course_count_query(): [[
                 100, 10
             ]],
-            self.enrollment_queries.get_completion_count_query(): [[
-                50
-            ]],
             self.engagement_queries.get_learning_hours_and_daily_sessions_query(): [[
                 100, 10
             ]],
             'SELECT MAX(created) FROM enterprise_learner_enrollment': [[datetime.strptime('2021-01-01', "%Y-%m-%d")]]
         }
-        return mock_responses[query]
+        return mock_responses.get(query, [[]])
 
     def test_get_admin_analytics_aggregates(self):
         """

enterprise_reporting/tests/test_delivery_method.py

@@ -5,8 +5,8 @@ Test delivery methods.
 import unittest
 
 import ddt
+from mock import MagicMock, patch
 
-from mock import patch, MagicMock
 from enterprise_reporting.delivery_method import SFTPDeliveryMethod, SMTPDeliveryMethod
 from enterprise_reporting.utils import encrypt_string