edx-enterprise-data 6.2.2__tar.gz → 7.0.0__tar.gz

{edx_enterprise_data-6.2.2 → edx_enterprise_data-7.0.0}/CHANGELOG.rst

@@ -15,6 +15,14 @@ Unreleased
 ----------
 
 =========================
+[7.0.0] - 2024-07-12
+---------------------
+  * Add new fields in EnterpriseLearnerEnrollment model
+
+[6.2.3] - 2024-07-01
+---------------------
+  * Dependency updates
+
 [6.2.2] - 2024-06-24
 ---------------------
   * Dependency updates

{edx_enterprise_data-6.2.2/edx_enterprise_data.egg-info → edx_enterprise_data-7.0.0}/PKG-INFO

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

{edx_enterprise_data-6.2.2 → edx_enterprise_data-7.0.0/edx_enterprise_data.egg-info}/PKG-INFO

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

{edx_enterprise_data-6.2.2 → edx_enterprise_data-7.0.0}/edx_enterprise_data.egg-info/SOURCES.txt

@@ -87,6 +87,7 @@ enterprise_data/migrations/0036_enterprisesubsidybudget_subsidy_access_policy_di
 enterprise_data/migrations/0037_alter_enterpriseenrollment_consent_granted.py
 enterprise_data/migrations/0038_enterpriseoffer_export_timestamp.py
 enterprise_data/migrations/0039_auto_20240212_1403.py
+enterprise_data/migrations/0040_auto_20240712_0740.py
 enterprise_data/migrations/__init__.py
 enterprise_data/settings/__init__.py
 enterprise_data/settings/test.py

{edx_enterprise_data-6.2.2 → edx_enterprise_data-7.0.0}/enterprise_data/__init__.py

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

{edx_enterprise_data-6.2.2 → edx_enterprise_data-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):

edx_enterprise_data-7.0.0/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),
+        ),
+    ]

{edx_enterprise_data-6.2.2 → edx_enterprise_data-7.0.0}/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):

{edx_enterprise_data-6.2.2 → edx_enterprise_data-7.0.0}/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',
     ]

{edx_enterprise_data-6.2.2 → edx_enterprise_data-7.0.0}/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)

{edx_enterprise_data-6.2.2 → edx_enterprise_data-7.0.0}/requirements/base.txt

@@ -10,7 +10,7 @@ asgiref==3.8.1
     # via django
 asn1crypto==1.5.1
     # via snowflake-connector-python
-awscli==1.32.99
+awscli==1.33.18
     # via -r requirements/reporting.in
 backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
     # via
@@ -23,16 +23,16 @@ bcrypt==4.1.3
     # via paramiko
 billiard==4.2.0
     # via celery
-boto3==1.34.99
+boto3==1.34.136
     # via -r requirements/reporting.in
-botocore==1.34.99
+botocore==1.34.136
     # via
     #   awscli
     #   boto3
     #   s3transfer
 celery==5.3.6
     # via -r requirements/reporting.in
-certifi==2024.2.2
+certifi==2024.6.2
     # via
     #   py2neo
     #   requests
@@ -61,7 +61,7 @@ click-repl==0.3.0
     # via celery
 colorama==0.4.6
     # via awscli
-cryptography==42.0.7
+cryptography==42.0.8
     # via
     #   -r requirements/reporting.in
     #   django-fernet-fields-v2
@@ -70,7 +70,7 @@ cryptography==42.0.7
     #   pyjwt
     #   pyopenssl
     #   snowflake-connector-python
-django==4.2.12
+django==4.2.13
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
@@ -100,7 +100,7 @@ django-waffle==4.1.0
     # via
     #   edx-django-utils
     #   edx-drf-extensions
-djangorestframework==3.15.1
+djangorestframework==3.15.2
     # via
     #   djangorestframework-csv
     #   drf-jwt
@@ -113,7 +113,7 @@ docutils==0.16
     # via awscli
 drf-jwt==1.19.2
     # via edx-drf-extensions
-edx-django-utils==5.13.0
+edx-django-utils==5.14.2
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
@@ -122,19 +122,19 @@ edx-drf-extensions==10.3.0
     # via
     #   -r requirements/base.in
     #   edx-rbac
-edx-opaque-keys==2.9.0
+edx-opaque-keys==2.10.0
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
 edx-rbac==1.9.0
     # via -r requirements/base.in
