edx-enterprise-data 9.7.1__tar.gz → 9.7.5__tar.gz

{edx_enterprise_data-9.7.1 → edx_enterprise_data-9.7.5}/CHANGELOG.rst

@@ -16,6 +16,38 @@ Unreleased
 
 =========================
 
+[10.5.0] - 2024-11-14
+---------------------
+  * Fix CSV file names
+  * Fix ordering of skills charts data
+
+[10.4.0] - 2024-11-14
+---------------------
+  * Updated text for null emails record of leaderboard.
+
+[10.3.0] - 2024-11-13
+---------------------
+  * Re-write top 10 charts queries for Enrollments, Engagements and Completions
+
+[10.2.0] - 2024-11-12
+---------------------
+  * Fixed null email issue for leaderboard.
+
+
+[10.1.0] - 2024-10-29
+---------------------
+  * Added management command to pre-warm analytics data.
+
+[10.0.1] - 2024-10-25
+---------------------
+  * Same as ``10.0.0``
+  * Bumping the version so a new tag can be created in the GitHub
+
+[10.0.0] - 2024-10-25
+---------------------
+  * feat!: Python 3.12 Upgrade
+  * Dropped support for ``Python<3.12``
+
 [9.7.0] - 2024-10-23
 ---------------------
   * feat: Add API to fetch enterprise budgets information

{edx_enterprise_data-9.7.1/edx_enterprise_data.egg-info → edx_enterprise_data-9.7.5}/PKG-INFO

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

{edx_enterprise_data-9.7.1 → edx_enterprise_data-9.7.5/edx_enterprise_data.egg-info}/PKG-INFO

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

{edx_enterprise_data-9.7.1 → edx_enterprise_data-9.7.5}/enterprise_data/__init__.py

@@ -2,4 +2,4 @@
 Enterprise data api application. This Django app exposes API endpoints used by enterprises.
 """
 
-__version__ = "9.7.1"
+__version__ = "9.7.5"

{edx_enterprise_data-9.7.1 → edx_enterprise_data-9.7.5}/enterprise_data/admin_analytics/database/queries/fact_engagement_admin_dash.py

@@ -48,7 +48,7 @@ class FactEngagementAdminDashQueries:
         """
 
     @staticmethod
-    def get_top_courses_by_engagement_query(record_count=20):
+    def get_top_courses_by_engagement_query(record_count=10):
         """
         Get the query to fetch the learning time in hours by courses.
 
@@ -61,16 +61,40 @@ class FactEngagementAdminDashQueries:
             (str): Query to fetch the learning time in hours by courses for the top courses by user engagement.
         """
         return f"""
-            SELECT course_key, course_title, 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
+            WITH filtered_data AS (
+                SELECT
+                    course_key,
+                    course_title,
+                    enroll_type,
+                    (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
-            GROUP BY course_key, course_title, enroll_type
-            ORDER BY learning_time_hours DESC LIMIT {record_count};
+            ),
+            top_10_courses AS (
+                SELECT
+                    course_key,
+                    SUM(learning_time_hours) as total_learning_time
+                FROM filtered_data
+                GROUP BY course_key
+                ORDER BY total_learning_time DESC
+                LIMIT {record_count}
+            )
+            SELECT
+                d.course_key,
+                d.course_title,
+                d.enroll_type,
+                ROUND(SUM(d.learning_time_hours)) AS learning_time_hours
+            FROM filtered_data d
+            JOIN top_10_courses tc
+                ON d.course_key = tc.course_key
+            GROUP BY d.course_key, d.course_title, d.enroll_type
+            ORDER BY total_learning_time DESC;
         """
 
     @staticmethod
-    def get_top_subjects_by_engagement_query(record_count=20):
+    def get_top_subjects_by_engagement_query(record_count=10):
         """
         Get the query to fetch the learning time in hours by subjects.
 
@@ -83,12 +107,34 @@ class FactEngagementAdminDashQueries:
             (str): Query to fetch the learning time in hours by subjects for the top subjects by user engagement.
         """
         return f"""
-            SELECT course_subject, 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
+            WITH filtered_data AS (
+                SELECT
+                    course_subject,
+                    enroll_type,
+                    (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
-            GROUP BY course_subject, enroll_type
-            ORDER BY learning_time_hours DESC LIMIT {record_count};
+            ),
+            top_10_subjects AS (
+                SELECT
+                    course_subject,
+                    SUM(learning_time_hours) as total_learning_time
+                FROM filtered_data
+                GROUP BY course_subject
+                ORDER BY total_learning_time DESC
+                LIMIT {record_count}
+            )
+            SELECT
+                d.course_subject,
+                d.enroll_type,
+                ROUND(SUM(d.learning_time_hours)) AS learning_time_hours
+            FROM filtered_data d
+            JOIN top_10_subjects ts
+                ON d.course_subject = ts.course_subject
+            GROUP BY d.course_subject, d.enroll_type
+            ORDER BY total_learning_time DESC;
         """
 
     @staticmethod
