edx-enterprise-data 10.7.7__py3-none-any.whl → 10.8.1__py3-none-any.whl

{edx_enterprise_data-10.7.7.dist-info → edx_enterprise_data-10.8.1.dist-info}/METADATA

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

{edx_enterprise_data-10.7.7.dist-info → edx_enterprise_data-10.8.1.dist-info}/RECORD

@@ -1,14 +1,14 @@
-enterprise_data/__init__.py,sha256=9lUAIZ2fOPZMMSGpLwzcuUQwMGpiMM7gNptTzd7IDnM,124
+enterprise_data/__init__.py,sha256=pPBujM0IVxjUhz1lnPdSHkkELYKz27-OefUZyDB8Nu4,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
 enterprise_data/filters.py,sha256=D2EiK12MMpBoz6eOUmTpoJEhj_sH7bA93NRRAdvkDVo,6163
-enterprise_data/models.py,sha256=INIETN4B6G1EtxVzgBQr6-JMy3ZsHj9K_FCyrS5OFAk,26312
+enterprise_data/models.py,sha256=6_rtrxVX-eW7IjJLLFDK712ih-tFqHWzlsPwwTk7XL0,26555
 enterprise_data/paginators.py,sha256=YPrC5TeXFt-ymenT2H8H2nCbDCnAzJQlH9kFPElRxWE,269
 enterprise_data/renderers.py,sha256=qggCLZklL9ohVcLHLO1pSecPJSDCCR7e_-PVobl9Lj8,3063
 enterprise_data/signals.py,sha256=8eqNPnlvmfsKf19lGWv5xTIuBgQIqR8EZSp9UYzC8Rc,1024
 enterprise_data/urls.py,sha256=bqtKF5OEWEwrNmHG3os-pZNuNsmjlhxEqp7yM4TbPf4,243
-enterprise_data/utils.py,sha256=sDrpBd62DpybCV41QCxRUaCuvch3qKjEhfUp9cA_GV0,2952
+enterprise_data/utils.py,sha256=djGuQUnvT8HJMMV60CzcD5BWerPIwiK9uG26bhkpWMg,3518
 enterprise_data/admin_analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enterprise_data/admin_analytics/constants.py,sha256=-6uLAq5DUeA_rv5eUb9SeqlG3iVWV30qUS8asbK4430,160
 enterprise_data/admin_analytics/data_loaders.py,sha256=b6RjEIxCol8ETQMY7QfwhqN9eEAvrUN_UldIG7rgsSY,736
@@ -30,7 +30,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=mya_ZvP7CTvUTF_ccYkMJZFuzOKIU-aM3eSCQmFazWY,11274
+enterprise_data/api/v1/serializers.py,sha256=DUhk8cP-JFQmbLR_JNGmmwis9Un5dyvd01kRdmxn8Lk,11866
 enterprise_data/api/v1/urls.py,sha256=Wl1xLboPg-Lq1ZvjAWf51JKYkHlmx02Kpq1nwfDyS8s,4372
 enterprise_data/api/v1/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enterprise_data/api/v1/views/analytics_completions.py,sha256=esFbJ5q8ssnm2Mfbc3rZXtiGHF-MeM4KQ4Ft3N7wwHU,6260
@@ -106,6 +106,7 @@ enterprise_data/migrations/0040_auto_20240718_0536_squashed_0043_alter_enterpris
 enterprise_data/migrations/0044_enterpriseexecedlcmoduleperformance.py,sha256=1aJ0wIu9K2cT3AJdBIHuNCUpJysPWmq_37Ucp5ntEO8,6122
 enterprise_data/migrations/0045_alter_enterpriseexecedlcmoduleperformance_options_and_more.py,sha256=HJkY2OvuE39ciWgaEescd--ixQhTVrwzbL0_bvNofSo,876
 enterprise_data/migrations/0046_enterprisegroupmembership.py,sha256=38qfi3EySDLrpP3gDuO_oUl_7rphGPZIrPsCuBhQ_dk,1766
+enterprise_data/migrations/0047_enterpriseexecedlcmoduleperformance_avg_after_lo_score_and_more.py,sha256=_lHmsJozjV_JEWyUfHDKleOhd53594fOaRhz7M0z-nY,897
 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=4-flfrlf81AthGx9wTaT5PscyoOWyhsDDqbzBl-z7Eg,4191