-edx-rest-api-client==5.7.0
+edx-rest-api-client==5.7.1
     # via -r requirements/base.in
 factory-boy==3.3.0
     # via -r requirements/base.in
-faker==25.0.1
+faker==26.0.0
     # via factory-boy
-filelock==3.14.0
+filelock==3.15.4
     # via snowflake-connector-python
 idna==3.7
     # via
@@ -150,9 +150,9 @@ kombu==5.3.7
     # via celery
 monotonic==1.6
     # via py2neo
-newrelic==9.9.0
+newrelic==9.11.0
     # via edx-django-utils
-packaging==24.0
+packaging==24.1
     # via
     #   py2neo
     #   snowflake-connector-python
@@ -164,11 +164,11 @@ pbr==6.0.0
     # via stevedore
 pgpy==0.6.0
     # via -r requirements/reporting.in
-platformdirs==4.2.1
+platformdirs==4.2.2
     # via snowflake-connector-python
-prompt-toolkit==3.0.43
+prompt-toolkit==3.0.47
     # via click-repl
-psutil==5.9.8
+psutil==6.0.0
     # via edx-django-utils
 py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz
     # via -r requirements/reporting.in
@@ -188,7 +188,7 @@ pyjwt[crypto]==2.8.0
     #   snowflake-connector-python
 pyminizip==0.2.6
     # via -r requirements/reporting.in
-pymongo==4.4.0
+pymongo==4.8.0
     # via edx-opaque-keys
 pynacl==1.5.0
     # via
@@ -208,7 +208,7 @@ pytz==2024.1
     #   snowflake-connector-python
 pyyaml==6.0.1
     # via awscli
-requests==2.31.0
+requests==2.32.3
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
@@ -217,9 +217,9 @@ requests==2.31.0
     #   snowflake-connector-python
 rsa==4.7.2
     # via awscli
-rules==3.3
+rules==3.4
     # via -r requirements/base.in
-s3transfer==0.10.1
+s3transfer==0.10.2
     # via
     #   awscli
     #   boto3
@@ -235,7 +235,7 @@ six==1.16.0
     #   vertica-python
 slumber==0.7.1
     # via edx-rest-api-client
-snowflake-connector-python==3.10.0
+snowflake-connector-python==3.11.0
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
@@ -245,9 +245,9 @@ stevedore==5.2.0
     # via
     #   edx-django-utils
     #   edx-opaque-keys
-tomlkit==0.12.4
+tomlkit==0.12.5
     # via snowflake-connector-python
-typing-extensions==4.11.0
+typing-extensions==4.12.2
     # via
     #   asgiref
     #   edx-opaque-keys
@@ -259,7 +259,7 @@ tzdata==2024.1
     #   celery
 unicodecsv==0.14.1
     # via -r requirements/reporting.in
-urllib3==1.26.18
+urllib3==1.26.19
     # via
     #   botocore
     #   py2neo

{edx_enterprise_data-6.2.2 → edx_enterprise_data-7.0.0}/requirements/ci.txt

@@ -10,31 +10,31 @@ chardet==5.2.0
     # via tox
 colorama==0.4.6
     # via tox
-coverage==7.5.1
+coverage==7.5.4
     # via -r requirements/ci.in
 distlib==0.3.8
     # via virtualenv
-filelock==3.14.0
+filelock==3.15.4
     # via
     #   tox
     #   virtualenv
-packaging==24.0
+packaging==24.1
     # via
     #   pyproject-api
     #   tox
-platformdirs==4.2.1
+platformdirs==4.2.2
     # via
     #   tox
     #   virtualenv
 pluggy==1.5.0
     # via tox
-pyproject-api==1.6.1
+pyproject-api==1.7.1
     # via tox
 tomli==2.0.1
     # via
     #   pyproject-api
     #   tox
-tox==4.15.0
+tox==4.15.1
     # via -r requirements/ci.in
-virtualenv==20.26.1
+virtualenv==20.26.3
     # via tox

{edx_enterprise_data-6.2.2 → edx_enterprise_data-7.0.0}/requirements/dev.txt

@@ -10,13 +10,13 @@ asgiref==3.8.1
     # via django
 asn1crypto==1.5.1
     # via snowflake-connector-python
-astroid==3.1.0
+astroid==3.2.2
     # via
     #   pylint
     #   pylint-celery
-awscli==1.32.99
+awscli==1.33.18
     # via -r requirements/reporting.in
