edx-enterprise-data 9.1.0__py3-none-any.whl → 9.2.0__py3-none-any.whl

{edx_enterprise_data-9.1.0.dist-info → edx_enterprise_data-9.2.0.dist-info}/METADATA

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

{edx_enterprise_data-9.1.0.dist-info → edx_enterprise_data-9.2.0.dist-info}/RECORD

@@ -1,27 +1,26 @@
-enterprise_data/__init__.py,sha256=iLQWwenZSKPK_Ygv_cROjWWAtH0biPa7Cuvdqy3hrbg,123
+enterprise_data/__init__.py,sha256=lw4RdMlnQpEaiuEI442W84A9nCk5Y2AFB3wxyg2DhY0,123
 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
 enterprise_data/filters.py,sha256=D2EiK12MMpBoz6eOUmTpoJEhj_sH7bA93NRRAdvkDVo,6163
 enterprise_data/models.py,sha256=khGcOh7NWP8KGu84t78Y2zAu3knREeXA_prApmU2NX8,24428
 enterprise_data/paginators.py,sha256=YPrC5TeXFt-ymenT2H8H2nCbDCnAzJQlH9kFPElRxWE,269
-enterprise_data/renderers.py,sha256=94JNmPj6OuOcoqMfwl_ieTwy-fQPJO7IbYpYQhxvHJY,3022
+enterprise_data/renderers.py,sha256=d_bJZjeUTyHRBBtpCcslrTyldv6IMYQ_QW-GWijwGHU,3026
 enterprise_data/signals.py,sha256=8eqNPnlvmfsKf19lGWv5xTIuBgQIqR8EZSp9UYzC8Rc,1024
 enterprise_data/urls.py,sha256=bqtKF5OEWEwrNmHG3os-pZNuNsmjlhxEqp7yM4TbPf4,243
-enterprise_data/utils.py,sha256=_zK3BErjZSIkP_JNzK8m-DR5pRTnxKylP9I-vURaRcE,3009
+enterprise_data/utils.py,sha256=Hrmz6uB8LsPSrau-lK0vvBWzRKTMl_Tygxv8qWG2NNw,2471
 enterprise_data/admin_analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-enterprise_data/admin_analytics/constants.py,sha256=bTU05drUaePj9ZjLVxUwFMq_8hibafXqPnVrmrQt4Og,532
-enterprise_data/admin_analytics/data_loaders.py,sha256=z5OHCmsjQuu1lBw43mSSCbdSQ40fmL_WtodV_Tcnj5U,4791
-enterprise_data/admin_analytics/utils.py,sha256=DftyBaSKnf0f6E3adH8yVAvGNeQGROywufqnJxZ0W84,6295
+enterprise_data/admin_analytics/constants.py,sha256=-6uLAq5DUeA_rv5eUb9SeqlG3iVWV30qUS8asbK4430,160
+enterprise_data/admin_analytics/data_loaders.py,sha256=NixI-4M3D4MnI279x5hqqTw84uKpQy0TRib_g-0Bt5Q,726
 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/queries/__init__.py,sha256=IC5TLOr_GnydbrVbl2mWhwO3aUbYeHuDmfPTLmwGhZA,218
-enterprise_data/admin_analytics/database/queries/fact_engagement_admin_dash.py,sha256=QNoeuUQ2Fg9IWSxayA8mBbrnRYNPaXVBWhA7-dbquNc,4445
+enterprise_data/admin_analytics/database/queries/fact_engagement_admin_dash.py,sha256=28R1uISsLmMrbvTZXF2bGsVCCOyfQzXY-tMzThDndHo,7809
 enterprise_data/admin_analytics/database/queries/fact_enrollment_admin_dash.py,sha256=brRgmgtzPLsOdt1vYrk_EpoQLm2izmOdBapxAxNkXzA,8420
 enterprise_data/admin_analytics/database/queries/skills_daily_rollup_admin_dash.py,sha256=PgWwvtVCK5lbiq6z44lH0fwbkdWYukhyXZL9X8lNWCY,4099
 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=VM-5S1ayJuFaWhBoJd1odTqWaFsWDeLZkoaPixAG2dQ,5544
