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

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

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

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

@@ -1,4 +1,4 @@
-enterprise_data/__init__.py,sha256=6EwDYR1Ig68WDaZhWEMjK_4a3LbkjyRay9rmzaGXfPE,124
+enterprise_data/__init__.py,sha256=8TjCXGqGwt4y6eG7nZC6OYCp9Dut66Hr_TTySgVt3PE,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
@@ -18,7 +18,7 @@ enterprise_data/admin_analytics/database/__init__.py,sha256=vNSWKf2VV5xMegN7htJJ
 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=ofV4uYgMC_quHxDFPV_3UTeKffjgcm6ri68VSVelKe4,5425
+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/tables/base.py,sha256=1KyKsC18pW3m-5U-T6pdt5rIwsz6Wp3QFFbD3r6L6YQ,395
 enterprise_data/admin_analytics/database/tables/fact_engagement_admin_dash.py,sha256=EsG8KgRW84wtA_nJuUknjLYlDtaPSJf_9mWdkO2Bj2I,1293
@@ -35,9 +35,9 @@ enterprise_data/api/v1/serializers.py,sha256=FEuH-_iTlKFJoxM8ABzEYHDAWHsgSYfdQd2
 enterprise_data/api/v1/urls.py,sha256=JzaaVsHEAELMLFdhR60_8LRLb9klDeA4zdH1dLxnQEo,4048
 enterprise_data/api/v1/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enterprise_data/api/v1/views/analytics_engagements.py,sha256=8H3Fk-hTqJaU3H5Lpu1kFWq7p7xDp1pjge-sK7osDbg,17553
-enterprise_data/api/v1/views/analytics_enrollments.py,sha256=nT3eu336mtjZuAXYRGhugxAY_G3BWPkyf0TtybRe_HM,6249
+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=5fXUH3Q3J6t_GJ-Hb3TFOAC_BUED9SiCk-eGzvNqDRE,3395
+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_completions.py,sha256=bJG2ZtTbLyiBrj64iJHQNHEKLrJCzl9OuJ7nDtw-9aY,8377
 enterprise_data/api/v1/views/enterprise_learner.py,sha256=yABjJje3CT8I8YOhWr1_tTkdKtnGJom8eu3EFz_-0BU,18517
@@ -169,8 +169,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.0.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-edx_enterprise_data-8.12.0.dist-info/METADATA,sha256=ePpHvJ_L1ZArGfUBHXEcPExU5vTGx17l-HvK14USLIo,1570
-edx_enterprise_data-8.12.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-edx_enterprise_data-8.12.0.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
-edx_enterprise_data-8.12.0.dist-info/RECORD,,
+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,,

enterprise_data/__init__.py

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

enterprise_data/admin_analytics/database/queries/fact_enrollment_admin_dash.py

@@ -96,10 +96,8 @@ class FactEnrollmentAdminDashQueries:
         """
         # Some local environments raise error when course_title is added in SELECT without GROUP BY.
         # If you face this issue, you can remove course_title from SELECT.
-
-        # TODO: Re-add course_title after testing.
         return f"""
-            SELECT course_key, enroll_type, count(course_key) as enrollment_count
+            SELECT course_key, course_title , enroll_type, count(course_key) as enrollment_count
             FROM fact_enrollment_admin_dash
             WHERE enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
                 enterprise_enrollment_date BETWEEN %(start_date)s AND %(end_date)s

enterprise_data/api/v1/views/analytics_enrollments.py

@@ -43,6 +43,9 @@ class AdvanceAnalyticsEnrollmentsView(AnalyticsPaginationMixin, ViewSet):
         """
         Get individual enrollments data for the enterprise.
         """
+        # Remove hyphens from the UUID
+        enterprise_uuid = enterprise_uuid.replace('-', '')
+
         serializer = AdvanceAnalyticsQueryParamSerializer(data=request.GET)
         serializer.is_valid(raise_exception=True)
         min_enrollment_date, _ = FactEnrollmentAdminDashTable().get_enrollment_date_range(
@@ -122,6 +125,9 @@ class AdvanceAnalyticsEnrollmentsView(AnalyticsPaginationMixin, ViewSet):
         2. `top_courses_by_enrollments`: This will show the top courses by enrollments.
         3. `top_subjects_by_enrollments`: This will show the top subjects by enrollments.
         """
+        # Remove hyphens from the UUID
+        enterprise_uuid = enterprise_uuid.replace('-', '')
+
         serializer = AdvanceAnalyticsEnrollmentStatsSerializer(data=request.GET)
         serializer.is_valid(raise_exception=True)
 

enterprise_data/api/v1/views/base.py

@@ -92,7 +92,7 @@ class AnalyticsPaginationMixin:
             (Response): The pagination data.
         """
         page_count = math.ceil(total_count / page_size)
-        if page <= 0 or page > page_count:
+        if page_count > 0 and (page <= 0 or page > page_count):
             raise NotFound('Invalid page.')
 
         return Response({