edx-enterprise-data 10.11.0__tar.gz → 10.12.0__tar.gz

{edx_enterprise_data-10.11.0 → edx_enterprise_data-10.12.0}/CHANGELOG.rst

@@ -15,6 +15,14 @@ Unreleased
 ----------
 
 =========================
+[10.12.0] - 2025-04-09
+---------------------
+  * feat: Added the ability to filter enrollments by group_uuid in the enterprise completions API
+
+[10.11.1] - 2025-04-08
+---------------------
+  * fix: Fixed a bug in group_uuid based filtering.
+
 [10.11.0] - 2025-03-25
 ---------------------
   * feat: Added the ability to filter enrollments by group_uuid in the enterprise enrollments API.

{edx_enterprise_data-10.11.0/edx_enterprise_data.egg-info → edx_enterprise_data-10.12.0}/PKG-INFO

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

{edx_enterprise_data-10.11.0 → edx_enterprise_data-10.12.0/edx_enterprise_data.egg-info}/PKG-INFO

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

{edx_enterprise_data-10.11.0 → edx_enterprise_data-10.12.0}/edx_enterprise_data.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ enterprise_data/admin_analytics/database/__init__.py
 enterprise_data/admin_analytics/database/utils.py
 enterprise_data/admin_analytics/database/filters/__init__.py
 enterprise_data/admin_analytics/database/filters/base.py
+enterprise_data/admin_analytics/database/filters/fact_completion_admin_dash.py
 enterprise_data/admin_analytics/database/filters/fact_enrollment_admin_dash.py
 enterprise_data/admin_analytics/database/queries/__init__.py
 enterprise_data/admin_analytics/database/queries/fact_engagement_admin_dash.py

{edx_enterprise_data-10.11.0 → edx_enterprise_data-10.12.0}/enterprise_data/__init__.py

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

{edx_enterprise_data-10.11.0 → edx_enterprise_data-10.12.0}/enterprise_data/admin_analytics/database/filters/__init__.py

@@ -2,4 +2,5 @@
 Query Filters for database tables.
 """
 
+from .fact_completion_admin_dash import FactCompletionAdminDashFilters
 from .fact_enrollment_admin_dash import FactEnrollmentAdminDashFilters

edx_enterprise_data-10.12.0/enterprise_data/admin_analytics/database/filters/fact_completion_admin_dash.py

@@ -0,0 +1,36 @@
+"""
+Query filters for enrollments table.
+"""
+from enterprise_data.admin_analytics.database.filters.base import BaseFilter
+from enterprise_data.admin_analytics.database.query_filters import BetweenQueryFilter, EqualQueryFilter
+
+
+class FactCompletionAdminDashFilters(BaseFilter):
+    """
+    Query filters for completions data in enrollments table.
+    """
+    @staticmethod
+    def passed_date_range_filter(
+            start_date_params_key: str, end_date_params_key: str
+    ) -> BetweenQueryFilter:
+        """
+        Filter by passed date to be in the given range.
+
+        Arguments:
+            start_date_params_key (str): The start date key against which value will be passed in the query.
+            end_date_params_key (str): The end date key against which value will be passed in the query.
+        """
+        return BetweenQueryFilter(
+            column='passed_date',
+            range_placeholders=(start_date_params_key, end_date_params_key),
+        )
+
+    @staticmethod
+    def has_passed_filter() -> EqualQueryFilter:
+        """
+        Filter by has passed with fixed value 1.
+        """
+        return EqualQueryFilter(
+            column='has_passed',
+            value=1
+        )

{edx_enterprise_data-10.11.0 → edx_enterprise_data-10.12.0}/enterprise_data/admin_analytics/database/queries/fact_enrollment_admin_dash.py

@@ -70,17 +70,15 @@ class FactEnrollmentAdminDashQueries:
         """
 
     @staticmethod
-    def get_completion_count_query():
+    def get_completion_count_query(query_filters: QueryFilters) -> str:
         """
         Get the query to fetch the completion count.
         """
-        return """
+        return f"""
             SELECT
                 SUM(has_passed) as completions
             FROM fact_enrollment_admin_dash
-            WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
-                has_passed=1 AND
-                passed_date BETWEEN %(start_date)s AND %(end_date)s;
+            WHERE {query_filters.to_sql()};
         """
 
     @staticmethod
@@ -94,7 +92,7 @@ class FactEnrollmentAdminDashQueries:
             FROM fact_engagement_admin_dash
             WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
                 activity_date BETWEEN %(start_date)s AND %(end_date)s;
-        """
+            """
 
     @staticmethod
     def get_top_courses_by_enrollments_query(query_filters: QueryFilters, record_count: int = 10) -> str:
@@ -183,27 +181,28 @@ class FactEnrollmentAdminDashQueries:
         """
 
     @staticmethod
