edx-enterprise-data 10.6.0__tar.gz → 10.7.0__tar.gz

{edx_enterprise_data-10.6.0 → edx_enterprise_data-10.7.0}/CHANGELOG.rst

@@ -16,6 +16,14 @@ Unreleased
 
 =========================
 
+[10.7.0] - 2024-12-24
+---------------------
+  * feat: Added user's first and last name in the enterprise enrollments API and related DB table.
+
+[10.6.1] - 2024-12-10
+---------------------
+  * feat: add course_title in top courses in enrollments csv
+
 [10.6.0] - 2024-12-09
 ---------------------
   * chore: upgrade python requirements

{edx_enterprise_data-10.6.0/edx_enterprise_data.egg-info → edx_enterprise_data-10.7.0}/PKG-INFO

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

{edx_enterprise_data-10.6.0 → edx_enterprise_data-10.7.0/edx_enterprise_data.egg-info}/PKG-INFO

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

{edx_enterprise_data-10.6.0 → edx_enterprise_data-10.7.0}/edx_enterprise_data.egg-info/SOURCES.txt

@@ -115,6 +115,7 @@ enterprise_data/migrations/0038_enterpriseoffer_export_timestamp.py
 enterprise_data/migrations/0039_auto_20240212_1403.py
 enterprise_data/migrations/0040_auto_20240718_0536_squashed_0043_alter_enterpriselearnerenrollment_enterprise_enrollment_id.py
 enterprise_data/migrations/0044_enterpriseexecedlcmoduleperformance.py
+enterprise_data/migrations/0045_alter_enterpriseexecedlcmoduleperformance_options_and_more.py
 enterprise_data/migrations/__init__.py
 enterprise_data/settings/__init__.py
 enterprise_data/settings/test.py

{edx_enterprise_data-10.6.0 → edx_enterprise_data-10.7.0}/enterprise_data/__init__.py

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

{edx_enterprise_data-10.6.0 → edx_enterprise_data-10.7.0}/enterprise_data/admin_analytics/database/queries/fact_enrollment_admin_dash.py

@@ -124,6 +124,7 @@ class FactEnrollmentAdminDashQueries:
 
             SELECT
                 d.course_key,
+                MAX(d.course_title) AS course_title,
                 d.enroll_type,
                 COUNT(*) AS enrollment_count
             FROM filtered_data d

{edx_enterprise_data-10.6.0 → edx_enterprise_data-10.7.0}/enterprise_data/api/v1/serializers.py

@@ -41,9 +41,9 @@ class EnterpriseLearnerEnrollmentSerializer(serializers.ModelSerializer):
             'course_primary_program', 'primary_program_type', 'course_primary_subject', 'has_passed',
             'last_activity_date', 'progress_status', 'passed_date', 'current_grade',
             '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', 'enterprise_group_name', 'enterprise_group_uuid',
+            'user_country_code', 'user_username', 'user_first_name', 'user_last_name', 'enterprise_name',
+            'enterprise_customer_uuid', 'enterprise_sso_uid', 'created', 'course_api_url', 'total_learning_time_hours',
+            'is_subsidy', 'course_product_line', 'budget_id', 'enterprise_group_name', 'enterprise_group_uuid',
         )
 
     def get_course_api_url(self, obj):

{edx_enterprise_data-10.6.0 → edx_enterprise_data-10.7.0}/enterprise_data/api/v1/views/enterprise_learner.py

@@ -59,9 +59,9 @@ class EnterpriseLearnerEnrollmentViewSet(EnterpriseViewSetMixin, viewsets.ReadOn
         'course_primary_program', 'primary_program_type', 'course_primary_subject', 'has_passed',
         'last_activity_date', 'progress_status', 'passed_date', 'current_grade',
         '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'
+        'user_country_code', 'user_username', 'user_first_name', 'user_last_name', 'enterprise_name',
+        'enterprise_customer_uuid', 'enterprise_sso_uid', 'created', 'course_api_url', 'total_learning_time_hours',
+        'is_subsidy', 'course_product_line', 'budget_id',
     ]
 
     # TODO: Remove after we release the streaming csv changes

{edx_enterprise_data-10.6.0 → edx_enterprise_data-10.7.0}/enterprise_data/management/commands/tests/test_create_enterprise_learner_enrollment_lpr_v1.py

@@ -39,6 +39,8 @@ class TestCreateEnterpriseLearnerEnrollmentCommand(TestCase):
         assert enterprise_learner_enrollment[0].letter_grade is None
         assert enterprise_learner_enrollment[0].enterprise_user_id is None
         assert enterprise_learner_enrollment[0].user_username is None