-backports-tarfile==1.1.1
+backports-tarfile==1.2.0
     # via jaraco-context
 backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
     # via
@@ -29,9 +29,9 @@ bcrypt==4.1.3
     # via paramiko
 billiard==4.2.0
     # via celery
-boto3==1.34.99
+boto3==1.34.136
     # via -r requirements/reporting.in
-botocore==1.34.99
+botocore==1.34.136
     # via
     #   awscli
     #   boto3
@@ -42,7 +42,7 @@ cachetools==5.3.3
     # via tox
 celery==5.3.6
     # via -r requirements/reporting.in
-certifi==2024.2.2
+certifi==2024.6.2
     # via
     #   py2neo
     #   requests
@@ -85,7 +85,7 @@ colorama==0.4.6
     # via
     #   awscli
     #   tox
-cryptography==42.0.7
+cryptography==42.0.8
     # via
     #   -r requirements/reporting.in
     #   django-fernet-fields-v2
@@ -95,13 +95,13 @@ cryptography==42.0.7
     #   pyopenssl
     #   secretstorage
     #   snowflake-connector-python
-diff-cover==9.0.0
+diff-cover==9.1.0
     # via -r requirements/dev-enterprise_data.in
 dill==0.3.8
     # via pylint
 distlib==0.3.8
     # via virtualenv
-django==4.2.12
+django==4.2.13
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
@@ -132,7 +132,7 @@ django-waffle==4.1.0
     # via
     #   edx-django-utils
     #   edx-drf-extensions
-djangorestframework==3.15.1
+djangorestframework==3.15.2
     # via
     #   djangorestframework-csv
     #   drf-jwt
@@ -147,7 +147,7 @@ docutils==0.16
     #   readme-renderer
 drf-jwt==1.19.2
     # via edx-drf-extensions
-edx-django-utils==5.13.0
+edx-django-utils==5.14.2
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
@@ -162,19 +162,19 @@ edx-lint==5.3.6
     # via
     #   -r requirements/dev-enterprise_data.in
     #   -r requirements/quality.in
-edx-opaque-keys==2.9.0
+edx-opaque-keys==2.10.0
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
 edx-rbac==1.9.0
     # via -r requirements/base.in
-edx-rest-api-client==5.7.0
+edx-rest-api-client==5.7.1
     # via -r requirements/base.in
 factory-boy==3.3.0
     # via -r requirements/base.in
-faker==25.0.1
+faker==26.0.0
     # via factory-boy
-filelock==3.14.0
+filelock==3.15.4
     # via
     #   snowflake-connector-python
     #   tox
@@ -215,11 +215,11 @@ jmespath==1.0.1
     # via
     #   boto3
     #   botocore
-keyring==25.2.0
+keyring==25.2.1
     # via twine
 kombu==5.3.7
     # via celery
-lxml[html-clean,html_clean]==5.2.1
+lxml[html-clean,html_clean]==5.2.2
     # via
     #   edx-i18n-tools
     #   lxml-html-clean
@@ -235,15 +235,15 @@ mdurl==0.1.2
     # via markdown-it-py
 monotonic==1.6
     # via py2neo
-more-itertools==10.2.0
+more-itertools==10.3.0
     # via
     #   jaraco-classes
     #   jaraco-functools
-newrelic==9.9.0
+newrelic==9.11.0
     # via edx-django-utils
 nh3==0.2.17
     # via readme-renderer
-packaging==24.0
+packaging==24.1
     # via
     #   build
     #   py2neo
@@ -264,7 +264,7 @@ pip-tools==7.4.1
     # via -r requirements/dev-enterprise_data.in
 pkginfo==1.10.0
     # via twine
-platformdirs==4.2.1
+platformdirs==4.2.2
     # via
     #   pylint
     #   snowflake-connector-python
@@ -276,9 +276,9 @@ pluggy==1.5.0
     #   tox
 polib==1.2.0
     # via edx-i18n-tools
-prompt-toolkit==3.0.43
+prompt-toolkit==3.0.47
     # via click-repl
-psutil==5.9.8
+psutil==6.0.0
     # via edx-django-utils
 py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz
     # via -r requirements/reporting.in
@@ -286,7 +286,7 @@ pyasn1==0.6.0
     # via
     #   pgpy
     #   rsa
-pycodestyle==2.11.1
+pycodestyle==2.12.0
     # via -r requirements/quality.in
 pycparser==2.22
     # via cffi
