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

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

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

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

@@ -1,29 +1,28 @@
-enterprise_data/__init__.py,sha256=wEC_qcYuekT4a1fFlvFa8RoVQmkPyucJqib8SX4wwn4,123
+enterprise_data/__init__.py,sha256=iLQWwenZSKPK_Ygv_cROjWWAtH0biPa7Cuvdqy3hrbg,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=VaCymaZUhYEZ6yvryoASEohKeeL6lcPSWhFCnyfzjps,2699
+enterprise_data/renderers.py,sha256=94JNmPj6OuOcoqMfwl_ieTwy-fQPJO7IbYpYQhxvHJY,3022
 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/admin_analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-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/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/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=fq01Ni_sKnvSRoiPQfTnJ8TtRePQe5MBLmI5CpVy36o,747
-enterprise_data/admin_analytics/database/queries/fact_enrollment_admin_dash.py,sha256=uuhX3OIB5Cp0-5uxN604HNEUuzb3s9nH3VR4CiEXs18,5388
+enterprise_data/admin_analytics/database/queries/fact_engagement_admin_dash.py,sha256=QNoeuUQ2Fg9IWSxayA8mBbrnRYNPaXVBWhA7-dbquNc,4445
+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=EsG8KgRW84wtA_nJuUknjLYlDtaPSJf_9mWdkO2Bj2I,1293
-enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py,sha256=ix5QvPnrUZMVs_Fdt742i9PAmrQTXuqHlfW3PJhSQWo,7282
+enterprise_data/admin_analytics/database/tables/fact_engagement_admin_dash.py,sha256=VM-5S1ayJuFaWhBoJd1odTqWaFsWDeLZkoaPixAG2dQ,5544
+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
 enterprise_data/api/urls.py,sha256=POqc_KATHdnpMf9zHtpO46pKD5KAlAExtx7G6iylLcU,273
@@ -33,15 +32,15 @@ enterprise_data/api/v0/urls.py,sha256=vzJjqIo_S3AXWs9Us8XTaJc3FnxLbYzAkmLyuDQqum
 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=FEuH-_iTlKFJoxM8ABzEYHDAWHsgSYfdQd2WSPdXoeE,13329
-enterprise_data/api/v1/urls.py,sha256=JzaaVsHEAELMLFdhR60_8LRLb9klDeA4zdH1dLxnQEo,4048
+enterprise_data/api/v1/serializers.py,sha256=leVxK1fVAk_25TDnuMLDHKvOw7GvTmU7zSYXiX0nmZU,11620
+enterprise_data/api/v1/urls.py,sha256=zoztENyCI_8TcKpE88Q6pkKSHiWCC9DascjC9ul4arc,3975
 enterprise_data/api/v1/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-enterprise_data/api/v1/views/analytics_engagements.py,sha256=8H3Fk-hTqJaU3H5Lpu1kFWq7p7xDp1pjge-sK7osDbg,17553
-enterprise_data/api/v1/views/analytics_enrollments.py,sha256=uVc36C0s9y1dPBfbYwFhXLqPlExvQvZeiJ4C45lb4ZQ,6447
+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/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_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
 enterprise_data/fixtures/enterprise_enrollment.json,sha256=6onPXXR29pMdTdbl_mn81sDi3Re5jkLUZz2TPMB_1IY,5786
@@ -115,13 +114,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=LiuwYQXj44XW_mBIQz9gP3Izy8dwrkX-Yp9s8PA19e4,20866
-enterprise_data/tests/admin_analytics/mock_enrollments.py,sha256=LfuMo9Kn-OQD4z42G3BRuM5MXUUXXlaAMhTqfJf46XE,7266
-enterprise_data/tests/admin_analytics/test_analytics_engagements.py,sha256=KPXtBPaAOrzfff7W-xERSGx9KtZAJndLbIJx3gopSnE,15689
-enterprise_data/tests/admin_analytics/test_analytics_enrollments.py,sha256=GePv5E8BRGRWUHUwGaXvYIsN3dtDpNXUh-yfW5iBTi4,13781
+enterprise_data/tests/admin_analytics/mock_analytics_data.py,sha256=NYmgPKIZrIK7HqbjxQ_PKqhY5zmafoePM4NcqE5zfpc,17401
+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_enterprise_completions.py,sha256=afkHQFy4bvqZ0pq5Drl1t2nv8zxbgca2jzOQbihlPG0,7359
+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
@@ -171,8 +170,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.0.1.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-edx_enterprise_data-9.0.1.dist-info/METADATA,sha256=sQyBej1XBqXBR31O1IvBhV4BP1KonVp6JfzuiCgdtYA,1569
-edx_enterprise_data-9.0.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-edx_enterprise_data-9.0.1.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
-edx_enterprise_data-9.0.1.dist-info/RECORD,,
+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,,

enterprise_data/__init__.py

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

enterprise_data/admin_analytics/constants.py

@@ -19,23 +19,7 @@ class Calculation(Enum):
     MOVING_AVERAGE_7_PERIOD = 'Moving Average (7 Period)'
 
 
-class EnrollmentChart(Enum):
-    """CSV choices"""
-    ENROLLMENTS_OVER_TIME = 'enrollments_over_time'
-    TOP_COURSES_BY_ENROLLMENTS = 'top_courses_by_enrollments'
-    TOP_SUBJECTS_BY_ENROLLMENTS = 'top_subjects_by_enrollments'
-    INDIVIDUAL_ENROLLMENTS = 'individual_enrollments'
-
-
 class ResponseType(Enum):
     """Response type choices"""
     JSON = 'json'
     CSV = 'csv'
-
-
-class EngagementChart(Enum):
-    """Response Choices"""
-    ENGAGEMENTS_OVER_TIME = 'engagements_over_time'
-    TOP_COURSES_BY_ENGAGEMENTS = 'top_courses_by_engagements'
-    TOP_SUBJECTS_BY_ENGAGEMENTS = 'top_subjects_by_engagements'
-    INDIVIDUAL_ENGAGEMENTS = 'individual_engagements'

enterprise_data/admin_analytics/database/queries/fact_engagement_admin_dash.py

@@ -19,3 +19,93 @@ class FactEngagementAdminDashQueries:
             WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
                 activity_date BETWEEN %(start_date)s AND %(end_date)s;
         """
+
+    @staticmethod
+    def get_engagement_count_query():
+        """
+        Get the query to fetch the total number of engagements for an enterprise customer.
+        """
+        return """
+            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;
+        """
+
+    @staticmethod
+    def get_all_engagement_query():
+        """
+        Get the query to fetch all engagement data.
+        """
+        return """
+            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
+            ORDER BY activity_date DESC LIMIT %(limit)s OFFSET %(offset)s;
+        """
+
+    @staticmethod
+    def get_top_courses_by_engagement_query(record_count=20):
+        """
+        Get the query to fetch the learning time in hours by courses.
+
+        Query should fetch the top N courses by user engagement. Where N is the value of record_count.
+
+        Arguments:
+            record_count (int): Number of records to fetch.
+
+        Returns:
+            (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
+                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};
+        """
+
+    @staticmethod
+    def get_top_subjects_by_engagement_query(record_count=20):
+        """
+        Get the query to fetch the learning time in hours by subjects.
+
+        Query should fetch the top N subjects by user engagement. Where N is the value of record_count.
+
+        Arguments:
+            record_count (int): Number of records to fetch.
+
+        Returns:
+            (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
+                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};
+        """
+
+    @staticmethod
+    def get_engagement_time_series_data_query():
+        """
+        Get the query to fetch the completion time series data.
+
+        Query should fetch the time series data with daily granularity.
+
+        Returns:
+            (str): Query to fetch the completion time series data.
+        """
+        return """
+            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
+            GROUP BY activity_date, enroll_type
+            ORDER BY activity_date;
+        """

enterprise_data/admin_analytics/database/queries/fact_enrollment_admin_dash.py

@@ -68,6 +68,7 @@ class FactEnrollmentAdminDashQueries:
                 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;
         """
 
@@ -85,7 +86,7 @@ class FactEnrollmentAdminDashQueries:
         """
 
     @staticmethod
-    def get_top_courses_enrollments_query(record_count=20):
+    def get_top_courses_by_enrollments_query(record_count=20):
         """
         Get the query to fetch the enrollment count by courses.
 
@@ -94,14 +95,12 @@ class FactEnrollmentAdminDashQueries:
         Arguments:
             record_count (int): Number of records to fetch.
         """
-        # Some local environments raise error when course_title is added in SELECT without GROUP BY.
-        # If you face this issue, you can remove course_title from SELECT.
         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
                 enterprise_enrollment_date BETWEEN %(start_date)s AND %(end_date)s
-            GROUP BY course_key, enroll_type ORDER BY enrollment_count DESC LIMIT {record_count};
+            GROUP BY course_key, course_title, enroll_type ORDER BY enrollment_count DESC LIMIT {record_count};
         """
 
     @staticmethod
