edx-enterprise-data 8.10.0__py3-none-any.whl → 8.11.1__py3-none-any.whl

{edx_enterprise_data-8.10.0.dist-info → edx_enterprise_data-8.11.1.dist-info}/METADATA

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

{edx_enterprise_data-8.10.0.dist-info → edx_enterprise_data-8.11.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-enterprise_data/__init__.py,sha256=Cji_MQl_02kLp1gNtiDwEL03f3XaG45wQPHOFScJs1I,124
+enterprise_data/__init__.py,sha256=XT15XKKqKMAKtb0mKrGHjwWzDy3Y_AMCd_U5UKSh5Rc,124
 enterprise_data/apps.py,sha256=aF6hZwDfI2oWj95tUTm_2ikHueQj-jLj-u0GrgzpsQI,414
 enterprise_data/clients.py,sha256=GvQupy5TVYfO_IKC3yzXSAgNP54r-PtIjidM5ws9Iks,3947
 enterprise_data/constants.py,sha256=uCKjfpdlMYFZJsAj3n9RMw4Cmg5_6s3NuwocO-fch3s,238
@@ -13,8 +13,16 @@ enterprise_data/admin_analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 enterprise_data/admin_analytics/completions_utils.py,sha256=kGmLy7x6aD0coNYgzLa5XzJypLkGTT5clDHLSH_QFDE,9442
 enterprise_data/admin_analytics/constants.py,sha256=7WturLuMISekgcHHlgj45PPdPrDTYM-l21lA8-Q_Tfc,1107
 enterprise_data/admin_analytics/data_loaders.py,sha256=4PSsIveNBtpFqwrLUjTl5oywHVYFAMdZrNRHRGMk4XY,6116
-enterprise_data/admin_analytics/database.py,sha256=mNS_9xE5h6O7oMMzr6kr6LDTTSNvKzo8vaM-YG8tOd8,1312
 enterprise_data/admin_analytics/utils.py,sha256=CQuTlg36AALJiopp4us-JN8oTXsw-jDXSJenbphLDME,12270
+enterprise_data/admin_analytics/database/__init__.py,sha256=vNSWKf2VV5xMegN7htJJtxtQEb0ASLC6frE2w0ZpYpE,104
+enterprise_data/admin_analytics/database/utils.py,sha256=Zl-W_w5SVb-QpIwWxbHr0w7z4L2ZFeruJSygWh8g7II,1408
+enterprise_data/admin_analytics/database/queries/__init__.py,sha256=IC5TLOr_GnydbrVbl2mWhwO3aUbYeHuDmfPTLmwGhZA,218
+enterprise_data/admin_analytics/database/queries/fact_engagement_admin_dash.py,sha256=fq01Ni_sKnvSRoiPQfTnJ8TtRePQe5MBLmI5CpVy36o,747
+enterprise_data/admin_analytics/database/queries/fact_enrollment_admin_dash.py,sha256=X1muOEhEvqD-tyhrVEQkPrf8_7g7SPaJuMwriUPo3jw,2062
+enterprise_data/admin_analytics/database/tables/__init__.py,sha256=3ECKlKlz1wuTER5M57CMFvmLFp0oCnVQXAUeTN96Bs0,213
+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=EsG8KgRW84wtA_nJuUknjLYlDtaPSJf_9mWdkO2Bj2I,1293
+enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py,sha256=WiFWVF4TsDhLlDQr-3FuqTrzFy7Qv1Y5EnwZXYhdTrM,2962
 enterprise_data/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enterprise_data/api/urls.py,sha256=POqc_KATHdnpMf9zHtpO46pKD5KAlAExtx7G6iylLcU,273
 enterprise_data/api/v0/__init__.py,sha256=1aAzAYU5hk-RW6cKUxa1645cbZMxn7GIZ7OMjWc9MKI,46
@@ -30,7 +38,7 @@ enterprise_data/api/v1/views/analytics_engagements.py,sha256=8H3Fk-hTqJaU3H5Lpu1
 enterprise_data/api/v1/views/analytics_enrollments.py,sha256=trC92GOej6vUoju53KT3dPEDnoPHdukfXEIXPThz76A,16886
 enterprise_data/api/v1/views/analytics_leaderboard.py,sha256=2DALqzUIbe4-ZGgHHIkYAKJ5L1ik2ruPtQNYtTdPba4,5974
 enterprise_data/api/v1/views/base.py,sha256=FTAxlz5EzvAY657wzVgzhJPFSCHHzct7IDcvm71Smt8,866
-enterprise_data/api/v1/views/enterprise_admin.py,sha256=HiFJLFWCHn4UbRIlN9TlqIwTJWrse5b4qf3gQmx4QLY,9352
+enterprise_data/api/v1/views/enterprise_admin.py,sha256=d79WkyBbqLk6pKGWWrnbYdrbOgQztP03Q7NKRA5tZB4,8639
 enterprise_data/api/v1/views/enterprise_completions.py,sha256=bJG2ZtTbLyiBrj64iJHQNHEKLrJCzl9OuJ7nDtw-9aY,8377
 enterprise_data/api/v1/views/enterprise_learner.py,sha256=yABjJje3CT8I8YOhWr1_tTkdKtnGJom8eu3EFz_-0BU,18517
 enterprise_data/api/v1/views/enterprise_offers.py,sha256=VifxgqTLFLVw4extYPlHcN1N_yjXcsYsAlYEnAbpb10,1266
@@ -120,7 +128,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=At4g5Q4W4SNPk693HxuoEOHtMehvkscLvtXV4dbivvE,4969
+enterprise_data/tests/api/v1/views/test_enterprise_admin.py,sha256=i0A1JqG1YQTVRiXviFPbx385p7YhMxew72lgTZ7YNEg,6173
 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
@@ -161,8 +169,8 @@ enterprise_reporting/tests/test_send_enterprise_reports.py,sha256=WtL-RqGgu2x5PP
 enterprise_reporting/tests/test_utils.py,sha256=Zt_TA0LVb-B6fQGkUkAKKVlUKKnQh8jnw1US1jKe7g8,9493
 enterprise_reporting/tests/test_vertica_client.py,sha256=-R2yNCGUjRtoXwLMBloVFQkFYrJoo613VCr61gwI3kQ,140
 enterprise_reporting/tests/utils.py,sha256=xms2LM7DV3wczXEfctOK1ddel1EE0J_YSr17UzbCDy4,1401
-edx_enterprise_data-8.10.0.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-edx_enterprise_data-8.10.0.dist-info/METADATA,sha256=AYOfkH_4tZ4ANxQ--Pk_2jmmkxfbg0bRlBDaVA8YuSM,1570
-edx_enterprise_data-8.10.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-edx_enterprise_data-8.10.0.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
-edx_enterprise_data-8.10.0.dist-info/RECORD,,
+edx_enterprise_data-8.11.1.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+edx_enterprise_data-8.11.1.dist-info/METADATA,sha256=27UVJwZuQylIJzEZ-R-VWbzisk0jOxS04oHJNrjLQTw,1570
+edx_enterprise_data-8.11.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+edx_enterprise_data-8.11.1.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
+edx_enterprise_data-8.11.1.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__ = "8.10.0"
+__version__ = "8.11.1"

enterprise_data/admin_analytics/database/__init__.py

@@ -0,0 +1,4 @@
+"""
+This module contains the database queries for the admin analytics.
+"""
+from .utils import run_query

enterprise_data/admin_analytics/database/queries/__init__.py

@@ -0,0 +1,5 @@
+"""
+Module containing queries for the fact_enrollment_admin_dash table.
+"""
+from .fact_engagement_admin_dash import FactEngagementAdminDashQueries
+from .fact_enrollment_admin_dash import FactEnrollmentAdminDashQueries

enterprise_data/admin_analytics/database/queries/fact_engagement_admin_dash.py

@@ -0,0 +1,21 @@
+"""
+Module containing queries for the fact_enrollment_engagement_day_admin_dash table.
+"""
+
+
+class FactEngagementAdminDashQueries:
+    """
+    Queries related to the fact_enrollment_engagement_day_admin_dash table.
+    """
+    @staticmethod
+    def get_learning_hours_and_daily_sessions_query():
+        """
+        Get the query to fetch the learning hours and daily sessions.
+        """
+        return """
+            SELECT
+                ROUND(SUM(learning_time_seconds) / 60 / 60, 1) as hours, SUM(is_engaged) as sessions
+            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;
+        """

enterprise_data/admin_analytics/database/queries/fact_enrollment_admin_dash.py

@@ -0,0 +1,61 @@
+"""
+Module containing queries for the fact_enrollment_admin_dash table.
+"""
+
+
+class FactEnrollmentAdminDashQueries:
+    """
+    Queries related to the fact_enrollment_admin_dash table.
+    """
+
+    @staticmethod
+    def get_enrollment_date_range_query():
+        """
+        Get the query to fetch the enrollment date range.
+        """
+        return """
+            SELECT
+                MIN(enterprise_enrollment_date) AS min_enrollment_date,
+                MAX(enterprise_enrollment_date) AS max_enrollment_date
+            FROM fact_enrollment_admin_dash
+            WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s;
+        """
+
+    @staticmethod
+    def get_enrollment_and_course_count_query():
+        """
+        Get the query to fetch the enrollment and course count.
+        """
+        return """
+            SELECT
+                count(*) as enrolls, count(DISTINCT course_key) as courses
+            FROM fact_enrollment_admin_dash
+            WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
+                enterprise_enrollment_date BETWEEN %(start_date)s AND %(end_date)s;
+        """
+
+    @staticmethod
+    def get_completion_count_query():
+        """
+        Get the query to fetch the completion count.
+        """
+        return """
+            SELECT
+                SUM(has_passed) as completions
+            FROM fact_enrollment_admin_dash
+            WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
+                passed_date BETWEEN %(start_date)s AND %(end_date)s;
+        """
+
+    @staticmethod
+    def get_learning_hours_and_daily_sessions_query():
+        """
+        Get the query to fetch the learning hours and daily sessions.
+        """
+        return """
+            SELECT
+                ROUND(SUM(learning_time_seconds) / 60 / 60, 1) as hours, SUM(is_engaged) as sessions
+            FROM fact_engagement_admin_dash
+            WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
+                activity_date BETWEEN %(start_date)s AND %(end_date)s;
+        """

enterprise_data/admin_analytics/database/tables/__init__.py

@@ -0,0 +1,5 @@
+"""
+This module contains the database queries for the admin analytics.
+"""
+from .fact_engagement_admin_dash import FactEngagementAdminDashTable
+from .fact_enrollment_admin_dash import FactEnrollmentAdminDashTable

enterprise_data/admin_analytics/database/tables/base.py

@@ -0,0 +1,18 @@
+"""
+Base class to store the table information.
+"""
+
+
+class BaseTable:
+    """
+    Singleton class to store the table information.
+    """
+    instance = None
+
+    def __new__(cls):
+        """
+        Singleton method to create a single instance of the table.
+        """
+        if cls.instance is None:
+            cls.instance = super(BaseTable, cls).__new__(cls)
+        return cls.instance

enterprise_data/admin_analytics/database/tables/fact_engagement_admin_dash.py

@@ -0,0 +1,38 @@
+"""
+Module for interacting with the fact_enrollment_engagement_day_admin_dash table.
+"""
+from datetime import date
+from uuid import UUID
+
+from ..queries import FactEngagementAdminDashQueries
+from ..utils import run_query
+from .base import BaseTable
+
+
+class FactEngagementAdminDashTable(BaseTable):
+    """
+    Class for communicating with the fact_enrollment_engagement_day_admin_dash table.
+    """
+    queries = FactEngagementAdminDashQueries()
+
+    def get_learning_hours_and_daily_sessions(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+        """
+        Get the learning hours and daily sessions for the given enterprise customer.
+
+        Arguments:
+            enterprise_customer_uuid (UUID): The UUID of the enterprise customer.
+            start_date (date): The start date.
+            end_date (date): The end date.
+
+        Returns:
+            (tuple<float, int>): The learning hours and daily sessions.
+        """
+        results = run_query(
+            query=self.queries.get_learning_hours_and_daily_sessions_query(),
+            params={
+                'enterprise_customer_uuid': enterprise_customer_uuid,
+                'start_date': start_date,
+                'end_date': end_date,
+            }
+        )
+        return tuple(results[0])

enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py

@@ -0,0 +1,85 @@
+"""
+Module for interacting with the fact_enrollment_admin_dash table.
+"""
+from datetime import date, datetime
+from uuid import UUID
+
+from ..queries import FactEnrollmentAdminDashQueries
+from ..utils import run_query
+from .base import BaseTable
+
+
+class FactEnrollmentAdminDashTable(BaseTable):
+    """
+    Class for communicating with the fact_enrollment_admin_dash table.
+    """
+    queries = FactEnrollmentAdminDashQueries()
+
+    def get_enrollment_date_range(self, enterprise_customer_uuid: UUID):
+        """
+        Get the enrollment date range for the given enterprise customer.
+
+        Arguments:
+            enterprise_customer_uuid (UUID): The UUID of the enterprise customer.
+
+        Returns:
+            (tuple<date, date>): The minimum and maximum enrollment dates.
+        """
+        results = run_query(
+            query=self.queries.get_enrollment_date_range_query(),
+            params={'enterprise_customer_uuid': enterprise_customer_uuid}
+        )
+        min_date, max_date = results[0]
+
+        # We should return date objects, not datetime objects
+        # This is done to counter cases where database values are datetime objects.
+        if min_date and isinstance(min_date, datetime):
+            min_date = min_date.date()
+        if max_date and isinstance(max_date, datetime):
+            max_date = max_date.date()
+
+        return min_date, max_date
+
+    def get_enrollment_and_course_count(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+        """
+        Get the enrollment and course count for the given enterprise customer.
+
+        Arguments:
+            enterprise_customer_uuid (UUID): The UUID of the enterprise customer.
+            start_date (date): The start date.
+            end_date (date): The end date.
+
+        Returns:
+            (tuple<int, int>): The enrollment and course count.
+        """
+        results = run_query(
+            query=self.queries.get_enrollment_and_course_count_query(),
+            params={
+                'enterprise_customer_uuid': enterprise_customer_uuid,
+                'start_date': start_date,
+                'end_date': end_date,
+            }
+        )
+        return tuple(results[0])
+
+    def get_completion_count(self, enterprise_customer_uuid: 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.
+            start_date (date): The start date.
+            end_date (date): The end date.
+
+        Returns:
+            int: The completion count.
+        """
+        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,
+            }
+        )
+        return results[0][0]

enterprise_data/admin_analytics/{database.py → database/utils.py}

@@ -30,12 +30,13 @@ def get_db_connection(database=settings.ENTERPRISE_REPORTING_DB_ALIAS):
 
 
 @timeit
-def run_query(query):
+def run_query(query, params: dict = None):
     """
     Run a query on the database and return the results.
 
     Arguments:
         query (str): The query to run.
+        params (dict): The parameters to pass to the query.
 
     Returns:
         (list): The results of the query.
@@ -43,7 +44,7 @@ def run_query(query):
     try:
         with closing(get_db_connection()) as connection:
             with closing(connection.cursor()) as cursor:
-                cursor.execute(query)
+                cursor.execute(query, params=params)
                 return cursor.fetchall()
     except Exception:
         LOGGER.exception(f'[run_query]: run_query failed for query "{query}".')

enterprise_data/api/v1/views/enterprise_admin.py

@@ -13,9 +13,9 @@ from rest_framework.views import APIView
 from django.http import HttpResponse
 
 from enterprise_data.admin_analytics.data_loaders import fetch_max_enrollment_datetime
+from enterprise_data.admin_analytics.database.tables import FactEngagementAdminDashTable, FactEnrollmentAdminDashTable
 from enterprise_data.admin_analytics.utils import (
     ChartType,
-    fetch_and_cache_engagements_data,
     fetch_and_cache_enrollments_data,
     fetch_and_cache_skills_data,
     get_skills_chart_data,
@@ -27,7 +27,7 @@ from enterprise_data.models import (
     EnterpriseAdminSummarizeInsights,
     EnterpriseExecEdLCModulePerformance,
 )
-from enterprise_data.utils import date_filter, timer
+from enterprise_data.utils import timer
 
 from .base import EnterpriseViewSetMixin
 
@@ -95,61 +95,33 @@ class EnterpriseAdminAnalyticsAggregatesView(APIView):
         """
         HTTP GET endpoint to retrieve the enterprise admin aggregate data.
         """
+        # Validate the enterprise_id
+        enterprise_id = enterprise_id.replace('-', '')
         serializer = serializers.AdminAnalyticsAggregatesQueryParamsSerializer(
             data=request.GET
         )
         serializer.is_valid(raise_exception=True)
 
         last_updated_at = fetch_max_enrollment_datetime()
-        cache_expiry = (
-            last_updated_at + timedelta(days=1) if last_updated_at else datetime.now()
+        min_enrollment_date, max_enrollment_date = FactEnrollmentAdminDashTable().get_enrollment_date_range(
+            enterprise_id,
         )
 
-        enrollment = fetch_and_cache_enrollments_data(
-            enterprise_id, cache_expiry
-        ).copy()
-        engagement = fetch_and_cache_engagements_data(
-            enterprise_id, cache_expiry
-        ).copy()
-        # Use start and end date if provided by the client, if client has not provided then use
-        # 1. minimum enrollment date from the data as the start_date
-        # 2. today's date as the end_date
         start_date = serializer.data.get(
-            'start_date', enrollment.enterprise_enrollment_date.min()
+            'start_date', min_enrollment_date
         )
-        end_date = serializer.data.get('end_date', datetime.now())
+        end_date = serializer.data.get('end_date', datetime.today())
 
-        # Date filtering.
-        dff = date_filter(
-            start=start_date,
-            end=end_date,
-            data_frame=enrollment.copy(),
-            date_column='enterprise_enrollment_date',
+        enrolls, courses = FactEnrollmentAdminDashTable().get_enrollment_and_course_count(
+            enterprise_id, start_date, end_date,
         )
-
-        enrolls = len(dff)
-        courses = len(dff.course_key.unique())
-
-        dff = date_filter(
-            start=start_date,
-            end=end_date,
-            data_frame=enrollment.copy(),
-            date_column='passed_date',
+        completions = FactEnrollmentAdminDashTable().get_completion_count(
+            enterprise_id, start_date, end_date,
         )
-
-        completions = dff.has_passed.sum()
-
-        # Date filtering.
-        dff = date_filter(
-            start=start_date,
-            end=end_date,
-            data_frame=engagement.copy(),
-            date_column='activity_date',
+        hours, sessions = FactEngagementAdminDashTable().get_learning_hours_and_daily_sessions(
+            enterprise_id, start_date, end_date,
         )
 
-        hours = round(dff.learning_time_seconds.sum() / 60 / 60, 1)
-        sessions = dff.is_engaged.sum()
-
         return Response(
             data={
                 'enrolls': enrolls,
@@ -158,8 +130,8 @@ class EnterpriseAdminAnalyticsAggregatesView(APIView):
                 'hours': hours,
                 'sessions': sessions,
                 'last_updated_at': last_updated_at.date() if last_updated_at else None,
-                'min_enrollment_date': enrollment.enterprise_enrollment_date.min().date(),
-                'max_enrollment_date': enrollment.enterprise_enrollment_date.max().date(),
+                'min_enrollment_date': min_enrollment_date,
+                'max_enrollment_date': max_enrollment_date,
             },
             status=HTTP_200_OK,
         )

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

@@ -1,6 +1,7 @@
 """
 Test cases for enterprise_admin views
 """
+from datetime import datetime
 from unittest import mock
 from uuid import uuid4
 
@@ -11,10 +12,13 @@ from rest_framework import status
 from rest_framework.reverse import reverse
 from rest_framework.test import APITransactionTestCase
 
+from enterprise_data.admin_analytics.database.queries import (
+    FactEngagementAdminDashQueries,
+    FactEnrollmentAdminDashQueries,
+)
 from enterprise_data.tests.mixins import JWTTestMixin
 from enterprise_data.tests.test_utils import (
     UserFactory,
-    get_dummy_engagements_data,
     get_dummy_enrollments_data,
     get_dummy_enterprise_api_data,
     get_dummy_skills_data,
@@ -52,19 +56,30 @@ class TestEnterpriseAdminAnalyticsAggregatesView(JWTTestMixin, APITransactionTes
         self.addCleanup(mocked_get_enterprise_customer.stop)
         self.enterprise_id = 'ee5e6b3a-069a-4947-bb8d-d2dbc323396c'
         self.set_jwt_cookie()
+        self.enrollment_queries = FactEnrollmentAdminDashQueries()
+        self.engagement_queries = FactEngagementAdminDashQueries()
 
-    def _mock_run_query(self, query):
+    def _mock_run_query(self, query, *args, **kwargs):
         """
         mock implementation of run_query.
         """
-        if 'fact_enrollment_admin_dash' in query:
-            return [
-                list(item.values()) for item in get_dummy_enrollments_data(self.enterprise_id, 15)
-            ]
-        else:
-            return [
-                list(item.values()) for item in get_dummy_engagements_data(self.enterprise_id, 15)
-            ]
+        mock_responses = {
+            self.enrollment_queries.get_enrollment_date_range_query(): [[
+                datetime.strptime('2021-01-01', "%Y-%m-%d"),
+                datetime.strptime('2021-12-31', "%Y-%m-%d"),
+            ]],
+            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]
 
     def test_get_admin_analytics_aggregates(self):
         """
@@ -72,16 +87,24 @@ class TestEnterpriseAdminAnalyticsAggregatesView(JWTTestMixin, APITransactionTes
         """
         url = reverse('v1:enterprise-admin-analytics-aggregates', kwargs={'enterprise_id': self.enterprise_id})
         with patch('enterprise_data.admin_analytics.data_loaders.run_query', side_effect=self._mock_run_query):
-            response = self.client.get(url)
-            assert response.status_code == status.HTTP_200_OK
-            assert 'enrolls' in response.json()
-            assert 'courses' in response.json()
-            assert 'completions' in response.json()
-            assert 'hours' in response.json()
-            assert 'sessions' in response.json()
-            assert 'last_updated_at' in response.json()
-            assert 'min_enrollment_date' in response.json()
-            assert 'max_enrollment_date' in response.json()
+            with patch(
+                    'enterprise_data.admin_analytics.database.tables.fact_engagement_admin_dash.run_query',
+                    side_effect=self._mock_run_query
+            ):
+                with patch(
+                        'enterprise_data.admin_analytics.database.tables.fact_enrollment_admin_dash.run_query',
+                        side_effect=self._mock_run_query
+                ):
+                    response = self.client.get(url)
+                    assert response.status_code == status.HTTP_200_OK
+                    assert 'enrolls' in response.json()
+                    assert 'courses' in response.json()
+                    assert 'completions' in response.json()
+                    assert 'hours' in response.json()
+                    assert 'sessions' in response.json()
+                    assert 'last_updated_at' in response.json()
+                    assert 'min_enrollment_date' in response.json()
+                    assert 'max_enrollment_date' in response.json()
 
 
 @ddt.ddt