@@ -163,6 +209,55 @@ class FactEngagementAdminDashQueries:
             GROUP BY email;
         """
 
+    @staticmethod
+    def get_engagement_data_for_leaderboard_null_email_only_query():
+        """
+        Get the query to fetch the engagement data for leaderboard for NULL emails only.
+
+        Query should fetch the engagement data for like learning time, session length of
+        the enterprise learners to show in the leaderboard.
+
+        Returns:
+            (str): Query to fetch the engagement data for leaderboard.
+        """
+        return """
+            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 AND
+                email is NULL
+            GROUP BY email;
+        """
+
+    @staticmethod
+    def get_completion_data_for_leaderboard_null_email_only_query():
+        """
+        Get the query to fetch the completions data for leaderboard for NULL emails.
+
+        Query should fetch the completion data for like course completion count of
+        the enterprise learners to show in the leaderboard.
+
+        Returns:
+            (list<str>): Query to fetch the completions data for leaderboard.
+        """
+        return """
+            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 AND
+                email is NULL
+            GROUP BY email;
+        """
+
     @staticmethod
     def get_leaderboard_data_count_query():
         """

{edx_enterprise_data-9.7.1 → edx_enterprise_data-9.7.5}/enterprise_data/admin_analytics/database/queries/fact_enrollment_admin_dash.py

@@ -98,7 +98,7 @@ class FactEnrollmentAdminDashQueries:
         """
 
     @staticmethod
-    def get_top_courses_by_enrollments_query(record_count=20):
+    def get_top_courses_by_enrollments_query(record_count=10):
         """
         Get the query to fetch the enrollment count by courses.
 
@@ -108,15 +108,32 @@ class FactEnrollmentAdminDashQueries:
             record_count (int): Number of records to fetch.
         """
         return f"""
-            SELECT course_key, course_title , enroll_type, count(course_key) as enrollment_count
-            FROM fact_enrollment_admin_dash
-            WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
+            WITH filtered_data AS (
+                SELECT *
+                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
-            GROUP BY course_key, course_title, enroll_type ORDER BY enrollment_count DESC LIMIT {record_count};
+            ),
+            top_10_courses AS (
+                SELECT course_key
+                FROM filtered_data
+                GROUP BY course_key
+                ORDER BY COUNT(*) DESC
+                LIMIT {record_count}
+            )
+
+            SELECT
+                d.course_key,
+                d.enroll_type,
+                COUNT(*) AS enrollment_count
+            FROM filtered_data d
+            JOIN top_10_courses tc
+                ON d.course_key = tc.course_key
+            GROUP BY d.course_key, d.enroll_type;
         """
 
     @staticmethod
-    def get_top_subjects_by_enrollments_query(record_count=20):
+    def get_top_subjects_by_enrollments_query(record_count=10):
         """
         Get the query to fetch the enrollment count by subjects.
 
@@ -126,11 +143,27 @@ class FactEnrollmentAdminDashQueries:
             record_count (int): Number of records to fetch.
         """
         return f"""
-            SELECT course_subject, enroll_type, count(course_subject) enrollment_count
-            FROM fact_enrollment_admin_dash
-            WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
+            WITH filtered_data AS (
+                SELECT *
+                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
-            GROUP BY course_subject, enroll_type ORDER BY enrollment_count DESC LIMIT {record_count};
+            ),
+            top_10_subjects AS (
+                SELECT course_subject
+                FROM filtered_data
+                GROUP BY course_subject
+                ORDER BY COUNT(*) DESC
+                LIMIT {record_count}
+            )
+            SELECT
+                d.course_subject,
+                d.enroll_type,
+                COUNT(*) AS enrollment_count
+            FROM filtered_data d
+            JOIN top_10_subjects ts
+                ON d.course_subject = ts.course_subject
+            GROUP BY d.course_subject, d.enroll_type;
         """
 
     @staticmethod
@@ -162,7 +195,7 @@ class FactEnrollmentAdminDashQueries:
         """
 
     @staticmethod
