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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edx-enterprise-data
-Version: 10.11.1
+Version: 10.13.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.13.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.13.0.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+enterprise_data/__init__.py,sha256=6b64KfpVwhIK3wktzVb4OEjFotuixZTyDM-kl7XnqaI,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,15 @@ 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=qzRLCsLTocvaFKpHIB3juyVsxaQ3ByO3YNeSAYkUsHc,257
 enterprise_data/admin_analytics/database/filters/base.py,sha256=nOek6XgHEVBKUTGk-K0PZpy0RSZB3D7kc8OD5nlqXcE,71
-enterprise_data/admin_analytics/database/filters/fact_enrollment_admin_dash.py,sha256=WKRBWRCujiMay2ePdl9vnNN1ux-LO0edyb79W4dm-S4,1808
+enterprise_data/admin_analytics/database/filters/fact_completion_admin_dash.py,sha256=pklKo12Vxm3rfNGE4qUiFmb9mZ526MhONPDzoJ-o0DM,679
+enterprise_data/admin_analytics/database/filters/fact_engagement_admin_dash.py,sha256=ljdCbRbPS26qJaG6RnqepqwFgiE9GIQnR1uyQRlU5RM,334
+enterprise_data/admin_analytics/database/filters/fact_enrollment_admin_dash.py,sha256=X7aVTii8hS49rSRf8EtZZKxsSZR64tX3TsEsLiHfVUg,338
+enterprise_data/admin_analytics/database/filters/mixins.py,sha256=FOtOKvcugQC8eofli8Pf2vi8EKKXoWHem1CVaLw7moA,3064
 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_engagement_admin_dash.py,sha256=RejAfiNGr0i3wyNe5bsqFOcdRKCGp-tbqS04ibgLi5I,10393
+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
@@ -30,8 +33,8 @@ enterprise_data/admin_analytics/database/query_filters/equal.py,sha256=Z4OPVSZmo
 enterprise_data/admin_analytics/database/query_filters/in_.py,sha256=RsqDVTgzJ0vvEMmtyefPNZh8U3eShLp7ZqY_J5oC45E,802
 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_engagement_admin_dash.py,sha256=wAnpNgh1USAQKi86JdEy4KJ_d_IL2fbKKu3ypqi5BCs,15434
+enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py,sha256=BwchyH1VJy8Ie-m_ma3bXiKKkNtJhb8A0u37hjocyiU,17049
 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 +43,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_engagements.py,sha256=Yo-bpA-0xOQHUPTFF0jHWxjm6KpSC-l2nGxhYX0ajBk,6298
+enterprise_data/api/v1/views/analytics_completions.py,sha256=ALkoUTgvaqCxpjnf3rkvwBT7-Hv7eM1RnCdRboCQgR8,6540
+enterprise_data/api/v1/views/analytics_engagements.py,sha256=XHJ_sfGyeamCW4krEazHzOMDGjK5qwIDvZ1IJRUgLaE,6577
 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 +67,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=MdvwIZdxYei5V6pTOe_-ohCXHlrMRk29fGe9rfijJzk,8841
 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 +147,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 +181,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 +189,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.13.0.dist-info/METADATA,sha256=RgZC-iLHMg24D7ZS5S4ZDaxN0IhZYCYdhFnx49ZQNuA,1707
+edx_enterprise_data-10.13.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+edx_enterprise_data-10.13.0.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
+edx_enterprise_data-10.13.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.13.0"

enterprise_data/admin_analytics/database/filters/__init__.py

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

enterprise_data/admin_analytics/database/filters/fact_completion_admin_dash.py

@@ -0,0 +1,22 @@
+"""
+Query filters for enrollments table.
+"""
+from enterprise_data.admin_analytics.database.filters.base import BaseFilter
+from enterprise_data.admin_analytics.database.filters.mixins import CommonFiltersMixin
+from enterprise_data.admin_analytics.database.query_filters import EqualQueryFilter
+
+
+class FactCompletionAdminDashFilters(CommonFiltersMixin, BaseFilter):
+    """
+    Query filters for completions data in enrollments table.
+    """
+
+    @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/filters/fact_engagement_admin_dash.py

@@ -0,0 +1,11 @@
+"""
+Query filters for engagments data.
+"""
+from enterprise_data.admin_analytics.database.filters.base import BaseFilter
+from enterprise_data.admin_analytics.database.filters.mixins import CommonFiltersMixin
+
+
+class FactEngagementAdminDashFilters(CommonFiltersMixin, BaseFilter):
+    """
+    Query filters for engagments data.
+    """

enterprise_data/admin_analytics/database/filters/fact_enrollment_admin_dash.py

@@ -2,50 +2,10 @@
 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, INQueryFilter
+from enterprise_data.admin_analytics.database.filters.mixins import CommonFiltersMixin
 
 
-class FactEnrollmentAdminDashFilters(BaseFilter):
+class FactEnrollmentAdminDashFilters(CommonFiltersMixin, BaseFilter):
     """
     Query filters for enrollments table.
     """
