Merge remote-tracking branch 'origin' into hu/ent-9579

CHANGELOG.rst

@@ -21,6 +21,10 @@ Unreleased
 --------
 * feat: Create django admin for default enrollments
 
+[4.28.3]
+--------
+* feat: removing all references of to-be-deleted field
+
 [4.28.2]
 --------
 * fix: added content_title, progress_status in get_learner_data_records for derived classed of learner data exporters.

enterprise/admin/__init__.py

@@ -1251,8 +1251,8 @@ class EnterpriseGroupAdmin(admin.ModelAdmin):
     Django admin for EnterpriseGroup model.
     """
     model = models.EnterpriseGroup
-    list_display = ('uuid', 'enterprise_customer', 'applies_to_all_contexts', )
-    list_filter = ('applies_to_all_contexts',)
+    list_display = ('uuid', 'enterprise_customer', )
+    list_filter = ('group_type',)
     search_fields = (
         'uuid',
         'name',

enterprise/api/v1/serializers.py

@@ -638,7 +638,7 @@ class EnterpriseGroupSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.EnterpriseGroup
         fields = (
-            'enterprise_customer', 'name', 'uuid', 'applies_to_all_contexts',
+            'enterprise_customer', 'name', 'uuid',
             'accepted_members_count', 'group_type', 'created')
 
     accepted_members_count = serializers.SerializerMethodField()
@@ -786,22 +786,11 @@ def get_enterprise_group(self, obj):
         """
         Return the enterprise group membership for this enterprise customer user.
         """
-        related_customer = obj.enterprise_customer
-        # Find any groups that have ``applies_to_all_contexts`` set to True that are connected to the customer
-        # that's related to the customer associated with this customer user record.
-        all_context_groups = models.EnterpriseGroup.objects.filter(
-            enterprise_customer=related_customer,
-            applies_to_all_contexts=True
-        ).values_list('uuid', flat=True)
         enterprise_groups_from_memberships = obj.memberships.select_related('group').all().values_list(
             'group',
             flat=True
         )
-        # Combine both sets of group UUIDs
         group_uuids = set(enterprise_groups_from_memberships)
-        for group in all_context_groups:
-            group_uuids.add(group)
-
         return list(group_uuids)
 
 

enterprise/models.py

@@ -4618,14 +4618,6 @@ class EnterpriseGroup(TimeStampedModel, SoftDeletableModel):
         related_name='groups',
         on_delete=models.deletion.CASCADE
     )
-    applies_to_all_contexts = models.BooleanField(
-        verbose_name="Set group membership to the entire org of learners.",
-        default=False,
-        null=True,
-        help_text=_(
-            "When enabled, all learners connected to the org will be considered a member."
-        )
-    )
     group_type = models.CharField(
         verbose_name="Group Type",
         max_length=20,

test_utils/factories.py

@@ -1116,7 +1116,6 @@ class Meta:
         model = EnterpriseGroup
 
     uuid = factory.LazyAttribute(lambda x: UUID(FAKER.uuid4()))
-    applies_to_all_contexts = False
     enterprise_customer = factory.SubFactory(EnterpriseCustomerFactory)
     name = factory.LazyAttribute(lambda x: FAKER.company())
 

tests/test_enterprise/api/test_serializers.py

@@ -314,21 +314,6 @@ def test_group_membership(self):
         assert len(serializer.data['enterprise_group']) == 1
         assert serializer.data['enterprise_group'][0] == membership.group.uuid
 
-    def test_group_membership_when_applies_to_all_contexts(self):
-        """
-        Test that when a group has ``applies_to_all_contexts`` set to True, that group is included in the enterprise
-        customer user serializer data when there is an associated via an enterprise customer object.
-        """
-        enterprise_group = factories.EnterpriseGroupFactory(
-            enterprise_customer=self.enterprise_customer_1,
-            applies_to_all_contexts=True,
-        )
-        serializer = EnterpriseCustomerUserReadOnlySerializer(self.enterprise_customer_user_1)
-        # Assert the enterprise customer user serializer found the group
-        assert serializer.data.get('enterprise_group') == [enterprise_group.uuid]
-        # Assert the group has no memberships that could be read by the serializer
-        assert not enterprise_group.members.all()
-
     def test_multi_group_membership(self):
         """
         Test that multiple group memberships are associated properly with a single instance.

tests/test_enterprise/api/test_views.py

@@ -8144,7 +8144,6 @@ def test_list_learners_filtered(self):
         """
         group = EnterpriseGroupFactory(
             enterprise_customer=self.enterprise_customer,
-            applies_to_all_contexts=True,
         )
         pending_user = PendingEnterpriseCustomerUserFactory(
             user_email="foobar@example.com",
@@ -8159,7 +8158,6 @@ def test_list_learners_filtered(self):
 
         assert response.json().get('count') == 0
 
-        group.applies_to_all_contexts = False
         group.save()
         pending_membership = EnterpriseGroupMembershipFactory(
             group=group,
@@ -8202,7 +8200,6 @@ def test_list_learners_filtered(self):
     def test_list_removed_learners(self):
         group = EnterpriseGroupFactory(
             enterprise_customer=self.enterprise_customer,
-            applies_to_all_contexts=False,
         )
         memberships_to_delete = []
         membership = EnterpriseGroupMembershipFactory(
@@ -8894,32 +8891,6 @@ def test_remove_learners_from_group_only_removes_from_specified_group(self):
             EnterpriseGroupMembership.objects.get(pk=membership_to_remove.pk)
         assert EnterpriseGroupMembership.objects.get(pk=existing_membership.pk)
 
-    def test_group_applies_to_all_contexts_learner_list(self):
-        """
-        Test that hitting the enterprise-group `/learners/` endpoint for a group that has ``applies_to_all_contexts``
-        will return all learners in the group's org regardless of what membership records exist.
-        """
-        new_group = EnterpriseGroupFactory(applies_to_all_contexts=True)
-        new_user = EnterpriseCustomerUserFactory(
-            user_id=self.user.id, enterprise_customer=new_group.enterprise_customer,
-            active=True
-        )
-        pending_user = PendingEnterpriseCustomerUserFactory(
-            enterprise_customer=new_group.enterprise_customer,
-        )
-        url = settings.TEST_SERVER + reverse(
-            'enterprise-group-learners',
-            kwargs={'group_uuid': new_group.uuid},
-        )
-        response = self.client.get(url)
-        results = response.json().get('results')
-        for result in results:
-            assert (
-                result.get('pending_enterprise_customer_user_id') == pending_user.id
-            ) or (
-                result.get('enterprise_customer_user_id') == new_user.id
-            )
-
     def test_group_assign_realized_learner_adds_activated_at(self):
         """
         Test that newly created membership records associated with an existing user have an activated at value written