edx-enterprise-data 6.2.3__py3-none-any.whl → 7.0.0__py3-none-any.whl

{edx_enterprise_data-6.2.3.dist-info → edx_enterprise_data-7.0.0.dist-info}/METADATA

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

{edx_enterprise_data-6.2.3.dist-info → edx_enterprise_data-7.0.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
-enterprise_data/__init__.py,sha256=Cf0lU4ksiviqhFzy4aVtBks4XHnQLxV3WcokMyCQn4Q,123
+enterprise_data/__init__.py,sha256=nWXJGOIMpRKA2rw4gS921qQoQfhaFBo7vGbY0-zVI04,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=5QV4efMK1zlRIZZ7MWM5G2yWRgs3yUHHWfj5IWrrbdY,18765
+enterprise_data/models.py,sha256=3VHJ5eWfI0KZxh5u969E7uA2nE5VZqyUnk_VV--UTI4,19154
 enterprise_data/paginators.py,sha256=YPrC5TeXFt-ymenT2H8H2nCbDCnAzJQlH9kFPElRxWE,269
-enterprise_data/renderers.py,sha256=8ZErid5abB1_2QWbWEhdrqnSNa834FBhrLxM6x4_Xv0,1719
+enterprise_data/renderers.py,sha256=WVt0qy9Ippdnl404Zsq-MruB9oQfY6h87ZzpScYBeaw,1770
 enterprise_data/signals.py,sha256=8eqNPnlvmfsKf19lGWv5xTIuBgQIqR8EZSp9UYzC8Rc,1024
 enterprise_data/urls.py,sha256=bqtKF5OEWEwrNmHG3os-pZNuNsmjlhxEqp7yM4TbPf4,243
-enterprise_data/utils.py,sha256=5GrhqmlC28ogRkvHPFJmVR9xB13bdA2Zt6segUGUEyc,830
+enterprise_data/utils.py,sha256=JdJDCzpbaQgdOrdMR8RqwveIUlB3bN5uZTn1ez9dcqs,952
 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
@@ -16,7 +16,7 @@ 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/serializers.py,sha256=A-X-XT-ykaMGehrlZquw0TvWB8kwFvY3GEnH6A_tpjA,7484
+enterprise_data/api/v1/serializers.py,sha256=iRPdUnkAVcoJQVWdxQDtIFQJdLftnpjGNJlavMExWmg,7535
 enterprise_data/api/v1/urls.py,sha256=Vev34sBjvDSqGUuQQGTu-1ft-ISYUPO_GTOpx0RTiEA,1106
 enterprise_data/api/v1/views.py,sha256=gEPEkWFmS8n_nN5gk_MBRO9pkc2QwhS3OxPAVKxt08Q,22434
 enterprise_data/fixtures/enterprise_enrollment.json,sha256=6onPXXR29pMdTdbl_mn81sDi3Re5jkLUZz2TPMB_1IY,5786
@@ -76,6 +76,7 @@ enterprise_data/migrations/0036_enterprisesubsidybudget_subsidy_access_policy_di
 enterprise_data/migrations/0037_alter_enterpriseenrollment_consent_granted.py,sha256=MF9-RRhCR1efO51UPgSn746V5EnymdwNYrL8dA_P7Q8,471
 enterprise_data/migrations/0038_enterpriseoffer_export_timestamp.py,sha256=8St3DsKb-VI3LGGC-Mc7OvmFn67kVob0HKCPGKcjvu4,436
 enterprise_data/migrations/0039_auto_20240212_1403.py,sha256=rMiJcYx26ZGqPdQzgiWkUgbcRhD-tp9BgXdgt67vC2Q,1002
+enterprise_data/migrations/0040_auto_20240712_0740.py,sha256=BgY4RoXAIgPqufwCFkOgi38fbTPwcjMPXMTypebAgKY,1492
 enterprise_data/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enterprise_data/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enterprise_data/settings/test.py,sha256=RR6qIff09dgzx-Csj2U6oM2j4gwUfOXGwyss_WcN6CY,4018
@@ -133,8 +134,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-6.2.3.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-edx_enterprise_data-6.2.3.dist-info/METADATA,sha256=jCCIOYZnvZp5FFOmB_zi7w6cel7BFSJMTofPpg2AS7Q,1486
-edx_enterprise_data-6.2.3.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-edx_enterprise_data-6.2.3.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
-edx_enterprise_data-6.2.3.dist-info/RECORD,,
+edx_enterprise_data-7.0.0.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+edx_enterprise_data-7.0.0.dist-info/METADATA,sha256=gOOPz06b4b_xSeT-KAF2liB-knu90YX9eTgo3enG-mk,1486
+edx_enterprise_data-7.0.0.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+edx_enterprise_data-7.0.0.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
+edx_enterprise_data-7.0.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__ = "6.2.3"
+__version__ = "7.0.0"

enterprise_data/api/v1/serializers.py

@@ -41,7 +41,7 @@ class EnterpriseLearnerEnrollmentSerializer(serializers.ModelSerializer):
             'letter_grade', 'enterprise_user_id', 'user_email', 'user_account_creation_date',
             'user_country_code', 'user_username', 'enterprise_name', 'enterprise_customer_uuid',
             'enterprise_sso_uid', 'created', 'course_api_url', 'total_learning_time_hours', 'is_subsidy',
-            'course_product_line', 'budget_id'
+            'course_product_line', 'budget_id', 'enterprise_group_name', 'enterprise_group_uuid',
         )
 
     def get_course_api_url(self, obj):

