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

removed signal and set invited_date via defaults

updating changelog.rst

Removed  unintended migration file

fixed comments

Author: sjasti-sonata-svg

CHANGELOG.rst

@@ -17,6 +17,10 @@ Unreleased
 ----------
 * nothing unreleased
 
+[6.6.3] - 2026-01-22
+---------------------
+* feat: updates the enterprise customer user table
+
 [6.6.2] - 2026-01-15
 ---------------------
 * feat: add a waffle flag for invite admins

enterprise/api/__init__.py

@@ -1,6 +1,8 @@
 """
 Python API for various enterprise functionality.
 """
+from django.utils.timezone import now
+
 from enterprise import roles_api
 from enterprise.models import EnterpriseCustomerAdmin, PendingEnterpriseCustomerAdminUser
 
@@ -26,6 +28,7 @@ def activate_admin_permissions(enterprise_customer_user):
         # if this user is an admin, we want to create an accompanying EnterpriseCustomerAdmin record
         EnterpriseCustomerAdmin.objects.get_or_create(
             enterprise_customer_user=enterprise_customer_user,
+            defaults={'joined_date': now()}
         )
     except PendingEnterpriseCustomerAdminUser.DoesNotExist:
         return  # this is ok, nothing to do

enterprise/api/v1/views/enterprise_customer_admin.py

@@ -143,7 +143,8 @@ def create_admin_by_email(self, request):
 
         response_status_code = status.HTTP_200_OK
         admin, was_created = models.EnterpriseCustomerAdmin.objects.get_or_create(
-            enterprise_customer_user=enterprise_customer_user
+            enterprise_customer_user=enterprise_customer_user,
+            defaults={'joined_date': timezone.now()}
         )
         if was_created:
             response_status_code = status.HTTP_201_CREATED

enterprise/management/commands/create_enterprise_customer_admins.py

@@ -110,7 +110,8 @@ def handle(self, *args, **options):
                             admin_records = [
                                 EnterpriseCustomerAdmin(
                                     enterprise_customer_user=eu,
-                                    last_login=timezone.now()
+                                    last_login=timezone.now(),
+                                    joined_date=timezone.now(),
                                 )
                                 for eu in enterprise_users_to_create
                             ]

enterprise/migrations/0243_enterprisecustomeradmin_joined_date.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.2.8 on 2026-01-30 05:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("enterprise", "0242_mariadb_uuid_conversion"),
+    ]
+
+    operations = [
+        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,
+            ),
+        ),
+    ]

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()
@@ -5006,6 +5005,12 @@ class EnterpriseCustomerAdmin(TimeStampedModel):
         default=False,
         help_text=_("Whether the admin has completed the onboarding tour.")
     )
+    #Track when the admin accepted the invite and joined.
+    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,13 @@
 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,