-    def get_top_courses_by_completions_query(record_count=20):
+    def get_top_courses_by_completions_query(record_count=10):
         """
         Get the query to fetch the completion count by courses.
 
@@ -175,17 +208,40 @@ class FactEnrollmentAdminDashQueries:
             (str): Query to fetch the enrollment count by courses for the top courses by enrollment count.
         """
         return f"""
-            SELECT course_key, course_title, 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
+            WITH filtered_data AS (
+                SELECT
+                    course_key,
+                    course_title,
+                    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
-            GROUP BY course_key, course_title, enroll_type
-            ORDER BY completion_count DESC LIMIT {record_count};
+            ),
+            top_10_courses AS (
+                SELECT
+                    course_key,
+                    COUNT(*) AS total_completion_count
+                FROM filtered_data
+                GROUP BY course_key
+                ORDER BY total_completion_count DESC
+                LIMIT {record_count}
+            )
+            SELECT
+                d.course_key,
+                d.course_title,
+                d.enroll_type,
+                COUNT(*) AS completion_count
+            FROM filtered_data d
+            JOIN top_10_courses tc
+                ON d.course_key = tc.course_key
+            GROUP BY d.course_key, d.course_title, d.enroll_type
+            ORDER BY total_completion_count DESC;
         """
 
     @staticmethod
-    def get_top_subjects_by_completions_query(record_count=20):
+    def get_top_subjects_by_completions_query(record_count=10):
         """
         Get the query to fetch the completion count by subjects.
 
@@ -198,13 +254,34 @@ class FactEnrollmentAdminDashQueries:
             (str): Query to fetch the completion count by subjects for the top subjects by completion count.
         """
         return f"""
-            SELECT course_subject, enroll_type, count(course_subject) as completion_count
-            FROM fact_enrollment_admin_dash
-            WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
-                has_passed=1 AND
+            WITH filtered_data AS (
+                SELECT
+                    course_subject,
+                    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
-            GROUP BY course_subject, enroll_type
-            ORDER BY completion_count DESC LIMIT {record_count};
+            ),
+            top_10_subjects AS (
+                SELECT
+                    course_subject,
+                    COUNT(*) AS total_completion_count
+                FROM filtered_data
+                GROUP BY course_subject
+                ORDER BY total_completion_count DESC
+                LIMIT {record_count}
+            )
+            SELECT
+                d.course_subject,
+                d.enroll_type,
+                COUNT(*) AS completion_count
+            FROM filtered_data d
+            JOIN top_10_subjects ts
+                ON d.course_subject = ts.course_subject
+            GROUP BY d.course_subject, d.enroll_type
+            ORDER BY total_completion_count DESC;
         """
 
     @staticmethod

{edx_enterprise_data-9.7.1 → edx_enterprise_data-9.7.5}/enterprise_data/admin_analytics/database/queries/skills_daily_rollup_admin_dash.py

@@ -38,7 +38,8 @@ class SkillsDailyRollupAdminDashQueries:
             WITH TopSkills AS (
                 -- Get top 10 skills by total enrollments
                 SELECT
-                    skill_name
+                    skill_name,
+                    SUM(enrolls) AS total_enrollment_count
                 FROM
                     skills_daily_rollup_admin_dash
                 WHERE
@@ -47,7 +48,7 @@ class SkillsDailyRollupAdminDashQueries:
                 GROUP BY
                     skill_name
                 ORDER BY
-                    SUM(enrolls) DESC
+                    total_enrollment_count DESC
                 LIMIT 10
             )
             SELECT
@@ -70,7 +71,7 @@ class SkillsDailyRollupAdminDashQueries:
             GROUP BY
                 sd.skill_name, subject_name
             ORDER BY
-                subject_name;
+                total_enrollment_count DESC;
         """
 
     @staticmethod
@@ -82,7 +83,8 @@ class SkillsDailyRollupAdminDashQueries:
             WITH TopSkills AS (
                 -- Get top 10 skills by total completions
                 SELECT
-                    skill_name
+                    skill_name,
+                    SUM(completions) AS total_completion_count
                 FROM
                     skills_daily_rollup_admin_dash
                 WHERE
@@ -91,7 +93,7 @@ class SkillsDailyRollupAdminDashQueries:
                 GROUP BY
                     skill_name
                 ORDER BY
-                    SUM(completions) DESC
+                    total_completion_count DESC
                 LIMIT 10
             )
             SELECT
@@ -114,5 +116,5 @@ class SkillsDailyRollupAdminDashQueries:
             GROUP BY
                 sd.skill_name, subject_name
             ORDER BY
-                subject_name;
+                total_completion_count DESC;
         """

{edx_enterprise_data-9.7.1 → edx_enterprise_data-9.7.5}/enterprise_data/admin_analytics/database/tables/fact_engagement_admin_dash.py

@@ -5,11 +5,14 @@ from datetime import date
 from uuid import UUID
 
 from enterprise_data.cache.decorators import cache_it
+from enterprise_data.utils import find_first
 
 from ..queries import FactEngagementAdminDashQueries
 from ..utils import run_query
 from .base import BaseTable
 
+NULL_EMAIL_TEXT = 'learners who have not shared consent'
+
 
 class FactEngagementAdminDashTable(BaseTable):
     """
@@ -168,7 +171,14 @@ class FactEngagementAdminDashTable(BaseTable):
 
     @cache_it()
     def _get_engagement_data_for_leaderboard(
-            self, enterprise_customer_uuid: UUID, start_date: date, end_date: date, limit: int, offset: int
+            self,
+            enterprise_customer_uuid: UUID,
+            start_date: date,
+            end_date: date,
+            limit: int,
+            offset: int,
+            include_null_email: bool,
+
     ):
         """
         Get the engagement data for leaderboard.
@@ -182,11 +192,12 @@ class FactEngagementAdminDashTable(BaseTable):
             end_date (date): The end date.
             limit (int): The maximum number of records to return.
             offset (int): The number of records to skip.
+            include_null_email (bool): If True, only fetch data for NULL emails.
 
         Returns:
             list[dict]: The engagement data for leaderboard.
         """
-        return run_query(
+        engagements = run_query(
             query=self.queries.get_engagement_data_for_leaderboard_query(),
             params={
                 'enterprise_customer_uuid': enterprise_customer_uuid,
@@ -198,9 +209,27 @@ class FactEngagementAdminDashTable(BaseTable):
             as_dict=True,
         )
 
+        if include_null_email:
+            engagement_for_null_email = run_query(
+                query=self.queries.get_engagement_data_for_leaderboard_null_email_only_query(),
+                params={
+                    'enterprise_customer_uuid': enterprise_customer_uuid,
+                    'start_date': start_date,
+                    'end_date': end_date,
+                },
+                as_dict=True,
+            )
+            engagements += engagement_for_null_email
+        return engagements
+
     @cache_it()
     def _get_completion_data_for_leaderboard_query(
-            self, enterprise_customer_uuid: UUID, start_date: date, end_date: date, email_list: list
+            self,
+            enterprise_customer_uuid: UUID,
+            start_date: date,
+            end_date: date,
+            email_list: list,
+            include_null_email: bool,
     ):
         """
         Get the completion data for leaderboard.
@@ -213,11 +242,13 @@ class FactEngagementAdminDashTable(BaseTable):
             start_date (date): The start date.
             end_date (date): The end date.
             email_list (list<str>): List of emails of the enterprise learners.
+            include_null_email (bool): If True, only fetch data for NULL emails.
 
         Returns:
             list[dict]: The engagement data for leaderboard.
         """
-        return run_query(
+
+        completions = run_query(
             query=self.queries.get_completion_data_for_leaderboard_query(email_list),
             params={
                 'enterprise_customer_uuid': enterprise_customer_uuid,
@@ -227,8 +258,28 @@ class FactEngagementAdminDashTable(BaseTable):
             as_dict=True,
         )
 
+        if include_null_email:
+            completions_for_null_email = run_query(
+                query=self.queries.get_completion_data_for_leaderboard_null_email_only_query(),
+                params={
+                    'enterprise_customer_uuid': enterprise_customer_uuid,
+                    'start_date': start_date,
+                    'end_date': end_date,
+                },
+                as_dict=True,
+            )
+            completions += completions_for_null_email
+
+        return completions
+
     def get_all_leaderboard_data(
-            self, enterprise_customer_uuid: UUID, start_date: date, end_date: date, limit: int, offset: int
+            self,
+            enterprise_customer_uuid: UUID,
+            start_date: date,
+            end_date: date,
+            limit: int,
+            offset: int,
+            total_count: int,
     ):
         """
         Get the leaderboard data for the given enterprise customer.
@@ -239,32 +290,49 @@ class FactEngagementAdminDashTable(BaseTable):
             end_date (date): The end date.
             limit (int): The maximum number of records to return.
             offset (int): The number of records to skip.