@@ -304,7 +304,7 @@ pyjwt[crypto]==2.8.0
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   snowflake-connector-python
-pylint==3.1.0
+pylint==3.2.5
     # via
     #   edx-lint
     #   pylint-celery
@@ -320,7 +320,7 @@ pylint-plugin-utils==0.8.2
     #   pylint-django
 pyminizip==0.2.6
     # via -r requirements/reporting.in
-pymongo==4.4.0
+pymongo==4.8.0
     # via edx-opaque-keys
 pynacl==1.5.0
     # via
@@ -328,7 +328,7 @@ pynacl==1.5.0
     #   paramiko
 pyopenssl==24.1.0
     # via snowflake-connector-python
-pyproject-api==1.6.1
+pyproject-api==1.7.1
     # via tox
 pyproject-hooks==1.1.0
     # via
@@ -353,7 +353,7 @@ pyyaml==6.0.1
     #   edx-i18n-tools
 readme-renderer==43.0
     # via twine
-requests==2.31.0
+requests==2.32.3
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
@@ -370,9 +370,9 @@ rich==13.7.1
     # via twine
 rsa==4.7.2
     # via awscli
-rules==3.3
+rules==3.4
     # via -r requirements/base.in
-s3transfer==0.10.1
+s3transfer==0.10.2
     # via
     #   awscli
     #   boto3
@@ -393,7 +393,7 @@ slumber==0.7.1
     # via edx-rest-api-client
 snowballstemmer==2.2.0
     # via pydocstyle
-snowflake-connector-python==3.10.0
+snowflake-connector-python==3.11.0
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
@@ -404,7 +404,7 @@ stevedore==5.2.0
     #   code-annotations
     #   edx-django-utils
     #   edx-opaque-keys
-testfixtures==8.2.0
+testfixtures==8.3.0
     # via -r requirements/quality.in
 text-unidecode==1.3
     # via python-slugify
@@ -415,15 +415,15 @@ tomli==2.0.1
     #   pylint
     #   pyproject-api
     #   tox
-tomlkit==0.12.4
+tomlkit==0.12.5
     # via
     #   pylint
     #   snowflake-connector-python
-tox==4.15.0
+tox==4.15.1
     # via -r requirements/dev-enterprise_data.in
-twine==5.0.0
+twine==5.1.1
     # via -r requirements/dev-enterprise_data.in
-typing-extensions==4.11.0
+typing-extensions==4.12.2
     # via
     #   asgiref
     #   astroid
@@ -438,7 +438,7 @@ tzdata==2024.1
     #   celery
 unicodecsv==0.14.1
     # via -r requirements/reporting.in
-urllib3==1.26.18
+urllib3==1.26.19
     # via
     #   botocore
     #   py2neo
@@ -452,7 +452,7 @@ vine==5.1.0
     #   amqp
     #   celery
     #   kombu
-virtualenv==20.26.1
+virtualenv==20.26.3
     # via tox
 wcwidth==0.2.13
     # via prompt-toolkit
@@ -460,7 +460,7 @@ wheel==0.43.0
     # via
     #   -r requirements/dev-enterprise_data.in
     #   pip-tools
-zipp==3.18.1
+zipp==3.19.2
     # via
     #   importlib-metadata
     #   importlib-resources

edx_enterprise_data-7.0.0/requirements/django.txt

@@ -0,0 +1 @@
+django==4.2.13

{edx_enterprise_data-6.2.2 → edx_enterprise_data-7.0.0}/requirements/pip.txt

@@ -8,7 +8,7 @@ wheel==0.43.0
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==24.0
+pip==24.1.1
     # via -r requirements/pip.in
-setuptools==69.5.1
+setuptools==70.1.1
     # via -r requirements/pip.in

{edx_enterprise_data-6.2.2 → edx_enterprise_data-7.0.0}/requirements/pip_tools.txt

@@ -12,7 +12,7 @@ importlib-metadata==6.11.0
     # via
     #   -c requirements/common_constraints.txt
     #   build
-packaging==24.0
+packaging==24.1
     # via build
 pip-tools==7.4.1
     # via -r requirements/pip_tools.in
@@ -26,7 +26,7 @@ tomli==2.0.1
     #   pip-tools
 wheel==0.43.0
     # via pip-tools
-zipp==3.18.1
+zipp==3.19.2
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file: