Merge pull request #32773 from openedx/btahir/ENT-7373-7374

feat: enrollment mode and organisation auth id
This commit is contained in:
Ejaz Ahmad
2023-07-25 16:56:18 +05:00
committed by GitHub
2 changed files with 6 additions and 1 deletions

View File

@@ -200,6 +200,7 @@ class EnrollmentSerializer(serializers.Serializer):
hasOptedOutOfEmail = serializers.SerializerMethodField()
lastEnrolled = serializers.DateTimeField(source="created")
isEnrolled = serializers.BooleanField(source="is_active")
mode = serializers.CharField()
def get_accessExpirationDate(self, instance):
return self.context.get("audit_access_deadlines", {}).get(instance.course_id)
@@ -495,6 +496,7 @@ class UnfulfilledEntitlementSerializer(serializers.Serializer):
"hasOptedOutOfEmail": False,
"lastEnrolled": None,
"isEnrolled": False,
"mode": None,
}
# These fields contain all real data and will be serialized
@@ -561,6 +563,7 @@ class EnterpriseDashboardSerializer(serializers.Serializer):
label = serializers.CharField(source="name")
url = serializers.SerializerMethodField()
uuid = serializers.UUIDField()
authOrgId = serializers.CharField(source="auth_org_id")
isLearnerPortalEnabled = serializers.BooleanField(source="enable_learner_portal")
def get_url(self, instance):

View File

@@ -1132,6 +1132,7 @@ class TestEnterpriseDashboardSerializer(TestCase):
"slug": str(uuid4()),
"enable_learner_portal": True,
"uuid": str(uuid4()),
"auth_org_id": str(uuid4()),
}
def test_structure(self):
@@ -1140,7 +1141,7 @@ class TestEnterpriseDashboardSerializer(TestCase):
output_data = EnterpriseDashboardSerializer(input_data).data
expected_keys = ["label", "url", "uuid", "isLearnerPortalEnabled"]
expected_keys = ["label", "url", "uuid", "isLearnerPortalEnabled", "authOrgId"]
self.assertEqual(output_data.keys(), set(expected_keys))
def test_happy_path(self):
@@ -1159,6 +1160,7 @@ class TestEnterpriseDashboardSerializer(TestCase):
+ input_data["slug"],
"uuid": input_data["uuid"],
"isLearnerPortalEnabled": input_data["enable_learner_portal"],
"authOrgId": input_data["auth_org_id"],
},
)