-    def get_all_completions_query():
+    def get_all_completions_query(
+        query_filters: QueryFilters,
+    ) -> str:
         """
         Get the query to fetch all completions.
         """
-        return """
+        return f"""
             SELECT email, course_title, course_subject, enroll_type, passed_date
             FROM fact_enrollment_admin_dash
-            WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
-                has_passed=1 AND
-                passed_date BETWEEN %(start_date)s AND %(end_date)s
+            WHERE {query_filters.to_sql()}
             ORDER BY passed_date DESC LIMIT %(limit)s OFFSET %(offset)s
         """
 
     @staticmethod
-    def get_top_courses_by_completions_query(record_count=10):
+    def get_top_courses_by_completions_query(query_filters: QueryFilters, record_count=10) -> str:
         """
         Get the query to fetch the completion count by courses.
 
         Query should fetch the top N courses by completion count. Where N is the value of record_count.
 
         Arguments:
+            query_filters (QueryFilters): List of query filters.
             record_count (int): Number of records to fetch.
 
         Returns:
@@ -217,9 +216,7 @@ class FactEnrollmentAdminDashQueries:
                     enroll_type,
                     passed_date
                 FROM fact_enrollment_admin_dash
-                WHERE has_passed = 1 AND
-                enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
-                passed_date BETWEEN %(start_date)s AND %(end_date)s
+                WHERE {query_filters.to_sql()}
             ),
             top_10_courses AS (
                 SELECT
@@ -243,13 +240,14 @@ class FactEnrollmentAdminDashQueries:
         """
 
     @staticmethod
-    def get_top_subjects_by_completions_query(record_count=10):
+    def get_top_subjects_by_completions_query(query_filters: QueryFilters, record_count=10) -> str:
         """
         Get the query to fetch the completion count by subjects.
 
         Query should fetch the top N subjects by completion count. Where N is the value of record_count.
 
         Arguments:
+            query_filters (QueryFilters): List of query filters.
             record_count (int): Number of records to fetch.
 
         Returns:
@@ -262,9 +260,7 @@ class FactEnrollmentAdminDashQueries:
                     enroll_type,
                     passed_date
                 FROM fact_enrollment_admin_dash
-                WHERE has_passed = 1 AND
-                enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
-                passed_date BETWEEN %(start_date)s AND %(end_date)s
+                WHERE {query_filters.to_sql()}
             ),
             top_10_subjects AS (
                 SELECT
@@ -287,7 +283,9 @@ class FactEnrollmentAdminDashQueries:
         """
 
     @staticmethod
-    def get_completions_time_series_data_query():
+    def get_completions_time_series_data_query(
+        query_filters: QueryFilters,
+    ) -> str:
         """
         Get the query to fetch the completion time series data.
 
@@ -296,12 +294,10 @@ class FactEnrollmentAdminDashQueries:
         Returns:
             (str): Query to fetch the completion time series data.
         """
-        return """
+        return f"""
             SELECT passed_date, enroll_type, count(course_key) as completion_count
             FROM fact_enrollment_admin_dash
-            WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
-                has_passed=1 AND
-                passed_date BETWEEN %(start_date)s AND %(end_date)s
+            WHERE {query_filters.to_sql()}
             GROUP BY passed_date, enroll_type
             ORDER BY passed_date;
         """

{edx_enterprise_data-10.11.0 → edx_enterprise_data-10.12.0}/enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py

@@ -10,7 +10,7 @@ from enterprise_data.cache.decorators import cache_it
 from enterprise_data.clients import EnterpriseApiClient
 from enterprise_data.exceptions import EnterpriseApiClientException
 
-from ..filters import FactEnrollmentAdminDashFilters
+from ..filters import FactCompletionAdminDashFilters, FactEnrollmentAdminDashFilters
 from ..queries import FactEnrollmentAdminDashQueries
 from ..query_filters import INQueryFilter, QueryFilters
 from ..utils import run_query
@@ -25,6 +25,7 @@ class FactEnrollmentAdminDashTable(BaseTable):
     """
     queries = FactEnrollmentAdminDashQueries()
     filters = FactEnrollmentAdminDashFilters()
+    completion_filters = FactCompletionAdminDashFilters()
 
     def __get_enterprise_user_query_filter(  # pylint: disable=inconsistent-return-statements
             self, group_uuid: Optional[UUID],
@@ -52,7 +53,7 @@ class FactEnrollmentAdminDashTable(BaseTable):
                 enterprise_customer_uuid,
             )
         else:
-            params = {f'eu_{i}': i for i in range(len(learners_in_group))}
+            params = {f'eu_{i}': enterprise_user_id for i, enterprise_user_id in enumerate(learners_in_group)}
             return self.filters.enterprise_user_id_in_filter(list(params.keys())), params
 
     def __get_common_query_filters(
@@ -92,6 +93,45 @@ class FactEnrollmentAdminDashTable(BaseTable):
 
         return query_filters, params
 
+    def __get_common_query_filters_for_completion(
+        self, enterprise_customer_uuid: UUID,
+        group_uuid: Optional[UUID],
+        start_date: date,
+        end_date: date,
+    ) -> Tuple[QueryFilters, dict]:
+        """
+        Utility method to get query filters common in most usages below.
+
+        This will return a tuple containing the query filters list and the dictionary of query parameters that
+        will be used in the query.
+
+        It will contain the following query filters.
+            1. enterprise_customer_uuid filter to filter records for an enterprise customer.
+            2. enrollment_date range filter to filter records by enrollment date.
+            3. group_uuid filter to filter records for learners who belong to the given group.
+            4. has_passed filter to filter records for successful completions.
+        """
+        query_filters = QueryFilters([
+            self.filters.enterprise_customer_uuid_filter('enterprise_customer_uuid'),
+            self.completion_filters.passed_date_range_filter('start_date', 'end_date'),
+            self.completion_filters.has_passed_filter(),
+        ])
+        params = {
+            'enterprise_customer_uuid': enterprise_customer_uuid,
+            'start_date': start_date,
+            'end_date': end_date,
+        }
+
+        response = self.__get_enterprise_user_query_filter(
+            group_uuid, enterprise_customer_uuid
+        )
+        if response is not None:
+            enterprise_user_id_in_filter, enterprise_user_id_params = response
+            query_filters.append(enterprise_user_id_in_filter)
+            params.update(enterprise_user_id_params)
+
+        return query_filters, params
+
     def get_top_enterprises(self, count=10):
         """
         Get the top enterprises by enrollments.
@@ -232,27 +272,31 @@ class FactEnrollmentAdminDashTable(BaseTable):
         return tuple(results[0])
 
     @cache_it()
-    def get_completion_count(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+    def get_completion_count(
+        self, enterprise_customer_uuid: UUID, group_uuid: Optional[UUID], start_date: date, end_date: date
+    ):
         """
         Get the completion count for the given enterprise customer.
 
         Arguments:
             enterprise_customer_uuid (UUID): The UUID of the enterprise customer.
+            group_uuid (UUID): The UUID of the group.
             start_date (date): The start date.
             end_date (date): The end date.
 
         Returns:
             int: The completion count.
         """
+        query_filters, query_filter_params = self.__get_common_query_filters_for_completion(
+            enterprise_customer_uuid, group_uuid, start_date, end_date
+        )
         results = run_query(
-            query=self.queries.get_completion_count_query(),
-            params={
-                'enterprise_customer_uuid': enterprise_customer_uuid,
-                'start_date': start_date,
-                'end_date': end_date,
-            }
+            query=self.queries.get_completion_count_query(query_filters),
+            params=query_filter_params,
+            as_dict=False,
         )
-        if not results:
+        # Handle empty results defensively
+        if not results or not results[0] or len(results[0]) == 0:
             return 0
 
         return int(results[0][0] or 0)
@@ -347,7 +391,13 @@ class FactEnrollmentAdminDashTable(BaseTable):
 
     @cache_it()
     def get_all_completions(
-            self, enterprise_customer_uuid: UUID, start_date: date, end_date: date, limit: int, offset: int
+        self,
+        enterprise_customer_uuid: UUID,
+        group_uuid: Optional[UUID],
+        start_date: date,
+        end_date: date,
+        limit: int,
+        offset: int,
     ):
         """
         Get all completions for the given enterprise customer.
@@ -355,6 +405,7 @@ class FactEnrollmentAdminDashTable(BaseTable):
         Arguments:
             enterprise_customer_uuid (UUID): The UUID of the enterprise customer.
             start_date (date): The start date.
+            group_uuid (UUID): The UUID of the group.
             end_date (date): The end date.
             limit (int): The maximum number of records to return.
             offset (int): The number of records to skip.
@@ -362,12 +413,13 @@ class FactEnrollmentAdminDashTable(BaseTable):
         Returns:
             list<dict>: A list of dictionaries containing the completions data.
         """
+        query_filters, query_filter_params = self.__get_common_query_filters_for_completion(
+            enterprise_customer_uuid, group_uuid, start_date, end_date
+        )
         return run_query(
-            query=self.queries.get_all_completions_query(),
+            query=self.queries.get_all_completions_query(query_filters),
             params={
-                'enterprise_customer_uuid': enterprise_customer_uuid,
-                'start_date': start_date,
-                'end_date': end_date,
+                **query_filter_params,
                 'limit': limit,
                 'offset': offset,
             },
@@ -375,7 +427,9 @@ class FactEnrollmentAdminDashTable(BaseTable):
         )
 
     @cache_it()
-    def get_top_courses_by_completions(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+    def get_top_courses_by_completions(
+        self, enterprise_customer_uuid: UUID, group_uuid: Optional[UUID], start_date: date, end_date: date
+    ):
         """
         Get the top courses by completion for the given enterprise customer.
 
@@ -387,18 +441,19 @@ class FactEnrollmentAdminDashTable(BaseTable):
         Returns:
             list<dict>: A list of dictionaries containing the course key, course_title and completion count.
         """
+        query_filters, query_filter_params = self.__get_common_query_filters_for_completion(
+            enterprise_customer_uuid, group_uuid, start_date, end_date
+        )
         return run_query(
-            query=self.queries.get_top_courses_by_completions_query(),
-            params={
-                'enterprise_customer_uuid': enterprise_customer_uuid,
-                'start_date': start_date,
-                'end_date': end_date,
-            },
+            query=self.queries.get_top_courses_by_completions_query(query_filters),
+            params=query_filter_params,
             as_dict=True,
         )
 
     @cache_it()
-    def get_top_subjects_by_completions(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+    def get_top_subjects_by_completions(
+        self, enterprise_customer_uuid: UUID, group_uuid: Optional[UUID], start_date: date, end_date: date
+    ):
         """
         Get the top subjects by completions for the given enterprise customer.
 
@@ -410,35 +465,36 @@ class FactEnrollmentAdminDashTable(BaseTable):
         Returns:
             list<dict>: A list of dictionaries containing the subject and completion count.
         """
+        query_filters, query_filter_params = self.__get_common_query_filters_for_completion(
+            enterprise_customer_uuid, group_uuid, start_date, end_date
+        )
         return run_query(
-            query=self.queries.get_top_subjects_by_completions_query(),
-            params={
-                'enterprise_customer_uuid': enterprise_customer_uuid,
-                'start_date': start_date,
-                'end_date': end_date,
-            },
+            query=self.queries.get_top_subjects_by_completions_query(query_filters),
+            params=query_filter_params,
             as_dict=True,
         )
 
     @cache_it()
-    def get_completions_time_series_data(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+    def get_completions_time_series_data(
+        self, enterprise_customer_uuid: UUID, group_uuid: Optional[UUID], start_date: date, end_date: date
+    ):
         """
         Get the completions time series data for the given enterprise customer.
 
         Arguments:
             enterprise_customer_uuid (UUID): The UUID of the enterprise customer.
+            group_uuid (UUID): The UUID of the group.
             start_date (date): The start date.
             end_date (date): The end date.
 
         Returns:
             list<dict>: A list of dictionaries containing the date and completion count.
         """
+        query_filters, query_filter_params = self.__get_common_query_filters_for_completion(
+            enterprise_customer_uuid, group_uuid, start_date, end_date
+        )
         return run_query(
-            query=self.queries.get_completions_time_series_data_query(),
-            params={
-                'enterprise_customer_uuid': enterprise_customer_uuid,
-                'start_date': start_date,
-                'end_date': end_date,
-            },
+            query=self.queries.get_completions_time_series_data_query(query_filters),
+            params=query_filter_params,
             as_dict=True,
         )

{edx_enterprise_data-10.11.0 → edx_enterprise_data-10.12.0}/enterprise_data/api/v1/serializers.py

@@ -262,6 +262,7 @@ class AdminAnalyticsAggregatesQueryParamsSerializer(serializers.Serializer):  #
     response_type = serializers.CharField(required=False)
     page = serializers.IntegerField(required=False)
     chart_type = serializers.CharField(required=False)
+    group_uuid = serializers.UUIDField(required=False)
 
     def validate(self, attrs):
         """

{edx_enterprise_data-10.11.0 → edx_enterprise_data-10.12.0}/enterprise_data/api/v1/views/analytics_completions.py

@@ -51,10 +51,12 @@ class AdvanceAnalyticsCompletionsView(AnalyticsPaginationMixin, ViewSet):
         # get values from query params or use default values
         start_date = serializer.data.get('start_date', min_enrollment_date)
         end_date = serializer.data.get('end_date', date.today())
+        group_uuid = serializer.data.get('group_uuid')
         page = serializer.data.get('page', 1)
         page_size = serializer.data.get('page_size', 100)
         completions = FactEnrollmentAdminDashTable().get_all_completions(
             enterprise_customer_uuid=enterprise_uuid,
+            group_uuid=group_uuid,
             start_date=start_date,
             end_date=end_date,
             limit=page_size,
@@ -62,6 +64,7 @@ class AdvanceAnalyticsCompletionsView(AnalyticsPaginationMixin, ViewSet):
         )
         total_count = FactEnrollmentAdminDashTable().get_completion_count(
             enterprise_customer_uuid=enterprise_uuid,
+            group_uuid=group_uuid,
             start_date=start_date,
             end_date=end_date,
         )
@@ -79,7 +82,7 @@ class AdvanceAnalyticsCompletionsView(AnalyticsPaginationMixin, ViewSet):
 
             return StreamingHttpResponse(
                 IndividualCompletionsCSVRenderer().render(self._stream_serialized_data(
-                    enterprise_uuid, start_date, end_date, total_count
+                    enterprise_uuid, group_uuid, start_date, end_date, total_count
                 )),
                 content_type="text/csv",
                 headers={"Content-Disposition": f'attachment; filename="{filename}"'},
@@ -94,7 +97,7 @@ class AdvanceAnalyticsCompletionsView(AnalyticsPaginationMixin, ViewSet):
         )
 
     @staticmethod
-    def _stream_serialized_data(enterprise_uuid, start_date, end_date, total_count, page_size=50000):
+    def _stream_serialized_data(enterprise_uuid, group_uuid, start_date, end_date, total_count, page_size=50000):
         """
         Stream the serialized data.
         """
@@ -102,6 +105,7 @@ class AdvanceAnalyticsCompletionsView(AnalyticsPaginationMixin, ViewSet):
         while offset < total_count:
             completions = FactEnrollmentAdminDashTable().get_all_completions(
                 enterprise_customer_uuid=enterprise_uuid,
+                group_uuid=group_uuid,
                 start_date=start_date,
                 end_date=end_date,
                 limit=page_size,
@@ -133,16 +137,18 @@ class AdvanceAnalyticsCompletionsView(AnalyticsPaginationMixin, ViewSet):
         # get values from query params or use default
         start_date = serializer.data.get('start_date', min_enrollment_date)
         end_date = serializer.data.get('end_date', date.today())
+        group_uuid = serializer.data.get('group_uuid')
+
         with timer('construct_completion_all_stats'):
             data = {
                 'completions_over_time': FactEnrollmentAdminDashTable().get_completions_time_series_data(
-                    enterprise_uuid, start_date, end_date
+                    enterprise_uuid, group_uuid, start_date, end_date
                 ),
                 'top_courses_by_completions': FactEnrollmentAdminDashTable().get_top_courses_by_completions(
-                    enterprise_uuid, start_date, end_date,
+                    enterprise_uuid, group_uuid, start_date, end_date,
                 ),
                 'top_subjects_by_completions': FactEnrollmentAdminDashTable().get_top_subjects_by_completions(
-                    enterprise_uuid, start_date, end_date,
+                    enterprise_uuid, group_uuid, start_date, end_date,
                 ),
             }
         return Response(data)

{edx_enterprise_data-10.11.0 → edx_enterprise_data-10.12.0}/enterprise_data/api/v1/views/enterprise_admin.py

@@ -108,12 +108,13 @@ class EnterpriseAdminAnalyticsAggregatesView(APIView):
             'start_date', min_enrollment_date
         )
         end_date = serializer.data.get('end_date', datetime.today())
+        group_uuid = serializer.data.get('group_uuid', None)
 
         enrolls, courses = FactEnrollmentAdminDashTable().get_enrollment_and_course_count(
             enterprise_id, start_date, end_date,
         )
         completions = FactEnrollmentAdminDashTable().get_completion_count(
-            enterprise_id, start_date, end_date,
+            enterprise_id, group_uuid, start_date, end_date,
         )
         hours, sessions = FactEngagementAdminDashTable().get_learning_hours_and_daily_sessions(
             enterprise_id, start_date, end_date,

{edx_enterprise_data-10.11.0 → edx_enterprise_data-10.12.0}/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,
         )

{edx_enterprise_data-10.11.0 → edx_enterprise_data-10.12.0}/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):
         """

{edx_enterprise_data-10.11.0 → edx_enterprise_data-10.12.0}/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