edx-enterprise-data 8.8.0__py3-none-any.whl → 8.8.1__py3-none-any.whl

{edx_enterprise_data-8.8.0.dist-info → edx_enterprise_data-8.8.1.dist-info}/METADATA

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

{edx_enterprise_data-8.8.0.dist-info → edx_enterprise_data-8.8.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-enterprise_data/__init__.py,sha256=RrNn-g6Sr1lxlOQ0yApeFQ3jHDqC66CWjYalcIXFhF0,123
+enterprise_data/__init__.py,sha256=SFfjo0qp4b4IjWzit7qM4Eib5E1or2vxpohALjmvTNM,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
@@ -8,13 +8,13 @@ enterprise_data/paginators.py,sha256=YPrC5TeXFt-ymenT2H8H2nCbDCnAzJQlH9kFPElRxWE
 enterprise_data/renderers.py,sha256=9gIzavWspZTk4vDfVKXJtdn0tSZ2xNgkF-Akf7AWIDM,2389
 enterprise_data/signals.py,sha256=8eqNPnlvmfsKf19lGWv5xTIuBgQIqR8EZSp9UYzC8Rc,1024
 enterprise_data/urls.py,sha256=bqtKF5OEWEwrNmHG3os-pZNuNsmjlhxEqp7yM4TbPf4,243
-enterprise_data/utils.py,sha256=kNO4nW_GBpBiIBlVUkCb4Xo0k1oVshT8nDOBP5eWoV8,2643
+enterprise_data/utils.py,sha256=KykylyK9KTauj239-_V5w5iQHQBhFF3iuY3Df7p6Q5E,3017
 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=aHDgTHdsjbKNpgtNLDsl4giqhhrRkCGi72ysGIEk0Ao,817
-enterprise_data/admin_analytics/data_loaders.py,sha256=x1XNYdtJV1G9cv0SeBZqYitRV8-GlJXtEZ2cc2OJU7M,5415
+enterprise_data/admin_analytics/data_loaders.py,sha256=YpSyygATVFtItcWlkIHvjsX5Lh1qMw6onDK-ZHP_AUw,5586
 enterprise_data/admin_analytics/database.py,sha256=mNS_9xE5h6O7oMMzr6kr6LDTTSNvKzo8vaM-YG8tOd8,1312
-enterprise_data/admin_analytics/utils.py,sha256=Bq5Vur5_DQbVoVPs7tUBPgW1xrPbhZYUffJaqe8zBmE,11948
+enterprise_data/admin_analytics/utils.py,sha256=CQuTlg36AALJiopp4us-JN8oTXsw-jDXSJenbphLDME,12270
 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
@@ -26,11 +26,11 @@ enterprise_data/api/v1/paginators.py,sha256=f0xsilLaU94jSBltJk46tR1rLEIt7YrqSzMA
 enterprise_data/api/v1/serializers.py,sha256=9F2LGa8IKvglgeYNHw3Q0eEZUWknwHZMNZOdpDviEo4,12327
 enterprise_data/api/v1/urls.py,sha256=xFsBf3TTsdblFAiHq1Bj3h82Ye1PS3cgqLC0pIso2js,3504
 enterprise_data/api/v1/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-enterprise_data/api/v1/views/analytics_enrollments.py,sha256=IRViGbPj8PjWRxnJ8ScfDVt8kfj03LG0veErDGLrKlY,15842
-enterprise_data/api/v1/views/analytics_leaderboard.py,sha256=oSww7866o1DdPIQU7J2sfXpbqqAgkqfC30cr7OI5C7w,5257
+enterprise_data/api/v1/views/analytics_enrollments.py,sha256=om8i5HTDxDMSny1fy49Wh38LdYLLz-k-oFQJqlQLOxg,16812
+enterprise_data/api/v1/views/analytics_leaderboard.py,sha256=EE34fJWYp8OGbIj8oRLlgMhbSm37w98oPXn1aPIZWWE,5860
 enterprise_data/api/v1/views/base.py,sha256=FTAxlz5EzvAY657wzVgzhJPFSCHHzct7IDcvm71Smt8,866
-enterprise_data/api/v1/views/enterprise_admin.py,sha256=7f1RHlXxmH8oLr0WLxdGPNsxdhjubwyqNIefb7PMH68,9149
-enterprise_data/api/v1/views/enterprise_completions.py,sha256=Tpj0Q3tdwFGtRPGNdmcr2_mKxxA90HvROEfPw79l_Gc,7433
+enterprise_data/api/v1/views/enterprise_admin.py,sha256=F34FbOz1gLwHPUAQOg3mOjZoKirbCRrjZS2xFJSUBpw,9274
+enterprise_data/api/v1/views/enterprise_completions.py,sha256=OkH6eYNql6UGVU-Xjx7PzwzaHeUHfa6e4WJmkUoHGDM,8221
 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
@@ -104,7 +104,7 @@ 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=WO4JtnNaiMtnu-Bj59ejad-eoYUBeA90Kz26UqfS3yE,17695
+enterprise_data/tests/admin_analytics/mock_analytics_data.py,sha256=mLGTIP89VAQgqKtYlYnKUAKyZATzKnBtI_5aJwMmr7Q,18344
 enterprise_data/tests/admin_analytics/mock_enrollments.py,sha256=LfuMo9Kn-OQD4z42G3BRuM5MXUUXXlaAMhTqfJf46XE,7266
 enterprise_data/tests/admin_analytics/test_analytics_enrollments.py,sha256=UdKRkP6BNbsSo-gm0YCoddT-ReUMI1x9E6HNLSHT7pY,15177
 enterprise_data/tests/admin_analytics/test_analytics_leaderboard.py,sha256=VSEyDAHfWBJvqmx9yzd4NnPAqK3TqaKrMBWswMAdzfU,6206
@@ -159,8 +159,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.8.0.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-edx_enterprise_data-8.8.0.dist-info/METADATA,sha256=8aDZ6UZXhRF0ZL2ZO0CULCGKUvQYW8dTR-bW1TYM5P0,1569
-edx_enterprise_data-8.8.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-edx_enterprise_data-8.8.0.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
-edx_enterprise_data-8.8.0.dist-info/RECORD,,
+edx_enterprise_data-8.8.1.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+edx_enterprise_data-8.8.1.dist-info/METADATA,sha256=hQ_trgT7XN1RJtLpZUIF33MB0ycCnKRAf1aOKxatsWw,1569
+edx_enterprise_data-8.8.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+edx_enterprise_data-8.8.1.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
+edx_enterprise_data-8.8.1.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.8.0"
+__version__ = "8.8.1"

enterprise_data/admin_analytics/data_loaders.py

@@ -7,6 +7,7 @@ import pandas
 from django.http import Http404
 
 from enterprise_data.admin_analytics.database import run_query
+from enterprise_data.utils import timer
 
 
 def get_select_query(table: str, columns: list, enterprise_uuid: str) -> str:
@@ -65,7 +66,8 @@ def fetch_enrollment_data(enterprise_uuid: str):
         enterprise_uuid=enterprise_uuid,
     )
 
-    results = run_query(query=query)
+    with timer('fetch_enrollment_data'):
+        results = run_query(query=query)
     if not results:
         raise Http404(f'No enrollment data found for enterprise {enterprise_uuid}')
 
@@ -113,7 +115,8 @@ def fetch_engagement_data(enterprise_uuid: str):
         table='fact_enrollment_engagement_day_admin_dash', columns=columns, enterprise_uuid=enterprise_uuid
     )
 
-    results = run_query(query=query)
+    with timer('fetch_engagement_data'):
+        results = run_query(query=query)
     if not results:
         raise Http404(f'No engagement data found for enterprise {enterprise_uuid}')
 
@@ -171,7 +174,8 @@ def fetch_skills_data(enterprise_uuid: str):
         table='skills_daily_rollup_admin_dash', columns=cols, enterprise_uuid=enterprise_uuid
     )
 
-    skills = run_query(query=query)
+    with timer('fetch_skills_data'):
+        skills = run_query(query=query)
 
     if not skills:
         raise Http404(f'No skills data found for enterprise {enterprise_uuid}')

enterprise_data/admin_analytics/utils.py

@@ -3,6 +3,7 @@ Utility functions for fetching data from the database.
 """
 from datetime import datetime, timedelta
 from enum import Enum
+from logging import getLogger
 
 from edx_django_utils.cache import TieredCache, get_cache_key
 
@@ -15,6 +16,8 @@ from enterprise_data.admin_analytics.data_loaders import (
 )
 from enterprise_data.utils import date_filter, primary_subject_truncate
 
+LOGGER = getLogger(__name__)
+
 
 class ChartType(Enum):
     """
@@ -144,6 +147,7 @@ def fetch_and_cache_enrollments_data(enterprise_id, cache_expiry):
     cached_response = TieredCache.get_cached_response(cache_key)
 
     if cached_response.is_found:
+        LOGGER.info(f"Enrollments data found in cache for Enterprise [{enterprise_id}]")
         return cached_response.value
     else:
         enrollments = fetch_enrollment_data(enterprise_id)
@@ -171,6 +175,7 @@ def fetch_and_cache_engagements_data(enterprise_id, cache_expiry):
     cached_response = TieredCache.get_cached_response(cache_key)
 
     if cached_response.is_found:
+        LOGGER.info(f"Engagements data found in cache for Enterprise [{enterprise_id}]")
         return cached_response.value
     else:
         engagements = fetch_engagement_data(enterprise_id)
@@ -198,6 +203,7 @@ def fetch_and_cache_skills_data(enterprise_id, cache_expiry):
     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)

enterprise_data/api/v1/views/analytics_enrollments.py

@@ -1,5 +1,6 @@
 """Advance Analytics for Enrollments"""
 from datetime import datetime
+from logging import getLogger
 
 from edx_rbac.decorators import permission_required
 from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
@@ -21,7 +22,9 @@ from enterprise_data.api.v1.serializers import (
     AdvanceAnalyticsQueryParamSerializer,
 )
 from enterprise_data.renderers import IndividualEnrollmentsCSVRenderer
-from enterprise_data.utils import date_filter
+from enterprise_data.utils import date_filter, timer
+
+LOGGER = getLogger(__name__)
 
 
 class AdvanceAnalyticsIndividualEnrollmentsView(APIView):
@@ -46,6 +49,13 @@ class AdvanceAnalyticsIndividualEnrollmentsView(APIView):
         end_date = serializer.data.get('end_date', datetime.now())
         response_type = request.query_params.get('response_type', ResponseType.JSON.value)
 
+        LOGGER.info(
+            "Individual enrollments data requested for enterprise [%s] from [%s] to [%s]",
+            enterprise_uuid,
+            start_date,
+            end_date,
+        )
+
         # filter enrollments by date
         enrollments = date_filter(start_date, end_date, enrollments_df, "enterprise_enrollment_date")
 
@@ -62,6 +72,13 @@ class AdvanceAnalyticsIndividualEnrollmentsView(APIView):
         enrollments["enterprise_enrollment_date"] = enrollments["enterprise_enrollment_date"].dt.date
         enrollments = enrollments.sort_values(by="enterprise_enrollment_date", ascending=False).reset_index(drop=True)
 
+        LOGGER.info(
+            "Individual enrollments data prepared for enterprise [%s] from [%s] to [%s]",
+            enterprise_uuid,
+            start_date,
+            end_date,
+        )
+
         if response_type == ResponseType.CSV.value:
             filename = f"""individual_enrollments, {start_date} - {end_date}.csv"""
             return StreamingHttpResponse(
@@ -112,49 +129,55 @@ class AdvanceAnalyticsEnrollmentStatsView(APIView):
         response_type = serializer.data.get('response_type', ResponseType.JSON.value)
         chart_type = serializer.data.get('chart_type')
 
+        # TODO: Add validation that if response_type is CSV then chart_type must be provided
+
         if response_type == ResponseType.JSON.value:
-            data = {
-                "enrollments_over_time": self.construct_enrollments_over_time(
-                    enrollments_df.copy(),
-                    start_date,
-                    end_date,
-                    granularity,
-                    calculation,
-                ),
-                "top_courses_by_enrollments": self.construct_top_courses_by_enrollments(
-                    enrollments_df.copy(),
-                    start_date,
-                    end_date,
-                ),
-                "top_subjects_by_enrollments": self.construct_top_subjects_by_enrollments(
-                    enrollments_df.copy(),
-                    start_date,
-                    end_date,
-                ),
-            }
+            with timer('construct_enrollment_all_stats'):
+                data = {
+                    "enrollments_over_time": self.construct_enrollments_over_time(
+                        enrollments_df.copy(),
+                        start_date,
+                        end_date,
+                        granularity,
+                        calculation,
+                    ),
+                    "top_courses_by_enrollments": self.construct_top_courses_by_enrollments(
+                        enrollments_df.copy(),
+                        start_date,
+                        end_date,
+                    ),
+                    "top_subjects_by_enrollments": self.construct_top_subjects_by_enrollments(
+                        enrollments_df.copy(),
+                        start_date,
+                        end_date,
+                    ),
+                }
             return Response(data)
 
         if response_type == ResponseType.CSV.value:
             if chart_type == EnrollmentChart.ENROLLMENTS_OVER_TIME.value:
-                return self.construct_enrollments_over_time_csv(
-                    enrollments_df.copy(),
-                    start_date,
-                    end_date,
-                    granularity,
-                    calculation,
-                )
+                with timer('construct_enrollments_over_time_csv'):
+                    return self.construct_enrollments_over_time_csv(
+                        enrollments_df.copy(),
+                        start_date,
+                        end_date,
+                        granularity,
+                        calculation,
+                    )
             elif chart_type == EnrollmentChart.TOP_COURSES_BY_ENROLLMENTS.value:
-                return self.construct_top_courses_by_enrollments_csv(
-                    enrollments_df.copy(),
-                    start_date,
-                    end_date,
-                )
+                with timer('construct_top_courses_by_enrollments_csv'):
+                    return self.construct_top_courses_by_enrollments_csv(
+                        enrollments_df.copy(),
+                        start_date,
+                        end_date,
+                    )
             elif chart_type == EnrollmentChart.TOP_SUBJECTS_BY_ENROLLMENTS.value:
-                return self.construct_top_subjects_by_enrollments_csv(
-                    enrollments_df.copy(),
-                    start_date,
-                    end_date,
-                )
+                with timer('construct_top_subjects_by_enrollments_csv'):
+                    return self.construct_top_subjects_by_enrollments_csv(
+                        enrollments_df.copy(),
+                        start_date,
+                        end_date,
+                    )
 
     def enrollments_over_time_common(self, enrollments_df, start_date, end_date, granularity, calculation):
         """

enterprise_data/api/v1/views/analytics_leaderboard.py

@@ -1,5 +1,6 @@
 """Advance Analytics for Leaderboard"""
 from datetime import datetime
+from logging import getLogger
 
 import numpy as np
 import pandas as pd
@@ -21,6 +22,8 @@ from enterprise_data.api.v1.serializers import AdvanceAnalyticsQueryParamSeriali
 from enterprise_data.renderers import LeaderboardCSVRenderer
 from enterprise_data.utils import date_filter
 
+LOGGER = getLogger(__name__)
+
 
 class AdvanceAnalyticsLeaderboardView(APIView):
     """
@@ -46,6 +49,13 @@ class AdvanceAnalyticsLeaderboardView(APIView):
         end_date = serializer.data.get('end_date', datetime.now())
         response_type = serializer.data.get('response_type', ResponseType.JSON.value)
 
+        LOGGER.info(
+            "Leaderboard data requested for enterprise [%s] from [%s] to [%s]",
+            enterprise_uuid,
+            start_date,
+            end_date,
+        )
+
         # only include learners who have passed the course
         enrollments_df = enrollments_df[enrollments_df["has_passed"] == 1]
 
@@ -67,8 +77,12 @@ class AdvanceAnalyticsLeaderboardView(APIView):
         engage["learning_time_hours"] = round(
             engage["learning_time_seconds"].astype("float") / 60 / 60, 1
         )
-        engage["average_session_length"] = round(
-            engage["learning_time_hours"] / engage["daily_sessions"].astype("float"), 1
+
+        # if daily_sessions is 0, set average_session_length to 0 becuase otherwise it will be `inf`
+        engage["average_session_length"] = np.where(
+            engage["daily_sessions"] == 0,
+            0,
+            round(engage["learning_time_hours"] / engage["daily_sessions"].astype("float"), 1)
         )
 
         leaderboard_df = engage.merge(completions, on="email", how="left")
@@ -85,6 +99,13 @@ class AdvanceAnalyticsLeaderboardView(APIView):
         # convert `nan` values to `None` because `nan` is not JSON serializable
         leaderboard_df = leaderboard_df.replace(np.nan, None)
 
+        LOGGER.info(
+            "Leaderboard data prepared for enterprise [%s] from [%s] to [%s]",
+            enterprise_uuid,
+            start_date,
+            end_date,
+        )
+
         if response_type == ResponseType.CSV.value:
             filename = f"""Leaderboard, {start_date} - {end_date}.csv"""
             leaderboard_df = leaderboard_df[

enterprise_data/api/v1/views/enterprise_admin.py

@@ -27,7 +27,7 @@ from enterprise_data.models import (
     EnterpriseAdminSummarizeInsights,
     EnterpriseExecEdLCModulePerformance,
 )
-from enterprise_data.utils import date_filter
+from enterprise_data.utils import date_filter, timer
 
 from .base import EnterpriseViewSetMixin
 
@@ -211,24 +211,25 @@ class EnterpriseAdminAnalyticsSkillsView(APIView):
             csv_data.to_csv(path_or_buf=response, index=False)
             return response
 
-        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,
-        )
-        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('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,
+            )
+            top_skills_by_completions = get_skills_chart_data(
+                chart_type=ChartType.TOP_SKILLS_COMPLETION,
+                start_date=start_date,
+                end_date=end_date,
+                skills=skills,
+            )
 
         response_data = {
             "top_skills": top_skills.to_dict(orient="records"),

enterprise_data/api/v1/views/enterprise_completions.py

@@ -1,6 +1,7 @@
 """Views for enterprise admin completions analytics."""
 import datetime
 from datetime import datetime, timedelta
+from logging import getLogger
 
 from edx_rbac.decorators import permission_required
 from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
@@ -23,7 +24,9 @@ from enterprise_data.admin_analytics.data_loaders import fetch_max_enrollment_da
 from enterprise_data.admin_analytics.utils import ChartType, fetch_and_cache_enrollments_data
 from enterprise_data.api.v1 import serializers
 from enterprise_data.api.v1.paginators import AdvanceAnalyticsPagination
-from enterprise_data.utils import date_filter
+from enterprise_data.utils import date_filter, timer
+
+LOGGER = getLogger(__name__)
 
 
 class EnterrpiseAdminCompletionsStatsView(APIView):
@@ -67,39 +70,43 @@ class EnterrpiseAdminCompletionsStatsView(APIView):
             csv_data = {}
 
             if chart_type == ChartType.COMPLETIONS_OVER_TIME.value:
-                csv_data = get_csv_data_for_completions_over_time(
-                    start_date=start_date,
-                    end_date=end_date,
-                    enrollments=enrollments.copy(),
-                    date_agg=serializer.data.get('granularity', Granularity.DAILY.value),
-                    calc=serializer.data.get('calculation', Calculation.TOTAL.value),
-                )
+                with timer('completions_over_time_csv_data'):
+                    csv_data = get_csv_data_for_completions_over_time(
+                        start_date=start_date,
+                        end_date=end_date,
+                        enrollments=enrollments.copy(),
+                        date_agg=serializer.data.get('granularity', Granularity.DAILY.value),
+                        calc=serializer.data.get('calculation', Calculation.TOTAL.value),
+                    )
             elif chart_type == ChartType.TOP_COURSES_BY_COMPLETIONS.value:
-                csv_data = get_csv_data_for_top_courses_by_completions(
-                    start_date=start_date, end_date=end_date, enrollments=enrollments.copy()
-                )
+                with timer('top_courses_by_completions_csv_data'):
+                    csv_data = get_csv_data_for_top_courses_by_completions(
+                        start_date=start_date, end_date=end_date, enrollments=enrollments.copy()
+                    )
             elif chart_type == ChartType.TOP_SUBJECTS_BY_COMPLETIONS.value:
-                csv_data = get_csv_data_for_top_subjects_by_completions(
-                    start_date=start_date, end_date=end_date, enrollments=enrollments.copy()
-                )
+                with timer('top_subjects_by_completions_csv_data'):
+                    csv_data = get_csv_data_for_top_subjects_by_completions(
+                        start_date=start_date, end_date=end_date, enrollments=enrollments.copy()
+                    )
             filename = csv_data['filename']
             response['Content-Disposition'] = f'attachment; filename="{filename}"'
             csv_data['data'].to_csv(path_or_buf=response)
             return response
 
-        completions_over_time = get_completions_over_time(
-            start_date=start_date,
-            end_date=end_date,
-            dff=enrollments.copy(),
-            date_agg=serializer.data.get('granularity', Granularity.DAILY.value),
-            calc=serializer.data.get('calculation', Calculation.TOTAL.value),
-        )
-        top_courses_by_completions = get_top_courses_by_completions(
-            start_date=start_date, end_date=end_date, dff=enrollments.copy()
-        )
-        top_subjects_by_completions = get_top_subjects_by_completions(
-            start_date=start_date, end_date=end_date, dff=enrollments.copy()
-        )
+        with timer('completions_all_charts_data'):
+            completions_over_time = get_completions_over_time(
+                start_date=start_date,
+                end_date=end_date,
+                dff=enrollments.copy(),
+                date_agg=serializer.data.get('granularity', Granularity.DAILY.value),
+                calc=serializer.data.get('calculation', Calculation.TOTAL.value),
+            )
+            top_courses_by_completions = get_top_courses_by_completions(
+                start_date=start_date, end_date=end_date, dff=enrollments.copy()
+            )
+            top_subjects_by_completions = get_top_subjects_by_completions(
+                start_date=start_date, end_date=end_date, dff=enrollments.copy()
+            )
 
         return Response(
             data={
@@ -153,6 +160,13 @@ class EnterrpiseAdminCompletionsView(APIView):
         )
         end_date = serializer.data.get('end_date', datetime.now())
 
+        LOGGER.info(
+            "Completions data requested for enterprise [%s] from [%s] to [%s]",
+            enterprise_id,
+            start_date,
+            end_date,
+        )
+
         dff = enrollments[enrollments['has_passed'] == 1]
 
         # Date filtering
@@ -162,6 +176,13 @@ class EnterrpiseAdminCompletionsView(APIView):
         dff['passed_date'] = dff['passed_date'].dt.date
         dff = dff.sort_values(by="passed_date", ascending=False).reset_index(drop=True)
 
+        LOGGER.info(
+            "Completions data prepared for enterprise [%s] from [%s] to [%s]",
+            enterprise_id,
+            start_date,
+            end_date,
+        )
+
         if serializer.data.get('response_type') == 'csv':
             response = HttpResponse(content_type='text/csv')
             filename = f"Individual Completions, {start_date} - {end_date}.csv"

enterprise_data/tests/admin_analytics/mock_analytics_data.py

@@ -374,14 +374,24 @@ def enrollments_csv_content():
 
 def leaderboard_csv_content():
     """Return the CSV content of leaderboard."""
+    # return (
+    #     b'email,learning_time_hours,daily_sessions,average_session_length,course_completions\r\n'
+    #     b'paul77@example.org,4.4,1,4.4,\r\nseth57@example.org,2.7,1,2.7,\r\n'
+    #     b'weaverpatricia@example.net,2.6,1,2.6,\r\nwebertodd@example.com,1.5,1,1.5,\r\n'
+    #     b'yferguson@example.net,1.3,1,1.3,\r\nyallison@example.org,1.2,1,1.2,\r\n'
+    #     b'padillamichelle@example.org,1.0,1,1.0,\r\ncaseyjohnny@example.com,0.0,0,,\r\n'
+    #     b'crystal86@example.net,0.0,0,,\r\ngraceperez@example.com,0.0,0,,\r\n'
+    #     b'mackwilliam@example.com,0.0,0,,\r\nsamanthaclarke@example.org,0.0,0,,\r\n'
+    # )
+
     return (
         b'email,learning_time_hours,daily_sessions,average_session_length,course_completions\r\n'
         b'paul77@example.org,4.4,1,4.4,\r\nseth57@example.org,2.7,1,2.7,\r\n'
         b'weaverpatricia@example.net,2.6,1,2.6,\r\nwebertodd@example.com,1.5,1,1.5,\r\n'
         b'yferguson@example.net,1.3,1,1.3,\r\nyallison@example.org,1.2,1,1.2,\r\n'
-        b'padillamichelle@example.org,1.0,1,1.0,\r\ncaseyjohnny@example.com,0.0,0,,\r\n'
-        b'crystal86@example.net,0.0,0,,\r\ngraceperez@example.com,0.0,0,,\r\n'
-        b'mackwilliam@example.com,0.0,0,,\r\nsamanthaclarke@example.org,0.0,0,,\r\n'
+        b'padillamichelle@example.org,1.0,1,1.0,\r\ncaseyjohnny@example.com,0.0,0,0.0,\r\n'
+        b'crystal86@example.net,0.0,0,0.0,\r\ngraceperez@example.com,0.0,0,0.0,\r\n'
+        b'mackwilliam@example.com,0.0,0,0.0,\r\nsamanthaclarke@example.org,0.0,0,0.0,\r\n'
     )
 
 
@@ -447,7 +457,7 @@ LEADERBOARD_RESPONSE = [
         "daily_sessions": 0,
         "learning_time_seconds": 0,
         "learning_time_hours": 0.0,
-        "average_session_length": None,
+        "average_session_length": 0.0,
         "course_completions": None,
     },
     {
@@ -455,7 +465,7 @@ LEADERBOARD_RESPONSE = [
         "daily_sessions": 0,
         "learning_time_seconds": 0,
         "learning_time_hours": 0.0,
-        "average_session_length": None,
+        "average_session_length": 0.0,
         "course_completions": None,
     },
     {
@@ -463,7 +473,7 @@ LEADERBOARD_RESPONSE = [
         "daily_sessions": 0,
         "learning_time_seconds": 21,
         "learning_time_hours": 0.0,
-        "average_session_length": None,
+        "average_session_length": 0.0,
         "course_completions": None,
     },
     {
@@ -471,7 +481,7 @@ LEADERBOARD_RESPONSE = [
         "daily_sessions": 0,
         "learning_time_seconds": 0,
         "learning_time_hours": 0.0,
-        "average_session_length": None,
+        "average_session_length": 0.0,
         "course_completions": None,
     },
     {
@@ -479,7 +489,7 @@ LEADERBOARD_RESPONSE = [
         "daily_sessions": 0,
         "learning_time_seconds": 29,
         "learning_time_hours": 0.0,
-        "average_session_length": None,
+        "average_session_length": 0.0,
         "course_completions": None,
     },
 ]

enterprise_data/utils.py

@@ -4,6 +4,7 @@ Utility functions for Enterprise Data app.
 import hashlib
 import random
 import time
+from contextlib import contextmanager
 from datetime import timedelta
 from functools import wraps
 from logging import getLogger
@@ -68,6 +69,21 @@ def timeit(func):
     return wrapper
 
 
+@contextmanager
+def timer(prefix):
+    """
+    Context manager to measure the time taken by a block of code.
+
+    Arguments:
+        prefix (str): The prefix to print in the log.
+    """
+    start = time.time()
+    yield
+    end = time.time()
+    difference = end - start
+    print(f"TIMER:: {prefix} took {difference:.20f} seconds")
+
+
 def date_filter(start, end, data_frame, date_column):
     """
     Filter a pandas DataFrame by date range.