+enterprise_data/admin_analytics/database/tables/fact_engagement_admin_dash.py,sha256=cA-Y63LQVDD7UHv5rYdX2091R7W6clcT2DXO0VbMhVQ,7354
 enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py,sha256=q1XB7aDwFzllS5lBQNfS2y7drehqiK7o0J1eiYzqFOk,10854
 enterprise_data/admin_analytics/database/tables/skills_daily_rollup_admin_dash.py,sha256=9PqLeVqByrz7R0qumRbwJlr5lzIWn7Fl7WEGM0aJVlw,3131
 enterprise_data/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -31,17 +30,16 @@ 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/paginators.py,sha256=f0xsilLaU94jSBltJk46tR1rLEIt7YrqSzMAAVtPXjA,3592
-enterprise_data/api/v1/serializers.py,sha256=leVxK1fVAk_25TDnuMLDHKvOw7GvTmU7zSYXiX0nmZU,11620
-enterprise_data/api/v1/urls.py,sha256=zoztENyCI_8TcKpE88Q6pkKSHiWCC9DascjC9ul4arc,3975
+enterprise_data/api/v1/serializers.py,sha256=JOpHjP7n-NgXsShT_Wf6VLVlF-supKw2PW0oZxiwwrI,10323
+enterprise_data/api/v1/urls.py,sha256=vPBZ7p9hsj-lMowqbp29sd2hKhHtICCMVal6th4eQxg,3995
 enterprise_data/api/v1/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-enterprise_data/api/v1/views/analytics_completions.py,sha256=Px-hwNpkgwZN-Kwrl9MEfpY-TNuVglp1pyJEG9QnPFQ,6391
-enterprise_data/api/v1/views/analytics_engagements.py,sha256=yvnHALXVkxQHuX7M8Mom1vNEH-2vvPHZMVlm1SUvTTE,6429
-enterprise_data/api/v1/views/analytics_enrollments.py,sha256=RF-OOSVOPbESIUmrLbSM229lMPQ8RokJ6MqTpWoxIgY,6413
-enterprise_data/api/v1/views/analytics_leaderboard.py,sha256=2DALqzUIbe4-ZGgHHIkYAKJ5L1ik2ruPtQNYtTdPba4,5974
+enterprise_data/api/v1/views/analytics_completions.py,sha256=4jg2I50TNn2Q6InLCI9eS1MBiFo4SMRsTx4kZJtNmpI,6268
+enterprise_data/api/v1/views/analytics_engagements.py,sha256=W9DNalWIgoeo_KXqapDj2_ireRyXU47nKHw95sAEtxM,6306
+enterprise_data/api/v1/views/analytics_enrollments.py,sha256=HXgoFwvXk-CZcf6qbVOfYSCnkfDxGvfHxl0j3RcKz7A,6290
+enterprise_data/api/v1/views/analytics_leaderboard.py,sha256=zwd-2A2sctjAdx5BUjCqiwcZ5aNvM8wfm386pR-RwGQ,4114
 enterprise_data/api/v1/views/base.py,sha256=Kkmd5zgEBAhvwS_GoGXSK6lgbDNwSPioYn-QbnizI3w,3416
 enterprise_data/api/v1/views/enterprise_admin.py,sha256=DsR1oHFhe6LCIFjIJ4YLLZ7PUChvNlFfdZD-sxHoijY,7388
-enterprise_data/api/v1/views/enterprise_learner.py,sha256=yABjJje3CT8I8YOhWr1_tTkdKtnGJom8eu3EFz_-0BU,18517
+enterprise_data/api/v1/views/enterprise_learner.py,sha256=E1eU0DgCIhe4Bx70uZku89-RwEKay4aYt7X0IbPhJzA,18650
 enterprise_data/api/v1/views/enterprise_offers.py,sha256=VifxgqTLFLVw4extYPlHcN1N_yjXcsYsAlYEnAbpb10,1266
 enterprise_data/fixtures/enterprise_enrollment.json,sha256=6onPXXR29pMdTdbl_mn81sDi3Re5jkLUZz2TPMB_1IY,5786
 enterprise_data/fixtures/enterprise_user.json,sha256=6g8GvNY9j_fh1dvAU80bTAMI2F5vXCkb8a4UjsftMvQ,1970