@@ -154,8 +155,8 @@ enterprise_reporting/__init__.py,sha256=yQO9ureIxFnl-1a_34H53elDwuAzXrSmhLlzqqD2
 enterprise_reporting/delivery_method.py,sha256=bG-JCGhrK3nuC3P6D88zBRSwDJCbaDxN35nNlXzvoRM,4813
 enterprise_reporting/external_resource_link_report.py,sha256=jQ6RS0yec0IhAz4wErQ3q8Yn206R7aQbgcR2c803BLA,8066
 enterprise_reporting/reporter.py,sha256=3wI46qH-CNCUC5r9-Eme1mQdMjwEsFk9myRb-ajzJkM,13807
-enterprise_reporting/send_enterprise_reports.py,sha256=usseqP7tG0oyG7goaBA-kz2nQnU6wGLOIv0jlfq_4Lg,4753
-enterprise_reporting/utils.py,sha256=5T2G04Re8tMQ8fAjyy_TdDlq9ZZjm7Yrq_dRQjgTAn4,13860
+enterprise_reporting/send_enterprise_reports.py,sha256=W9xc7hu3ZP4zmoIndITc3hdXDbd4A3QEWQN0_ZO1E1A,5270
+enterprise_reporting/utils.py,sha256=L_ENZYE-UgTy3sHRJSXjN-Hb3qkT-VLAIIqzIu9fpDQ,13745
 enterprise_reporting/clients/__init__.py,sha256=9xW-Nj1A3JWb9rOWVFdFaDzcyremAS-whVB8DRW_wCY,5121
 enterprise_reporting/clients/enterprise.py,sha256=-ZKoQTyDLYPLDfC7hWKhJZxVOorWt0kYmFAiOUJkyNM,9853
 enterprise_reporting/clients/s3.py,sha256=CZ9FgwOGKo-lQmZ4cw8oIqoVmhEtwBb6jfhFqoNHgh4,559
@@ -169,12 +170,12 @@ enterprise_reporting/tests/test_delivery_method.py,sha256=Zy169SrKz5zWjysI_RhGuj
 enterprise_reporting/tests/test_enterprise_client.py,sha256=lpWm0muvA3alRjmlRAezE5901C9DU3WiySH4D5-U3qE,1058
 enterprise_reporting/tests/test_external_link_report.py,sha256=zdnVOD1qtAp9c5EbIPnD9jcoLtW4iKs7gSVklgBK328,7029
 enterprise_reporting/tests/test_reporter.py,sha256=PTmkGvPjGEjxiyizL88LAKnaWdvZDgOBjL4QStfOdyw,4057
-enterprise_reporting/tests/test_send_enterprise_reports.py,sha256=WtL-RqGgu2x5PPqmD8ot8Uiqhlu9w8frat7CbW9RnFk,1034
-enterprise_reporting/tests/test_utils.py,sha256=Zt_TA0LVb-B6fQGkUkAKKVlUKKnQh8jnw1US1jKe7g8,9493
+enterprise_reporting/tests/test_send_enterprise_reports.py,sha256=zBj7sDvRLJQbRsOHwYeOzTGrKx7t7JUq5dLNGASiq7o,1052
+enterprise_reporting/tests/test_utils.py,sha256=y4t6w9aKra-ftqtUeHvPwOhje-1npz7auV5o74ya8fE,9523
 enterprise_reporting/tests/test_vertica_client.py,sha256=-R2yNCGUjRtoXwLMBloVFQkFYrJoo613VCr61gwI3kQ,140
 enterprise_reporting/tests/utils.py,sha256=xms2LM7DV3wczXEfctOK1ddel1EE0J_YSr17UzbCDy4,1401
-edx_enterprise_data-10.7.7.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-edx_enterprise_data-10.7.7.dist-info/METADATA,sha256=uaDRQ8nAmHv_-Jka5r5X0hhD1wsRTr4KY-Px0OQgMRI,1684
-edx_enterprise_data-10.7.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-edx_enterprise_data-10.7.7.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
-edx_enterprise_data-10.7.7.dist-info/RECORD,,
+edx_enterprise_data-10.8.1.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+edx_enterprise_data-10.8.1.dist-info/METADATA,sha256=PETAn5Cls0D4pVyyxTW0flv7OFqFjBNV6RA44cbivOU,1684
+edx_enterprise_data-10.8.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+edx_enterprise_data-10.8.1.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
+edx_enterprise_data-10.8.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__ = "10.7.7"
+__version__ = "10.8.1"

enterprise_data/api/v1/serializers.py

@@ -16,6 +16,7 @@ from enterprise_data.models import (
     EnterpriseOffer,
     EnterpriseSubsidyBudget,
 )
+from enterprise_data.utils import calculate_percentage_difference
 
 
 class EnterpriseLearnerEnrollmentSerializer(serializers.ModelSerializer):
@@ -231,6 +232,7 @@ class EnterpriseExecEdLCModulePerformanceSerializer(serializers.ModelSerializer)
     Serializer for EnterpriseExecEdLCModulePerformance model.
     """
     extensions_requested = serializers.SerializerMethodField()
+    avg_lo_percentage_difference = serializers.SerializerMethodField()
 
     class Meta:
         model = EnterpriseExecEdLCModulePerformance
@@ -240,6 +242,18 @@ class EnterpriseExecEdLCModulePerformanceSerializer(serializers.ModelSerializer)
         """Return extensions_requested if not None, otherwise return 0"""
         return obj.extensions_requested if obj.extensions_requested is not None else 0
 
+    def get_avg_lo_percentage_difference(self, obj):
+        """
+        Return percentage difference between `avg_before_lo_score` and `avg_after_lo_score` if not None,
+        otherwise return None
+        """
+        if obj.avg_before_lo_score is None or obj.avg_after_lo_score is None:
+            return None
+        return round(
+            calculate_percentage_difference(obj.avg_before_lo_score, obj.avg_after_lo_score),
+            2
+        )
+
 
 class EnterpriseBudgetSerializer(serializers.ModelSerializer):
     """

enterprise_data/migrations/0047_enterpriseexecedlcmoduleperformance_avg_after_lo_score_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.15 on 2025-02-20 08:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('enterprise_data', '0046_enterprisegroupmembership'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='enterpriseexecedlcmoduleperformance',
+            name='avg_after_lo_score',
+            field=models.DecimalField(decimal_places=6, max_digits=38, null=True),
+        ),
+        migrations.AddField(
+            model_name='enterpriseexecedlcmoduleperformance',
+            name='avg_before_lo_score',
+            field=models.DecimalField(decimal_places=6, max_digits=38, null=True),
+        ),
+        migrations.AddField(
+            model_name='enterpriseexecedlcmoduleperformance',
+            name='question_name',
+            field=models.CharField(max_length=500, null=True),
+        ),
+    ]

enterprise_data/models.py

@@ -558,6 +558,9 @@ class EnterpriseExecEdLCModulePerformance(models.Model):
     discussion_forum_activities_completed_count = models.PositiveIntegerField(null=True)
     discussion_forum_activities_total_count = models.PositiveIntegerField(null=True)
     pass_grade = models.DecimalField(max_digits=38, decimal_places=2, null=True)
+    question_name = models.CharField(max_length=500, null=True)
+    avg_before_lo_score = models.DecimalField(max_digits=38, decimal_places=6, null=True)
+    avg_after_lo_score = models.DecimalField(max_digits=38, decimal_places=6, null=True)
 
     def __str__(self):
         """

enterprise_data/utils.py

@@ -114,3 +114,22 @@ def find_first(iterable, condition):
         return next(item for item in iterable if condition(item))
     except StopIteration:
         return None
+
+
+def calculate_percentage_difference(first, second):
+    """
+    Calculate the percentage difference between two numbers.
+
+    It will calculate the percentage difference between the two numbers using the formula:
+    ((second - first) / (first + second)/2) * 100
+
+    Arguments:
+        first (float): The first number.
+        second (float): The second number.
+
+    Returns:
+        float: The percentage difference between the two numbers.
+    """
+    if first == 0 and second == 0:
+        return 0
+    return ((second - first) / ((first + second) / 2)) * 100

enterprise_reporting/send_enterprise_reports.py

@@ -4,13 +4,15 @@ Sends an Enterprise Customer's data file to a configured destination.
 """
 
 
-
 import argparse
+import datetime
 import logging
 import os
 import re
 import sys
 
+import pytz
+
 from enterprise_reporting.clients.enterprise import EnterpriseAPIClient
 from enterprise_reporting.reporter import EnterpriseReportSender
 from enterprise_reporting.utils import is_current_time_in_schedule
@@ -55,11 +57,13 @@ def cleanup_files(enterprise_id):
             os.remove(os.path.join(directory, f))
 
 
-def should_deliver_report(args, reporting_config):
+def should_deliver_report(args, reporting_config, current_est_time):
     """Given CLI arguments and the reporting configuration, determine if delivery should happen."""
     valid_data_type = reporting_config['data_type'] in (args.data_type or DATA_TYPES)
     enterprise_customer_specified = bool(args.enterprise_customer)
+
     meets_schedule_requirement = is_current_time_in_schedule(
+        current_est_time,
         reporting_config['frequency'],
         reporting_config['hour_of_day'],
         reporting_config['day_of_month'],
@@ -101,6 +105,12 @@ def process_reports():
         LOGGER.error(f'The enterprise {args.enterprise_customer} does not have a reporting configuration.')
         sys.exit(1)
 
+    # We are defining the current est time globally because we want the current time for a job
+    # to remain same thoughout the job. This ensures that a single report is not processed multiple times. 
+    # See this comment for more details: https://2u-internal.atlassian.net/browse/ENT-9954?focusedCommentId=5356815
+    est_timezone = pytz.timezone('US/Eastern')
+    current_est_time = datetime.datetime.now(est_timezone)
+
     error_raised = False
     for reporting_config in reporting_configs['results']:
         LOGGER.info('Checking if {}\'s reporting config for {} data in {} format is ready for processing'.format(
@@ -109,7 +119,7 @@ def process_reports():
             reporting_config['report_type'],
         ))
 
-        if should_deliver_report(args, reporting_config):
+        if should_deliver_report(args, reporting_config, current_est_time):
             if send_data(reporting_config):
                 error_raised = True
         else:

enterprise_reporting/tests/test_send_enterprise_reports.py

@@ -33,4 +33,4 @@ class TestSendEnterpriseReports(unittest.TestCase):
 		Command = namedtuple("Command", "data_type enterprise_customer")
 		args = Command('', '')
 
-		assert should_deliver_report(args, reporting_config)
+		assert should_deliver_report(args, reporting_config, current_est_time)

enterprise_reporting/tests/test_utils.py

@@ -165,6 +165,7 @@ class TestUtilities(unittest.TestCase):
         est_timezone = pytz.timezone('US/Eastern')
         current_est_time = datetime.datetime.now(est_timezone)
         assert utils.is_current_time_in_schedule(
+            current_est_time,
             utils.FREQUENCY_TYPE_DAILY,
             current_est_time.hour,
             current_est_time.day,

enterprise_reporting/utils.py

@@ -3,7 +3,6 @@ Utility functions for Enterprise Reporting.
 """
 
 
-import datetime
 import logging
 import os
 import re
@@ -16,7 +15,6 @@ from urllib.parse import parse_qs, urlparse
 import boto3
 import pgpy
 import pyminizip
-import pytz
 from cryptography.fernet import Fernet
 from fernet_fields.hkdf import derive_fernet_key
 
@@ -149,12 +147,11 @@ def send_email_with_attachment(subject, body, from_email, to_email, attachment_d
         LOGGER.debug(result)
 
 
-def is_current_time_in_schedule(frequency, hour_of_day, day_of_month=None, day_of_week=None):
+def is_current_time_in_schedule(current_est_time, frequency, hour_of_day, day_of_month=None, day_of_week=None):
     """
     Determine if the current time is in the range specified by this configuration's schedule.
     """
-    est_timezone = pytz.timezone('US/Eastern')
-    current_est_time = datetime.datetime.now(est_timezone)
+
     current_hour_of_day = current_est_time.hour
     current_day_of_week = current_est_time.weekday()
     current_day_of_month = current_est_time.day