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

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

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

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

@@ -1,20 +1,20 @@
-enterprise_data/__init__.py,sha256=uaNc7nZk0jrnfiaQzk9MA9gKcNIQ30m99eUJ0R4k1X8,123
+enterprise_data/__init__.py,sha256=RrNn-g6Sr1lxlOQ0yApeFQ3jHDqC66CWjYalcIXFhF0,123
 enterprise_data/apps.py,sha256=aF6hZwDfI2oWj95tUTm_2ikHueQj-jLj-u0GrgzpsQI,414
 enterprise_data/clients.py,sha256=GvQupy5TVYfO_IKC3yzXSAgNP54r-PtIjidM5ws9Iks,3947
 enterprise_data/constants.py,sha256=uCKjfpdlMYFZJsAj3n9RMw4Cmg5_6s3NuwocO-fch3s,238
 enterprise_data/filters.py,sha256=D2EiK12MMpBoz6eOUmTpoJEhj_sH7bA93NRRAdvkDVo,6163
 enterprise_data/models.py,sha256=khGcOh7NWP8KGu84t78Y2zAu3knREeXA_prApmU2NX8,24428
 enterprise_data/paginators.py,sha256=YPrC5TeXFt-ymenT2H8H2nCbDCnAzJQlH9kFPElRxWE,269
-enterprise_data/renderers.py,sha256=eh-FZFbP_yWcfDemavUGB7vYIJA2PjW_dvM79qxYZz8,2085
+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/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=6Gc9rP-J3nGgAk3fhzNlyR1HMq8Apjxs9ViWJiYrri4,722
+enterprise_data/admin_analytics/constants.py,sha256=aHDgTHdsjbKNpgtNLDsl4giqhhrRkCGi72ysGIEk0Ao,817
 enterprise_data/admin_analytics/data_loaders.py,sha256=x1XNYdtJV1G9cv0SeBZqYitRV8-GlJXtEZ2cc2OJU7M,5415
 enterprise_data/admin_analytics/database.py,sha256=mNS_9xE5h6O7oMMzr6kr6LDTTSNvKzo8vaM-YG8tOd8,1312
-enterprise_data/admin_analytics/utils.py,sha256=w1GpdJCvt-ocwwLEaag4YVO5XH31NCvjwAGFYAiwUZE,10213
+enterprise_data/admin_analytics/utils.py,sha256=Bq5Vur5_DQbVoVPs7tUBPgW1xrPbhZYUffJaqe8zBmE,11948
 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
@@ -22,14 +22,15 @@ enterprise_data/api/v0/serializers.py,sha256=dngZTk6DhRxApchQKCMp1B_c8aVnQtH0NCq
 enterprise_data/api/v0/urls.py,sha256=vzJjqIo_S3AXWs9Us8XTaJc3FnxLbYzAkmLyuDQqum0,699
 enterprise_data/api/v0/views.py,sha256=4RslZ4NZOU-844bnebEQ71ji2utRY7jEijqC45oQQD0,14380
 enterprise_data/api/v1/__init__.py,sha256=1aAzAYU5hk-RW6cKUxa1645cbZMxn7GIZ7OMjWc9MKI,46
-enterprise_data/api/v1/paginators.py,sha256=OHbuBP7hAFJ_ce0UAMfJ1pARMMzqvzVYiYeFMw3xZLU,3592
-enterprise_data/api/v1/serializers.py,sha256=SaMFlNRMPIqaKelFZa7nYn3su7DJFS2wJfYZ5sUl_gM,12000
-enterprise_data/api/v1/urls.py,sha256=JLjkMzTiJmHtDjN5_z4hOe0s1ug8Ec3A4Ll1E5pwVmY,3206
+enterprise_data/api/v1/paginators.py,sha256=f0xsilLaU94jSBltJk46tR1rLEIt7YrqSzMAAVtPXjA,3592
+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=SvuK53i_4S3etqktoJ0h5ky4dntD176u6DXZuqHTsEg,16352
+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/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=LGwwCiJSBVhsm52ROIDAJQkLAaj4Wbxh-A-1INfZbOE,7433
+enterprise_data/api/v1/views/enterprise_completions.py,sha256=Tpj0Q3tdwFGtRPGNdmcr2_mKxxA90HvROEfPw79l_Gc,7433
 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
@@ -103,10 +104,12 @@ 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_enrollments.py,sha256=kINSGZx7M3CcsVZ04AZAy4AqNGVbRD47OfI2_3dEVSs,7262
-enterprise_data/tests/admin_analytics/test_analytics_enrollments.py,sha256=WNdJCM52zUJikBTl3VakPIvNiVNvUed-8vk275njSdY,14847
+enterprise_data/tests/admin_analytics/mock_analytics_data.py,sha256=WO4JtnNaiMtnu-Bj59ejad-eoYUBeA90Kz26UqfS3yE,17695
+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
 enterprise_data/tests/admin_analytics/test_data_loaders.py,sha256=o3denJ4aUS1pI5Crksl4C6m-NtCBm8ynoHBnLkf-v2U,4641
-enterprise_data/tests/admin_analytics/test_enterprise_completions.py,sha256=BXptZVfnTReJfMSog-ZMDnoIe6Gh_sX2GDRzyugxSMI,7356
+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/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enterprise_data/tests/api/v0/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -156,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.7.0.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-edx_enterprise_data-8.7.0.dist-info/METADATA,sha256=6ZncVDwM9a49UHdde9Rk1fhjP1BEaradbGjKCHSX_WE,1569
-edx_enterprise_data-8.7.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-edx_enterprise_data-8.7.0.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
-edx_enterprise_data-8.7.0.dist-info/RECORD,,
+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,,

enterprise_data/__init__.py

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

enterprise_data/admin_analytics/constants.py

@@ -3,7 +3,7 @@
 from enum import Enum
 
 
-class GRANULARITY(Enum):
+class Granularity(Enum):
     """Granularity choices"""
     DAILY = 'Daily'
     WEEKLY = 'Weekly'
@@ -11,7 +11,7 @@ class GRANULARITY(Enum):
     QUARTERLY = 'Quarterly'
 
 
-class CALCULATION(Enum):
+class Calculation(Enum):
     """Calculation choices"""
     TOTAL = 'Total'
     RUNNING_TOTAL = 'Running Total'
@@ -19,9 +19,15 @@ class CALCULATION(Enum):
     MOVING_AVERAGE_7_PERIOD = 'Moving Average (7 Period)'
 
 
-class ENROLLMENT_CSV(Enum):
+class EnrollmentChart(Enum):
     """CSV choices"""
     ENROLLMENTS_OVER_TIME = 'enrollments_over_time'
     TOP_COURSES_BY_ENROLLMENTS = 'top_courses_by_enrollments'
     TOP_SUBJECTS_BY_ENROLLMENTS = 'top_subjects_by_enrollments'
     INDIVIDUAL_ENROLLMENTS = 'individual_enrollments'
+
+
+class ResponseType(Enum):
+    """Response type choices"""
+    JSON = 'json'
+    CSV = 'csv'

enterprise_data/admin_analytics/utils.py

@@ -1,13 +1,18 @@
 """
 Utility functions for fetching data from the database.
 """
-from datetime import datetime
+from datetime import datetime, timedelta
 from enum import Enum
 
 from edx_django_utils.cache import TieredCache, get_cache_key
 
-from enterprise_data.admin_analytics.constants import CALCULATION, GRANULARITY
-from enterprise_data.admin_analytics.data_loaders import fetch_engagement_data, fetch_enrollment_data, fetch_skills_data
+from enterprise_data.admin_analytics.constants import Calculation, Granularity
+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
 
 
@@ -23,14 +28,45 @@ class ChartType(Enum):
     TOP_SUBJECTS_BY_COMPLETIONS = 'top_subjects_by_completions'
 
 
+def fetch_enrollments_cache_expiry_timestamp():
+    """Calculate cache expiry timestamp"""
+    # TODO: Implement correct cache expiry logic for `enrollments` data.
+    #       Current cache expiry logic is based on `enterprise_learner_enrollment` table,
+    #       Which has nothing to do with the `enrollments` data. Instead cache expiry should
+    #       be based on `fact_enrollment_admin_dash` table. Currently we have no timestamp in
+    #       `fact_enrollment_admin_dash` table that can be used for cache expiry. Add a new
+    #       column in the table for this purpose and then use that column for cache expiry.
+    last_updated_at = fetch_max_enrollment_datetime()
+    cache_expiry = (
+        last_updated_at + timedelta(days=1) if last_updated_at else datetime.now()
+    )
+    return cache_expiry
+
+
+def fetch_engagements_cache_expiry_timestamp():
+    """Calculate cache expiry timestamp"""
+    # TODO: Implement correct cache expiry logic for `engagements` data.
+    #       Current cache expiry logic is based on `enterprise_learner_enrollment` table,
+    #       Which has nothing to do with the `engagements` data. Instead cache expiry should
+    #       be based on `fact_enrollment_engagement_day_admin_dash` table. Currently we have
+    #       no timestamp in `fact_enrollment_engagement_day_admin_dash` table that can be used
+    #       for cache expiry. Add a new column in the table for this purpose and then use that
+    #       column for cache expiry.
+    last_updated_at = fetch_max_enrollment_datetime()
+    cache_expiry = (
+        last_updated_at + timedelta(days=1) if last_updated_at else datetime.now()
+    )
+    return cache_expiry
+
+
 def granularity_aggregation(level, group, date, data_frame, aggregation_type="count"):
     """Aggregate data based on granularity"""
     df = data_frame
 
     period_mapping = {
-        GRANULARITY.WEEKLY.value: "W",
-        GRANULARITY.MONTHLY.value: "M",
-        GRANULARITY.QUARTERLY.value: "Q"
+        Granularity.WEEKLY.value: "W",
+        Granularity.MONTHLY.value: "M",
+        Granularity.QUARTERLY.value: "Q"
     }
 
     if level in period_mapping:
@@ -52,15 +88,15 @@ def calculation_aggregation(calc, data_frame, aggregation_type="count"):
     df = data_frame
 
     window_mapping = {
-        CALCULATION.MOVING_AVERAGE_3_PERIOD.value: 3,
-        CALCULATION.MOVING_AVERAGE_7_PERIOD.value: 7,
+        Calculation.MOVING_AVERAGE_3_PERIOD.value: 3,
+        Calculation.MOVING_AVERAGE_7_PERIOD.value: 7,
     }
 
     aggregation_column = "count" if aggregation_type == "count" else "sum"
 
-    if calc == CALCULATION.RUNNING_TOTAL.value:
+    if calc == Calculation.RUNNING_TOTAL.value:
         df[aggregation_column] = df.groupby("enroll_type")[aggregation_column].cumsum()
-    elif calc in [CALCULATION.MOVING_AVERAGE_3_PERIOD.value, CALCULATION.MOVING_AVERAGE_7_PERIOD.value]:
+    elif calc in [Calculation.MOVING_AVERAGE_3_PERIOD.value, Calculation.MOVING_AVERAGE_7_PERIOD.value]:
         df[aggregation_column] = (
             df.groupby("enroll_type")[aggregation_column]
             .rolling(window_mapping[calc])

enterprise_data/api/v1/paginators.py

@@ -72,7 +72,7 @@ class AdvanceAnalyticsPagination(PageNumberPagination):
         max_page_size (int): The maximum allowed page size.
     """
     page_size_query_param = "page_size"
-    page_size = 10
+    page_size = 50
     max_page_size = 100
 
     def paginate_queryset(self, queryset, request, view=None):

enterprise_data/api/v1/serializers.py

@@ -5,7 +5,7 @@ from uuid import UUID
 
 from rest_framework import serializers
 
-from enterprise_data.admin_analytics.constants import CALCULATION, ENROLLMENT_CSV, GRANULARITY
+from enterprise_data.admin_analytics.constants import Calculation, EnrollmentChart, Granularity, ResponseType
 from enterprise_data.models import (
     EnterpriseAdminLearnerProgress,
     EnterpriseAdminSummarizeInsights,
@@ -237,23 +237,28 @@ class EnterpriseExecEdLCModulePerformanceSerializer(serializers.ModelSerializer)
 
 class AdvanceAnalyticsQueryParamSerializer(serializers.Serializer):  # pylint: disable=abstract-method
     """Serializer for validating query params"""
+    RESPONSE_TYPES = [
+        ResponseType.JSON.value,
+        ResponseType.CSV.value
+    ]
     GRANULARITY_CHOICES = [
-        GRANULARITY.DAILY.value,
-        GRANULARITY.WEEKLY.value,
-        GRANULARITY.MONTHLY.value,
-        GRANULARITY.QUARTERLY.value
+        Granularity.DAILY.value,
+        Granularity.WEEKLY.value,
+        Granularity.MONTHLY.value,
+        Granularity.QUARTERLY.value
     ]
     CALCULATION_CHOICES = [
-        CALCULATION.TOTAL.value,
-        CALCULATION.RUNNING_TOTAL.value,
-        CALCULATION.MOVING_AVERAGE_3_PERIOD.value,
-        CALCULATION.MOVING_AVERAGE_7_PERIOD.value
+        Calculation.TOTAL.value,
+        Calculation.RUNNING_TOTAL.value,
+        Calculation.MOVING_AVERAGE_3_PERIOD.value,
+        Calculation.MOVING_AVERAGE_7_PERIOD.value
     ]
 
     start_date = serializers.DateField(required=False)
     end_date = serializers.DateField(required=False)
     granularity = serializers.CharField(required=False)
     calculation = serializers.CharField(required=False)
+    response_type = serializers.CharField(required=False)
 
     def validate(self, attrs):
         """
@@ -270,6 +275,17 @@ class AdvanceAnalyticsQueryParamSerializer(serializers.Serializer):  # pylint: d
 
         return attrs
 
+    def validate_response_type(self, value):
+        """
+        Validate the response_type value.
+
+        Raises:
+            serializers.ValidationError: If response_type is not one of the valid choices in `RESPONSE_TYPES`.
+        """
+        if value not in self.RESPONSE_TYPES:
+            raise serializers.ValidationError(f"response_type must be one of {self.RESPONSE_TYPES}")
+        return value
+
     def validate_granularity(self, value):
         """
         Validate the granularity value.
@@ -293,32 +309,25 @@ class AdvanceAnalyticsQueryParamSerializer(serializers.Serializer):  # pylint: d
         return value
 
 
-class AdvanceAnalyticsEnrollmentSerializer(AdvanceAnalyticsQueryParamSerializer):  # pylint: disable=abstract-method
-    """Serializer for validating Advance Analytics Enrollments API"""
-    CSV_TYPES = [
-        ENROLLMENT_CSV.INDIVIDUAL_ENROLLMENTS.value
+class AdvanceAnalyticsEnrollmentStatsSerializer(
+    AdvanceAnalyticsQueryParamSerializer
+):  # pylint: disable=abstract-method
+    """Serializer for validating Advance Analytics Enrollments Stats API"""
+    CHART_TYPES = [
+        EnrollmentChart.ENROLLMENTS_OVER_TIME.value,
+        EnrollmentChart.TOP_COURSES_BY_ENROLLMENTS.value,
+        EnrollmentChart.TOP_SUBJECTS_BY_ENROLLMENTS.value
     ]
 
-    csv_type = serializers.CharField(required=False)
+    chart_type = serializers.CharField(required=False)
 
-    def validate_csv_type(self, value):
+    def validate_chart_type(self, value):
         """
-        Validate the csv_type value.
+        Validate the chart_type value.
 
         Raises:
-            serializers.ValidationError: If csv_type is not one of the valid choices
+            serializers.ValidationError: If chart_type is not one of the valid choices
         """
-        if value not in self.CSV_TYPES:
-            raise serializers.ValidationError(f"csv_type must be one of {self.CSV_TYPES}")
+        if value not in self.CHART_TYPES:
+            raise serializers.ValidationError(f"chart_type must be one of {self.CHART_TYPES}")
         return value
-
-
-class AdvanceAnalyticsEnrollmentStatsSerializer(
-    AdvanceAnalyticsEnrollmentSerializer
-):  # pylint: disable=abstract-method
-    """Serializer for validating Advance Analytics Enrollments Stats API"""
-    CSV_TYPES = [
-        ENROLLMENT_CSV.ENROLLMENTS_OVER_TIME.value,
-        ENROLLMENT_CSV.TOP_COURSES_BY_ENROLLMENTS.value,
-        ENROLLMENT_CSV.TOP_SUBJECTS_BY_ENROLLMENTS.value
-    ]

enterprise_data/api/v1/urls.py

@@ -15,6 +15,7 @@ from enterprise_data.api.v1.views.analytics_enrollments import (
     AdvanceAnalyticsEnrollmentStatsView,
     AdvanceAnalyticsIndividualEnrollmentsView,
 )
+from enterprise_data.api.v1.views.analytics_leaderboard import AdvanceAnalyticsLeaderboardView
 from enterprise_data.constants import UUID4_REGEX
 
 app_name = 'enterprise_data_api_v1'
@@ -53,32 +54,37 @@ urlpatterns = [
         name='enterprise-admin-insights'
     ),
     re_path(
-        fr'^admin/anlaytics/(?P<enterprise_id>{UUID4_REGEX})$',
+        fr'^admin/analytics/(?P<enterprise_id>{UUID4_REGEX})$',
         enterprise_admin_views.EnterpriseAdminAnalyticsAggregatesView.as_view(),
         name='enterprise-admin-analytics-aggregates'
     ),
     re_path(
-        fr'^admin/anlaytics/(?P<enterprise_uuid>{UUID4_REGEX})/enrollments/stats$',
+        fr'^admin/analytics/(?P<enterprise_uuid>{UUID4_REGEX})/leaderboard$',
+        AdvanceAnalyticsLeaderboardView.as_view(),
+        name='enterprise-admin-analytics-leaderboard'
+    ),
+    re_path(
+        fr'^admin/analytics/(?P<enterprise_uuid>{UUID4_REGEX})/enrollments/stats$',
         AdvanceAnalyticsEnrollmentStatsView.as_view(),
         name='enterprise-admin-analytics-enrollments-stats'
     ),
     re_path(
-        fr'^admin/anlaytics/(?P<enterprise_uuid>{UUID4_REGEX})/enrollments$',
+        fr'^admin/analytics/(?P<enterprise_uuid>{UUID4_REGEX})/enrollments$',
         AdvanceAnalyticsIndividualEnrollmentsView.as_view(),
         name='enterprise-admin-analytics-enrollments'
     ),
     re_path(
-        fr'^admin/anlaytics/(?P<enterprise_id>{UUID4_REGEX})/skills/stats',
+        fr'^admin/analytics/(?P<enterprise_id>{UUID4_REGEX})/skills/stats',
         enterprise_admin_views.EnterpriseAdminAnalyticsSkillsView.as_view(),
         name='enterprise-admin-analytics-skills'
     ),
     re_path(
-        fr'^admin/anlaytics/(?P<enterprise_id>{UUID4_REGEX})/completions/stats$',
+        fr'^admin/analytics/(?P<enterprise_id>{UUID4_REGEX})/completions/stats$',
         enterprise_completions_views.EnterrpiseAdminCompletionsStatsView.as_view(),
         name='enterprise-admin-analytics-completions-stats'
     ),
     re_path(
-        fr'^admin/anlaytics/(?P<enterprise_id>{UUID4_REGEX})/completions$',
+        fr'^admin/analytics/(?P<enterprise_id>{UUID4_REGEX})/completions$',
         enterprise_completions_views.EnterrpiseAdminCompletionsView.as_view(),
         name='enterprise-admin-analytics-completions'
     ),

enterprise_data/api/v1/views/analytics_enrollments.py

@@ -1,5 +1,5 @@
 """Advance Analytics for Enrollments"""
-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
@@ -8,37 +8,22 @@ from rest_framework.views import APIView
 
 from django.http import HttpResponse, StreamingHttpResponse
 
-from enterprise_data.admin_analytics.constants import CALCULATION, ENROLLMENT_CSV, GRANULARITY
-from enterprise_data.admin_analytics.data_loaders import fetch_max_enrollment_datetime
+from enterprise_data.admin_analytics.constants import Calculation, EnrollmentChart, Granularity, ResponseType
 from enterprise_data.admin_analytics.utils import (
     calculation_aggregation,
     fetch_and_cache_enrollments_data,
+    fetch_enrollments_cache_expiry_timestamp,
     granularity_aggregation,
 )
 from enterprise_data.api.v1.paginators import AdvanceAnalyticsPagination
 from enterprise_data.api.v1.serializers import (
-    AdvanceAnalyticsEnrollmentSerializer,
     AdvanceAnalyticsEnrollmentStatsSerializer,
+    AdvanceAnalyticsQueryParamSerializer,
 )
 from enterprise_data.renderers import IndividualEnrollmentsCSVRenderer
 from enterprise_data.utils import date_filter
 
 
-def fetch_enrollments_cache_expiry_timestamp():
-    """Calculate cache expiry timestamp"""
-    # TODO: Implement correct cache expiry logic for `enrollments` data.
-    #       Current cache expiry logic is based on `enterprise_learner_enrollment` table,
-    #       Which has nothing to do with the `enrollments` data. Instead cache expiry should
-    #       be based on `fact_enrollment_admin_dash` table. Currently we have no timestamp in
-    #       `fact_enrollment_admin_dash` table that can be used for cache expiry. Add a new
-    #       column in the table for this purpose and then use that column for cache expiry.
-    last_updated_at = fetch_max_enrollment_datetime()
-    cache_expiry = (
-        last_updated_at + timedelta(days=1) if last_updated_at else datetime.now()
-    )
-    return cache_expiry
-
-
 class AdvanceAnalyticsIndividualEnrollmentsView(APIView):
     """
     API for getting the advance analytics individual enrollments data.
@@ -50,7 +35,7 @@ class AdvanceAnalyticsIndividualEnrollmentsView(APIView):
     @permission_required('can_access_enterprise', fn=lambda request, enterprise_uuid: enterprise_uuid)
     def get(self, request, enterprise_uuid):
         """Get individual enrollments data"""
-        serializer = AdvanceAnalyticsEnrollmentSerializer(data=request.GET)
+        serializer = AdvanceAnalyticsQueryParamSerializer(data=request.GET)
         serializer.is_valid(raise_exception=True)
 
         cache_expiry = fetch_enrollments_cache_expiry_timestamp()
@@ -59,7 +44,7 @@ class AdvanceAnalyticsIndividualEnrollmentsView(APIView):
         # get values from query params or use default values
         start_date = serializer.data.get('start_date', enrollments_df.enterprise_enrollment_date.min())
         end_date = serializer.data.get('end_date', datetime.now())
-        csv_type = request.query_params.get('csv_type')
+        response_type = request.query_params.get('response_type', ResponseType.JSON.value)
 
         # filter enrollments by date
         enrollments = date_filter(start_date, end_date, enrollments_df, "enterprise_enrollment_date")
@@ -77,11 +62,12 @@ 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)
 
-        if csv_type == ENROLLMENT_CSV.INDIVIDUAL_ENROLLMENTS.value:
+        if response_type == ResponseType.CSV.value:
+            filename = f"""individual_enrollments, {start_date} - {end_date}.csv"""
             return StreamingHttpResponse(
                 IndividualEnrollmentsCSVRenderer().render(self._stream_serialized_data(enrollments)),
                 content_type="text/csv",
-                headers={"Content-Disposition": 'attachment; filename="individual_enrollments.csv"'},
+                headers={"Content-Disposition": f'attachment; filename="{filename}"'},
             )
 
         paginator = self.pagination_class()
@@ -121,11 +107,12 @@ class AdvanceAnalyticsEnrollmentStatsView(APIView):
         # get values from query params or use default
         start_date = serializer.data.get('start_date', enrollments_df.enterprise_enrollment_date.min())
         end_date = serializer.data.get('end_date', datetime.now())
-        granularity = serializer.data.get('granularity', GRANULARITY.DAILY.value)
-        calculation = serializer.data.get('calculation', CALCULATION.TOTAL.value)
-        csv_type = serializer.data.get('csv_type')
+        granularity = serializer.data.get('granularity', Granularity.DAILY.value)
+        calculation = serializer.data.get('calculation', Calculation.TOTAL.value)
+        response_type = serializer.data.get('response_type', ResponseType.JSON.value)
+        chart_type = serializer.data.get('chart_type')
 
-        if csv_type is None:
+        if response_type == ResponseType.JSON.value:
             data = {
                 "enrollments_over_time": self.construct_enrollments_over_time(
                     enrollments_df.copy(),
@@ -146,26 +133,28 @@ class AdvanceAnalyticsEnrollmentStatsView(APIView):
                 ),
             }
             return Response(data)
-        elif csv_type == ENROLLMENT_CSV.ENROLLMENTS_OVER_TIME.value:
-            return self.construct_enrollments_over_time_csv(
-                enrollments_df.copy(),
-                start_date,
-                end_date,
-                granularity,
-                calculation,
-            )
-        elif csv_type == ENROLLMENT_CSV.TOP_COURSES_BY_ENROLLMENTS.value:
-            return self.construct_top_courses_by_enrollments_csv(
-                enrollments_df.copy(),
-                start_date,
-                end_date,
-            )
-        elif csv_type == ENROLLMENT_CSV.TOP_SUBJECTS_BY_ENROLLMENTS.value:
-            return self.construct_top_subjects_by_enrollments_csv(
-                enrollments_df.copy(),
-                start_date,
-                end_date,
-            )
+
+        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,
+                )
+            elif chart_type == EnrollmentChart.TOP_COURSES_BY_ENROLLMENTS.value:
+                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,
+                )
 
     def enrollments_over_time_common(self, enrollments_df, start_date, end_date, granularity, calculation):
         """
@@ -175,8 +164,8 @@ class AdvanceAnalyticsEnrollmentStatsView(APIView):
             enrollments_df {DataFrame} -- DataFrame of enrollments
             start_date {datetime} -- Enrollment start date in the format 'YYYY-MM-DD'
             end_date {datetime} -- Enrollment end date in the format 'YYYY-MM-DD'
-            granularity {str} -- Granularity of the data. One of GRANULARITY choices
-            calculation {str} -- Calculation of the data. One of CALCULATION choices
+            granularity {str} -- Granularity of the data. One of Granularity choices
+            calculation {str} -- Calculation of the data. One of Calculation choices
         """
         # filter enrollments by date
         enrollments = date_filter(start_date, end_date, enrollments_df, "enterprise_enrollment_date")
@@ -202,8 +191,8 @@ class AdvanceAnalyticsEnrollmentStatsView(APIView):
             enrollments_df {DataFrame} -- DataFrame of enrollments
             start_date {datetime} -- Enrollment start date in the format 'YYYY-MM-DD'
             end_date {datetime} -- Enrollment end date in the format 'YYYY-MM-DD'
-            granularity {str} -- Granularity of the data. One of GRANULARITY choices
-            calculation {str} -- Calculation of the data. One of CALCULATION choices
+            granularity {str} -- Granularity of the data. One of Granularity choices
+            calculation {str} -- Calculation of the data. One of Calculation choices
         """
         enrollments = self.enrollments_over_time_common(enrollments_df, start_date, end_date, granularity, calculation)
 
@@ -218,8 +207,8 @@ class AdvanceAnalyticsEnrollmentStatsView(APIView):
             enrollments_df {DataFrame} -- DataFrame of enrollments
             start_date {datetime} -- Enrollment start date in the format 'YYYY-MM-DD'
             end_date {datetime} -- Enrollment end date in the format 'YYYY-MM-DD'
-            granularity {str} -- Granularity of the data. One of GRANULARITY choices
-            calculation {str} -- Calculation of the data. One of CALCULATION choices
+            granularity {str} -- Granularity of the data. One of Granularity choices
+            calculation {str} -- Calculation of the data. One of Calculation choices
         """
         enrollments = self.enrollments_over_time_common(enrollments_df, start_date, end_date, granularity, calculation)