@@ -114,14 +112,13 @@ enterprise_data/tests/test_models.py,sha256=MWBY-LY5TPBjZ4GlvpM-h4W-BvRKr2Rml8Bz
 enterprise_data/tests/test_utils.py,sha256=vbmYM7DMN-lHS2p4yaa0Yd6uSGXd2qoZRDE9X3J4Sec,18385
 enterprise_data/tests/test_views.py,sha256=UvDRNTxruy5zBK_KgUy2cBMbwlaTW_vkM0-TCXbQZiY,69667
 enterprise_data/tests/admin_analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-enterprise_data/tests/admin_analytics/mock_analytics_data.py,sha256=NYmgPKIZrIK7HqbjxQ_PKqhY5zmafoePM4NcqE5zfpc,17401
+enterprise_data/tests/admin_analytics/mock_analytics_data.py,sha256=qN73YxoD1kAtKsQo94avR0DGMCsJClrpqFxxYC6reqE,15248
 enterprise_data/tests/admin_analytics/mock_enrollments.py,sha256=u61tkqSdVKExURJF7arvBoXvbdkF39CkjxQiTvVMXIE,4467
 enterprise_data/tests/admin_analytics/test_analytics_engagements.py,sha256=gfO6RI2gbDMhOD4p4h7l6sZpisglBreTPtJRqNxIgo8,10440
 enterprise_data/tests/admin_analytics/test_analytics_enrollments.py,sha256=uFa6gnlf-CthctdYTWsw-pLLOxkELGiq8YFq5CyWFbs,10826
-enterprise_data/tests/admin_analytics/test_analytics_leaderboard.py,sha256=VSEyDAHfWBJvqmx9yzd4NnPAqK3TqaKrMBWswMAdzfU,6206
-enterprise_data/tests/admin_analytics/test_data_loaders.py,sha256=b4BjN88FX9WjE6XJjkJZnoEvWVB_DovBGJ_wh-HgT9I,3514
+enterprise_data/tests/admin_analytics/test_analytics_leaderboard.py,sha256=iFT47BVlgf93u1K2l3_8HDcXY-9vWKp3iUaWM7V0C2U,5476
+enterprise_data/tests/admin_analytics/test_data_loaders.py,sha256=0ZsxW4J5bFDsujLXa0PpIP2BjuKK4EDQRF7C6gfgCfA,1067
 enterprise_data/tests/admin_analytics/test_enterprise_completions.py,sha256=6BsCnaXdTMaQXoqy4SWNxAkGimc75lBCdBHjR2MdOFU,7233
-enterprise_data/tests/admin_analytics/test_utils.py,sha256=4qL_ZK-sGzbMMqiOrBrPmzdIPno7KohiaIfd7FMehic,5260
 enterprise_data/tests/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enterprise_data/tests/api/v0/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enterprise_data/tests/api/v0/test_serializers.py,sha256=Gfty6gy6OQLN318uL1OCPhAZOqSUL50FWc0nC23VMnc,6257
@@ -170,8 +167,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-9.1.0.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-edx_enterprise_data-9.1.0.dist-info/METADATA,sha256=7nemB4hOP7OfCH-uN87q4YINSbTbnicYsTd_P6CLSPE,1569
-edx_enterprise_data-9.1.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-edx_enterprise_data-9.1.0.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
-edx_enterprise_data-9.1.0.dist-info/RECORD,,
+edx_enterprise_data-9.2.0.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+edx_enterprise_data-9.2.0.dist-info/METADATA,sha256=Y3R-klk-iA_cgSs0EiuD_zzzPnx-4_JBwF9ZMrirwpg,1569
+edx_enterprise_data-9.2.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+edx_enterprise_data-9.2.0.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
+edx_enterprise_data-9.2.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__ = "9.1.0"
+__version__ = "9.2.0"

enterprise_data/admin_analytics/constants.py

