Merge remote-tracking branch 'origin' into knguyen2/ent-9524

CHANGELOG.rst

@@ -17,6 +17,18 @@ Unreleased
 ----------
 * nothing unreleased
 
+[4.26.0]
+---------
+* feat: add new field to EnterpriseGroup model and EnterpriseGroupSerializer
+
+[4.25.15]
+---------
+* fix: Don't import HttpClientError from edx-rest-api-client
+
+[4.25.14]
+---------
+* This version was incorretly tagged and so wasn't properly released.
+
 [4.25.13]
 ----------
 * feat: add logging to debug SAP SuccessFactors transmission issues
@@ -257,7 +269,7 @@ Unreleased
 
 [4.20.7]
 --------
-* fix: add name from profile to group membership details 
+* fix: add name from profile to group membership details
 
 [4.20.6]
 --------

enterprise/__init__.py

@@ -2,4 +2,4 @@
 Your project description goes here.
 """
 
-__version__ = "4.25.13"
+__version__ = "4.26.0"

enterprise/api/v1/serializers.py

@@ -8,11 +8,11 @@
 from collections.abc import Iterable
 
 import pytz
-from edx_rest_api_client.exceptions import HttpClientError
 from oauth2_provider.generators import generate_client_id, generate_client_secret
 from rest_framework import serializers
 from rest_framework.fields import empty
 from rest_framework.settings import api_settings
+from slumber.exceptions import HttpClientError
 
 from django.contrib import auth
 from django.contrib.sites.models import Site
@@ -26,8 +26,8 @@
 from enterprise.constants import (
     ENTERPRISE_ADMIN_ROLE,
     ENTERPRISE_PERMISSION_GROUPS,
-    DefaultColors,
     GROUP_MEMBERSHIP_ACCEPTED_STATUS,
+    DefaultColors,
 )
 from enterprise.logging import getEnterpriseLogger
 from enterprise.models import (

enterprise/migrations/0222_alter_enterprisegroup_group_type_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.15 on 2024-09-25 20:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('enterprise', '0221_enterprisegroup_group_type_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='enterprisegroup',
+            name='group_type',
+            field=models.CharField(choices=[('budget', 'Budget'), ('flex', 'Flex')], default='flex', help_text='The type of enterprise group', max_length=20, verbose_name='Group Type'),
+        ),
+        migrations.AlterField(
+            model_name='historicalenterprisegroup',
+            name='group_type',
+            field=models.CharField(choices=[('budget', 'Budget'), ('flex', 'Flex')], default='flex', help_text='The type of enterprise group', max_length=20, verbose_name='Group Type'),
+        ),
+    ]

enterprise/models.py

@@ -13,13 +13,13 @@
 from config_models.models import ConfigurationModel
 from django_countries.fields import CountryField
 from edx_rbac.models import UserRole, UserRoleAssignment
-from edx_rest_api_client.exceptions import HttpClientError
 from fernet_fields import EncryptedCharField
 from jsonfield.encoder import JSONEncoder
 from jsonfield.fields import JSONField
 from multi_email_field.fields import MultiEmailField
 from requests.exceptions import HTTPError
 from simple_history.models import HistoricalRecords
+from slumber.exceptions import HttpClientError
 
 from django.apps import apps
 from django.conf import settings
@@ -4410,8 +4410,6 @@ class EnterpriseGroup(TimeStampedModel, SoftDeletableModel):
     group_type = models.CharField(
         verbose_name="Group Type",
         max_length=20,
-        blank=True,
-        null=True,
         choices=GROUP_TYPE_CHOICES,
         default=GROUP_TYPE_FLEX,
         help_text=_("The type of enterprise group"),

enterprise/utils.py

@@ -15,7 +15,7 @@
 import pytz
 from edx_django_utils.cache import TieredCache
 from edx_django_utils.cache import get_cache_key as get_django_cache_key
-from edx_rest_api_client.exceptions import HttpClientError
+from slumber.exceptions import HttpClientError
 
 from django.apps import apps
 from django.conf import settings

enterprise/views.py

@@ -13,9 +13,9 @@
 import waffle  # pylint: disable=invalid-django-waffle-import
 from dateutil.parser import parse
 from edx_django_utils import monitoring
-from edx_rest_api_client.exceptions import HttpClientError
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
+from slumber.exceptions import HttpClientError
 
 from django.apps import apps
 from django.conf import settings

test_utils/fake_enrollment_api.py

@@ -6,7 +6,7 @@
 import json
 import re
 
-from edx_rest_api_client.exceptions import HttpClientError
+from slumber.exceptions import HttpClientError
 
 from django.conf import settings
 

tests/test_admin/test_view.py

@@ -9,8 +9,8 @@
 from urllib.parse import urlencode
 
 import ddt
-from edx_rest_api_client.exceptions import HttpClientError
 from pytest import mark
+from slumber.exceptions import HttpClientError
 
 from django.conf import settings
 from django.contrib import auth

tests/test_enterprise/api/test_views.py

@@ -8018,7 +8018,8 @@ def setUp(self):
                 group=self.group_1,
                 pending_enterprise_customer_user=None,
                 enterprise_customer_user__enterprise_customer=self.enterprise_customer,
-                activated_at=datetime.now()
+                activated_at=datetime.now(),
+                status='accepted',
             ))
 
     def test_group_permissions(self):
@@ -8043,7 +8044,8 @@ def test_successful_list_groups(self):
         response = self.client.get(url)
         assert response.json().get('count') == 2
         assert response.json().get('results')[0].get('group_type') == 'flex'
-        assert response.json().get('results')[0].get('accepted_members_count') == 10
+        serializer = serializers.EnterpriseGroupSerializer(self.group_1)
+        assert serializer.data['accepted_members_count'] == 11
 
     def test_successful_retrieve_group(self):
         """

tests/test_enterprise/views/test_grant_data_sharing_permissions.py

@@ -8,8 +8,8 @@
 
 import ddt
 from dateutil.parser import parse
-from edx_rest_api_client.exceptions import HttpClientError
 from pytest import mark
+from slumber.exceptions import HttpClientError
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured

tests/test_models.py

@@ -15,11 +15,11 @@
 
 import ddt
 import responses
-from edx_rest_api_client.exceptions import HttpClientError
 from faker import Factory as FakerFactory
 from freezegun.api import freeze_time
 from opaque_keys.edx.keys import CourseKey
 from pytest import mark, raises
+from slumber.exceptions import HttpClientError
 from testfixtures import LogCapture
 
 from django.conf import settings