edx-enterprise-data 10.9.8__tar.gz → 10.10.1__tar.gz

{edx_enterprise_data-10.9.8 → edx_enterprise_data-10.10.1}/CHANGELOG.rst

@@ -15,6 +15,53 @@ Unreleased
 ----------
 
 =========================
+[10.10.1] - 2025-03-18
+---------------------
+  * fix: Updated FROM email address to a provisioned email address.
+
+[10.10.0] - 2025-02-24
+---------------------
+  * feat: Added separate handling for of SFTP transmission failures.
+
+[10.9.2] - 2025-03-11
+---------------------
+  * feat: support flex groups in csv report on LPR.
+
+[10.9.0] - 2025-02-24
+---------------------
+  * feat: get groups data from membership endpoint using enterprise client.
+
+[10.8.1] - 2025-02-20
+---------------------
+  * fix: Limited accuracy of floating pointing numbers to 2 places.
+
+[10.8.1] - 2025-02-20
+---------------------
+  * feat: Added 2 new columns in module performance report model and exposed them via associated REST API.
+
+[10.7.8] - 2025-02-18
+---------------------
+  * chore: bump version from 10.7.7 to 10.7.8 for dependency upgrades
+
+[10.7.7] - 2025-02-11
+---------------------
+  * chore: upgrade python requirements
+
+[10.7.6] - 2025-02-03
+---------------------
+  * chore: upgrade python requirements
+
+[10.7.5] - 2025-01-28
+---------------------
+  * chore: upgrade python requirements
+
+[10.7.4] - 2025-01-27
+---------------------
+  * Fix: added UTC timezone in last_updated_date in enterprise enrollments API
+
+[10.7.3] - 2025-01-21
+---------------------
+  * Fix: added timestampt in last_updated_date in enterprise enrollments API
 
 [10.7.2] - 2025-01-16
 ---------------------