@@ -1,24 +1,10 @@
-"""Advanced Analytics Constants"""
+"""
+Constants for admin analytics app.
+"""
 
 from enum import Enum
 
 
-class Granularity(Enum):
-    """Granularity choices"""
-    DAILY = 'Daily'
-    WEEKLY = 'Weekly'
-    MONTHLY = 'Monthly'
-    QUARTERLY = 'Quarterly'
-
-
-class Calculation(Enum):
-    """Calculation choices"""
-    TOTAL = 'Total'
-    RUNNING_TOTAL = 'Running Total'
-    MOVING_AVERAGE_3_PERIOD = 'Moving Average (3 Period)'
-    MOVING_AVERAGE_7_PERIOD = 'Moving Average (7 Period)'
-
-
 class ResponseType(Enum):
     """Response type choices"""
     JSON = 'json'

enterprise_data/admin_analytics/data_loaders.py

@@ -3,138 +3,13 @@ Utility functions for fetching data from the database.
 """
 from logging import getLogger
 
-import numpy
 import pandas
 
-from django.http import Http404
-
 from enterprise_data.admin_analytics.database import run_query
-from enterprise_data.utils import timer
 
 LOGGER = getLogger(__name__)
 
 
-def get_select_query(table: str, columns: list, enterprise_uuid: str) -> str:
-    """
-    Generate a SELECT query for the given table and columns.
-
-    Arguments:
-        table (str): The table to query.
-        columns (list): The columns to select.
-        enterprise_uuid (str): The UUID of the enterprise customer.
-
-    Returns:
-        (str): The SELECT query.
-    """
-    return f'SELECT {", ".join(columns)} FROM {table} WHERE enterprise_customer_uuid = "{enterprise_uuid}"'
-
-
-def fetch_enrollment_data(enterprise_uuid: str):
-    """
-    Fetch enrollment data from the database for the given enterprise customer.
-
-    Arguments:
-        enterprise_uuid (str): The UUID of the enterprise customer.
-
-    Returns:
-        (pandas.DataFrame): The enrollment data.
-    """
-    enterprise_uuid = enterprise_uuid.replace('-', '')
-
-    columns = [
-        'enterprise_customer_name',
-        'enterprise_customer_uuid',
-        'lms_enrollment_id',
-        'user_id',
-        'email',
-        'course_key',
-        'courserun_key',
-        'course_id',
-        'course_subject',
-        'course_title',
-        'enterprise_enrollment_date',
-        'lms_enrollment_mode',
-        'enroll_type',
-        'program_title',
-        'date_certificate_awarded',
-        'grade_percent',
-        'cert_awarded',
-        'date_certificate_created_raw',
-        'passed_date_raw',
-        'passed_date',
-        'has_passed',
-    ]
-    query = get_select_query(
-        table='fact_enrollment_admin_dash',
-        columns=columns,
-        enterprise_uuid=enterprise_uuid,
-    )
-
-    with timer('fetch_enrollment_data'):
-        results = run_query(query=query)
-
-    if not results:
-        raise Http404(f'No enrollment data found for enterprise {enterprise_uuid}')
-
-    LOGGER.info(f'[PLOTLY] Enrollment data fetched successfully. Records: {len(results)}')
-    enrollments = pandas.DataFrame(numpy.array(results), columns=columns)
-    LOGGER.info('[PLOTLY] Enrollment data converted to DataFrame.')
-
-    # Convert date columns to datetime.
-    enrollments['enterprise_enrollment_date'] = enrollments['enterprise_enrollment_date'].astype('datetime64[ns]')
-    enrollments['date_certificate_awarded'] = enrollments['date_certificate_awarded'].astype('datetime64[ns]')
-    enrollments['date_certificate_created_raw'] = enrollments['date_certificate_created_raw'].astype('datetime64[ns]')
-    enrollments['passed_date_raw'] = enrollments['passed_date_raw'].astype('datetime64[ns]')
-    enrollments['passed_date'] = enrollments['passed_date'].astype('datetime64[ns]')
-
-    return enrollments
-
-
-def fetch_engagement_data(enterprise_uuid: str):
-    """
-    Fetch engagement data from the database for the given enterprise customer.
-
-    Arguments:
-        enterprise_uuid (str): The UUID of the enterprise customer.
-
-    Returns:
-        (pandas.DataFrame): The engagement data.
-    """
-    enterprise_uuid = enterprise_uuid.replace('-', '')
-
-    columns = [
-        'user_id',
-        'email',
-        'enterprise_customer_uuid',
-        'course_key',
-        'enroll_type',
-        'activity_date',
-        'course_title',
-        'course_subject',
-        'is_engaged',
-        'is_engaged_video',
-        'is_engaged_forum',
-        'is_engaged_problem',
-        'is_active',
-        'learning_time_seconds',
-    ]
-    query = get_select_query(
-        table='fact_enrollment_engagement_day_admin_dash', columns=columns, enterprise_uuid=enterprise_uuid
-    )
-
-    with timer('fetch_engagement_data'):
-        results = run_query(query=query)
-    if not results:
-        raise Http404(f'No engagement data found for enterprise {enterprise_uuid}')
-
-    LOGGER.info(f'[PLOTLY] Engagement data fetched successfully. Records: {len(results)}')
-    engagement = pandas.DataFrame(numpy.array(results), columns=columns)
-    LOGGER.info('[PLOTLY] Engagement data converted to DataFrame.')
-    engagement['activity_date'] = engagement['activity_date'].astype('datetime64[ns]')
-
-    return engagement
-
-
 def fetch_max_enrollment_datetime():
     """
     Fetch the latest created date from the enterprise_learner_enrollment table.

