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

enterprise_data/admin_analytics/database/tables/fact_engagement_admin_dash.py

@@ -2,12 +2,15 @@
 Module for interacting with the fact_enrollment_engagement_day_admin_dash table.
 """
 from datetime import date
+from typing import Optional, Tuple
 from uuid import UUID
 
 from enterprise_data.cache.decorators import cache_it
 from enterprise_data.utils import find_first
 
+from ..filters import FactEngagementAdminDashFilters
 from ..queries import FactEngagementAdminDashQueries
+from ..query_filters import QueryFilters
 from ..utils import run_query
 from .base import BaseTable
 
@@ -19,6 +22,43 @@ class FactEngagementAdminDashTable(BaseTable):
     Class for communicating with the fact_enrollment_engagement_day_admin_dash table.
     """
     queries = FactEngagementAdminDashQueries()
+    engagement_filters = FactEngagementAdminDashFilters()
+
+    def __get_common_query_filters_for_engagement(
+            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.
+        """
+        query_filters = QueryFilters([
+            self.engagement_filters.enterprise_customer_uuid_filter('enterprise_customer_uuid'),
+            self.engagement_filters.date_range_filter('activity_date', 'start_date', 'end_date'),
+        ])
+        params = {
+            'enterprise_customer_uuid': enterprise_customer_uuid,
+            'start_date': start_date,
+            'end_date': end_date,
+        }
+
+        response = self.engagement_filters.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
 
     @cache_it()
     def get_learning_hours_and_daily_sessions(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
@@ -47,7 +87,13 @@ class FactEngagementAdminDashTable(BaseTable):
         return tuple(results[0])
 
     @cache_it()
-    def get_engagement_count(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+    def get_engagement_count(
+        self,
+        enterprise_customer_uuid: UUID,
+        group_uuid: Optional[UUID],
+        start_date: date,
+        end_date: date
+    ):
         """
         Get the total number of engagements for the given enterprise customer.
 
@@ -59,13 +105,13 @@ class FactEngagementAdminDashTable(BaseTable):
         Returns:
             int: The total number of engagements.
         """
+        query_filters, query_filter_params = self.__get_common_query_filters_for_engagement(
+            enterprise_customer_uuid, group_uuid, start_date, end_date
+        )
+
         results = run_query(
-            query=self.queries.get_engagement_count_query(),
-            params={
-                'enterprise_customer_uuid': enterprise_customer_uuid,
-                'start_date': start_date,
-                'end_date': end_date,
-            }
+            query=self.queries.get_engagement_count_query(query_filters),
+            params=query_filter_params,
         )
         if not results:
             return 0
@@ -73,13 +119,20 @@ class FactEngagementAdminDashTable(BaseTable):
 
     @cache_it()
     def get_all_engagements(
-            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 engagement data for the given enterprise customer.
 
         Arguments:
             enterprise_customer_uuid (UUID): The UUID of the enterprise customer.
+            group_uuid (UUID): The UUID of a group.
             start_date (date): The start date.
             end_date (date): The end date.
             limit (int): The maximum number of records to return.
@@ -88,12 +141,14 @@ class FactEngagementAdminDashTable(BaseTable):
         Returns:
             list<dict>: A list of dictionaries containing the engagement data.
         """
+        query_filters, query_filter_params = self.__get_common_query_filters_for_engagement(
+            enterprise_customer_uuid, group_uuid, start_date, end_date
+        )
+
         return run_query(
-            query=self.queries.get_all_engagement_query(),
+            query=self.queries.get_all_engagement_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,
             },
@@ -101,7 +156,13 @@ class FactEngagementAdminDashTable(BaseTable):
         )
 
     @cache_it()
