feat(enterprise) ENT-11235: Fix EnterpriseCustomerAdmin invited_date and add invitation lifecycle fields

- Fixed the invited_date signal handling for EnterpriseCustomerAdmin
- Updated related models and signals
- Added date fields to track enterprise user invitation lifecycle

Author: sjasti-sonata-svg

CHANGELOG.rst

@@ -17,6 +17,10 @@ Unreleased
 ----------
 * nothing unreleased
 
+[6.5.8] - 2025-12-16
+---------------------
+* feat: Update admin table with new fields
+
 [6.5.7] - 2025-11-28
 ---------------------
 * feat: fetch SAP user id by remote_id_field_name

enterprise/__init__.py

@@ -2,4 +2,4 @@
 Your project description goes here.
 """
 
-__version__ = "6.5.7"
+__version__ = "6.5.8"

enterprise/api/v1/serializers.py

@@ -2047,7 +2047,7 @@ class Meta:
     is_admin = serializers.SerializerMethodField()
 
     def is_enterprise_customer_user(self, obj):
-        return hasattr(obj, 'user_id') and obj.user_id > 0
+         return hasattr(obj, 'user_id') and obj.user_id > 0
 
     def get_enterprise_customer_user(self, obj):
         """

enterprise/migrations/0243_enterprisecustomeradmin_invited_date_and_more.py

@@ -0,0 +1,49 @@
+# Generated by Django 5.2.8 on 2025-12-29 17:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("enterprise", "0242_mariadb_uuid_conversion"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="enterprisecustomeradmin",
+            name="invited_date",
+            field=models.DateTimeField(
+                blank=True, 
+                help_text="Timestamp when the admin was invited.", 
+                null=True
+            ),
+        ),
+        migrations.AddField(
+            model_name="enterprisecustomeradmin",
+            name="joined_date",
+            field=models.DateTimeField(
+                blank=True,
+                help_text="Timestamp when the admin accepted the invite and was created.",
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalpendingenterprisecustomeradminuser",
+            name="invited_date",
+            field=models.DateTimeField(
+                blank=True,
+                help_text="Timestamp when the admin invite was created.",
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="pendingenterprisecustomeradminuser",
+            name="invited_date",
+            field=models.DateTimeField(
+                blank=True,
+                help_text="Timestamp when the admin invite was created.",
+                null=True,
+            ),
+        ),
+    ]

enterprise/models.py

@@ -1091,7 +1091,6 @@ class EnterpriseCustomerUser(TimeStampedModel):
         related_name='linked_enterprise_customer_users',
         on_delete=models.SET_NULL
     )
-
     objects = EnterpriseCustomerUserManager()
     all_objects = EnterpriseCustomerUserManager(linked_only=False)
     history = HistoricalRecords()
@@ -3971,6 +3970,12 @@ class PendingEnterpriseCustomerAdminUser(TimeStampedModel):
     user_email = models.EmailField(null=False, blank=False)
     history = HistoricalRecords()
 
+    invited_date = models.DateTimeField(
+        null=True,
+        blank=True,
+        help_text="Timestamp when the admin invite was created."
+    )
+
     class Meta:
         app_label = 'enterprise'
         ordering = ['created']
@@ -5006,6 +5011,17 @@ class EnterpriseCustomerAdmin(TimeStampedModel):
         default=False,
         help_text=_("Whether the admin has completed the onboarding tour.")
     )
+    invited_date = models.DateTimeField(
+        null=True,
+        blank=True,
+        help_text="Timestamp when the admin was invited."
+    )
+
+    joined_date = models.DateTimeField(
+        null=True,
+        blank=True,
+        help_text="Timestamp when the admin accepted the invite and was created."
+    )
 
     class Meta:
         app_label = 'enterprise'

enterprise/signals.py

@@ -8,11 +8,16 @@
 from django.db import transaction
 from django.db.models.signals import post_delete, post_save, pre_save
 from django.dispatch import receiver
+from django.utils.timezone import now
 
 from enterprise import models, roles_api
 from enterprise.api import activate_admin_permissions
 from enterprise.api_client.enterprise_catalog import EnterpriseCatalogApiClient
 from enterprise.decorators import disable_for_loaddata