enterprise_data/admin_analytics/database/queries/fact_engagement_admin_dash.py

@@ -109,3 +109,88 @@ class FactEngagementAdminDashQueries:
             GROUP BY activity_date, enroll_type
             ORDER BY activity_date;
         """
+
+    @staticmethod
+    def get_all_leaderboard_data_query():
+        """
+        Get the query to fetch the leaderboard data.
+
+        Query should fetch the leaderboard data for the enterprise customer to show in the data table.
+
+        Returns:
+            (str): Query to fetch the leaderboard data.
+        """
+        return """
+            WITH Engagement AS (
+                SELECT
+                    email,
+                    ROUND(SUM(learning_time_seconds) / 3600, 1) as learning_time_hours,
+                    SUM(is_engaged) as session_count,
+                    CASE
+                        WHEN SUM(is_engaged) = 0 THEN 0.0
+                        ELSE ROUND(SUM(learning_time_seconds) / 3600 / SUM(is_engaged), 1)
+                    END AS average_session_length
+                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) AND
+                    is_engaged = 1
+                GROUP BY email
+            ),
+            Completions AS (
+                SELECT email, count(course_key) as course_completion_count
+                FROM fact_enrollment_admin_dash
+                WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
+                    (passed_date BETWEEN %(start_date)s AND %(end_date)s) AND
+                    has_passed = 1
+                GROUP BY email
+            )
+            SELECT
+                Engagement.email,
+                Engagement.learning_time_hours,
+                Engagement.session_count,
+                Engagement.average_session_length,
+                Completions.course_completion_count
+            FROM Engagement
+            LEFT JOIN Completions
+            ON Engagement.email = Completions.email
+            ORDER BY
+                Engagement.learning_time_hours DESC,
+                Engagement.session_count DESC,
+                Completions.course_completion_count DESC
+            LIMIT %(limit)s OFFSET %(offset)s;
+        """
+
+    @staticmethod
+    def get_leaderboard_data_count_query():
+        """
+        Get the query to fetch the leaderboard row count.
+
+        Query should fetch the count of rows for the leaderboard data for the enterprise customer.
+
+        Returns:
+            (str): Query to fetch the leaderboard row count.
+        """
+        return """
+            WITH Engagement AS (
+                SELECT
+                    email
+                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) AND
+                    is_engaged = 1
+                GROUP BY email
+            ),
+            Completions AS (
+                SELECT email, count(course_key) as course_completion_count
+                FROM fact_enrollment_admin_dash
+                WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
+                    (passed_date BETWEEN %(start_date)s AND %(end_date)s) AND
+                    has_passed = 1
+                GROUP BY email
+            )
+            SELECT
+                count(*)
+            FROM Engagement
+            LEFT JOIN Completions
+            ON Engagement.email = Completions.email
+        """

enterprise_data/admin_analytics/database/tables/fact_engagement_admin_dash.py

@@ -152,3 +152,53 @@ class FactEngagementAdminDashTable(BaseTable):
             },
             as_dict=True,
         )
+
+    def get_all_leaderboard_data(
+            self, enterprise_customer_uuid: UUID, start_date: date, end_date: date, limit: int, offset: int
+    ):
+        """
+        Get the leaderboard data 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.
+            limit (int): The maximum number of records to return.
+            offset (int): The number of records to skip.
+
+        Returns:
+            list[dict]: The leaderboard data.
+        """
+        return run_query(
+            query=self.queries.get_all_leaderboard_data_query(),
+            params={
+                'enterprise_customer_uuid': enterprise_customer_uuid,
+                'start_date': start_date,
+                'end_date': end_date,
+                'limit': limit,
+                'offset': offset,
+            },
+            as_dict=True,
+        )
+
+    def get_leaderboard_data_count(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+        """
+        Get the total number of leaderboard records 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 total number of leaderboard records.
+        """
+        results = run_query(
+            query=self.queries.get_leaderboard_data_count_query(),
+            params={
+                'enterprise_customer_uuid': enterprise_customer_uuid,
+                'start_date': start_date,
+                'end_date': end_date,
+            }
+        )
+        return results[0][0]

enterprise_data/api/v1/serializers.py

@@ -5,7 +5,7 @@ from uuid import UUID
 
 from rest_framework import serializers
 
-from enterprise_data.admin_analytics.constants import Calculation, Granularity, ResponseType
+from enterprise_data.admin_analytics.constants import ResponseType
 from enterprise_data.models import (
     EnterpriseAdminLearnerProgress,
     EnterpriseAdminSummarizeInsights,
@@ -241,23 +241,8 @@ class AdvanceAnalyticsQueryParamSerializer(serializers.Serializer):  # pylint: d
         ResponseType.JSON.value,
         ResponseType.CSV.value
     ]
-    GRANULARITY_CHOICES = [
-        Granularity.DAILY.value,
-        Granularity.WEEKLY.value,
-        Granularity.MONTHLY.value,
-        Granularity.QUARTERLY.value
-    ]
-    CALCULATION_CHOICES = [
-        Calculation.TOTAL.value,
-        Calculation.RUNNING_TOTAL.value,
-        Calculation.MOVING_AVERAGE_3_PERIOD.value,
-        Calculation.MOVING_AVERAGE_7_PERIOD.value
-    ]
-
     start_date = serializers.DateField(required=False)
     end_date = serializers.DateField(required=False)
-    granularity = serializers.CharField(required=False)
-    calculation = serializers.CharField(required=False)
     response_type = serializers.CharField(required=False)
     page = serializers.IntegerField(required=False, min_value=1)
     page_size = serializers.IntegerField(required=False, min_value=2)
@@ -287,25 +272,3 @@ class AdvanceAnalyticsQueryParamSerializer(serializers.Serializer):  # pylint: d
         if value not in self.RESPONSE_TYPES:
             raise serializers.ValidationError(f"response_type must be one of {self.RESPONSE_TYPES}")
         return value
-
-    def validate_granularity(self, value):
-        """
-        Validate the granularity value.
-
-        Raises:
-            serializers.ValidationError: If granularity is not one of the valid choices.
-        """
-        if value not in self.GRANULARITY_CHOICES:
-            raise serializers.ValidationError(f"Granularity must be one of {self.GRANULARITY_CHOICES}")
-        return value
-
-    def validate_calculation(self, value):
-        """
-        Validate the calculation value.
-
-        Raises:
-            serializers.ValidationError: If calculation is not one of the valid choices
-        """
-        if value not in self.CALCULATION_CHOICES:
-            raise serializers.ValidationError(f"Calculation must be one of {self.CALCULATION_CHOICES}")
-        return value

enterprise_data/api/v1/urls.py

@@ -58,8 +58,8 @@ urlpatterns = [
     ),
     re_path(
         fr'^admin/analytics/(?P<enterprise_uuid>{UUID4_REGEX})/leaderboard$',
-        AdvanceAnalyticsLeaderboardView.as_view(),
-        name='enterprise-admin-analytics-leaderboard'
+        AdvanceAnalyticsLeaderboardView.as_view({'get': 'list'}),
+        name='enterprise-admin-analytics-leaderboard-list'
     ),
     re_path(
         fr'^admin/analytics/(?P<enterprise_uuid>{UUID4_REGEX})/enrollments/stats$',

enterprise_data/api/v1/views/analytics_completions.py

@@ -15,7 +15,6 @@ from django.http import StreamingHttpResponse
 
 from enterprise_data.admin_analytics.constants import ResponseType
 from enterprise_data.admin_analytics.database.tables import FactEnrollmentAdminDashTable
-from enterprise_data.api.v1.paginators import AdvanceAnalyticsPagination
 from enterprise_data.api.v1.serializers import AdvanceAnalyticsQueryParamSerializer
 from enterprise_data.api.v1.views.base import AnalyticsPaginationMixin
 from enterprise_data.renderers import IndividualCompletionsCSVRenderer
@@ -33,7 +32,6 @@ class AdvanceAnalyticsCompletionsView(AnalyticsPaginationMixin, ViewSet):
     2. `enterprise_data_api_v1.enterprise-learner-completion-stats`: Get completion stats data.
     """
     authentication_classes = (JwtAuthentication,)