{edx_enterprise_data-10.9.8/edx_enterprise_data.egg-info → edx_enterprise_data-10.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: edx-enterprise-data
-Version: 10.9.8
+Version: 10.10.1
 Summary: Enterprise Reporting
 Home-page: https://github.com/openedx/edx-enterprise-data
 Author: edX
@@ -9,7 +9,6 @@ License: AGPL 3.0
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 4.2
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.12
 License-File: LICENSE
 Requires-Dist: Django
@@ -24,8 +23,8 @@ Requires-Dist: edx-rbac
 Requires-Dist: edx-rest-api-client
 Requires-Dist: factory_boy
 Requires-Dist: mysql-connector-python
-Requires-Dist: numpy<=1.24.4
-Requires-Dist: pandas<=2.0.3
+Requires-Dist: numpy
+Requires-Dist: pandas
 Requires-Dist: requests
 Requires-Dist: rules
 Provides-Extra: reporting
@@ -40,5 +39,14 @@ Requires-Dist: pyminizip; extra == "reporting"
 Requires-Dist: snowflake-connector-python; extra == "reporting"
 Requires-Dist: unicodecsv==0.14.1; extra == "reporting"
 Requires-Dist: vertica-python; extra == "reporting"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 Tools and products related to providing access to Enterprise data.

{edx_enterprise_data-10.9.8 → edx_enterprise_data-10.10.1/edx_enterprise_data.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: edx-enterprise-data
-Version: 10.9.8
+Version: 10.10.1
 Summary: Enterprise Reporting
 Home-page: https://github.com/openedx/edx-enterprise-data
 Author: edX
@@ -9,7 +9,6 @@ License: AGPL 3.0
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 4.2
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.12
 License-File: LICENSE
 Requires-Dist: Django
@@ -24,8 +23,8 @@ Requires-Dist: edx-rbac
 Requires-Dist: edx-rest-api-client
 Requires-Dist: factory_boy
 Requires-Dist: mysql-connector-python
-Requires-Dist: numpy<=1.24.4
-Requires-Dist: pandas<=2.0.3
+Requires-Dist: numpy
+Requires-Dist: pandas
 Requires-Dist: requests
 Requires-Dist: rules
 Provides-Extra: reporting
@@ -40,5 +39,14 @@ Requires-Dist: pyminizip; extra == "reporting"
 Requires-Dist: snowflake-connector-python; extra == "reporting"
 Requires-Dist: unicodecsv==0.14.1; extra == "reporting"
 Requires-Dist: vertica-python; extra == "reporting"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 Tools and products related to providing access to Enterprise data.

{edx_enterprise_data-10.9.8 → edx_enterprise_data-10.10.1}/edx_enterprise_data.egg-info/SOURCES.txt

@@ -117,6 +117,8 @@ enterprise_data/migrations/0040_auto_20240718_0536_squashed_0043_alter_enterpris
 enterprise_data/migrations/0044_enterpriseexecedlcmoduleperformance.py
 enterprise_data/migrations/0045_alter_enterpriseexecedlcmoduleperformance_options_and_more.py
 enterprise_data/migrations/0046_enterprisegroupmembership.py
+enterprise_data/migrations/0047_enterpriseexecedlcmoduleperformance_avg_after_lo_score_and_more.py
+enterprise_data/migrations/0048_alter_enterpriseexecedlcmoduleperformance_avg_after_lo_score_and_more.py
 enterprise_data/migrations/__init__.py
 enterprise_data/settings/__init__.py
 enterprise_data/settings/test.py
@@ -162,6 +164,7 @@ enterprise_data_roles/tests/__init__.py
 enterprise_data_roles/tests/factories.py
 enterprise_data_roles/tests/test_models.py
 enterprise_reporting/__init__.py
+enterprise_reporting/constants.py
 enterprise_reporting/delivery_method.py
 enterprise_reporting/external_resource_link_report.py
 enterprise_reporting/reporter.py

{edx_enterprise_data-10.9.8 → edx_enterprise_data-10.10.1}/edx_enterprise_data.egg-info/requires.txt

@@ -10,8 +10,8 @@ edx-rbac
 edx-rest-api-client
 factory_boy
 mysql-connector-python
-numpy<=1.24.4
-pandas<=2.0.3
+numpy
+pandas
 requests
 rules
 

{edx_enterprise_data-10.9.8 → edx_enterprise_data-10.10.1}/enterprise_data/__init__.py

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

{edx_enterprise_data-10.9.8 → edx_enterprise_data-10.10.1}/enterprise_data/admin_analytics/data_loaders.py

@@ -21,4 +21,4 @@ def fetch_max_enrollment_datetime():
     results = run_query(query)
     if not results:
         return None
-    return pandas.to_datetime(results[0][0])
+    return pandas.to_datetime(results[0][0], utc=True)

{edx_enterprise_data-10.9.8 → edx_enterprise_data-10.10.1}/enterprise_data/api/v1/serializers.py

@@ -6,6 +6,7 @@ from uuid import UUID
 from rest_framework import serializers
 
 from enterprise_data.admin_analytics.constants import ResponseType
+from enterprise_data.cache.decorators import cache_it
 from enterprise_data.models import (
     EnterpriseAdminLearnerProgress,
     EnterpriseAdminSummarizeInsights,
@@ -16,6 +17,7 @@ from enterprise_data.models import (
     EnterpriseOffer,
     EnterpriseSubsidyBudget,
 )
+from enterprise_data.utils import calculate_percentage_difference
 
 
 class EnterpriseLearnerEnrollmentSerializer(serializers.ModelSerializer):
@@ -25,6 +27,8 @@ class EnterpriseLearnerEnrollmentSerializer(serializers.ModelSerializer):
     course_api_url = serializers.SerializerMethodField()
     enterprise_user_id = serializers.SerializerMethodField()
     total_learning_time_hours = serializers.SerializerMethodField()
+    enterprise_flex_group_name = serializers.SerializerMethodField()
+    enterprise_flex_group_uuid = serializers.SerializerMethodField()
 
     class Meta:
         model = EnterpriseLearnerEnrollment
@@ -43,8 +47,9 @@ class EnterpriseLearnerEnrollmentSerializer(serializers.ModelSerializer):
             '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', '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',
+            'enterprise_customer_uuid', 'enterprise_sso_uid', 'created', 'course_api_url',
+            'total_learning_time_hours', 'is_subsidy', 'course_product_line', 'budget_id',
+            'enterprise_flex_group_name', 'enterprise_flex_group_uuid',
         )
 
     def get_course_api_url(self, obj):
@@ -61,6 +66,51 @@ class EnterpriseLearnerEnrollmentSerializer(serializers.ModelSerializer):
         """Returns the learners total learning time in hours"""
         return round((obj.total_learning_time_seconds or 0.0)/3600.0, 2)
 
+    @cache_it()
+    def _get_flex_groups(self, obj):
+        """
+        Returns list of tuples containing group (name, uuid) pairs for the learner.
+        This is cached to prevent duplicate database queries.
+        """
+        enterprise_user_id = obj.enterprise_user_id
+
+        if not enterprise_user_id:
+            return []
+
+        # Get all group memberships for this user in a single query
+        # Order by name for consistent ordering
+        return list(
+            EnterpriseGroupMembership.objects.filter(
+                enterprise_customer_user_id=enterprise_user_id,
+                membership_is_removed=False,
+                group_is_removed=False,
+                group_type="flex",
+            )
+            .order_by("enterprise_group_name")
+            .values_list("enterprise_group_name", "enterprise_group_uuid")
+            .distinct()
+        )
+
+    def get_enterprise_flex_group_name(self, obj):
+        """Returns a comma-separated list of enterprise group names that the learner is associated with"""
+        groups = self._get_flex_groups(obj)
+
+        if not groups:
+            return obj.enterprise_group_name
+
+        # Return comma-separated list of group names (first element of each tuple)
+        return ', '.join(group[0] for group in groups)
+
+    def get_enterprise_flex_group_uuid(self, obj):
+        """Returns a comma-separated list of enterprise group UUIDs that the learner is associated with"""
+        groups = self._get_flex_groups(obj)
+
+        if not groups:
+            return obj.enterprise_group_uuid
+
+        # Return comma-separated list of group UUIDs (second element of each tuple)
+        return ', '.join(str(group[1]) for group in groups)
+
 
 class EnterpriseSubsidyBudgetSerializer(serializers.ModelSerializer):
     """
@@ -231,6 +281,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 +291,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):
     """

{edx_enterprise_data-10.9.8 → edx_enterprise_data-10.10.1}/enterprise_data/api/v1/views/enterprise_admin.py

@@ -126,7 +126,7 @@ class EnterpriseAdminAnalyticsAggregatesView(APIView):
                 'completions': completions,
                 'hours': hours,
                 'sessions': sessions,
-                'last_updated_at': last_updated_at.date() if last_updated_at else None,
+                'last_updated_at': last_updated_at if last_updated_at else None,
                 'min_enrollment_date': min_enrollment_date,
                 'max_enrollment_date': max_enrollment_date,
             },

{edx_enterprise_data-10.9.8 → edx_enterprise_data-10.10.1}/enterprise_data/api/v1/views/enterprise_learner.py

@@ -8,6 +8,7 @@ from uuid import UUID
 
 from rest_framework import filters, viewsets
 from rest_framework.decorators import action
+from rest_framework.exceptions import NotFound
 from rest_framework.response import Response
 
 from django.conf import settings
@@ -20,6 +21,7 @@ from django.utils import timezone
 
 from enterprise_data.admin_analytics.database.utils import LOGGER
 from enterprise_data.api.v1 import serializers
+from enterprise_data.clients import EnterpriseApiClient
 from enterprise_data.models import EnterpriseGroupMembership, EnterpriseLearner, EnterpriseLearnerEnrollment
 from enterprise_data.paginators import EnterpriseEnrollmentsPagination
 from enterprise_data.renderers import EnrollmentsCSVRenderer
@@ -176,12 +178,51 @@ class EnterpriseLearnerEnrollmentViewSet(EnterpriseViewSetMixin, viewsets.ReadOn
 
         group_uuid = query_filters.get('group_uuid')
         if group_uuid:
-            flex_group_exists = EnterpriseGroupMembership.objects.filter(
-                enterprise_customer_user_id=OuterRef('enterprise_user_id'),
-                enterprise_group_uuid=group_uuid,
-                group_type='flex'
-            )
-            queryset = queryset.filter(Exists(flex_group_exists))
+            queryset = self.filter_by_group_uuid(queryset, group_uuid)
+
+        return queryset
+
+    def filter_by_group_uuid(self, queryset, group_uuid):
+        """
+        Filters the queryset based on the provided group_uuid. If no records are found,
+        it attempts to fetch group learners from the API and filter the queryset again.
+
+        Args:
+            queryset (QuerySet): The initial queryset to filter.
+            group_uuid (str): The UUID of the group to filter by.
+
+        Returns:
+            QuerySet: The filtered queryset.
+        """
+        flex_group_exists = EnterpriseGroupMembership.objects.filter(
+            enterprise_customer_user_id=OuterRef('enterprise_user_id'),
+            enterprise_group_uuid=group_uuid,
+            group_type='flex'
+        )
+
+        # First, filter the queryset using flex_group_exists
+        filtered_queryset = queryset.filter(Exists(flex_group_exists))
+
+        # If no records are found, attempt to fetch group_learners from the API
+        if not filtered_queryset.exists():
+            try:
+                enterprise_api_client = EnterpriseApiClient(
+                    settings.BACKEND_SERVICE_EDX_OAUTH2_PROVIDER_URL,
+                    settings.BACKEND_SERVICE_EDX_OAUTH2_KEY,
+                    settings.BACKEND_SERVICE_EDX_OAUTH2_SECRET,
+                )
+                group_learners = enterprise_api_client.get_enterprise_group_learners(group_uuid)
+                if group_learners:
+                    group_learners_ids = [learner['enterprise_customer_user_id'] for learner in group_learners]
+                    queryset = queryset.filter(enterprise_user_id__in=group_learners_ids)
+                else:
+                    LOGGER.warning(f"No group learners found for group: {group_uuid}")
+                    raise NotFound(f"No learners found for group: {group_uuid}")
+            except (Exception) as e:  # pylint: disable=broad-exception-caught
+                LOGGER.error("Failed to fetch group learners from API: %s", e)
+                queryset = queryset.none()  # API call failed or unexpected error, return an empty queryset
+        else:
+            queryset = filtered_queryset
 
         return queryset
 

{edx_enterprise_data-10.9.8 → edx_enterprise_data-10.10.1}/enterprise_data/clients.py

@@ -101,3 +101,30 @@ class EnterpriseApiClient(OAuthAPIClient):
         TieredCache.set_all_tiers(cache_key, data, DEFAULT_REPORTING_CACHE_TIMEOUT)
 
         return data
+
+    def get_enterprise_group_learners(self, group_uuid):
+        """
+        Get the learners associated with a given enterprise group.
+
+        Returns: list of learners or None if unable to retrieve or no learners exist
+        """
+        LOGGER.info(f'[EnterpriseApiClient] getting learners for enterprise group:{group_uuid}')
+        url = urljoin(self.API_BASE_URL, f'enterprise-group/{group_uuid}/learners/')
+        all_learners = []
+
+        try:
+            while url:
+                response = self.get(url)
+                response.raise_for_status()
+                data = response.json()
+                all_learners.extend(data.get('results', []))
+                url = data.get('next')  # Get the URL for the next page, if any
+
+        except (HTTPError, RequestException) as exc:
+            LOGGER.warning(
+                "[Data Overview Failure] Unable to retrieve Enterprise Group Learners details. "
+                f"Group: {group_uuid}, Exception: {exc}"
+            )
+            return None
+
+        return all_learners

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

edx_enterprise_data-10.10.1/enterprise_data/migrations/0048_alter_enterpriseexecedlcmoduleperformance_avg_after_lo_score_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.15 on 2025-02-25 08:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('enterprise_data', '0047_enterpriseexecedlcmoduleperformance_avg_after_lo_score_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='enterpriseexecedlcmoduleperformance',
+            name='avg_after_lo_score',
+            field=models.DecimalField(decimal_places=2, max_digits=38, null=True),
+        ),
+        migrations.AlterField(
+            model_name='enterpriseexecedlcmoduleperformance',
+            name='avg_before_lo_score',
+            field=models.DecimalField(decimal_places=2, max_digits=38, null=True),
+        ),
+    ]

{edx_enterprise_data-10.9.8 → edx_enterprise_data-10.10.1}/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=2, null=True)
+    avg_after_lo_score = models.DecimalField(max_digits=38, decimal_places=2, null=True)
 
     def __str__(self):
         """

{edx_enterprise_data-10.9.8 → edx_enterprise_data-10.10.1}/enterprise_data/renderers.py

@@ -27,7 +27,7 @@ class EnrollmentsCSVRenderer(CSVStreamingRenderer):
         'letter_grade', 'enterprise_user_id', 'user_email', 'user_account_creation_date',
         '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',
+        'is_subsidy', 'course_product_line', 'budget_id', 'enterprise_flex_group_name', 'enterprise_flex_group_uuid',
     ]
 
 

{edx_enterprise_data-10.9.8 → edx_enterprise_data-10.10.1}/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

edx_enterprise_data-10.10.1/enterprise_reporting/constants.py

@@ -0,0 +1,7 @@
+"""
+Constants for enterprise_reporting.
+"""
+
+
+SFTP_OPS_GENIE_EMAIL_ALERT_FROM_EMAIL = "enterprise-integrations@edx.org"
+SFTP_OPS_GENIE_EMAIL_ALERT_EMAILS = ['enterprise-reporting-sftp@2u-internal.opsgenie.net']

{edx_enterprise_data-10.9.8 → edx_enterprise_data-10.10.1}/enterprise_reporting/delivery_method.py

@@ -2,15 +2,19 @@
 Classes that handle sending reports for enterprise customers with specific delivery methods.
 """
 