-    def get_top_courses_by_engagement(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+    def get_top_courses_by_engagement(
+        self,
+        enterprise_customer_uuid: UUID,
+        group_uuid: Optional[UUID],
+        start_date: date,
+        end_date: date
+    ):
         """
         Get the top courses by user engagement for the given enterprise customer.
 
@@ -113,18 +174,23 @@ class FactEngagementAdminDashTable(BaseTable):
         Returns:
             list<dict>: A list of dictionaries containing the course data.
         """
+        query_filters, query_filter_params = self.__get_common_query_filters_for_engagement(
+            enterprise_customer_uuid, group_uuid, start_date, end_date
+        )
         return run_query(
-            query=self.queries.get_top_courses_by_engagement_query(),
-            params={
-                'enterprise_customer_uuid': enterprise_customer_uuid,
-                'start_date': start_date,
-                'end_date': end_date,
-            },
+            query=self.queries.get_top_courses_by_engagement_query(query_filters),
+            params=query_filter_params,
             as_dict=True,
         )
 
     @cache_it()
-    def get_top_subjects_by_engagement(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+    def get_top_subjects_by_engagement(
+        self,
+        enterprise_customer_uuid: UUID,
+        group_uuid: Optional[UUID],
+        start_date: date,
+        end_date: date
+    ):
         """
         Get the top subjects by user engagement for the given enterprise customer.
 
@@ -136,18 +202,23 @@ class FactEngagementAdminDashTable(BaseTable):
         Returns:
             list<dict>: A list of dictionaries containing the subject data.
         """
+        query_filters, query_filter_params = self.__get_common_query_filters_for_engagement(
+            enterprise_customer_uuid, group_uuid, start_date, end_date
+        )
         return run_query(
-            query=self.queries.get_top_subjects_by_engagement_query(),
-            params={
-                'enterprise_customer_uuid': enterprise_customer_uuid,
-                'start_date': start_date,
-                'end_date': end_date,
-            },
+            query=self.queries.get_top_subjects_by_engagement_query(query_filters),
+            params=query_filter_params,
             as_dict=True,
         )
 
     @cache_it()
-    def get_engagement_time_series_data(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+    def get_engagement_time_series_data(
+        self,
+        enterprise_customer_uuid: UUID,
+        group_uuid: Optional[UUID],
+        start_date: date,
+        end_date: date
+    ):
         """
         Get the engagement time series data.
 
@@ -159,13 +230,12 @@ class FactEngagementAdminDashTable(BaseTable):
         Returns:
             list<dict>: A list of dictionaries containing the engagement time series data.
         """
+        query_filters, query_filter_params = self.__get_common_query_filters_for_engagement(
+            enterprise_customer_uuid, group_uuid, start_date, end_date
+        )
         return run_query(
-            query=self.queries.get_engagement_time_series_data_query(),
-            params={
-                'enterprise_customer_uuid': enterprise_customer_uuid,
-                'start_date': start_date,
-                'end_date': end_date,
-            },
+            query=self.queries.get_engagement_time_series_data_query(query_filters),
+            params=query_filter_params,
             as_dict=True,
         )
 

enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py

@@ -2,58 +2,25 @@
 Module for interacting with the fact_enrollment_admin_dash table.
 """
 from datetime import date, datetime
-from logging import getLogger
 from typing import Optional, Tuple
 from uuid import UUID
 
 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 ..query_filters import QueryFilters
 from ..utils import run_query
 from .base import BaseTable
 
-LOGGER = getLogger(__name__)
-
 
 class FactEnrollmentAdminDashTable(BaseTable):
     """
     Class for communicating with the fact_enrollment_admin_dash table.
     """
     queries = FactEnrollmentAdminDashQueries()
-    filters = FactEnrollmentAdminDashFilters()
-
-    def __get_enterprise_user_query_filter(  # pylint: disable=inconsistent-return-statements
-            self, group_uuid: Optional[UUID],
-            enterprise_customer_uuid: UUID
-    ) -> Optional[Tuple[INQueryFilter, dict]]:
-        """
-        Get the query filter to filter enrollments for enterprise users in the given group.
-
-        Arguments:
-            group_uuid (UUID): The UUID of the group.
-            enterprise_customer_uuid (UUID): The UUID of the enterprise customer.
-
-        Returns:
-            (INQueryFilter | None): The query filter to filter enrollments for enterprise users in the given group.
-        """
-        if not group_uuid:
-            return None
-
-        try:
-            learners_in_group = EnterpriseApiClient.get_enterprise_user_ids_in_group(group_uuid)
-        except EnterpriseApiClientException:
-            LOGGER.exception(
-                "Failed to get learners in group [%s] for enterprise [%s]",
-                group_uuid,
-                enterprise_customer_uuid,
-            )
-        else:
-            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
+    enrollment_filters = FactEnrollmentAdminDashFilters()
+    completion_filters = FactCompletionAdminDashFilters()
 
     def __get_common_query_filters(
             self, enterprise_customer_uuid: UUID,
@@ -73,8 +40,8 @@ class FactEnrollmentAdminDashTable(BaseTable):
             3. group_uuid filter to filter records for learners who belong to the given group.
         """
         query_filters = QueryFilters([
-            self.filters.enterprise_customer_uuid_filter('enterprise_customer_uuid'),
-            self.filters.enterprise_enrollment_date_range_filter('start_date', 'end_date'),
+            self.enrollment_filters.enterprise_customer_uuid_filter('enterprise_customer_uuid'),
+            self.enrollment_filters.date_range_filter('enterprise_enrollment_date', 'start_date', 'end_date'),
         ])
         params = {
             'enterprise_customer_uuid': enterprise_customer_uuid,
@@ -82,7 +49,46 @@ class FactEnrollmentAdminDashTable(BaseTable):
             'end_date': end_date,
         }
 
-        response = self.__get_enterprise_user_query_filter(
+        response = self.enrollment_filters.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_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.completion_filters.enterprise_customer_uuid_filter('enterprise_customer_uuid'),
+            self.completion_filters.date_range_filter('passed_date', '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.completion_filters.enterprise_user_query_filter(
             group_uuid, enterprise_customer_uuid
         )
         if response is not None:
@@ -232,27 +238,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 +357,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 +371,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 +379,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 +393,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 +407,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 +431,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,
         )

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):
         """

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)

enterprise_data/api/v1/views/analytics_engagements.py

@@ -51,10 +51,12 @@ class AdvanceAnalyticsEngagementView(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)
         engagements = FactEngagementAdminDashTable().get_all_engagements(
             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 AdvanceAnalyticsEngagementView(AnalyticsPaginationMixin, ViewSet):
         )
         total_count = FactEngagementAdminDashTable().get_engagement_count(
             enterprise_customer_uuid=enterprise_uuid,
+            group_uuid=group_uuid,
             start_date=start_date,
             end_date=end_date,
         )
@@ -79,7 +82,7 @@ class AdvanceAnalyticsEngagementView(AnalyticsPaginationMixin, ViewSet):
 
             return StreamingHttpResponse(
                 IndividualEngagementsCSVRenderer().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 AdvanceAnalyticsEngagementView(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 AdvanceAnalyticsEngagementView(AnalyticsPaginationMixin, ViewSet):
         while offset < total_count:
             engagements = FactEngagementAdminDashTable().get_all_engagements(
                 enterprise_customer_uuid=enterprise_uuid,
+                group_uuid=group_uuid,
                 start_date=start_date,
                 end_date=end_date,
                 limit=page_size,
@@ -133,16 +137,17 @@ class AdvanceAnalyticsEngagementView(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_engagement_all_stats'):
             data = {
                 'engagement_over_time': FactEngagementAdminDashTable().get_engagement_time_series_data(
-                    enterprise_uuid, start_date, end_date
+                    enterprise_uuid, group_uuid, start_date, end_date
                 ),
                 'top_courses_by_engagement': FactEngagementAdminDashTable().get_top_courses_by_engagement(
-                    enterprise_uuid, start_date, end_date,
+                    enterprise_uuid, group_uuid, start_date, end_date,
                 ),
                 'top_subjects_by_engagement': FactEngagementAdminDashTable().get_top_subjects_by_engagement(
-                    enterprise_uuid, start_date, end_date,
+                    enterprise_uuid, group_uuid, start_date, end_date,
                 ),
             }
         return Response(data)

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,