edx-enterprise-data 4.11.1__py3-none-any.whl → 5.0.0__py3-none-any.whl

{edx_enterprise_data-4.11.1.dist-info → edx_enterprise_data-5.0.0.dist-info}/METADATA

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

{edx_enterprise_data-4.11.1.dist-info → edx_enterprise_data-5.0.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-enterprise_data/__init__.py,sha256=rYT7H9pEm0bjdfRQ5Sdbtq678rQ1BoDMVRYzJis1TFo,225
+enterprise_data/__init__.py,sha256=9CalZxzrrlzN7gPjoqRg4WtrBoH9ajmbFp5PDXYl8wQ,224
 enterprise_data/apps.py,sha256=aF6hZwDfI2oWj95tUTm_2ikHueQj-jLj-u0GrgzpsQI,414
 enterprise_data/clients.py,sha256=GvQupy5TVYfO_IKC3yzXSAgNP54r-PtIjidM5ws9Iks,3947
 enterprise_data/constants.py,sha256=pS65L4mimz7hd_cLml_mXdU0GJ7hs0X8UQ8MNjC5hCU,234
@@ -17,7 +17,7 @@ enterprise_data/api/v0/views.py,sha256=4RslZ4NZOU-844bnebEQ71ji2utRY7jEijqC45oQQ
 enterprise_data/api/v1/__init__.py,sha256=4MKmD0y8ANRoaNzSYTwPFVCSfeid_bdzHCHnhR37MIs,144
 enterprise_data/api/v1/serializers.py,sha256=iLkuaXLRaRkfVyXch__IKXA3OIUH63QUNNGpXOjWPTk,6674
 enterprise_data/api/v1/urls.py,sha256=Vev34sBjvDSqGUuQQGTu-1ft-ISYUPO_GTOpx0RTiEA,1106
-enterprise_data/api/v1/views.py,sha256=bgDzbw8GpzFWfVSGg-AonIvTBg2HM776fBFr2sJO2wI,20563
+enterprise_data/api/v1/views.py,sha256=7bGzQQO2CORVByKVORwhAIKhgjf1UMcTzz1VXmMXaTs,21475
 enterprise_data/fixtures/enterprise_enrollment.json,sha256=6onPXXR29pMdTdbl_mn81sDi3Re5jkLUZz2TPMB_1IY,5786
 enterprise_data/fixtures/enterprise_user.json,sha256=6g8GvNY9j_fh1dvAU80bTAMI2F5vXCkb8a4UjsftMvQ,1970
 enterprise_data/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -85,7 +85,7 @@ enterprise_data/tests/api/v0/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 enterprise_data/tests/api/v0/test_serializers.py,sha256=Gfty6gy6OQLN318uL1OCPhAZOqSUL50FWc0nC23VMnc,6257
 enterprise_data/tests/api/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enterprise_data/tests/api/v1/test_serializers.py,sha256=DwgEHcyOP3oqNUPB2O-NkJGeO_cYs9XJiq7791vJLZE,3682
-enterprise_data/tests/api/v1/test_views.py,sha256=_ex_Cn_aXN3UA3QboHCUnrwPNd3ZSF6nt_lnHPuYrH0,15158
+enterprise_data/tests/api/v1/test_views.py,sha256=rLqUHfar0HdBNtz33hQxd_0qUUgr7Ku3KwQSQ1B4Ypg,15213
 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
@@ -126,8 +126,8 @@ enterprise_reporting/tests/test_send_enterprise_reports.py,sha256=WtL-RqGgu2x5PP
 enterprise_reporting/tests/test_utils.py,sha256=7Y5GmeibiC8Q5kIpYuIAkFpeyIDRs2U3ItxsabhR1zM,9493
 enterprise_reporting/tests/test_vertica_client.py,sha256=-R2yNCGUjRtoXwLMBloVFQkFYrJoo613VCr61gwI3kQ,140
 enterprise_reporting/tests/utils.py,sha256=xms2LM7DV3wczXEfctOK1ddel1EE0J_YSr17UzbCDy4,1401
-edx_enterprise_data-4.11.1.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-edx_enterprise_data-4.11.1.dist-info/METADATA,sha256=uErWJheUKOikIg83Sl9Bhzo0cJVwZK8kCpstii3fD1A,1490
-edx_enterprise_data-4.11.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-edx_enterprise_data-4.11.1.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
-edx_enterprise_data-4.11.1.dist-info/RECORD,,
+edx_enterprise_data-5.0.0.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+edx_enterprise_data-5.0.0.dist-info/METADATA,sha256=Lz8YW4ZkYhWJk6llJM1aMlVYR9vb5MiR6nk_R8DxB-o,1489
+edx_enterprise_data-5.0.0.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
+edx_enterprise_data-5.0.0.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
+edx_enterprise_data-5.0.0.dist-info/RECORD,,

{edx_enterprise_data-4.11.1.dist-info → edx_enterprise_data-5.0.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.41.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

enterprise_data/__init__.py

@@ -2,6 +2,6 @@
 Enterprise data api application. This Django app exposes API endpoints used by enterprises.
 """
 
-__version__ = "4.11.1"
+__version__ = "5.0.0"
 
 default_app_config = "enterprise_data.apps.EnterpriseDataAppConfig"  # pylint: disable=invalid-name

enterprise_data/api/v1/views.py

@@ -2,9 +2,9 @@
 Views for enterprise api v1.
 """
 
-
 from datetime import date, timedelta
 from logging import getLogger
+from uuid import UUID
 
 from django_filters.rest_framework import DjangoFilterBackend
 from edx_django_utils.cache import TieredCache
@@ -181,7 +181,7 @@ class EnterpriseLearnerEnrollmentViewSet(EnterpriseViewSetMixin, viewsets.ReadOn
 
         offer_id = query_filters.get('offer_id')
         if offer_id:
-            queryset = queryset.filter(offer_id=offer_id)
+            queryset = self.filter_by_offer_id(queryset, offer_id)
 
         ignore_null_course_list_price = query_filters.get('ignore_null_course_list_price')
         if ignore_null_course_list_price:
@@ -197,6 +197,27 @@ class EnterpriseLearnerEnrollmentViewSet(EnterpriseViewSetMixin, viewsets.ReadOn
 
         return queryset
 
+    def filter_by_offer_id(self, queryset, offer_id):
+        """
+        Filter queryset by `offer_id`
+        """
+        # offer_id field in table contains two types of data
+        # 1. integer
+        # 2. uuid
+        # In table, uuids are stored without hyphen and in lower case
+        # but api clients are sending uuids with hyphen and that causes the issue
+        # we need to remove the hyphens from uuid, convert the uuid to lower case and then do a compare in DB
+
+        # if offer_id is a uuid only then do the transformation
+        try:
+            offer_id_uuid_obj = UUID(offer_id, version=4)
+            offer_id = str(offer_id_uuid_obj)
+            offer_id = offer_id.replace('-', '')
+        except ValueError:
+            pass
+
+        return queryset.filter(offer_id=offer_id)
+
     def filter_active_enrollments(self, queryset):
         """
         Filters queryset to include enrollments with course date in future
@@ -471,7 +492,7 @@ class EnterpriseAdminInsightsView(APIView):
         """
         response_data = {}
         learner_progress = {}
-        summary = {}
+        learner_engagement = {}
 
         try:
             learner_progress = EnterpriseAdminLearnerProgress.objects.get(enterprise_customer_uuid=enterprise_id)
@@ -481,14 +502,14 @@ class EnterpriseAdminInsightsView(APIView):
             pass
 
         try:
-            summary = EnterpriseAdminSummarizeInsights.objects.get(enterprise_customer_uuid=enterprise_id)
-            summary = serializers.EnterpriseAdminSummarizeInsightsSerializer(summary).data
-            response_data['summary'] = summary
+            learner_engagement = EnterpriseAdminSummarizeInsights.objects.get(enterprise_customer_uuid=enterprise_id)
+            learner_engagement = serializers.EnterpriseAdminSummarizeInsightsSerializer(learner_engagement).data
+            response_data['learner_engagement'] = learner_engagement
         except EnterpriseAdminSummarizeInsights.DoesNotExist:
             pass
 
         status = HTTP_200_OK
-        if learner_progress == {} and summary == {}:
+        if learner_progress == {} and learner_engagement == {}:
             status = HTTP_404_NOT_FOUND
 
         return Response(data=response_data, status=status)

enterprise_data/tests/api/v1/test_views.py

@@ -338,7 +338,7 @@ class TestEnterpriseAdminInsightsView(JWTTestMixin, APITransactionTestCase):
         learner_progress_obj = EnterpriseAdminLearnerProgressFactory.create(
             enterprise_customer_uuid=enterprise_customer_uuid
         )
-        summary_obj = EnterpriseAdminSummarizeInsightsFactory.create(
+        learner_engagement_obj = EnterpriseAdminSummarizeInsightsFactory.create(
             enterprise_customer_uuid=enterprise_customer_uuid
         )
 
@@ -350,8 +350,8 @@ class TestEnterpriseAdminInsightsView(JWTTestMixin, APITransactionTestCase):
 
         learner_progress = response_json['learner_progress']
         self.verify_data(learner_progress, learner_progress_obj)
-        summary = response_json['summary']
-        self.verify_data(summary, summary_obj)
+        learner_engagement = response_json['learner_engagement']
+        self.verify_data(learner_engagement, learner_engagement_obj)
 
     def test_retrieve_enterprise_admin_insights_no_data(self):
         """