@@ -439,8 +441,8 @@ def generate_default_orchestration_record_display_name(sender, instance, **kwarg
             num_records_for_customer = models.EnterpriseCustomerSsoConfiguration.objects.filter(
                 enterprise_customer=instance.enterprise_customer,
             ).count()
-            instance.display_name = f'SSO-config-{instance.identity_provider}-{num_records_for_customer + 1}'
 
+            instance.display_name = f'SSO-config-{instance.identity_provider}-{num_records_for_customer + 1}'
 
 # Don't connect this receiver if we dont have access to CourseEnrollment model
 if CourseEnrollment is not None:

tests/test_enterprise/api/test_serializers.py

@@ -15,6 +15,7 @@
 from django.contrib.auth.models import Permission
 from django.http import HttpRequest
 from django.test import TestCase
+from django.urls import reverse
 
 from enterprise.api.utils import CourseRunProgressStatuses
 from enterprise.api.v1.serializers import (
@@ -37,6 +38,7 @@
     SystemWideEnterpriseUserRoleAssignment,
 )
 from test_utils import FAKE_UUIDS, TEST_PGP_KEY, TEST_USERNAME, APITest, factories
+from rest_framework.test import APIClient, APITestCase
 
 Application = get_application_model()
 
@@ -573,6 +575,93 @@ def test_serialize_pending_users(self):
 
             self.assertEqual(expected_pending_admin_user, serialized_pending_admin_user)
 
+class TestEnterpriseCustomerMembersView(APITestCase):
+    def setUp(self):
+        self.client = APIClient()
+        # Create an enterprise customer
+        self.enterprise_customer = factories.EnterpriseCustomerFactory()
+        
+        # Learner user
+        self.learner_user = factories.UserFactory()
+        factories.EnterpriseCustomerUserFactory(
+            enterprise_customer=self.enterprise_customer,
+            user_fk=self.learner_user, 
+            user_id=self.learner_user.id,
+        )
+        
+        # Admin user (should be excluded)
+        self.admin_user = factories.UserFactory()
+
+        # Create admin role
+        admin_role = SystemWideEnterpriseRole.objects.create(name="enterprise_admin")
+
+        # Assign the role to the admin user
+        SystemWideEnterpriseUserRoleAssignment.objects.create(
+            user_id=self.admin_user.id,
+            role=admin_role,
+        )
+
+        # Link the admin user to the enterprise customer
+        factories.EnterpriseCustomerUserFactory(
+            enterprise_customer=self.enterprise_customer,
+            user_fk=self.admin_user,
+            user_id=self.admin_user.id,
+        )
+        
+    def test_only_learners_returned(self):
+        url = reverse(
+            "enterprise-customer-members",
+            kwargs={"enterprise_uuid": self.enterprise_customer.uuid}
+        )
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        
+        # Extract user_ids from response
+        returned_ids = [u['enterprise_customer_user']['user_id'] for u in response.data['results']]
+        self.assertIn(self.learner_user.id, returned_ids)
+        self.assertNotIn(self.admin_user.id, returned_ids)
+
+    def test_inactive_ecu_records_not_returned(self):
+        """
+        Test that inactive EnterpriseCustomerUser records are excluded from the result set.
+        """
+        # Create a learner role
+        learner_role = SystemWideEnterpriseRole.objects.create(name="enterprise_learner")
+        
+        # Create another learner user
+        inactive_learner_user = factories.UserFactory()
+        inactive_ecu = factories.EnterpriseCustomerUserFactory(
+            enterprise_customer=self.enterprise_customer,
+            user_fk=inactive_learner_user,
+            user_id=inactive_learner_user.id,
+            active=False,  # Mark this user as inactive
+        )
+        
+        # Assign learner role to both users
+        SystemWideEnterpriseUserRoleAssignment.objects.create(
+            user_id=self.learner_user.id,
+            role=learner_role,
+        )
+        SystemWideEnterpriseUserRoleAssignment.objects.create(
+            user_id=inactive_learner_user.id,
+            role=learner_role,
+        )
+        
+        url = reverse(
+            "enterprise-customer-members",
+            kwargs={"enterprise_uuid": self.enterprise_customer.uuid}
+        )
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        
+        # Extract user_ids from response
+        returned_ids = [u['enterprise_customer_user']['user_id'] for u in response.data['results']]
+        
+        # Only the active learner should be returned
+        self.assertIn(self.learner_user.id, returned_ids)
+        # The inactive learner should NOT be returned
+        self.assertNotIn(inactive_learner_user.id, returned_ids)
+
 
 class TestEnterpriseMembersSerializer(TestCase):
     """

tests/test_enterprise/test_signals.py

@@ -16,6 +16,7 @@
 from enterprise.constants import ENTERPRISE_ADMIN_ROLE, ENTERPRISE_LEARNER_ROLE
 from enterprise.models import (
     EnterpriseCourseEnrollment,
+    EnterpriseCustomer,
     EnterpriseCustomerAdmin,
     EnterpriseCustomerCatalog,
     EnterpriseCustomerUser,
@@ -416,6 +417,7 @@ def test_delete_pending_enterprise_admin_user(self):
         self._assert_pending_ecus_exist(should_exist=False)
 
 
+
 @mark.django_db
 @ddt.ddt
 class TestEnterpriseAdminRoleSignals(unittest.TestCase):