+        assert enterprise_learner_enrollment[0].user_first_name is None
+        assert enterprise_learner_enrollment[0].user_last_name is None
         assert enterprise_learner_enrollment[0].user_email is None
         assert enterprise_learner_enrollment[0].enterprise_user is None
 
@@ -62,6 +64,8 @@ class TestCreateEnterpriseLearnerEnrollmentCommand(TestCase):
         assert enterprise_learner_enrollment[0].progress_status is not None
         assert enterprise_learner_enrollment[0].enterprise_user_id is not None
         assert enterprise_learner_enrollment[0].user_username is not None
+        assert enterprise_learner_enrollment[0].user_first_name is not None
+        assert enterprise_learner_enrollment[0].user_last_name is not None
         assert enterprise_learner_enrollment[0].enterprise_user is not None
         assert enterprise_learner_enrollment[0].user_email is not None
         assert EnterpriseLearner.objects.count() == 1

edx_enterprise_data-10.7.0/enterprise_data/migrations/0045_alter_enterpriseexecedlcmoduleperformance_options_and_more.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.15 on 2024-12-23 12:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('enterprise_data', '0044_enterpriseexecedlcmoduleperformance'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='enterpriseexecedlcmoduleperformance',
+            options={'verbose_name': 'Exec Ed LC Module Performance', 'verbose_name_plural': 'Exec Ed LC Module Performance'},
+        ),
+        migrations.AddField(
+            model_name='enterpriselearnerenrollment',
+            name='user_first_name',
+            field=models.CharField(max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='enterpriselearnerenrollment',
+            name='user_last_name',
+            field=models.CharField(max_length=255, null=True),
+        ),
+    ]

{edx_enterprise_data-10.6.0 → edx_enterprise_data-10.7.0}/enterprise_data/models.py

@@ -128,6 +128,8 @@ class EnterpriseLearnerEnrollment(models.Model):
     user_account_creation_date = models.DateTimeField(null=True)
     user_country_code = models.CharField(max_length=2, null=True)
     user_username = models.CharField(max_length=255, null=True)
+    user_first_name = models.CharField(max_length=255, null=True)
+    user_last_name = models.CharField(max_length=255, null=True)
     enterprise_name = models.CharField(max_length=255, db_index=True, null=False)
     enterprise_customer_uuid = models.UUIDField(db_index=True, null=False)
     enterprise_sso_uid = models.CharField(max_length=255, null=True)

{edx_enterprise_data-10.6.0 → edx_enterprise_data-10.7.0}/enterprise_data/renderers.py

@@ -25,9 +25,9 @@ class EnrollmentsCSVRenderer(CSVStreamingRenderer):
         'course_primary_program', 'primary_program_type', 'course_primary_subject', 'has_passed',
         'last_activity_date', 'progress_status', 'passed_date', 'current_grade',
         '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', 'enterprise_group_name', 'enterprise_group_uuid',
+        'user_country_code', 'user_username', 'user_first_name', 'user_last_name', 'enterprise_name',
+        'enterprise_customer_uuid', 'enterprise_sso_uid', 'created', 'course_api_url', 'total_learning_time_hours',
+        'is_subsidy', 'course_product_line', 'budget_id', 'enterprise_group_name', 'enterprise_group_uuid',
     ]
 
 

{edx_enterprise_data-10.6.0 → edx_enterprise_data-10.7.0}/enterprise_data/tests/test_utils.py

@@ -180,6 +180,8 @@ class EnterpriseLearnerEnrollmentFactory(factory.django.DjangoModelFactory):
     enterprise_user_id = factory.Sequence(lambda n: n)
     user_email = factory.lazy_attribute(lambda x: FAKER.email())  # pylint: disable=no-member
     user_username = factory.Sequence('robot{}'.format)
+    user_first_name = factory.Sequence('Robot First {}'.format)
+    user_last_name = factory.Sequence('Robot Last {}'.format)
     user_account_creation_date = factory.lazy_attribute(lambda x: '2018-01-01')
     user_country_code = factory.lazy_attribute(lambda x: FAKER.country_code())
     is_subsidy = factory.lazy_attribute(lambda x: FAKER.boolean())  # pylint: disable=no-member
@@ -230,6 +232,8 @@ class EnterpriseLearnerEnrollmentFactory(factory.django.DjangoModelFactory):
             'user_account_creation_date',
             'user_country_code',
             'user_username',
