Skip to content

Commit 573f058

Browse files
committed
fixup! fixup! feat: New User Agreements API
1 parent 412ea2e commit 573f058

File tree

3 files changed

+15
-16
lines changed

3 files changed

+15
-16
lines changed

openedx/core/djangoapps/agreements/serializers.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44

55
from rest_framework import serializers
66

7-
from openedx.core.djangoapps.agreements.models import IntegritySignature, LTIPIISignature
7+
from openedx.core.djangoapps.agreements.models import (
8+
IntegritySignature, LTIPIISignature, UserAgreement,
9+
UserAgreementRecord
10+
)
811
from openedx.core.lib.api.serializers import CourseKeyField
912

1013

@@ -34,25 +37,22 @@ class Meta:
3437
fields = ('username', 'course_id', 'lti_tools', 'created_at')
3538

3639

37-
class UserAgreementSerializer(serializers.Serializer):
40+
class UserAgreementSerializer(serializers.ModelSerializer):
3841
"""
3942
Serializer for UserAgreement model
4043
"""
4144

42-
type = serializers.CharField(read_only=True)
43-
name = serializers.CharField(read_only=True)
44-
summary = serializers.CharField(read_only=True)
45-
has_text = serializers.BooleanField(read_only=True)
46-
url = serializers.URLField(read_only=True)
47-
updated = serializers.DateTimeField(read_only=True)
45+
class Meta:
46+
model = UserAgreement
47+
read_only_fields = ('type', 'name', 'summary', 'has_text', 'url', 'updated')
4848

4949

50-
class UserAgreementRecordSerializer(serializers.Serializer):
50+
class UserAgreementRecordSerializer(serializers.ModelSerializer):
5151
"""
5252
Serializer for UserAgreementRecord model
5353
"""
5454

55-
username = serializers.CharField(read_only=True)
56-
agreement_type = serializers.CharField(read_only=True)
57-
accepted_at = serializers.DateTimeField()
58-
is_current = serializers.BooleanField(read_only=True)
55+
class Meta:
56+
model = UserAgreementRecord
57+
fields = ('username', 'agreement_type', 'accepted_at', 'is_current')
58+
read_only_fields = ('username', 'agreement_type', 'is_current')

openedx/core/djangoapps/agreements/toggles.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
ENABLE_LTI_PII_ACKNOWLEDGEMENT = CourseWaffleFlag('agreements.enable_lti_pii_acknowledgement', __name__)
2121

22-
2322
def lti_pii_acknowledgment_enabled(course_key):
2423
"""
2524
Returns a boolean if lti pii acknowledgements are enabled for a course.

openedx/core/djangoapps/agreements/urls.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
re_path(r'^lti_pii_signature/{course_id}$'.format(
2424
course_id=settings.COURSE_ID_PATTERN
2525
), LTIPIISignatureView.as_view(), name='lti_pii_signature'),
26-
path("agreement_record/<slug:agreement_type>", UserAgreementRecordsView.as_view(), name="user_agreement_record"),
27-
path("", include(router.urls)),
26+
path('agreement_record/<slug:agreement_type>', UserAgreementRecordsView.as_view(), name='user_agreement_record'),
27+
path('', include(router.urls)),
2828
]

0 commit comments

Comments
 (0)