+from enterprise.models import (
+    EnterpriseCustomerAdmin,
+    PendingEnterpriseCustomerAdminUser,
+)
 from enterprise.tasks import create_enterprise_enrollment
 from enterprise.utils import (
     NotConnectedToOpenEdX,
@@ -441,6 +446,27 @@ def generate_default_orchestration_record_display_name(sender, instance, **kwarg
             ).count()
             instance.display_name = f'SSO-config-{instance.identity_provider}-{num_records_for_customer + 1}'
 
+@receiver(post_save, sender=EnterpriseCustomerAdmin)
+def populate_admin_onboarding_metadata(sender, instance, created, **kwargs):
+    """
+    Populate joined_date and invited metadata for enterprise admins.
+    """
+    if not created:
+        return
+
+    # joined_date = when admin record is created
+    instance.joined_date = now()
+
+    # Attempt to backfill invitation metadata
+    pending_invite = PendingEnterpriseCustomerAdminUser.objects.filter(
+        enterprise_customer=instance.enterprise_customer_user.enterprise_customer,
+        user_email=instance.enterprise_customer_user.user_email,
+    ).order_by("-invited_date").first()
+
+    if pending_invite:
+        instance.invited_date = pending_invite.invited_date
+
+    instance.save(update_fields=["joined_date", "invited_date"])
 
 # Don't connect this receiver if we dont have access to CourseEnrollment model
 if CourseEnrollment is not None:

tests/test_enterprise/test_signals.py

@@ -12,10 +12,12 @@
 
 from django.db import transaction
 from django.test import TestCase, override_settings
+from django.utils import timezone
 
 from enterprise.constants import ENTERPRISE_ADMIN_ROLE, ENTERPRISE_LEARNER_ROLE
 from enterprise.models import (
     EnterpriseCourseEnrollment,
+    EnterpriseCustomer,
     EnterpriseCustomerAdmin,
     EnterpriseCustomerCatalog,
     EnterpriseCustomerUser,
@@ -415,6 +417,48 @@ def test_delete_pending_enterprise_admin_user(self):
         ).delete()
         self._assert_pending_ecus_exist(should_exist=False)
 
+@mark.django_db
+class TestEnterpriseCustomerAdminSignals(unittest.TestCase):
+    """
+    Tests signals related to EnterpriseCustomerAdmin creation and field updates.
+    """
+
+    def setUp(self):
+        self.admin_user = UserFactory(email='user@example.com')
+        self.enterprise_customer = EnterpriseCustomerFactory()
+
+        self.ecu = EnterpriseCustomerUserFactory(
+            user_fk=self.admin_user, 
+            user_id=self.admin_user.id,     
+            enterprise_customer=self.enterprise_customer,
+        )
+        super().setUp()
+
+    def test_invited_date_is_set_on_creation(self):
+        pending_admin = PendingEnterpriseCustomerAdminUserFactory(
+        enterprise_customer=self.ecu.enterprise_customer,
+        user_email=self.ecu.user_email,
+        invited_date=timezone.now() - timedelta(days=1)
+        )
+
+        admin = EnterpriseCustomerAdmin.objects.create(
+            enterprise_customer_user=self.ecu
+        )
+
+        admin.refresh_from_db()
+        self.assertIsNotNone(admin.invited_date)
+
+    def test_joined_date_not_set_on_create(self):
+        admin = EnterpriseCustomerAdmin(
+            enterprise_customer_user=self.ecu
+        )
+        self.assertIsNone(getattr(admin, 'joined_date', None))
+
+    def test_joined_date_set_when_admin_user_is_accepted(self):
+        admin = EnterpriseCustomerAdmin.objects.create(
+            enterprise_customer_user=self.ecu
+        )
+        self.assertIsNotNone(admin.joined_date)
 
 @mark.django_db
 @ddt.ddt

tests/test_utilities.py

@@ -20,6 +20,7 @@
 from enterprise import utils, validators
 from enterprise.models import (
     EnterpriseCustomer,
+    EnterpriseCustomerAdmin,
     EnterpriseCustomerBrandingConfiguration,
     EnterpriseCustomerIdentityProvider,
     EnterpriseCustomerUser,
@@ -207,6 +208,21 @@ def setUp(self):
                 "user_fk",
             ]
         ),
+        (
+            EnterpriseCustomerAdmin,
+            [
+                "uuid",
+                "created",
+                "modified",
+                "enterprise_customer_user",
+                "last_login",
+                "onboarding_tour_dismissed",
+                "onboarding_tour_completed",
+                "invited_date",
+                "joined_date",
+                "completed_tour_flows",
+            ]
+        ),
         (
             EnterpriseCustomerBrandingConfiguration,
             [