edx-enterprise-data 8.11.0__py3-none-any.whl → 8.11.1__py3-none-any.whl

{edx_enterprise_data-8.11.0.dist-info → edx_enterprise_data-8.11.1.dist-info}/METADATA

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

{edx_enterprise_data-8.11.0.dist-info → edx_enterprise_data-8.11.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-enterprise_data/__init__.py,sha256=43cEhgzFHOpsMk6l_FF2WJGDjIlxTPg6xfJU8UsyHrA,124
+enterprise_data/__init__.py,sha256=XT15XKKqKMAKtb0mKrGHjwWzDy3Y_AMCd_U5UKSh5Rc,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
@@ -22,7 +22,7 @@ enterprise_data/admin_analytics/database/queries/fact_enrollment_admin_dash.py,s
 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
-enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py,sha256=SLnhWEfbQfeaUWT1a7H5ZCTq3XMMrzO_6iG-g6kMry4,2571
+enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py,sha256=WiFWVF4TsDhLlDQr-3FuqTrzFy7Qv1Y5EnwZXYhdTrM,2962
 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 +38,7 @@ enterprise_data/api/v1/views/analytics_engagements.py,sha256=8H3Fk-hTqJaU3H5Lpu1
 enterprise_data/api/v1/views/analytics_enrollments.py,sha256=trC92GOej6vUoju53KT3dPEDnoPHdukfXEIXPThz76A,16886
 enterprise_data/api/v1/views/analytics_leaderboard.py,sha256=2DALqzUIbe4-ZGgHHIkYAKJ5L1ik2ruPtQNYtTdPba4,5974
 enterprise_data/api/v1/views/base.py,sha256=FTAxlz5EzvAY657wzVgzhJPFSCHHzct7IDcvm71Smt8,866
-enterprise_data/api/v1/views/enterprise_admin.py,sha256=_HfQ46bIC6uU3knCWhGLnsWf_YGtsjYHU5UrwG6sdfA,8568
+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
 enterprise_data/api/v1/views/enterprise_offers.py,sha256=VifxgqTLFLVw4extYPlHcN1N_yjXcsYsAlYEnAbpb10,1266
@@ -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.11.0.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-edx_enterprise_data-8.11.0.dist-info/METADATA,sha256=21GMLdFJo9VqGsBOCJgld3rUyVhCwGTZPXEYjPb3Ou4,1570
-edx_enterprise_data-8.11.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-edx_enterprise_data-8.11.0.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
-edx_enterprise_data-8.11.0.dist-info/RECORD,,
+edx_enterprise_data-8.11.1.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+edx_enterprise_data-8.11.1.dist-info/METADATA,sha256=27UVJwZuQylIJzEZ-R-VWbzisk0jOxS04oHJNrjLQTw,1570
+edx_enterprise_data-8.11.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+edx_enterprise_data-8.11.1.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
+edx_enterprise_data-8.11.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.11.0"
+__version__ = "8.11.1"

enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py

@@ -1,7 +1,7 @@
 """
 Module for interacting with the fact_enrollment_admin_dash table.
 """
-from datetime import date
+from datetime import date, datetime
 from uuid import UUID
 
 from ..queries import FactEnrollmentAdminDashQueries
@@ -23,13 +23,22 @@ class FactEnrollmentAdminDashTable(BaseTable):
             enterprise_customer_uuid (UUID): The UUID of the enterprise customer.
 
         Returns:
-            (tuple<int, int>): The minimum and maximum enrollment dates.
+            (tuple<date, date>): The minimum and maximum enrollment dates.
         """
         results = run_query(
             query=self.queries.get_enrollment_date_range_query(),
             params={'enterprise_customer_uuid': enterprise_customer_uuid}
         )
-        return tuple(results[0])
+        min_date, max_date = results[0]
+
+        # We should return date objects, not datetime objects
+        # This is done to counter cases where database values are datetime objects.
+        if min_date and isinstance(min_date, datetime):
+            min_date = min_date.date()
+        if max_date and isinstance(max_date, datetime):
+            max_date = max_date.date()
+
+        return min_date, max_date
 
     def get_enrollment_and_course_count(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
         """

enterprise_data/api/v1/views/enterprise_admin.py

@@ -95,6 +95,8 @@ class EnterpriseAdminAnalyticsAggregatesView(APIView):
         """
         HTTP GET endpoint to retrieve the enterprise admin aggregate data.
         """
+        # Validate the enterprise_id
+        enterprise_id = enterprise_id.replace('-', '')
         serializer = serializers.AdminAnalyticsAggregatesQueryParamsSerializer(
             data=request.GET
         )
@@ -106,7 +108,7 @@ class EnterpriseAdminAnalyticsAggregatesView(APIView):
         )
 
         start_date = serializer.data.get(
-            'start_date', min_enrollment_date.date()
+            'start_date', min_enrollment_date
         )
         end_date = serializer.data.get('end_date', datetime.today())
 
@@ -128,8 +130,8 @@ class EnterpriseAdminAnalyticsAggregatesView(APIView):
                 'hours': hours,
                 'sessions': sessions,
                 'last_updated_at': last_updated_at.date() if last_updated_at else None,
-                'min_enrollment_date': min_enrollment_date.date(),
-                'max_enrollment_date': max_enrollment_date.date(),
+                'min_enrollment_date': min_enrollment_date,
+                'max_enrollment_date': max_enrollment_date,
             },
             status=HTTP_200_OK,
         )