enterprise_data/migrations/0040_auto_20240712_0740.py

@@ -0,0 +1,45 @@
+# Generated by Django 3.2.23 on 2024-07-12 07:40
+
+from django.db import migrations, models
+
+import enterprise_data.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('enterprise_data', '0039_auto_20240212_1403'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='enterpriselearnerenrollment',
+            name='enterprise_group_name',
+            field=models.CharField(max_length=25, null=True),
+        ),
+        migrations.AddField(
+            model_name='enterpriselearnerenrollment',
+            name='enterprise_group_uuid',
+            field=models.UUIDField(null=True),
+        ),
+        migrations.AddField(
+            model_name='enterpriselearnerenrollment',
+            name='is_included_in_utilization',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='enterpriselearnerenrollment',
+            name='lpr_unique_id',
+            field=models.PositiveBigIntegerField(default=enterprise_data.utils.get_unique_id, primary_key=True, serialize=False),
+        ),
+        migrations.AddField(
+            model_name='enterpriselearnerenrollment',
+            name='subscription_license_uuid',
+            field=models.UUIDField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='enterpriselearnerenrollment',
+            name='enterprise_enrollment_id',
+            field=models.PositiveIntegerField(null=True),
+        ),
+    ]

enterprise_data/models.py

@@ -9,6 +9,8 @@ from django.conf import settings
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
+from enterprise_data.utils import get_unique_id
+
 LOGGER = getLogger(__name__)
 
 
@@ -78,7 +80,7 @@ class EnterpriseLearnerEnrollment(models.Model):
             ]),
         ]
 
-    enterprise_enrollment_id = models.PositiveIntegerField(primary_key=True)
+    enterprise_enrollment_id = models.PositiveIntegerField(null=True)
     enrollment_id = models.PositiveIntegerField(null=True)
     is_consent_granted = models.BooleanField(default=False)
     paid_by = models.CharField(max_length=255, null=True)
@@ -133,6 +135,11 @@ class EnterpriseLearnerEnrollment(models.Model):
     is_subsidy = models.BooleanField(default=False)
     course_product_line = models.CharField(max_length=64, null=True)
     budget_id = models.UUIDField(db_index=True, null=True)
+    is_included_in_utilization = models.BooleanField(default=False)
+    lpr_unique_id = models.PositiveBigIntegerField(primary_key=True, default=get_unique_id)
+    subscription_license_uuid = models.UUIDField(null=True)
+    enterprise_group_name = models.CharField(max_length=25, null=True)
+    enterprise_group_uuid = models.UUIDField(null=True)
 
 
 class EnterpriseAdminLearnerProgress(models.Model):

enterprise_data/renderers.py

@@ -27,5 +27,5 @@ class EnrollmentsCSVRenderer(CSVStreamingRenderer):
         'letter_grade', 'enterprise_user_id', 'user_email', 'user_account_creation_date',
         'user_country_code', 'user_username', 'enterprise_name', 'enterprise_customer_uuid',
         'enterprise_sso_uid', 'created', 'course_api_url', 'total_learning_time_hours', 'is_subsidy',
-        'course_product_line', 'budget_id'
+        'course_product_line', 'budget_id', 'enterprise_group_name', 'enterprise_group_uuid',
     ]

enterprise_data/utils.py

@@ -2,8 +2,8 @@
 Utility functions for Enterprise Data app.
 """
 
-
 import hashlib
+import random
 
 
 def get_cache_key(**kwargs):
@@ -28,3 +28,10 @@ def get_cache_key(**kwargs):
     key = '__'.join([f'{item}:{value}' for item, value in kwargs.items()])
 
     return hashlib.md5(key.encode('utf-8')).hexdigest()
+
+
+def get_unique_id():
+    """
+    Return a unique 32 bit integer.
+    """
+    return random.getrandbits(32)