edx-enterprise-data 8.12.1__py3-none-any.whl → 8.13.0__py3-none-any.whl

{edx_enterprise_data-8.12.1.dist-info → edx_enterprise_data-8.13.0.dist-info}/METADATA

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

{edx_enterprise_data-8.12.1.dist-info → edx_enterprise_data-8.13.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-enterprise_data/__init__.py,sha256=8TjCXGqGwt4y6eG7nZC6OYCp9Dut66Hr_TTySgVt3PE,124
+enterprise_data/__init__.py,sha256=2_b9Iv3g3fvN4GMN2sCDmFoIxUoDt6VL8J1dMTvRDUE,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
@@ -12,17 +12,19 @@ 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/data_loaders.py,sha256=4PSsIveNBtpFqwrLUjTl5oywHVYFAMdZrNRHRGMk4XY,6116
-enterprise_data/admin_analytics/utils.py,sha256=CQuTlg36AALJiopp4us-JN8oTXsw-jDXSJenbphLDME,12270
+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/tables/__init__.py,sha256=3ECKlKlz1wuTER5M57CMFvmLFp0oCnVQXAUeTN96Bs0,213
+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/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
 enterprise_data/api/v0/__init__.py,sha256=1aAzAYU5hk-RW6cKUxa1645cbZMxn7GIZ7OMjWc9MKI,46
@@ -38,7 +40,7 @@ enterprise_data/api/v1/views/analytics_engagements.py,sha256=8H3Fk-hTqJaU3H5Lpu1
 enterprise_data/api/v1/views/analytics_enrollments.py,sha256=uVc36C0s9y1dPBfbYwFhXLqPlExvQvZeiJ4C45lb4ZQ,6447
 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=d79WkyBbqLk6pKGWWrnbYdrbOgQztP03Q7NKRA5tZB4,8639
+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
@@ -113,14 +115,14 @@ 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=VZHhMKSQn5S-o1wNReSVyEnI_-6EkW-TUV5EvXCl5is,19536
+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/test_analytics_leaderboard.py,sha256=VSEyDAHfWBJvqmx9yzd4NnPAqK3TqaKrMBWswMAdzfU,6206
-enterprise_data/tests/admin_analytics/test_data_loaders.py,sha256=o3denJ4aUS1pI5Crksl4C6m-NtCBm8ynoHBnLkf-v2U,4641
+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_utils.py,sha256=y33HXy6BDOoftdcz3qYlOYhgx7JSXDki-OLzBdTpiwA,11449
+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
@@ -128,7 +130,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=i0A1JqG1YQTVRiXviFPbx385p7YhMxew72lgTZ7YNEg,6173
+enterprise_data/tests/api/v1/views/test_enterprise_admin.py,sha256=ysdxVJU-beWQ7eCCTvnKR4br8VFz2lPg7w64z9mrado,9495
 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
@@ -169,8 +171,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.12.1.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-edx_enterprise_data-8.12.1.dist-info/METADATA,sha256=zAJ9YvmaCGHDChLF25Cf1zmK3Okmbq3qIG7UJ6E7xuw,1570
-edx_enterprise_data-8.12.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-edx_enterprise_data-8.12.1.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
-edx_enterprise_data-8.12.1.dist-info/RECORD,,
+edx_enterprise_data-8.13.0.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+edx_enterprise_data-8.13.0.dist-info/METADATA,sha256=Nh0uCmLiclIEZJZgq-fQduIOzYp3g9mq9NTLoeaPQkc,1570
+edx_enterprise_data-8.13.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+edx_enterprise_data-8.13.0.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
+edx_enterprise_data-8.13.0.dist-info/RECORD,,

enterprise_data/__init__.py

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

enterprise_data/admin_analytics/data_loaders.py

@@ -147,51 +147,3 @@ def fetch_max_enrollment_datetime():
     if not results:
         return None
     return pandas.to_datetime(results[0][0])
-
-
-def fetch_skills_data(enterprise_uuid: str):
-    """
-    Fetch skills data from the database for the given enterprise customer.
-
-    Arguments:
-        enterprise_uuid (str): The UUID of the enterprise customer.
-
-    Returns:
-        (pandas.DataFrame): The skills data.
-    """
-
-    enterprise_uuid = enterprise_uuid.replace('-', '')
-
-    cols = [
-        'course_number',
-        'skill_type',
-        'skill_name',
-        'skill_url',
-        'confidence',
-        'skill_rank',
-        'course_title',
-        'course_key',
-        'level_type',
-        'primary_subject_name',
-        'date',
-        'enterprise_customer_uuid',
-        'enterprise_customer_name',
-        'enrolls',
-        'completions',
-    ]
-    query = get_select_query(
-        table='skills_daily_rollup_admin_dash', columns=cols, enterprise_uuid=enterprise_uuid
-    )
-
-    with timer('fetch_skills_data'):
-        skills = run_query(query=query)
-
-    if not skills:
-        raise Http404(f'No skills data found for enterprise {enterprise_uuid}')
-
-    LOGGER.info(f'[PLOTLY] Skills data fetched successfully. Records: {len(skills)}')
-    skills = pandas.DataFrame(numpy.array(skills), columns=cols)
-    LOGGER.info('[PLOTLY] Skills data converted to DataFrame.')
-    skills['date'] = skills['date'].astype('datetime64[ns]')
-
-    return skills

enterprise_data/admin_analytics/database/queries/skills_daily_rollup_admin_dash.py

@@ -0,0 +1,118 @@
+"""
+Module containing queries for the skills_daily_rollup_admin_dash table.
+"""
+
+
+class SkillsDailyRollupAdminDashQueries:
+    """
+    Queries related to the skills_daily_rollup_admin_dash table.
+    """
+    @staticmethod
+    def get_top_skills():
+        """
+        Get the query to fetch the top skills for an enterprise customer.
+        """
+        return """
+            SELECT
+                skill_name,
+                skill_type,
+                SUM(enrolls) AS enrolls,
+                SUM(completions) AS completions
+            FROM
+                skills_daily_rollup_admin_dash
+            WHERE
+                enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
+                date BETWEEN %(start_date)s AND %(end_date)s
+            GROUP BY
+                skill_name, skill_type
+            ORDER BY
+                enrolls DESC, completions DESC;
+        """
+
+    @staticmethod
+    def get_top_skills_by_enrollment():
+        """
+        Get the query to fetch the top skills by enrollment for an enterprise customer.
+        """
+        return """
+            WITH TopSkills AS (
+                -- Get top 10 skills by total enrollments
+                SELECT
+                    skill_name
+                FROM
+                    skills_daily_rollup_admin_dash
+                WHERE
+                    enterprise_customer_uuid=%(enterprise_customer_uuid)s
+                    AND date BETWEEN %(start_date)s AND %(end_date)s
+                GROUP BY
+                    skill_name
+                ORDER BY
+                    SUM(enrolls) DESC
+                LIMIT 10
+            )
+            SELECT
+                sd.skill_name,
+                CASE
+                    WHEN sd.primary_subject_name IN (
+                        'business-management', 'computer-science',
+                        'data-analysis-statistics', 'engineering', 'communication'
+                    ) THEN sd.primary_subject_name
+                    ELSE 'other'
+                END AS subject_name,
+                SUM(sd.enrolls) AS count
+            FROM
+                skills_daily_rollup_admin_dash AS sd
+            JOIN
+                TopSkills AS ts ON sd.skill_name = ts.skill_name
+            WHERE
+                sd.enterprise_customer_uuid=%(enterprise_customer_uuid)s
+                AND date BETWEEN %(start_date)s AND %(end_date)s
+            GROUP BY
+                sd.skill_name, subject_name
+            ORDER BY
+                subject_name;
+        """
+
+    @staticmethod
+    def get_top_skills_by_completion():
+        """
+        Get the query to fetch the top skills by completion for an enterprise customer.
+        """
+        return """
+            WITH TopSkills AS (
+                -- Get top 10 skills by total completions
+                SELECT
+                    skill_name
+                FROM
+                    skills_daily_rollup_admin_dash
+                WHERE
+                    enterprise_customer_uuid=%(enterprise_customer_uuid)s
+                    AND date BETWEEN %(start_date)s AND %(end_date)s
+                GROUP BY
+                    skill_name
+                ORDER BY
+                    SUM(completions) DESC
+                LIMIT 10
+            )
+            SELECT
+                sd.skill_name,
+                CASE
+                    WHEN sd.primary_subject_name IN (
+                        'business-management', 'computer-science',
+                        'data-analysis-statistics', 'engineering', 'communication'
+                    ) THEN sd.primary_subject_name
+                    ELSE 'other'
+                END AS subject_name,
+                SUM(sd.completions) AS count
+            FROM
+                skills_daily_rollup_admin_dash AS sd
+            JOIN
+                TopSkills AS ts ON sd.skill_name = ts.skill_name
+            WHERE
+                sd.enterprise_customer_uuid=%(enterprise_customer_uuid)s
+                AND date BETWEEN %(start_date)s AND %(end_date)s
+            GROUP BY
+                sd.skill_name, subject_name
+            ORDER BY
+                subject_name;
+        """

enterprise_data/admin_analytics/database/tables/__init__.py

@@ -3,3 +3,4 @@ This module contains the database queries for the admin analytics.
 """
 from .fact_engagement_admin_dash import FactEngagementAdminDashTable
 from .fact_enrollment_admin_dash import FactEnrollmentAdminDashTable
+from .skills_daily_rollup_admin_dash import SkillsDailyRollupAdminDashTable

enterprise_data/admin_analytics/database/tables/skills_daily_rollup_admin_dash.py

@@ -0,0 +1,94 @@
+"""
+Module for interacting with the skills_daily_rollup_admin_dash table.
+"""
+from datetime import date
+from uuid import UUID
+
+from enterprise_data.admin_analytics.database.queries.skills_daily_rollup_admin_dash import (
+    SkillsDailyRollupAdminDashQueries,
+)
+from enterprise_data.admin_analytics.database.tables.base import BaseTable
+from enterprise_data.admin_analytics.database.utils import run_query
+
+
+class SkillsDailyRollupAdminDashTable(BaseTable):
+    """
+    Class for communicating with the skills_daily_rollup_admin_dash table.
+    """
+    queries = SkillsDailyRollupAdminDashQueries()
+
+    def get_top_skills(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
+        """
+        Get the top skills 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 skill_name, skill_type, enrolls and completions.
+        """
+        return run_query(
+            query=self.queries.get_top_skills(),
+            params={
+                'enterprise_customer_uuid': enterprise_customer_uuid,
+                'start_date': start_date,
+                'end_date': end_date,
+            },
+            as_dict=True,
+        )
+
+    def get_top_skills_by_enrollment(
+        self,
+        enterprise_customer_uuid: UUID,
+        start_date: date,
+        end_date: date
+    ):
+        """
+        Get the top skills by enrollments 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 skill_name, subject_name, count.
+        """
+        return run_query(
+            query=self.queries.get_top_skills_by_enrollment(),
+            params={
+                'enterprise_customer_uuid': enterprise_customer_uuid,
+                'start_date': start_date,
+                'end_date': end_date,
+            },
+            as_dict=True,
+        )
+
+    def get_top_skills_by_completion(
+        self,
+        enterprise_customer_uuid: UUID,
+        start_date: date,
+        end_date: date
+    ):
+        """
+        Get the top skills 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 skill_name, subject_name, count.
+        """
+        return run_query(
+            query=self.queries.get_top_skills_by_completion(),
+            params={
+                'enterprise_customer_uuid': enterprise_customer_uuid,
+                'start_date': start_date,
+                'end_date': end_date,
+            },
+            as_dict=True,
+        )

enterprise_data/admin_analytics/utils.py

@@ -12,9 +12,7 @@ from enterprise_data.admin_analytics.data_loaders import (
     fetch_engagement_data,
     fetch_enrollment_data,
     fetch_max_enrollment_datetime,
-    fetch_skills_data,
 )
-from enterprise_data.utils import date_filter, primary_subject_truncate
 
 LOGGER = getLogger(__name__)
 
@@ -23,9 +21,6 @@ class ChartType(Enum):
     """
     Chart types.
     """
-    BUBBLE = 'bubble'
-    TOP_SKILLS_ENROLLMENT = 'top_skills_enrollment'
-    TOP_SKILLS_COMPLETION = 'top_skills_completion'
     COMPLETIONS_OVER_TIME = 'completions_over_time'
     TOP_COURSES_BY_COMPLETIONS = 'top_courses_by_completions'
     TOP_SUBJECTS_BY_COMPLETIONS = 'top_subjects_by_completions'
@@ -183,169 +178,3 @@ def fetch_and_cache_engagements_data(enterprise_id, cache_expiry):
             cache_key, engagements, get_cache_timeout(cache_expiry)
         )
         return engagements
-
-
-def fetch_and_cache_skills_data(enterprise_id, cache_expiry):
-    """
-    Helper method to fetch and cache skills data.
-
-    Arguments:
-        enterprise_id (str): UUID of the enterprise customer in string format.
-        cache_expiry (datetime): Datetime object denoting the cache expiry.
-
-    Returns:
-        (pandas.DataFrame): The skills data.
-    """
-    cache_key = get_cache_key(
-        resource='enterprise-admin-analytics-aggregate-skills',
-        enterprise_customer=enterprise_id,
-    )
-    cached_response = TieredCache.get_cached_response(cache_key)
-
-    if cached_response.is_found:
-        LOGGER.info(f"Skills data found in cache for Enterprise [{enterprise_id}]")
-        return cached_response.value
-    else:
-        skills = fetch_skills_data(enterprise_id)
-        TieredCache.set_all_tiers(
-            cache_key, skills, get_cache_timeout(cache_expiry)
-        )
-        return skills
-
-
-def get_skills_bubble_chart_df(skills_filtered):
-    """ Get the skills data for the bubble chart.
-
-    Args:
-        skills_filtered (pandas.DataFrame): The skills data.
-
-    Returns:
-        (pandas.DataFrame): The skills data for the bubble chart.
-    """
-
-    # Group by skill_name and skill_type, and aggregate enrolls and completions
-    skills_aggregated = (
-        skills_filtered.groupby(['skill_name', 'skill_type'], as_index=False)
-        .agg(enrolls=('enrolls', 'sum'), completions=('completions', 'sum'))
-    )
-
-    # Convert enrolls and completions to integers
-    skills_aggregated['enrolls'] = skills_aggregated['enrolls'].astype(int)
-    skills_aggregated['completions'] = skills_aggregated['completions'].astype(int)
-
-    # Sort the dataframe by enrolls and completions in descending order
-    skills_aggregated = skills_aggregated.sort_values(by=['enrolls', 'completions'], ascending=False)
-
-    return skills_aggregated
-
-
-def get_top_skills_enrollment(skills_filtered):
-    """ Get the top skills by enrolls.
-
-    Args:
-        skills_filtered (pandas.DataFrame): The skills data.
-
-    Returns:
-        (pandas.DataFrame): The top skills by enrolls data
-    """
-
-    # Get the top 10 skills by enrolls
-    top_skills = (
-        skills_filtered.groupby('skill_name')
-        .enrolls.sum()
-        .sort_values(ascending=False)
-        .head(10)
-        .index
-    )
-
-    # Apply primary_subject_truncate to the primary_subject_name column
-    skills_filtered['primary_subject_name'] = skills_filtered['primary_subject_name'].apply(primary_subject_truncate)
-
-    # Filter data for the top skills and aggregate enrolls by skill_name and primary_subject_name
-    top_skills_enrollment_data = (
-        skills_filtered[skills_filtered.skill_name.isin(top_skills)]
-        .groupby(['skill_name', 'primary_subject_name'], as_index=False)
-        .agg(count=('enrolls', 'sum'))
-    )
-
-    # Sort the dataframe by primary_subject_name
-    top_skills_enrollment_data = top_skills_enrollment_data.sort_values(by="primary_subject_name")
-
-    return top_skills_enrollment_data
-
-
-def get_top_skills_completion(skills_filtered):
-    """ Get the top skills by completions.
-
-    Args:
-        skills_filtered (pandas.DataFrame): The skills data.
-
-    Returns:
-        (pandas.DataFrame): The top skills by completions
-    """
-
-    # Get the top 10 skills by completions
-    top_skills = (
-        skills_filtered.groupby('skill_name')
-        .completions.sum()
-        .sort_values(ascending=False)
-        .head(10)
-        .index
-    )
-
-    # Apply primary_subject_truncate to the primary_subject_name column
-    skills_filtered['primary_subject_name'] = skills_filtered['primary_subject_name'].apply(primary_subject_truncate)
-
-    # Filter data for the top skills and aggregate completions by skill_name and primary_subject_name
-    top_skills_completion_data = (
-        skills_filtered[skills_filtered.skill_name.isin(top_skills)]
-        .groupby(['skill_name', 'primary_subject_name'], as_index=False)
-        .agg(count=('completions', 'sum'))
-    )
-
-    # Sort the dataframe by primary_subject_name
-    top_skills_completion_data = top_skills_completion_data.sort_values(by='primary_subject_name')
-
-    return top_skills_completion_data
-
-
-def get_skills_chart_data(chart_type, start_date, end_date, skills):
-    """
-    Get chart data for skill charts.
-
-    Arguments:
-        chart_type (ChartType): The type of chart to generate.
-        start_date (datetime): The start date for the date filter.
-        end_date (datetime): The end date for the date filter.
-        skills (pandas.DataFrame): The skills data.
-    """
-    skills_filtered = date_filter(start=start_date, end=end_date, data_frame=skills.copy(), date_column='date')
-    if chart_type == ChartType.BUBBLE:
-        return get_skills_bubble_chart_df(skills_filtered=skills_filtered.copy())
-    elif chart_type == ChartType.TOP_SKILLS_ENROLLMENT:
-        return get_top_skills_enrollment(skills_filtered=skills_filtered.copy())
-    elif chart_type == ChartType.TOP_SKILLS_COMPLETION:
-        return get_top_skills_completion(skills_filtered=skills_filtered.copy())
-    else:
-        raise ValueError(f"Invalid chart type: {chart_type}")
-
-
-def get_top_skills_csv_data(skills, start_date, end_date):
-    """ Get the top skills data for CSV download.
-
-    Args:
-        skills (pandas.DataFrame): The skills data.
-        start_date (str): The start date for the date filter.
-        end_date (str): The end date for the date filter.
-
-    Returns:
-        (pandas.DataFrame): The top skills data for CSV download.
-    """
-    dff = get_skills_chart_data(
-        chart_type=ChartType.BUBBLE,
-        start_date=start_date,
-        end_date=end_date,
-        skills=skills.copy(),
-    )
-    dff = dff.sort_values(by='enrolls', ascending=False)
-    return dff

enterprise_data/api/v1/views/enterprise_admin.py

@@ -1,7 +1,7 @@
 """
 Views for enterprise admin api v1.
 """
-from datetime import datetime, timedelta
+from datetime import datetime
 
 from edx_rbac.decorators import permission_required
 from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
@@ -10,16 +10,11 @@ from rest_framework.response import Response
 from rest_framework.status import HTTP_200_OK, HTTP_404_NOT_FOUND
 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_enrollments_data,
-    fetch_and_cache_skills_data,
-    get_skills_chart_data,
-    get_top_skills_csv_data,
+from enterprise_data.admin_analytics.database.tables import (
+    FactEngagementAdminDashTable,
+    FactEnrollmentAdminDashTable,
+    SkillsDailyRollupAdminDashTable,
 )
 from enterprise_data.api.v1 import serializers
 from enterprise_data.models import (
@@ -157,61 +152,35 @@ class EnterpriseAdminAnalyticsSkillsView(APIView):
         Returns:
             response(HttpResponse): response object
         """
-        serializer = serializers.AdminAnalyticsAggregatesQueryParamsSerializer(
-            data=request.GET
-        )
+        enterprise_id = enterprise_id.replace('-', '')
+        serializer = serializers.AdvanceAnalyticsQueryParamSerializer(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()
-        )
 
-        enrollment = fetch_and_cache_enrollments_data(
-            enterprise_id, cache_expiry
-        ).copy()
+        if (start_date := serializer.data.get('start_date')) is None:
+            start_date, _ = FactEnrollmentAdminDashTable().get_enrollment_date_range(enterprise_id)
 
-        start_date = serializer.data.get('start_date', enrollment.enterprise_enrollment_date.min())
         end_date = serializer.data.get('end_date', datetime.now())
 
-        skills = fetch_and_cache_skills_data(enterprise_id, cache_expiry).copy()
-
-        if serializer.data.get('response_type') == 'csv':
-            csv_data = get_top_skills_csv_data(skills, start_date, end_date)
-            response = HttpResponse(content_type='text/csv')
-            filename = f"Skills by Enrollment and Completion, {start_date} - {end_date}.csv"
-            response['Content-Disposition'] = f'attachment; filename="{filename}"'
-            response['Access-Control-Expose-Headers'] = 'Content-Disposition'
-            csv_data.to_csv(path_or_buf=response, index=False)
-            return response
-
-        with timer('skills_all_charts_data'):
-            top_skills = get_skills_chart_data(
-                chart_type=ChartType.BUBBLE,
-                start_date=start_date,
-                end_date=end_date,
-                skills=skills,
-            )
-            top_skills_enrollments = get_skills_chart_data(
-                chart_type=ChartType.TOP_SKILLS_ENROLLMENT,
-                start_date=start_date,
-                end_date=end_date,
-                skills=skills,
+        with timer('top_skills'):
+            skills = SkillsDailyRollupAdminDashTable().get_top_skills(enterprise_id, start_date, end_date)
+
+        with timer('top_skills_by_enrollments'):
+            top_skills_by_enrollments = SkillsDailyRollupAdminDashTable().get_top_skills_by_enrollment(
+                enterprise_id,
+                start_date,
+                end_date
             )
-            top_skills_by_completions = get_skills_chart_data(
-                chart_type=ChartType.TOP_SKILLS_COMPLETION,
-                start_date=start_date,
-                end_date=end_date,
-                skills=skills,
+        with timer('top_skills_by_completions'):
+            top_skills_by_completions = SkillsDailyRollupAdminDashTable().get_top_skills_by_completion(
+                enterprise_id,
+                start_date,
+                end_date
             )
 
         response_data = {
-            "top_skills": top_skills.to_dict(orient="records"),
-            "top_skills_by_enrollments": top_skills_enrollments.to_dict(
-                orient="records"
-            ),
-            "top_skills_by_completions": top_skills_by_completions.to_dict(
-                orient="records"
-            ),
+            "top_skills": skills,
+            "top_skills_by_enrollments": top_skills_by_enrollments,
+            "top_skills_by_completions": top_skills_by_completions,
         }
 
         return Response(data=response_data, status=HTTP_200_OK)

enterprise_data/tests/admin_analytics/mock_analytics_data.py

@@ -537,3 +537,59 @@ def engagements_csv_content():
         b'paul77@example.org,Synergized reciprocal encoding,2021-07-26,business-management,4.4\r\n'
         b'samanthaclarke@example.org,Synergized reciprocal encoding,2021-07-19,business-management,0.0\r\n'
     )
+
+
+TOP_SKILLS = [
+    {
+        "skill_name": "Python (Programming Language)",
+        "skill_type": "Specialized Skill",
+        "enrolls": 19027.0,
+        "completions": 3004.0
+    },
+    {
+        "skill_name": "Data Science",
+        "skill_type": "Specialized Skill",
+        "enrolls": 13756.0,
+        "completions": 1517.0
+    },
+    {
+        "skill_name": "Algorithms",
+        "skill_type": "Specialized Skill",
+        "enrolls": 12776.0,
+        "completions": 1640.0
+    },
+]
+TOP_SKILLS_BY_ENROLLMENTS = [
+    {
+        "skill_name": "Python (Programming Language)",
+        "subject_name": "business-management",
+        "count": 313.0
+    },
+    {
+        "skill_name": "Machine Learning",
+        "subject_name": "business-management",
+        "count": 442.0
+    },
+    {
+        "skill_name": "Computer Science",
+        "subject_name": "business-management",
+        "count": 39.0
+    },
+]
+TOP_SKILLS_BY_COMPLETIONS = [
+    {
+        "skill_name": "Python (Programming Language)",
+        "subject_name": "business-management",
+        "count": 21.0
+    },
+    {
+        "skill_name": "SQL (Programming Language)",
+        "subject_name": "business-management",
+        "count": 11.0
+    },
+    {
+        "skill_name": "Algorithms",
+        "subject_name": "business-management",
+        "count": 15.0
+    },
+]

enterprise_data/tests/admin_analytics/test_data_loaders.py

@@ -13,13 +13,8 @@ from enterprise_data.admin_analytics.data_loaders import (
     fetch_engagement_data,
     fetch_enrollment_data,
     fetch_max_enrollment_datetime,
-    fetch_skills_data,
-)
-from enterprise_data.tests.test_utils import (
-    get_dummy_engagements_data,
-    get_dummy_enrollments_data,
-    get_dummy_skills_data,
 )
+from enterprise_data.tests.test_utils import get_dummy_engagements_data, get_dummy_enrollments_data
 
 
 class TestDataLoaders(TestCase):
@@ -89,27 +84,3 @@ class TestDataLoaders(TestCase):
             with pytest.raises(Http404) as error:
                 fetch_enrollment_data(enterprise_uuid)
             error.value.message = f'No enrollment data found for enterprise {enterprise_uuid}'
-
-    def test_fetch_skills_data(self):
-        """
-        Validate the fetch_skills_data function.
-        """
-        with patch('enterprise_data.admin_analytics.data_loaders.run_query') as mock_run_query:
-            enterprise_uuid = str(uuid4())
-            mock_run_query.return_value = [
-                list(item.values()) for item in get_dummy_skills_data(enterprise_uuid)
-            ]
-
-            skills_data = fetch_skills_data(enterprise_uuid)
-            self.assertEqual(skills_data.shape, (10, 15))
-
-    def test_fetch_skills_data_empty_data(self):
-        """
-        Validate the fetch_skills_data function behavior when no data is returned from the query.
-        """
-        with patch('enterprise_data.admin_analytics.data_loaders.run_query') as mock_run_query:
-            mock_run_query.return_value = []
-            enterprise_uuid = str(uuid4())
-            with pytest.raises(Http404) as error:
-                fetch_skills_data(enterprise_uuid)
-            error.value.message = f'No skills data found for enterprise {enterprise_uuid}'

enterprise_data/tests/admin_analytics/test_utils.py

@@ -3,7 +3,6 @@ Test the utility functions in the admin_analytics app.
 """
 from datetime import datetime, timedelta
 
-import pandas
 from mock import patch
 
 from django.test import TestCase
@@ -11,13 +10,8 @@ from django.test import TestCase
 from enterprise_data.admin_analytics.utils import (
     fetch_and_cache_engagements_data,
     fetch_and_cache_enrollments_data,
-    fetch_and_cache_skills_data,
     get_cache_timeout,
-    get_skills_bubble_chart_df,
-    get_top_skills_completion,
-    get_top_skills_enrollment,
 )
-from enterprise_data.utils import date_filter
 
 
 class TestUtils(TestCase):
@@ -106,136 +100,3 @@ class TestUtils(TestCase):
                 self.assertEqual(enrollments, 'cached-engagements')
                 self.assertEqual(mock_tiered_cache.get_cached_response.call_count, 1)
                 self.assertEqual(mock_tiered_cache.set_all_tiers.call_count, 0)
-
-    def test_fetch_and_cache_skills_data(self):
-        """
-        Validate the fetch_and_cache_skills_data function.
-        """
-        with patch('enterprise_data.admin_analytics.utils.fetch_skills_data') as mock_fetch_skills_data:
-            with patch('enterprise_data.admin_analytics.utils.TieredCache') as mock_tiered_cache:
-                # Simulate the scenario where the data is not found in the cache.
-                mock_tiered_cache.get_cached_response.return_value.is_found = False
-                mock_fetch_skills_data.return_value = 'skills'
-                skills = fetch_and_cache_skills_data('enterprise_id', datetime.now() + timedelta(seconds=10))
-                self.assertEqual(skills, 'skills')
-                self.assertEqual(mock_tiered_cache.get_cached_response.call_count, 1)
-                self.assertEqual(mock_tiered_cache.set_all_tiers.call_count, 1)
-
-    def test_fetch_and_cache_skills_data_with_data_cache_found(self):
-        """
-        Validate the fetch_and_cache_skills_data function.
-        """
-        with patch('enterprise_data.admin_analytics.utils.fetch_skills_data') as mock_fetch_skills_data:
-            with patch('enterprise_data.admin_analytics.utils.TieredCache') as mock_tiered_cache:
-                # Simulate the scenario where the data is found in the cache.
-                mock_tiered_cache.get_cached_response.return_value.is_found = True
-                mock_tiered_cache.get_cached_response.return_value.value = 'cached-skills'
-                mock_fetch_skills_data.return_value = 'skills'
-
-                skills = fetch_and_cache_skills_data('enterprise_id', datetime.now() + timedelta(seconds=10))
-                self.assertEqual(skills, 'cached-skills')
-                self.assertEqual(mock_tiered_cache.get_cached_response.call_count, 1)
-                self.assertEqual(mock_tiered_cache.set_all_tiers.call_count, 0)
-
-    def test_get_skills_bubble_chart_df(self):
-        """
-        Validate the get_skills_bubble_chart_df function.
-        """
-        # Mock skills data
-        skills = pandas.DataFrame({
-            'skill_name': ['Skill A', 'Skill B', 'Skill C'],
-            'skill_type': ['Type 1', 'Type 2', 'Type 1'],
-            'enrolls': [100, 200, 150],
-            'completions': [50, 100, 75],
-            'date': [datetime.now(), datetime.now(), datetime.now()],
-        })
-
-        # Define the expected result
-        expected_result = pandas.DataFrame({
-            'skill_name': ['Skill B', 'Skill C', 'Skill A'],
-            'skill_type': ['Type 2', 'Type 1', 'Type 1'],
-            'enrolls': [200, 150, 100],
-            'completions': [100, 75, 50]
-        })
-        # Reset the index for the expected result
-        expected_result = expected_result.reset_index(drop=True)
-
-        start_date = datetime.now() - timedelta(days=10)
-        end_date = datetime.now()
-        filtered_skills = date_filter(start_date, end_date, skills, 'date')
-        # Call the function
-        result = get_skills_bubble_chart_df(filtered_skills)
-
-        # Reset the index for the result
-        result = result.reset_index(drop=True)
-
-        # Assert the result
-        pandas.testing.assert_frame_equal(result, expected_result)
-
-    def test_get_top_skills_enrollment(self):
-        """
-        Validate the get_top_skills_enrollment function.
-        """
-        # Mock skills data
-        skills = pandas.DataFrame({
-            'primary_subject_name': ['engineering', 'communication', 'engineering', 'other'],
-            'skill_name': ['Skill A', 'Skill B', 'Skill A', 'Skill D'],
-            'enrolls': [100, 200, 150, 300],
-            'completions': [50, 100, 75, 150],
-            'date': [datetime.now(), datetime.now(), datetime.now(), datetime.now()],
-        })
-
-        # Define the expected result
-        expected_result = pandas.DataFrame({
-            'skill_name': ['Skill B', 'Skill A', 'Skill D'],
-            'primary_subject_name': ['communication', 'engineering', 'other'],
-            'count': [200, 250, 300]
-        })
-        # Reset the index for the expected result
-        expected_result = expected_result.reset_index(drop=True)
-        start_date = datetime.now() - timedelta(days=10)
-        end_date = datetime.now()
-        filtered_skills = date_filter(start_date, end_date, skills, 'date')
-
-        # Call the function
-        result = get_top_skills_enrollment(filtered_skills)
-
-        # Reset the index for the result
-        result = result.reset_index(drop=True)
-
-        # Assert the result
-        pandas.testing.assert_frame_equal(result, expected_result)
-
-    def test_get_top_skills_completion(self):
-        """
-        Validate the get_top_skills_completion function.
-        """
-        # Mock skills data
-        skills = pandas.DataFrame({
-            'skill_name': ['Skill A', 'Skill B', 'Skill C', 'Skill D'],
-            'primary_subject_name': ['communication', 'engineering', 'communication', 'other'],
-            'enrolls': [100, 200, 150, 300],
-            'completions': [50, 100, 75, 150],
-            'date': [datetime.now(), datetime.now(), datetime.now(), datetime.now()]
-        })
-
-        # Define the expected result
-        expected_result = pandas.DataFrame({
-            'skill_name': ['Skill A', 'Skill C', 'Skill B', 'Skill D'],
-            'primary_subject_name': ['communication', 'communication', 'engineering', 'other'],
-            'count': [50, 75, 100, 150]
-        })
-        # Reset the index for the expected result
-        expected_result = expected_result.reset_index(drop=True)
-        start_date = datetime.now() - timedelta(days=10)
-        end_date = datetime.now()
-        filtered_skills = date_filter(start_date, end_date, skills, 'date')
-
-        # Call the function
-        result = get_top_skills_completion(filtered_skills)
-
-        # Reset the index for the result
-        result = result.reset_index(drop=True)
-
-        # Assert the result
-        pandas.testing.assert_frame_equal(result, expected_result)

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

@@ -3,7 +3,6 @@ Test cases for enterprise_admin views
 """
 from datetime import datetime
 from unittest import mock
-from uuid import uuid4
 
 import ddt
 from mock import patch
@@ -16,13 +15,13 @@ 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_enrollments_data,
-    get_dummy_enterprise_api_data,
-    get_dummy_skills_data,
+from enterprise_data.tests.admin_analytics.mock_analytics_data import (
+    TOP_SKILLS,
+    TOP_SKILLS_BY_COMPLETIONS,
+    TOP_SKILLS_BY_ENROLLMENTS,
 )
+from enterprise_data.tests.mixins import JWTTestMixin
+from enterprise_data.tests.test_utils import UserFactory, get_dummy_enterprise_api_data
 from enterprise_data_roles.constants import ENTERPRISE_DATA_ADMIN_ROLE
 from enterprise_data_roles.models import EnterpriseDataFeatureRole, EnterpriseDataRoleAssignment
 
@@ -108,51 +107,141 @@ class TestEnterpriseAdminAnalyticsAggregatesView(JWTTestMixin, APITransactionTes
 
 
 @ddt.ddt
-@mark.django_db
-class TestEnterpriseAdminAnalyticsSkillsView(JWTTestMixin, APITransactionTestCase):
-    """
-    Tests for EnterpriseAdminAnalyticsSkillsView.
-    """
+class TestSkillsStatsAPI(JWTTestMixin, APITransactionTestCase):
+    """Tests for EnterpriseAdminAnalyticsSkillsView."""
 
     def setUp(self):
         """
         Setup method.
         """
         super().setUp()
-        self.user = UserFactory()
-        self.enterprise_id = uuid4()
-        self.set_jwt_cookie(context=f'{self.enterprise_id}')
+        self.user = UserFactory(is_staff=True)
+        role, __ = EnterpriseDataFeatureRole.objects.get_or_create(
+            name=ENTERPRISE_DATA_ADMIN_ROLE
+        )
+        self.role_assignment = EnterpriseDataRoleAssignment.objects.create(
+            role=role, user=self.user
+        )
+        self.client.force_authenticate(user=self.user)
 
-    def _mock_run_query(self, query):
+        self.enterprise_uuid = "ee5e6b3a069a4947bb8dd2dbc323396c"
+        self.set_jwt_cookie()
+
+        self.url = reverse(
+            "v1:enterprise-admin-analytics-skills",
+            kwargs={"enterprise_id": self.enterprise_uuid},
+        )
+
+    @patch('enterprise_data.api.v1.views.enterprise_admin.FactEnrollmentAdminDashTable.get_enrollment_date_range')
+    @patch('enterprise_data.api.v1.views.enterprise_admin.SkillsDailyRollupAdminDashTable.get_top_skills')
+    @patch('enterprise_data.api.v1.views.enterprise_admin.SkillsDailyRollupAdminDashTable.get_top_skills_by_enrollment')
+    @patch('enterprise_data.api.v1.views.enterprise_admin.SkillsDailyRollupAdminDashTable.get_top_skills_by_completion')
+    def test_get(
+        self,
+        mock_get_top_skills_by_completion,
+        mock_get_top_skills_by_enrollment,
+        mock_get_top_skills,
+        mock_get_enrollment_date_range
+    ):
         """
-        mock implementation of run_query.
+        Test the GET method for the EnterpriseAdminAnalyticsSkillsView works.
         """
-        if 'skills_daily_rollup_admin_dash' in query:
-            return [
-                list(item.values()) for item in get_dummy_skills_data(self.enterprise_id)
-            ]
-        elif '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_skills_data(self.enterprise_id)
-            ]
-
-    def test_get_admin_analytics_skills(self):
+        mock_get_enrollment_date_range.return_value = ("2020-04-03", "2024-07-04")
+        mock_get_top_skills.return_value = TOP_SKILLS
+        mock_get_top_skills_by_enrollment.return_value = TOP_SKILLS_BY_ENROLLMENTS
+        mock_get_top_skills_by_completion.return_value = TOP_SKILLS_BY_COMPLETIONS
+
+        response = self.client.get(self.url)
+        assert response.status_code == status.HTTP_200_OK
+        data = response.json()
+        assert data == {
+            "top_skills": [
+                {
+                    "skill_name": "Python (Programming Language)",
+                    "skill_type": "Specialized Skill",
+                    "enrolls": 19027.0,
+                    "completions": 3004.0,
+                },
+                {
+                    "skill_name": "Data Science",
+                    "skill_type": "Specialized Skill",
+                    "enrolls": 13756.0,
+                    "completions": 1517.0,
+                },
+                {
+                    "skill_name": "Algorithms",
+                    "skill_type": "Specialized Skill",
+                    "enrolls": 12776.0,
+                    "completions": 1640.0,
+                },
+            ],
+            "top_skills_by_enrollments": [
+                {
+                    "skill_name": "Python (Programming Language)",
+                    "subject_name": "business-management",
+                    "count": 313.0,
+                },
+                {
+                    "skill_name": "Machine Learning",
+                    "subject_name": "business-management",
+                    "count": 442.0,
+                },
+                {
+                    "skill_name": "Computer Science",
+                    "subject_name": "business-management",
+                    "count": 39.0,
+                },
+            ],
+            "top_skills_by_completions": [
+                {
+                    "skill_name": "Python (Programming Language)",
+                    "subject_name": "business-management",
+                    "count": 21.0,
+                },
+                {
+                    "skill_name": "SQL (Programming Language)",
+                    "subject_name": "business-management",
+                    "count": 11.0,
+                },
+                {
+                    "skill_name": "Algorithms",
+                    "subject_name": "business-management",
+                    "count": 15.0,
+                },
+            ],
+        }
+
+    @ddt.data(
+        {
+            "params": {"start_date": 1},
+            "error": {
+                "start_date": [
+                    "Date has wrong format. Use one of these formats instead: YYYY-MM-DD."
+                ]
+            },
+        },
+        {
+            "params": {"end_date": 2},
+            "error": {
+                "end_date": [
+                    "Date has wrong format. Use one of these formats instead: YYYY-MM-DD."
+                ]
+            },
+        },
+        {
+            "params": {"start_date": "2024-01-01", "end_date": "2023-01-01"},
+            "error": {
+                "non_field_errors": [
+                    "start_date should be less than or equal to end_date."
+                ]
+            },
+        },
+    )
+    @ddt.unpack
+    def test_get_invalid_query_params(self, params, error):
         """
-        Test to get admin analytics skills.
+        Test the GET method return correct error if any query param value is incorrect.
         """
-        params = {'start_date': '2021-01-01', 'end_date': '2025-12-31'}
-        url = reverse('v1:enterprise-admin-analytics-skills', 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, params)
-            assert response.status_code == status.HTTP_200_OK
-            data = response.json()
-            assert 'top_skills' in data
-            assert 'top_skills_by_enrollments' in data
-            assert 'top_skills_by_completions' in data
-            assert len(data['top_skills']) == 10
-            assert len(data['top_skills_by_enrollments']) == 10
-            assert len(data['top_skills_by_completions']) == 10
+        response = self.client.get(self.url, params)
+        assert response.status_code == status.HTTP_400_BAD_REQUEST
+        assert response.json() == error