+            'user_first_name',
+            'user_last_name',
         ]
         if create and not obj.is_consent_granted:
             for field in dsc_dependent_fields:

{edx_enterprise_data-10.6.0 → edx_enterprise_data-10.7.0}/requirements/base.txt

@@ -10,22 +10,22 @@ asgiref==3.8.1
     # via django
 asn1crypto==1.5.1
     # via snowflake-connector-python
-awscli==1.36.17
+awscli==1.36.22
     # via -r requirements/reporting.in
 bcrypt==4.2.1
     # via paramiko
 billiard==4.2.1
     # via celery
-boto3==1.35.76
+boto3==1.35.81
     # via -r requirements/reporting.in
-botocore==1.35.76
+botocore==1.35.81
     # via
     #   awscli
     #   boto3
     #   s3transfer
 celery==5.3.6
     # via -r requirements/reporting.in
-certifi==2024.8.30
+certifi==2024.12.14
     # via
     #   py2neo
     #   requests
@@ -145,7 +145,7 @@ monotonic==1.6
     # via py2neo
 mysql-connector-python==9.1.0
     # via -r requirements/base.in
-newrelic==10.3.1
+newrelic==10.4.0
     # via edx-django-utils
 numpy==2.2.0
     # via
@@ -240,7 +240,7 @@ snowflake-connector-python==3.12.4
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
-sqlparse==0.5.2
+sqlparse==0.5.3
     # via django
 stevedore==5.4.0
     # via

{edx_enterprise_data-10.6.0 → edx_enterprise_data-10.7.0}/requirements/dev.txt

@@ -14,15 +14,15 @@ astroid==3.3.6
     # via
     #   pylint
     #   pylint-celery
-awscli==1.36.17
+awscli==1.36.22
     # via -r requirements/reporting.in
 bcrypt==4.2.1
     # via paramiko
 billiard==4.2.1
     # via celery
-boto3==1.35.76
+boto3==1.35.81
     # via -r requirements/reporting.in
-botocore==1.35.76
+botocore==1.35.81
     # via
     #   awscli
     #   boto3
@@ -33,7 +33,7 @@ cachetools==5.5.0
     # via tox
 celery==5.3.6
     # via -r requirements/reporting.in
-certifi==2024.8.30
+certifi==2024.12.14
     # via
     #   py2neo
     #   requests
@@ -70,7 +70,7 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.3.0
     # via celery
-code-annotations==2.0.0
+code-annotations==2.1.0
     # via edx-lint
 colorama==0.4.6
     # via
@@ -86,7 +86,7 @@ cryptography==44.0.0
     #   pyopenssl
     #   secretstorage
     #   snowflake-connector-python
-diff-cover==9.2.0
+diff-cover==9.2.1
     # via -r requirements/dev-enterprise_data.in
 dill==0.3.9
     # via pylint
@@ -224,7 +224,7 @@ more-itertools==10.5.0
     #   jaraco-functools
 mysql-connector-python==9.1.0
     # via -r requirements/base.in
-newrelic==10.3.1
+newrelic==10.4.0
     # via edx-django-utils
 nh3==0.2.19
     # via readme-renderer
@@ -389,7 +389,7 @@ snowflake-connector-python==3.12.4
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
-sqlparse==0.5.2
+sqlparse==0.5.3
     # via django
 stevedore==5.4.0
     # via

{edx_enterprise_data-10.6.0 → edx_enterprise_data-10.7.0}/requirements/quality.txt

@@ -14,15 +14,15 @@ astroid==3.3.6
     # via
     #   pylint
     #   pylint-celery
-awscli==1.36.17
+awscli==1.36.22
     # via -r requirements/reporting.in
 bcrypt==4.2.1
     # via paramiko
 billiard==4.2.1
     # via celery
-boto3==1.35.76
+boto3==1.35.81
     # via -r requirements/reporting.in
-botocore==1.35.76
+botocore==1.35.81
     # via
     #   awscli
     #   boto3
@@ -33,7 +33,7 @@ cachetools==5.5.0
     # via tox
 celery==5.3.6
     # via -r requirements/reporting.in
-certifi==2024.8.30
+certifi==2024.12.14
     # via
     #   py2neo
     #   requests
@@ -70,7 +70,7 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.3.0
     # via celery
-code-annotations==2.0.0
+code-annotations==2.1.0
     # via edx-lint
 colorama==0.4.6
     # via
@@ -90,7 +90,7 @@ cryptography==44.0.0
     #   snowflake-connector-python
 ddt==1.7.2
     # via -r requirements/test.in
-diff-cover==9.2.0
+diff-cover==9.2.1
     # via -r requirements/dev-enterprise_data.in
 dill==0.3.9
     # via pylint
@@ -239,7 +239,7 @@ more-itertools==10.5.0
     #   jaraco-functools
 mysql-connector-python==9.1.0
     # via -r requirements/base.in
-newrelic==10.3.1
+newrelic==10.4.0
     # via edx-django-utils
 nh3==0.2.19
     # via readme-renderer
@@ -419,7 +419,7 @@ snowflake-connector-python==3.12.4
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
-sqlparse==0.5.2
+sqlparse==0.5.3
     # via django
 stevedore==5.4.0
     # via

{edx_enterprise_data-10.6.0 → edx_enterprise_data-10.7.0}/requirements/test-master.txt

@@ -10,22 +10,22 @@ asgiref==3.8.1
     # via django
 asn1crypto==1.5.1
     # via snowflake-connector-python
-awscli==1.36.17
+awscli==1.36.22
     # via -r requirements/reporting.in
 bcrypt==4.2.1
     # via paramiko
 billiard==4.2.1
     # via celery
-boto3==1.35.76
+boto3==1.35.81
     # via -r requirements/reporting.in
-botocore==1.35.76
+botocore==1.35.81
     # via
     #   awscli
     #   boto3
     #   s3transfer
 celery==5.3.6
     # via -r requirements/reporting.in
-certifi==2024.8.30
+certifi==2024.12.14
     # via
     #   py2neo
     #   requests
@@ -162,7 +162,7 @@ monotonic==1.6
     # via py2neo
 mysql-connector-python==9.1.0
     # via -r requirements/base.in
-newrelic==10.3.1
+newrelic==10.4.0
     # via edx-django-utils
 numpy==2.2.0
     # via
@@ -274,7 +274,7 @@ snowflake-connector-python==3.12.4
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
-sqlparse==0.5.2
+sqlparse==0.5.3
     # via django
 stevedore==5.4.0
     # via

{edx_enterprise_data-10.6.0 → edx_enterprise_data-10.7.0}/requirements/test-reporting.txt

@@ -8,15 +8,15 @@ amqp==5.3.1
     # via kombu
 asn1crypto==1.5.1
     # via snowflake-connector-python
-awscli==1.36.17
+awscli==1.36.22
     # via -r /home/runner/work/edx-enterprise-data/edx-enterprise-data/requirements/reporting.in
 bcrypt==4.2.1
     # via paramiko
 billiard==4.2.1
     # via celery
-boto3==1.35.76
+boto3==1.35.81
     # via -r /home/runner/work/edx-enterprise-data/edx-enterprise-data/requirements/reporting.in
-botocore==1.35.76
+botocore==1.35.81
     # via
     #   awscli
     #   boto3
@@ -25,7 +25,7 @@ cachetools==5.5.0
     # via tox
 celery==5.3.6
     # via -r /home/runner/work/edx-enterprise-data/edx-enterprise-data/requirements/reporting.in
-certifi==2024.8.30
+certifi==2024.12.14
     # via
     #   py2neo
     #   requests

{edx_enterprise_data-10.6.0 → edx_enterprise_data-10.7.0}/requirements/test.txt

@@ -10,22 +10,22 @@ asgiref==3.8.1
     # via django
 asn1crypto==1.5.1
     # via snowflake-connector-python
-awscli==1.36.17
+awscli==1.36.22
     # via -r requirements/reporting.in
 bcrypt==4.2.1
     # via paramiko
 billiard==4.2.1
     # via celery
-boto3==1.35.76
+boto3==1.35.81
     # via -r requirements/reporting.in
-botocore==1.35.76
+botocore==1.35.81
     # via
     #   awscli
     #   boto3
     #   s3transfer
 celery==5.3.6
     # via -r requirements/reporting.in
-certifi==2024.8.30
+certifi==2024.12.14
     # via
     #   py2neo
     #   requests
@@ -160,7 +160,7 @@ monotonic==1.6
     # via py2neo
 mysql-connector-python==9.1.0
     # via -r requirements/base.in
-newrelic==10.3.1
+newrelic==10.4.0
     # via edx-django-utils
 numpy==2.2.0
     # via
@@ -272,7 +272,7 @@ snowflake-connector-python==3.12.4
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
-sqlparse==0.5.2
+sqlparse==0.5.3
     # via django
 stevedore==5.4.0
     # via