-
-
 import logging
 import os
 from smtplib import SMTPException
 
 import paramiko
 
-from enterprise_reporting.utils import compress_and_encrypt, decrypt_string, send_email_with_attachment
+from enterprise_reporting.constants import SFTP_OPS_GENIE_EMAIL_ALERT_EMAILS, SFTP_OPS_GENIE_EMAIL_ALERT_FROM_EMAIL
+from enterprise_reporting.utils import (
+    compress_and_encrypt,
+    decrypt_string,
+    retry_on_exception,
+    send_email_with_attachment,
+)
 
 LOGGER = logging.getLogger(__name__)
 
@@ -97,6 +101,8 @@ class SFTPDeliveryMethod(DeliveryMethod):
     """
     Class that handles sending an enterprise report file via SFTP.
     """
+    sender_email = SFTP_OPS_GENIE_EMAIL_ALERT_FROM_EMAIL
+    receiver_emails = SFTP_OPS_GENIE_EMAIL_ALERT_EMAILS
 
     def __init__(self, reporting_config, password):
         """Initialize the SFTP Delivery Method."""
@@ -106,9 +112,11 @@ class SFTPDeliveryMethod(DeliveryMethod):
         self.username = reporting_config['sftp_username']
         self.file_path = reporting_config['sftp_file_path']
 
-    def send(self, files):
-        """Send the given files through SFTP."""
-        data_reports = super().send(files)
+    @retry_on_exception(max_retries=3, delay=2, backoff=2)
+    def send_over_sftp(self, data_reports):
+        """
+        Send the reports via SFTP, retry on exception.
+        """
         LOGGER.info('Connecting via SFTP to remote host {} for {}'.format(
             self.hostname,
             self.enterprise_customer_name
@@ -129,4 +137,25 @@ class SFTPDeliveryMethod(DeliveryMethod):
             )
         sftp.close()
         ssh.close()
-        LOGGER.info(f'Successfully sent report via sftp for {self.enterprise_customer_name}')
+
+    def send(self, files):
+        """Send the given files through SFTP."""
+        try:
+            data_reports = super().send(files)
+            self.send_over_sftp(data_reports)
+        except Exception:  # pylint: disable=broad-except
+            email_subject = f'SFTP transmission failed for {self.enterprise_customer_name}'
+            email_body = f'Failed to send {self.data_type} report for {self.enterprise_customer_name}'
+            LOGGER.exception(f'SFTP transmission failed for {self.enterprise_customer_name}')
+        else:
+            LOGGER.info(f'Successfully sent report via sftp for {self.enterprise_customer_name}')
+            email_subject = f'SFTP transmission successful for {self.enterprise_customer_name}'
+            email_body = f'SFTP transmission successful for {self.enterprise_customer_name}'
+
+        send_email_with_attachment(
+            subject=email_subject,
+            body=email_body,
+            from_email=self.sender_email,
+            to_email=self.receiver_emails,
+            attachment_data={},
+        )

{edx_enterprise_data-10.9.8 → edx_enterprise_data-10.10.1}/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: