edx-enterprise-data 10.16.6__py3-none-any.whl → 10.16.9__py3-none-any.whl

{edx_enterprise_data-10.16.6.dist-info → edx_enterprise_data-10.16.9.dist-info}/METADATA

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

{edx_enterprise_data-10.16.6.dist-info → edx_enterprise_data-10.16.9.dist-info}/RECORD

@@ -1,5 +1,5 @@
-edx_enterprise_data-10.16.6.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-enterprise_data/__init__.py,sha256=dZT3Q3ESJQAMbR--mBETUuHta1jjIIigfuOt5mZC_X4,125
+edx_enterprise_data-10.16.9.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+enterprise_data/__init__.py,sha256=TE8afRufNXv1fzM-rmw0xsaobqx-ZirO7GdcVULfGuw,125
 enterprise_data/apps.py,sha256=aF6hZwDfI2oWj95tUTm_2ikHueQj-jLj-u0GrgzpsQI,414
 enterprise_data/clients.py,sha256=glw-fXu3V7rKEpiUBF056gZEdNK4KnWcP9tNYELimRQ,6566
 enterprise_data/constants.py,sha256=uCKjfpdlMYFZJsAj3n9RMw4Cmg5_6s3NuwocO-fch3s,238
@@ -25,7 +25,7 @@ enterprise_data/admin_analytics/database/filters/mixins.py,sha256=FOtOKvcugQC8eo
 enterprise_data/admin_analytics/database/queries/__init__.py,sha256=IC5TLOr_GnydbrVbl2mWhwO3aUbYeHuDmfPTLmwGhZA,218
 enterprise_data/admin_analytics/database/queries/fact_engagement_admin_dash.py,sha256=RejAfiNGr0i3wyNe5bsqFOcdRKCGp-tbqS04ibgLi5I,10393
 enterprise_data/admin_analytics/database/queries/fact_enrollment_admin_dash.py,sha256=n_RiqraVzYvCsgLaPmpSBUX3cyNEHjSnkNH7n35gC80,10609
-enterprise_data/admin_analytics/database/queries/skills_daily_rollup_admin_dash.py,sha256=ZaJPghTrQvBGsFxfpeR8EE45ujtaYI9R_xkoDDqD2So,4269
+enterprise_data/admin_analytics/database/queries/skills_daily_rollup_admin_dash.py,sha256=fn45gYBT1gKcBxUf40Tm8Oy6YB2Un8bnmjSgdKnP630,5149
 enterprise_data/admin_analytics/database/query_filters/__init__.py,sha256=xW9cf5KGpMs33tTlil5gzKq4RxcZVCJZESsrHo2X0E4,182
 enterprise_data/admin_analytics/database/query_filters/base.py,sha256=XZUC1AIaDPBq0cwh2Xn5wp_DZfsD3HnMMvqFUt7iM2E,2205
 enterprise_data/admin_analytics/database/query_filters/between.py,sha256=YvAM4WSJSCHb1nCzeJLwku4zkJKHrqnSrEnl7-xMOoA,924
@@ -35,7 +35,7 @@ enterprise_data/admin_analytics/database/tables/__init__.py,sha256=Z-c3P9hqR-dC9
 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=wAnpNgh1USAQKi86JdEy4KJ_d_IL2fbKKu3ypqi5BCs,15434
 enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py,sha256=BwchyH1VJy8Ie-m_ma3bXiKKkNtJhb8A0u37hjocyiU,17049
-enterprise_data/admin_analytics/database/tables/skills_daily_rollup_admin_dash.py,sha256=3xNwSi0wfCyBHcXPd6-9Ujs1NUm8kmZRg_gPrZzp9nQ,3233
+enterprise_data/admin_analytics/database/tables/skills_daily_rollup_admin_dash.py,sha256=hbxvjrhONXRiR27-NfyM8ldBK0wSU9t7oQuThwaO7UI,5638
 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
@@ -51,7 +51,7 @@ enterprise_data/api/v1/views/analytics_engagements.py,sha256=XHJ_sfGyeamCW4krEaz
 enterprise_data/api/v1/views/analytics_enrollments.py,sha256=_KBo4RhEmfQXcCOgvowD28WCVJwlc4APuCnRDbAYK9E,6563
 enterprise_data/api/v1/views/analytics_leaderboard.py,sha256=3dyo7_OhyGEEeibemBrRsUOo0jbM4LbDgV5gw3YnVig,4186
 enterprise_data/api/v1/views/base.py,sha256=Kkmd5zgEBAhvwS_GoGXSK6lgbDNwSPioYn-QbnizI3w,3416
-enterprise_data/api/v1/views/enterprise_admin.py,sha256=3rmFoRxnnQFoOsHDCt8excTJT84NLlhg4QhpdDJLxOM,9129
+enterprise_data/api/v1/views/enterprise_admin.py,sha256=zlufNTdlb_TxBa_zmMqR1911ussXhUxUfqM5bKq1vTI,9717
 enterprise_data/api/v1/views/enterprise_learner.py,sha256=vRzfaQCEoeq_tEY7KsNZJVzgn7XEWZ1l-n0oUoSVGyU,20093
 enterprise_data/api/v1/views/enterprise_offers.py,sha256=VifxgqTLFLVw4extYPlHcN1N_yjXcsYsAlYEnAbpb10,1266
 enterprise_data/cache/__init__.py,sha256=fiBUploll1kmDy2vCmnNpeZVTD4ewsgtRF14vVs0Rb4,1850
@@ -133,7 +133,7 @@ enterprise_data/tests/test_models.py,sha256=rRFrzjMnnUh1YpVvQMyA1OhFmX6BOCRt28SN
 enterprise_data/tests/test_utils.py,sha256=3sM3YWEoihHupgwhh0NiI66CbcQPLY4I_W0xjbLG0zg,19694
 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=qN73YxoD1kAtKsQo94avR0DGMCsJClrpqFxxYC6reqE,15248
+enterprise_data/tests/admin_analytics/mock_analytics_data.py,sha256=sKduLQq3cJhmxBdg2OCJduYNs46krpdARImRD0yg6qw,15541
 enterprise_data/tests/admin_analytics/mock_enrollments.py,sha256=n67vb0dQVbNaI1PvEPlo8ljkrlQ5RvnHpR2kVuOk1go,4632
 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
@@ -147,7 +147,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=6SXw7LcMaE-M2VSX8PHaWmOHDGXlqbI2ahNHqyBuPOk,11161
+enterprise_data/tests/api/v1/views/test_enterprise_admin.py,sha256=_bDr9o5OWhe-VvhjTa9gMxSlrDXj-jSVYo5yr8fEUZk,11899
 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
@@ -189,7 +189,7 @@ enterprise_reporting/tests/test_send_enterprise_reports.py,sha256=zBj7sDvRLJQbRs
 enterprise_reporting/tests/test_utils.py,sha256=y4t6w9aKra-ftqtUeHvPwOhje-1npz7auV5o74ya8fE,9523
 enterprise_reporting/tests/test_vertica_client.py,sha256=-R2yNCGUjRtoXwLMBloVFQkFYrJoo613VCr61gwI3kQ,140
 enterprise_reporting/tests/utils.py,sha256=xms2LM7DV3wczXEfctOK1ddel1EE0J_YSr17UzbCDy4,1401
-edx_enterprise_data-10.16.6.dist-info/METADATA,sha256=RTQfpbQ_R4r9tnEoCAf6JPPvBzXw3v1_vldc9iJ4hwg,1746
-edx_enterprise_data-10.16.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-edx_enterprise_data-10.16.6.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
-edx_enterprise_data-10.16.6.dist-info/RECORD,,
+edx_enterprise_data-10.16.9.dist-info/METADATA,sha256=dL-d09NGDXjh4ghxY1KkZNZ07jBPeMcC52Q3fF8458k,1746
+edx_enterprise_data-10.16.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+edx_enterprise_data-10.16.9.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
+edx_enterprise_data-10.16.9.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__ = "10.16.6"
+__version__ = "10.16.9"

enterprise_data/admin_analytics/database/queries/skills_daily_rollup_admin_dash.py

@@ -1,6 +1,7 @@
 """
 Module containing queries for the skills_daily_rollup_admin_dash table.
 """
+from ..query_filters import QueryFilters
 
 
 class SkillsDailyRollupAdminDashQueries:
@@ -118,3 +119,31 @@ class SkillsDailyRollupAdminDashQueries:
             ORDER BY
                 total_completion_count DESC;
         """
+
+    @staticmethod
+    def get_skills_by_learning_hours(query_filters: QueryFilters, record_count: int = 25):
+        """
+        Get the query to fetch skills by learning hours for an enterprise customer.
+        """
+        return f"""
+            WITH filtered_data AS (
+                SELECT
+                    skill_name,
+                    total_learning_time_hours
+                FROM
+                    skills_daily_rollup_admin_dash
+                WHERE
+                    {query_filters.to_sql()}
+            )
+
+            SELECT
+                skill_name,
+                SUM(total_learning_time_hours) AS learning_hours
+            FROM
+                filtered_data
+            GROUP BY
+                skill_name
+            ORDER BY
+                learning_hours DESC
+            LIMIT {record_count};
+        """

enterprise_data/admin_analytics/database/tables/skills_daily_rollup_admin_dash.py

@@ -4,15 +4,19 @@ 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.filters.mixins import CommonFiltersMixin
 from enterprise_data.admin_analytics.database.queries.skills_daily_rollup_admin_dash import (
     SkillsDailyRollupAdminDashQueries,
 )
+from enterprise_data.admin_analytics.database.query_filters import EqualQueryFilter
 from enterprise_data.admin_analytics.database.tables.base import BaseTable
 from enterprise_data.admin_analytics.database.utils import run_query
 from enterprise_data.cache.decorators import cache_it
 
+from ..query_filters import QueryFilters
 
-class SkillsDailyRollupAdminDashTable(BaseTable):
+
+class SkillsDailyRollupAdminDashTable(CommonFiltersMixin, BaseTable):
     """
     Class for communicating with the skills_daily_rollup_admin_dash table.
     """
@@ -96,3 +100,68 @@ class SkillsDailyRollupAdminDashTable(BaseTable):
             },
             as_dict=True,
         )
+
+    def get_skills_by_learning_hours(
+        self,
+        enterprise_customer_uuid: UUID,
+        start_date: date,
+        end_date: date,
+        course_key: str = None,
+        course_type: str = None,
+    ):
+        """
+        Get the skills by learning hours 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.
+            course_key (str): The course key to filter by (optional).
+            course_type (str): The course type (OCM or Executive Education) to filter by (optional).
+
+        Returns:
+            list<dict>: A list of dictionaries containing the skill_name, subject_name, count.
+        """
+        optional_params = {}
+        course_key_filter = None
+        course_type_filter = None
+
+        default_params = {
+            'enterprise_customer_uuid': enterprise_customer_uuid,
+            'start_date': start_date,
+            'end_date': end_date,
+        }
+        query_filters = QueryFilters([
+            self.enterprise_customer_uuid_filter('enterprise_customer_uuid'),
+            self.date_range_filter(
+                column='date',
+                start_date_params_key='start_date',
+                end_date_params_key='end_date',
+            ),
+        ])
+
+        if course_key:
+            course_key_filter = EqualQueryFilter(
+                column='course_key',
+                value_placeholder='course_key',
+            )
+
+            optional_params['course_key'] = course_key
+            query_filters.append(course_key_filter)
+
+        if course_type:
+            course_type_filter = EqualQueryFilter(
+                column='course_product_line',
+                value_placeholder='course_type',
+            )
+
+            optional_params['course_type'] = course_type
+            query_filters.append(course_type_filter)
+
+        params = {**default_params, **optional_params}
+
+        return run_query(
+            query=self.queries.get_skills_by_learning_hours(query_filters),
+            params=params,
+            as_dict=True,
+        )

enterprise_data/api/v1/views/enterprise_admin.py

@@ -180,10 +180,24 @@ class EnterpriseAdminAnalyticsSkillsView(APIView):
                 end_date
             )
 
+        # TODO: Handle course_key and course_type when they are provided in the request.
+        #       We have separate tickets to handle this implementation.
+        course_key = None
+        course_type = None
+        with timer('skills_by_learning_hours'):
+            skills_by_learning_hours = SkillsDailyRollupAdminDashTable().get_skills_by_learning_hours(
+                enterprise_id,
+                start_date,
+                end_date,
+                course_key,
+                course_type,
+            )
+
         response_data = {
             "top_skills": skills,
             "top_skills_by_enrollments": top_skills_by_enrollments,
             "top_skills_by_completions": top_skills_by_completions,
+            "skills_by_learning_hours": skills_by_learning_hours,
         }
 
         return Response(data=response_data, status=HTTP_200_OK)

enterprise_data/tests/admin_analytics/mock_analytics_data.py

@@ -470,3 +470,17 @@ TOP_SKILLS_BY_COMPLETIONS = [
         "count": 15.0
     },
 ]
+SKILLS_BY_LEARNING_HOURS = [
+    {
+        "skill_name": "Python (Programming Language)",
+        "learning_hours": 100.0
+    },
+    {
+        "skill_name": "Data Science",
+        "learning_hours": 80.0
+    },
+    {
+        "skill_name": "Algorithms",
+        "learning_hours": 60.0
+    },
+]

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

@@ -16,6 +16,7 @@ from enterprise_data.admin_analytics.database.queries import (
     FactEnrollmentAdminDashQueries,
 )
 from enterprise_data.tests.admin_analytics.mock_analytics_data import (
+    SKILLS_BY_LEARNING_HOURS,
     TOP_SKILLS,
     TOP_SKILLS_BY_COMPLETIONS,
     TOP_SKILLS_BY_ENROLLMENTS,
@@ -137,8 +138,10 @@ class TestSkillsStatsAPI(JWTTestMixin, APITransactionTestCase):
     @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')
+    @patch('enterprise_data.api.v1.views.enterprise_admin.SkillsDailyRollupAdminDashTable.get_skills_by_learning_hours')
     def test_get(
         self,
+        mock_get_skills_by_learning_hours,
         mock_get_top_skills_by_completion,
         mock_get_top_skills_by_enrollment,
         mock_get_top_skills,
@@ -151,6 +154,7 @@ class TestSkillsStatsAPI(JWTTestMixin, APITransactionTestCase):
         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
+        mock_get_skills_by_learning_hours.return_value = SKILLS_BY_LEARNING_HOURS
 
         response = self.client.get(self.url)
         assert response.status_code == status.HTTP_200_OK
@@ -210,6 +214,20 @@ class TestSkillsStatsAPI(JWTTestMixin, APITransactionTestCase):
                     "count": 15.0,
                 },
             ],
+            "skills_by_learning_hours": [
+                {
+                    "skill_name": "Python (Programming Language)",
+                    "learning_hours": 100.0
+                },
+                {
+                    "skill_name": "Data Science",
+                    "learning_hours": 80.0
+                },
+                {
+                    "skill_name": "Algorithms",
+                    "learning_hours": 60.0
+                },
+            ]
         }
 
     @ddt.data(