@@ -135,3 +134,83 @@ class FactEnrollmentAdminDashQueries:
             GROUP BY enterprise_enrollment_date, enroll_type
             ORDER BY enterprise_enrollment_date;
         """
+
+    @staticmethod
+    def get_all_completions_query():
+        """
+        Get the query to fetch all completions.
+        """
+        return """
+            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
+            ORDER BY passed_date DESC LIMIT %(limit)s OFFSET %(offset)s
+        """
+
+    @staticmethod
+    def get_top_courses_by_completions_query(record_count=20):
+        """
+        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:
+            record_count (int): Number of records to fetch.
+
+        Returns:
+            (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
+                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};
+        """
+
+    @staticmethod
+    def get_top_subjects_by_completions_query(record_count=20):
+        """
+        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:
+            record_count (int): Number of records to fetch.
+
+        Returns:
+            (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
+                passed_date BETWEEN %(start_date)s AND %(end_date)s
+            GROUP BY course_subject, enroll_type
+            ORDER BY completion_count DESC LIMIT {record_count};
+        """
+
+    @staticmethod
+    def get_completions_time_series_data_query():
+        """
+        Get the query to fetch the completion time series data.
+
+        Query should fetch the time series data with daily granularity.
+
+        Returns:
+            (str): Query to fetch the completion time series data.
+        """
+        return """
+            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
+            GROUP BY passed_date, enroll_type
+            ORDER BY passed_date;
+        """

enterprise_data/admin_analytics/database/tables/fact_engagement_admin_dash.py

@@ -36,3 +36,119 @@ class FactEngagementAdminDashTable(BaseTable):
             }
         )
         return tuple(results[0])
+
+    def get_engagement_count(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+        """
+        Get the total number of engagements 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 engagements.
+        """
+        results = run_query(
+            query=self.queries.get_engagement_count_query(),
+            params={
+                'enterprise_customer_uuid': enterprise_customer_uuid,
+                'start_date': start_date,
+                'end_date': end_date,
+            }
+        )
+        return results[0][0]
+
+    def get_all_engagements(
+            self, enterprise_customer_uuid: UUID, start_date: date, end_date: date, limit: int, offset: int
+    ):
+        """
+        Get all engagement 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>: A list of dictionaries containing the engagement data.
+        """
+        return run_query(
+            query=self.queries.get_all_engagement_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_top_courses_by_engagement(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+        """
+        Get the top courses by user engagement 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:
+            list<dict>: A list of dictionaries containing the course data.
+        """
+        return run_query(
+            query=self.queries.get_top_courses_by_engagement_query(),
+            params={
+                'enterprise_customer_uuid': enterprise_customer_uuid,
+                'start_date': start_date,
+                'end_date': end_date,
+            },
+            as_dict=True,
+        )
+
+    def get_top_subjects_by_engagement(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+        """
+        Get the top subjects by user engagement 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:
+            list<dict>: A list of dictionaries containing the subject data.
+        """
+        return run_query(
+            query=self.queries.get_top_subjects_by_engagement_query(),
+            params={
+                'enterprise_customer_uuid': enterprise_customer_uuid,
+                'start_date': start_date,
+                'end_date': end_date,
+            },
+            as_dict=True,
+        )
+
+    def get_engagement_time_series_data(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+        """
+        Get the engagement time series data.
+
+        Arguments:
+            enterprise_customer_uuid (UUID): The UUID of the enterprise customer.
+            start_date (date): The start date.
+            end_date (date): The end date.
+
+        Returns:
+            list<dict>: A list of dictionaries containing the engagement time series data.
+        """
+        return run_query(
+            query=self.queries.get_engagement_time_series_data_query(),
+            params={
+                'enterprise_customer_uuid': enterprise_customer_uuid,
+                'start_date': start_date,
+                'end_date': end_date,
+            },
+            as_dict=True,
+        )

enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py

@@ -35,7 +35,7 @@ class FactEnrollmentAdminDashTable(BaseTable):
                 'end_date': end_date,
             }
         )
-        return results[0][0]
+        return int(results[0][0] or 0)
 
     def get_all_enrollments(
             self, enterprise_customer_uuid: UUID, start_date: date, end_date: date, limit: int, offset: int
@@ -132,7 +132,7 @@ class FactEnrollmentAdminDashTable(BaseTable):
                 'end_date': end_date,
             }
         )
-        return results[0][0]
+        return int(results[0][0] or 0)
 
     def get_top_courses_by_enrollments(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
         """
@@ -147,7 +147,7 @@ class FactEnrollmentAdminDashTable(BaseTable):
             list<dict>: A list of dictionaries containing the course key, course_title and enrollment count.
         """
         return run_query(
-            query=self.queries.get_top_courses_enrollments_query(),
+            query=self.queries.get_top_courses_by_enrollments_query(),
             params={
                 'enterprise_customer_uuid': enterprise_customer_uuid,
                 'start_date': start_date,
@@ -199,3 +199,97 @@ class FactEnrollmentAdminDashTable(BaseTable):
             },
             as_dict=True,
         )
+
+    def get_all_completions(
+            self, enterprise_customer_uuid: UUID, start_date: date, end_date: date, limit: int, offset: int
+    ):
+        """
+        Get all completions 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>: A list of dictionaries containing the completions data.
+        """
+        return run_query(
+            query=self.queries.get_all_completions_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_top_courses_by_completions(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+        """
+        Get the top courses by completion 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:
+            list<dict>: A list of dictionaries containing the course key, course_title and completion count.
+        """
+        return run_query(
+            query=self.queries.get_top_courses_by_completions_query(),
+            params={
+                'enterprise_customer_uuid': enterprise_customer_uuid,
+                'start_date': start_date,
+                'end_date': end_date,
+            },
+            as_dict=True,
+        )
+
+    def get_top_subjects_by_completions(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+        """
+        Get the top subjects by completions 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:
+            list<dict>: A list of dictionaries containing the subject and completion count.
+        """
+        return run_query(
+            query=self.queries.get_top_subjects_by_completions_query(),
+            params={
+                'enterprise_customer_uuid': enterprise_customer_uuid,
+                'start_date': start_date,
+                'end_date': end_date,
+            },
+            as_dict=True,
+        )
+
+    def get_completions_time_series_data(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+        """
+        Get the completions time series data for the given enterprise customer.
+
+        Arguments:
+            enterprise_customer_uuid (UUID): The UUID of the enterprise customer.
+            start_date (date): The start date.
+            end_date (date): The end date.
+
+        Returns:
+            list<dict>: A list of dictionaries containing the date and completion count.
+        """
+        return run_query(
+            query=self.queries.get_completions_time_series_data_query(),
+            params={
+                'enterprise_customer_uuid': enterprise_customer_uuid,
+                'start_date': start_date,
+                'end_date': end_date,
+            },
+            as_dict=True,
+        )

enterprise_data/api/v1/serializers.py

@@ -5,13 +5,7 @@ from uuid import UUID
 
 from rest_framework import serializers
 
-from enterprise_data.admin_analytics.constants import (
-    Calculation,
-    EngagementChart,
-    EnrollmentChart,
-    Granularity,
-    ResponseType,
-)
+from enterprise_data.admin_analytics.constants import Calculation, Granularity, ResponseType
 from enterprise_data.models import (
     EnterpriseAdminLearnerProgress,
     EnterpriseAdminSummarizeInsights,
@@ -315,51 +309,3 @@ class AdvanceAnalyticsQueryParamSerializer(serializers.Serializer):  # pylint: d
         if value not in self.CALCULATION_CHOICES:
             raise serializers.ValidationError(f"Calculation must be one of {self.CALCULATION_CHOICES}")
         return value
-
-
-class AdvanceAnalyticsEnrollmentStatsSerializer(
-    AdvanceAnalyticsQueryParamSerializer
-):  # pylint: disable=abstract-method
-    """Serializer for validating Advance Analytics Enrollments Stats API"""
-    CHART_TYPES = [
-        EnrollmentChart.ENROLLMENTS_OVER_TIME.value,
-        EnrollmentChart.TOP_COURSES_BY_ENROLLMENTS.value,
-        EnrollmentChart.TOP_SUBJECTS_BY_ENROLLMENTS.value
-    ]
-
-    chart_type = serializers.CharField(required=False)
-
-    def validate_chart_type(self, value):
-        """
-        Validate the chart_type value.
-
-        Raises:
-            serializers.ValidationError: If chart_type is not one of the valid choices
-        """
-        if value not in self.CHART_TYPES:
-            raise serializers.ValidationError(f"chart_type must be one of {self.CHART_TYPES}")
-        return value
-
-
-class AdvanceAnalyticsEngagementStatsSerializer(
-    AdvanceAnalyticsQueryParamSerializer
-):  # pylint: disable=abstract-method
-    """Serializer for validating Advance Analytics Engagements Stats API"""
-    CHART_TYPES = [
-        EngagementChart.ENGAGEMENTS_OVER_TIME.value,
-        EngagementChart.TOP_COURSES_BY_ENGAGEMENTS.value,
-        EngagementChart.TOP_SUBJECTS_BY_ENGAGEMENTS.value
-    ]
-
-    chart_type = serializers.CharField(required=False)
-
-    def validate_chart_type(self, value):
-        """
-        Validate the chart_type value.
-
-        Raises:
-            serializers.ValidationError: If chart_type is not one of the valid choices
-        """
-        if value not in self.CHART_TYPES:
-            raise serializers.ValidationError(f"chart_type must be one of {self.CHART_TYPES}")
-        return value