-    pagination_class = AdvanceAnalyticsPagination
     http_method_names = ('get', )
 
     @permission_required('can_access_enterprise', fn=lambda request, enterprise_uuid: enterprise_uuid)

enterprise_data/api/v1/views/analytics_engagements.py

@@ -15,7 +15,6 @@ from django.http import StreamingHttpResponse
 
 from enterprise_data.admin_analytics.constants import ResponseType
 from enterprise_data.admin_analytics.database.tables import FactEngagementAdminDashTable, FactEnrollmentAdminDashTable
-from enterprise_data.api.v1.paginators import AdvanceAnalyticsPagination
 from enterprise_data.api.v1.serializers import AdvanceAnalyticsQueryParamSerializer
 from enterprise_data.api.v1.views.base import AnalyticsPaginationMixin
 from enterprise_data.renderers import IndividualEngagementsCSVRenderer
@@ -33,7 +32,6 @@ class AdvanceAnalyticsEngagementView(AnalyticsPaginationMixin, ViewSet):
     2. `enterprise_data_api_v1.enterprise-learner-engagement-stats`: Get engagement stats data.
     """
     authentication_classes = (JwtAuthentication,)
-    pagination_class = AdvanceAnalyticsPagination
     http_method_names = ('get', )
 
     @permission_required('can_access_enterprise', fn=lambda request, enterprise_uuid: enterprise_uuid)

enterprise_data/api/v1/views/analytics_enrollments.py

@@ -14,7 +14,6 @@ from django.http import StreamingHttpResponse
 
 from enterprise_data.admin_analytics.constants import ResponseType
 from enterprise_data.admin_analytics.database.tables import FactEnrollmentAdminDashTable
-from enterprise_data.api.v1.paginators import AdvanceAnalyticsPagination
 from enterprise_data.api.v1.serializers import AdvanceAnalyticsQueryParamSerializer
 from enterprise_data.api.v1.views.base import AnalyticsPaginationMixin
 from enterprise_data.renderers import IndividualEnrollmentsCSVRenderer
@@ -32,7 +31,6 @@ class AdvanceAnalyticsEnrollmentsView(AnalyticsPaginationMixin, ViewSet):
     2. `enterprise_data_api_v1.enterprise-learner-enrollment-stats`: Get enrollment stats data.
     """
     authentication_classes = (JwtAuthentication,)
-    pagination_class = AdvanceAnalyticsPagination
     http_method_names = ('get', )
 
     @permission_required('can_access_enterprise', fn=lambda request, enterprise_uuid: enterprise_uuid)