-    @staticmethod
-    def enterprise_customer_uuid_filter(enterprise_customer_uuid_params_key: str) -> EqualQueryFilter:
-        """
-        Filter by enterprise customer uuid.
-
-        Arguments:
-            enterprise_customer_uuid_params_key: The key against which value will be passed in the query.
-        """
-        return EqualQueryFilter(
-            column='enterprise_customer_uuid',
-            value_placeholder=enterprise_customer_uuid_params_key,
-        )
-
-    @staticmethod
-    def enterprise_enrollment_date_range_filter(
-            start_date_params_key: str, end_date_params_key: str
-    ) -> BetweenQueryFilter:
-        """
-        Filter by enrollment 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='enterprise_enrollment_date',
-            range_placeholders=(start_date_params_key, end_date_params_key),
-        )
-
-    @staticmethod
-    def enterprise_user_id_in_filter(
-            enterprise_user_id_param_keys: list,
-    ) -> INQueryFilter:
-        """
-        Filter by enterprise user id.
-        """
-        return INQueryFilter(
-            column='enterprise_user_id',
-            values_placeholders=enterprise_user_id_param_keys
-        )

enterprise_data/admin_analytics/database/filters/mixins.py

@@ -0,0 +1,84 @@
+"""
+Common query filters for all tables.
+"""
+from logging import getLogger
+from typing import Optional, Tuple
+from uuid import UUID
+
+from enterprise_data.admin_analytics.database.filters.base import BaseFilter
+from enterprise_data.admin_analytics.database.query_filters import BetweenQueryFilter, EqualQueryFilter, INQueryFilter
+from enterprise_data.clients import EnterpriseApiClient
+from enterprise_data.exceptions import EnterpriseApiClientException
+
+LOGGER = getLogger(__name__)
+
+
+class CommonFiltersMixin(BaseFilter):
+    """
+    Common filters.
+    """
+    @staticmethod
+    def enterprise_customer_uuid_filter(enterprise_customer_uuid_params_key: str) -> EqualQueryFilter:
+        """
+        Filter by enterprise customer uuid.
+
+        Arguments:
+            enterprise_customer_uuid_params_key: The key against which value will be passed in the query.
+        """
+        return EqualQueryFilter(
+            column='enterprise_customer_uuid',
+            value_placeholder=enterprise_customer_uuid_params_key,
+        )
+
+    @staticmethod
+    def date_range_filter(
+        column: str,
+        start_date_params_key: str,
+        end_date_params_key: str
+    ) -> BetweenQueryFilter:
+        """
+        Filter by a table column to be in the given date range.
+
+        Arguments:
+            column (str): The table column name to filter on.
+            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=column,
+            range_placeholders=(start_date_params_key, end_date_params_key),
+        )
+
+    def 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}': i for i in learners_in_group}
+            enterprise_user_id_in_filter = INQueryFilter(
+                column='enterprise_user_id',
+                values_placeholders=list(params.keys()),
+            )
+            return enterprise_user_id_in_filter, params

enterprise_data/admin_analytics/database/queries/fact_engagement_admin_dash.py

@@ -21,34 +21,32 @@ class FactEngagementAdminDashQueries:
         """
 
     @staticmethod
-    def get_engagement_count_query():
+    def get_engagement_count_query(query_filters):
         """
         Get the query to fetch the total number of engagements for an enterprise customer.
         """
-        return """
+        return f"""
             SELECT count(*)
             FROM fact_enrollment_engagement_day_admin_dash
-            WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
-                activity_date BETWEEN %(start_date)s AND %(end_date)s;
+            WHERE {query_filters.to_sql()};
         """
 
     @staticmethod
-    def get_all_engagement_query():
+    def get_all_engagement_query(query_filters):
         """
         Get the query to fetch all engagement data.
         """
-        return """
+        return f"""
             SELECT
                 email, course_title, course_subject, enroll_type, activity_date,
                 learning_time_seconds/3600 as learning_time_hours
             FROM fact_enrollment_engagement_day_admin_dash
-            WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
-                activity_date BETWEEN %(start_date)s AND %(end_date)s
+            WHERE {query_filters.to_sql()}
             ORDER BY activity_date DESC LIMIT %(limit)s OFFSET %(offset)s;
         """
 
     @staticmethod
-    def get_top_courses_by_engagement_query(record_count=10):
+    def get_top_courses_by_engagement_query(query_filters, record_count=10):
         """
         Get the query to fetch the learning time in hours by courses.
 
@@ -69,8 +67,7 @@ class FactEngagementAdminDashQueries:
                     (learning_time_seconds / 60.0 / 60.0) AS learning_time_hours,
                     activity_date
                 FROM fact_enrollment_engagement_day_admin_dash
-                WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
-                activity_date BETWEEN %(start_date)s AND %(end_date)s
+                WHERE {query_filters.to_sql()}
             ),
             top_10_courses AS (
                 SELECT
@@ -94,7 +91,7 @@ class FactEngagementAdminDashQueries:
         """
 
     @staticmethod
-    def get_top_subjects_by_engagement_query(record_count=10):
+    def get_top_subjects_by_engagement_query(query_filters, record_count=10):
         """
         Get the query to fetch the learning time in hours by subjects.
 
@@ -114,8 +111,7 @@ class FactEngagementAdminDashQueries:
                     (learning_time_seconds / 60.0 / 60.0) AS learning_time_hours,
                     activity_date
                 FROM fact_enrollment_engagement_day_admin_dash
-                WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
-                activity_date BETWEEN %(start_date)s AND %(end_date)s
+                WHERE {query_filters.to_sql()}
             ),
             top_10_subjects AS (
                 SELECT
@@ -138,7 +134,7 @@ class FactEngagementAdminDashQueries:
         """
 
     @staticmethod
-    def get_engagement_time_series_data_query():
+    def get_engagement_time_series_data_query(query_filters):
         """
         Get the query to fetch the completion time series data.
 
@@ -147,11 +143,10 @@ class FactEngagementAdminDashQueries:
         Returns:
             (str): Query to fetch the completion time series data.
         """
-        return """
+        return f"""
             SELECT activity_date, enroll_type, SUM(learning_time_seconds)/3600 as learning_time_hours
             FROM fact_enrollment_engagement_day_admin_dash
-            WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
-                activity_date BETWEEN %(start_date)s AND %(end_date)s
+            WHERE {query_filters.to_sql()}
             GROUP BY activity_date, enroll_type
             ORDER BY activity_date;
         """

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