+            total_count (int): The total number of records.
 
         Returns:
             list[dict]: The leaderboard data.
         """
+        include_null_email = False
+        # If this is the last or only page, we need to include NULL emails record.
+        if total_count <= offset + limit:
+            include_null_email = True
+
         engagement_data = self._get_engagement_data_for_leaderboard(
             enterprise_customer_uuid=enterprise_customer_uuid,
             start_date=start_date,
             end_date=end_date,
             limit=limit,
             offset=offset,
+            include_null_email=include_null_email,
         )
         # If there is no data, no need to proceed.
         if not engagement_data:
             return []
 
-        engagement_data_dict = {engagement['email']: engagement for engagement in engagement_data}
+        engagement_data_dict = {
+            engagement['email']: engagement for engagement in engagement_data if engagement['email']
+        }
         completion_data = self._get_completion_data_for_leaderboard_query(
             enterprise_customer_uuid=enterprise_customer_uuid,
             start_date=start_date,
             end_date=end_date,
             email_list=list(engagement_data_dict.keys()),
+            include_null_email=include_null_email,
         )
         for completion in completion_data:
             email = completion['email']
             engagement_data_dict[email]['course_completion_count'] = completion['course_completion_count']
 
+        if include_null_email:
+            engagement_data_dict['None'] = find_first(engagement_data, lambda x: x['email'] is None) or {}
+            completion = find_first(completion_data, lambda x: x['email'] is None) or \
+                {'course_completion_count': ''}
+            engagement_data_dict['None']['course_completion_count'] = completion['course_completion_count']
+            engagement_data_dict['None']['email'] = NULL_EMAIL_TEXT
+
         return list(engagement_data_dict.values())
 
     @cache_it()

{edx_enterprise_data-9.7.1 → edx_enterprise_data-9.7.5}/enterprise_data/api/v1/views/analytics_completions.py

@@ -75,7 +75,7 @@ class AdvanceAnalyticsCompletionsView(AnalyticsPaginationMixin, ViewSet):
         )
 
         if response_type == ResponseType.CSV.value:
-            filename = f"""individual_completions, {start_date} - {end_date}.csv"""
+            filename = f"""Individual Completions, {start_date} - {end_date}.csv"""
 
             return StreamingHttpResponse(
                 IndividualCompletionsCSVRenderer().render(self._stream_serialized_data(

{edx_enterprise_data-9.7.1 → edx_enterprise_data-9.7.5}/enterprise_data/api/v1/views/analytics_engagements.py

@@ -75,7 +75,7 @@ class AdvanceAnalyticsEngagementView(AnalyticsPaginationMixin, ViewSet):
         )
 
         if response_type == ResponseType.CSV.value:
-            filename = f"""individual_engagements, {start_date} - {end_date}.csv"""
+            filename = f"""Individual Engagements, {start_date} - {end_date}.csv"""
 
             return StreamingHttpResponse(
                 IndividualEngagementsCSVRenderer().render(self._stream_serialized_data(

{edx_enterprise_data-9.7.1 → edx_enterprise_data-9.7.5}/enterprise_data/api/v1/views/analytics_enrollments.py

@@ -74,7 +74,7 @@ class AdvanceAnalyticsEnrollmentsView(AnalyticsPaginationMixin, ViewSet):
         )
 
         if response_type == ResponseType.CSV.value:
-            filename = f"""individual_enrollments, {start_date} - {end_date}.csv"""
+            filename = f"""Individual Enrollments, {start_date} - {end_date}.csv"""
 
             return StreamingHttpResponse(
                 IndividualEnrollmentsCSVRenderer().render(self._stream_serialized_data(

{edx_enterprise_data-9.7.1 → edx_enterprise_data-9.7.5}/enterprise_data/api/v1/views/analytics_leaderboard.py

@@ -49,17 +49,18 @@ class AdvanceAnalyticsLeaderboardView(AnalyticsPaginationMixin, ViewSet):
         end_date = serializer.data.get('end_date', date.today())
         page = serializer.data.get('page', 1)
         page_size = serializer.data.get('page_size', 100)
-        leaderboard = FactEngagementAdminDashTable().get_all_leaderboard_data(
+        total_count = FactEngagementAdminDashTable().get_leaderboard_data_count(
             enterprise_customer_uuid=enterprise_uuid,
             start_date=start_date,
             end_date=end_date,
-            limit=page_size,
-            offset=(page - 1) * page_size,
         )
-        total_count = FactEngagementAdminDashTable().get_leaderboard_data_count(
+        leaderboard = FactEngagementAdminDashTable().get_all_leaderboard_data(
             enterprise_customer_uuid=enterprise_uuid,
             start_date=start_date,
             end_date=end_date,
+            limit=page_size,
+            offset=(page - 1) * page_size,
+            total_count=total_count,
         )
         response_type = request.query_params.get('response_type', ResponseType.JSON.value)
 
@@ -102,6 +103,7 @@ class AdvanceAnalyticsLeaderboardView(AnalyticsPaginationMixin, ViewSet):
                 end_date=end_date,
                 limit=page_size,
                 offset=offset,
+                total_count=total_count,
             )
             yield from leaderboard
             offset += page_size