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

{edx_enterprise_data-10.11.1.dist-info → edx_enterprise_data-10.12.0.dist-info}/METADATA

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

{edx_enterprise_data-10.11.1.dist-info → edx_enterprise_data-10.12.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-edx_enterprise_data-10.11.1.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-enterprise_data/__init__.py,sha256=j6aLs1tTZrhX0hqVukHt4A3LxK06eXBgt0DlKcYKKK4,125
+edx_enterprise_data-10.12.0.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+enterprise_data/__init__.py,sha256=eCPWfovt7oPmCOdH366B9g4bK-v2sL1oI2SGL8UqKx4,125
 enterprise_data/apps.py,sha256=aF6hZwDfI2oWj95tUTm_2ikHueQj-jLj-u0GrgzpsQI,414
 enterprise_data/clients.py,sha256=glw-fXu3V7rKEpiUBF056gZEdNK4KnWcP9tNYELimRQ,6566
 enterprise_data/constants.py,sha256=uCKjfpdlMYFZJsAj3n9RMw4Cmg5_6s3NuwocO-fch3s,238
@@ -16,12 +16,13 @@ enterprise_data/admin_analytics/constants.py,sha256=-6uLAq5DUeA_rv5eUb9SeqlG3iVW
 enterprise_data/admin_analytics/data_loaders.py,sha256=b6RjEIxCol8ETQMY7QfwhqN9eEAvrUN_UldIG7rgsSY,736
 enterprise_data/admin_analytics/database/__init__.py,sha256=vNSWKf2VV5xMegN7htJJtxtQEb0ASLC6frE2w0ZpYpE,104
 enterprise_data/admin_analytics/database/utils.py,sha256=5u-d6ZQW95mF_r4bH8Xdi7DgpYAuDFOG_q0P-bjKXHU,1712
-enterprise_data/admin_analytics/database/filters/__init__.py,sha256=ZteBm55429cn8zaUVYHRFA7InQPWP0b4XiZeq24HQT4,115
+enterprise_data/admin_analytics/database/filters/__init__.py,sha256=FIgcEfVQPU0TrJoFhWJMo6WPFz4WnPAzxxkwTLfwtP8,186
 enterprise_data/admin_analytics/database/filters/base.py,sha256=nOek6XgHEVBKUTGk-K0PZpy0RSZB3D7kc8OD5nlqXcE,71
+enterprise_data/admin_analytics/database/filters/fact_completion_admin_dash.py,sha256=j50oW-C-N2X3g6RsvnP9PHeiz8Z4qqe-SyjxeCzb6zQ,1208
 enterprise_data/admin_analytics/database/filters/fact_enrollment_admin_dash.py,sha256=WKRBWRCujiMay2ePdl9vnNN1ux-LO0edyb79W4dm-S4,1808
 enterprise_data/admin_analytics/database/queries/__init__.py,sha256=IC5TLOr_GnydbrVbl2mWhwO3aUbYeHuDmfPTLmwGhZA,218
 enterprise_data/admin_analytics/database/queries/fact_engagement_admin_dash.py,sha256=eLy9GT0gFGLbw8yZZdEaeCAw0pTEUsy0-Ud5g2T9T80,10836
-enterprise_data/admin_analytics/database/queries/fact_enrollment_admin_dash.py,sha256=0YbIQvNL8pgi-apsoYzBSnDeouiqZIUlYzIH4xkbY_w,10942
+enterprise_data/admin_analytics/database/queries/fact_enrollment_admin_dash.py,sha256=n_RiqraVzYvCsgLaPmpSBUX3cyNEHjSnkNH7n35gC80,10609
 enterprise_data/admin_analytics/database/queries/skills_daily_rollup_admin_dash.py,sha256=ZaJPghTrQvBGsFxfpeR8EE45ujtaYI9R_xkoDDqD2So,4269
 enterprise_data/admin_analytics/database/query_filters/__init__.py,sha256=xW9cf5KGpMs33tTlil5gzKq4RxcZVCJZESsrHo2X0E4,182
 enterprise_data/admin_analytics/database/query_filters/base.py,sha256=XZUC1AIaDPBq0cwh2Xn5wp_DZfsD3HnMMvqFUt7iM2E,2205
@@ -31,7 +32,7 @@ enterprise_data/admin_analytics/database/query_filters/in_.py,sha256=RsqDVTgzJ0v
 enterprise_data/admin_analytics/database/tables/__init__.py,sha256=Z-c3P9hqR-dC9uYKe63qHkQG9Nms8cLE2jRN-4jeMM0,289
 enterprise_data/admin_analytics/database/tables/base.py,sha256=1KyKsC18pW3m-5U-T6pdt5rIwsz6Wp3QFFbD3r6L6YQ,395
 enterprise_data/admin_analytics/database/tables/fact_engagement_admin_dash.py,sha256=VMUGwfrUsYd_NnxEDNBovAmHwhdTCSImGA6JjHzknhk,12959
-enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py,sha256=okRav232A2TD2WzVsOq_HHOm3itp_-uJB6uUxypykLI,15864
+enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py,sha256=yDqrt9SWvvBNb-v-7Sh-m2Vef2bsGRSsP-YKeLCAnSA,18411
 enterprise_data/admin_analytics/database/tables/skills_daily_rollup_admin_dash.py,sha256=3xNwSi0wfCyBHcXPd6-9Ujs1NUm8kmZRg_gPrZzp9nQ,3233
 enterprise_data/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enterprise_data/api/urls.py,sha256=POqc_KATHdnpMf9zHtpO46pKD5KAlAExtx7G6iylLcU,273
@@ -40,15 +41,15 @@ enterprise_data/api/v0/serializers.py,sha256=dngZTk6DhRxApchQKCMp1B_c8aVnQtH0NCq
 enterprise_data/api/v0/urls.py,sha256=vzJjqIo_S3AXWs9Us8XTaJc3FnxLbYzAkmLyuDQqum0,699
 enterprise_data/api/v0/views.py,sha256=4RslZ4NZOU-844bnebEQ71ji2utRY7jEijqC45oQQD0,14380
 enterprise_data/api/v1/__init__.py,sha256=1aAzAYU5hk-RW6cKUxa1645cbZMxn7GIZ7OMjWc9MKI,46
-enterprise_data/api/v1/serializers.py,sha256=U3zxiideqwpoJuofI0dkx0AwbN2GUiELxqJIXIVwI9s,13843
+enterprise_data/api/v1/serializers.py,sha256=6yxUe_7UBh80e2ZPZIf1AUzzgtKM8-yS38Q4Katqbj8,13898
 enterprise_data/api/v1/urls.py,sha256=Wl1xLboPg-Lq1ZvjAWf51JKYkHlmx02Kpq1nwfDyS8s,4372
 enterprise_data/api/v1/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-enterprise_data/api/v1/views/analytics_completions.py,sha256=esFbJ5q8ssnm2Mfbc3rZXtiGHF-MeM4KQ4Ft3N7wwHU,6260
+enterprise_data/api/v1/views/analytics_completions.py,sha256=ALkoUTgvaqCxpjnf3rkvwBT7-Hv7eM1RnCdRboCQgR8,6540
 enterprise_data/api/v1/views/analytics_engagements.py,sha256=Yo-bpA-0xOQHUPTFF0jHWxjm6KpSC-l2nGxhYX0ajBk,6298
 enterprise_data/api/v1/views/analytics_enrollments.py,sha256=_KBo4RhEmfQXcCOgvowD28WCVJwlc4APuCnRDbAYK9E,6563
 enterprise_data/api/v1/views/analytics_leaderboard.py,sha256=3dyo7_OhyGEEeibemBrRsUOo0jbM4LbDgV5gw3YnVig,4186
 enterprise_data/api/v1/views/base.py,sha256=Kkmd5zgEBAhvwS_GoGXSK6lgbDNwSPioYn-QbnizI3w,3416
-enterprise_data/api/v1/views/enterprise_admin.py,sha256=xxpb48cjuHkFJH-IQG0DwOvdH8RgyYD-aQjyfMMJNFg,9030
+enterprise_data/api/v1/views/enterprise_admin.py,sha256=uaf8sSp_JS1T5Kgi4xNCjhu6A0HKa3Zwp6JMjY3okJk,9103
 enterprise_data/api/v1/views/enterprise_learner.py,sha256=vRzfaQCEoeq_tEY7KsNZJVzgn7XEWZ1l-n0oUoSVGyU,20093
 enterprise_data/api/v1/views/enterprise_offers.py,sha256=VifxgqTLFLVw4extYPlHcN1N_yjXcsYsAlYEnAbpb10,1266
 enterprise_data/cache/__init__.py,sha256=fiBUploll1kmDy2vCmnNpeZVTD4ewsgtRF14vVs0Rb4,1850
@@ -64,7 +65,7 @@ enterprise_data/management/commands/create_enterprise_learner_enrollment_lpr_v1.
 enterprise_data/management/commands/create_enterprise_learner_lpr_v1.py,sha256=bUYmZHA3yK3ZBPhV0wkpRDgH_Q2b5rVQnwSp2hRmh28,1799
 enterprise_data/management/commands/create_enterprise_offer.py,sha256=0R1eEKWTCGjod4I8qBH2UBD-erqj5mFtM_DG5Vxet_0,1150
 enterprise_data/management/commands/create_enterprise_user.py,sha256=V_kvOSPZ1DXfAdF1W3AwAtavEYjdYaHBjjfzndZP8lk,1498
-enterprise_data/management/commands/pre_warm_analytics_cache.py,sha256=i64hcbvqGW0UWYbx046iEETzCOcva1cdYumdb5RByGU,8522
+enterprise_data/management/commands/pre_warm_analytics_cache.py,sha256=bwqocYMc72AlgXy_SbT0EL5Aa4sLtVLtYkWSLTZmio0,8696
 enterprise_data/management/commands/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enterprise_data/management/commands/tests/test_create_dummy_data_lpr_v1.py,sha256=wt9fqAFKQVTqllpZ42dch-n31JavUifUIB9CKNYcnYM,1086
 enterprise_data/management/commands/tests/test_create_enterprise_enrollment.py,sha256=5CABLk8qAx8RP8mrFtnbJ4-xVkf9-5Mq6iQcx8jBfFc,1742
@@ -144,7 +145,7 @@ enterprise_data/tests/api/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 enterprise_data/tests/api/v1/test_serializers.py,sha256=DwgEHcyOP3oqNUPB2O-NkJGeO_cYs9XJiq7791vJLZE,3682
 enterprise_data/tests/api/v1/test_views.py,sha256=rLqUHfar0HdBNtz33hQxd_0qUUgr7Ku3KwQSQ1B4Ypg,15213
 enterprise_data/tests/api/v1/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-enterprise_data/tests/api/v1/views/test_enterprise_admin.py,sha256=OxeCL_-wotTOoe7cQxJTFDNataBRn5y8ei6GM5-EklA,11052
+enterprise_data/tests/api/v1/views/test_enterprise_admin.py,sha256=6SXw7LcMaE-M2VSX8PHaWmOHDGXlqbI2ahNHqyBuPOk,11161
 enterprise_data_roles/__init__.py,sha256=toCpbypm2uDoWVw29_em9gPFNly8vNUS__C0b4TCqEg,112
 enterprise_data_roles/admin.py,sha256=QNP0VeWE092vZzpyxOA5UJK1nNGl5e71B1J0RCwo_nU,998
 enterprise_data_roles/apps.py,sha256=nKi8TyuQ5Q6WGtKs5QeXvUTc3N-YQjKhyBnm2EM3Bng,260
@@ -178,7 +179,7 @@ enterprise_reporting/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 enterprise_reporting/fixtures/enterprise_customer_reporting.json,sha256=nS6E9KHW0Iqk7ZHtTyyVyrztIXxjn9OtBvMJkn7owxc,3959
 enterprise_reporting/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enterprise_reporting/tests/test_clients.py,sha256=h-h7xBJ6wIBKP-QqRxcJJGiQxLfTOLYByCuWfcCeCy0,8474
-enterprise_reporting/tests/test_delivery_method.py,sha256=_nvpxPjYb59ix0nsgX4Ani0gJ0mgcBCgfHpw0rS0scc,4561
+enterprise_reporting/tests/test_delivery_method.py,sha256=p7OWkHKzl-iiA8jHXoo7TIRQees-AUryKzIq-t2MtwI,4561
 enterprise_reporting/tests/test_enterprise_client.py,sha256=lpWm0muvA3alRjmlRAezE5901C9DU3WiySH4D5-U3qE,1058
 enterprise_reporting/tests/test_external_link_report.py,sha256=zdnVOD1qtAp9c5EbIPnD9jcoLtW4iKs7gSVklgBK328,7029
 enterprise_reporting/tests/test_reporter.py,sha256=PTmkGvPjGEjxiyizL88LAKnaWdvZDgOBjL4QStfOdyw,4057
@@ -186,7 +187,7 @@ enterprise_reporting/tests/test_send_enterprise_reports.py,sha256=zBj7sDvRLJQbRs
 enterprise_reporting/tests/test_utils.py,sha256=y4t6w9aKra-ftqtUeHvPwOhje-1npz7auV5o74ya8fE,9523
 enterprise_reporting/tests/test_vertica_client.py,sha256=-R2yNCGUjRtoXwLMBloVFQkFYrJoo613VCr61gwI3kQ,140
 enterprise_reporting/tests/utils.py,sha256=xms2LM7DV3wczXEfctOK1ddel1EE0J_YSr17UzbCDy4,1401
-edx_enterprise_data-10.11.1.dist-info/METADATA,sha256=qGem3YioOvmd2BpaHm7xLHVjzDkgWIHl-eW5jn3r_o0,1707
-edx_enterprise_data-10.11.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-edx_enterprise_data-10.11.1.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
-edx_enterprise_data-10.11.1.dist-info/RECORD,,
+edx_enterprise_data-10.12.0.dist-info/METADATA,sha256=ug0VdbHtFCW6mtrxcaDxw6lYa72hnc6B_gMYHfAg8xA,1707
+edx_enterprise_data-10.12.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+edx_enterprise_data-10.12.0.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
+edx_enterprise_data-10.12.0.dist-info/RECORD,,

enterprise_data/__init__.py

@@ -2,4 +2,4 @@
 Enterprise data api application. This Django app exposes API endpoints used by enterprises.
 """
 
-__version__ = "10.11.1"
+__version__ = "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

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
+        )

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;
         """

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],
@@ -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,
         )

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/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,

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,
         )

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