[Django Upgrade] [Reference PR] The rest of the fixes

admin_tests/preprints/test_views.py

@@ -103,8 +103,8 @@ def test_get_object(self, req, preprint, plain_view):
     def test_no_user_permissions_raises_error(self, user, preprint, plain_view):
         request = RequestFactory().get(reverse('preprints:preprint', kwargs={'guid': preprint._id}))
         request.user = user
-        resp = plain_view.as_view()(request, guid=preprint._id)
-        assert resp._headers['location'][1] == f'/accounts/login/?next=/preprints/{preprint._id}/'
+        with pytest.raises(PermissionDenied):
+            plain_view.as_view()(request, guid=preprint._id)
 
     def test_get_flagged_spam(self, superuser, preprint, ham_preprint, spam_preprint, flagged_preprint):
         request = RequestFactory().get(reverse('preprints:flagged-spam'))
@@ -183,8 +183,8 @@ def test_correct_view_permissions(self, user, preprint, plain_view):
         request = RequestFactory().get(reverse('preprints:preprint', kwargs={'guid': preprint._id}))
         request.user = user
 
-        response = plain_view.as_view()(request, guid=preprint._id)
-        assert response.status_code == 302
+        with pytest.raises(PermissionDenied):
+            plain_view.as_view()(request, guid=preprint._id)
 
     def test_change_preprint_provider(self, user, preprint, plain_view):
         change_permission = Permission.objects.get(codename='change_preprint')

admin_tests/users/test_views.py

@@ -414,7 +414,7 @@ def test_search_user_by_guid(self):
         nt.assert_true(form.is_valid())
         response = self.view.form_valid(form)
         nt.assert_equal(response.status_code, 302)
-        nt.assert_equal(response._headers['location'][1], '/users/{}/'.format(self.user_1.guids.first()._id))
+        nt.assert_equal(response.headers['location'], '/users/{}/'.format(self.user_1.guids.first()._id))
 
     def test_search_user_by_name(self):
         form_data = {
@@ -424,7 +424,7 @@ def test_search_user_by_name(self):
         nt.assert_true(form.is_valid())
         response = self.view.form_valid(form)
         nt.assert_equal(response.status_code, 302)
-        nt.assert_equal(response._headers['location'][1], '/users/search/Hardy/')
+        nt.assert_equal(response.headers['location'], '/users/search/Hardy/')
 
     def test_search_user_by_name_with_punctuation(self):
         form_data = {
@@ -434,7 +434,7 @@ def test_search_user_by_name_with_punctuation(self):
         nt.assert_true(form.is_valid())
         response = self.view.form_valid(form)
         nt.assert_equal(response.status_code, 302)
-        nt.assert_equal(response._headers['location'][1], '/users/search/Dr.%20Sportello-Fay,%20PI%20@,%20%23,%20$,%20%25,%20%5E,%20&,%20*,%20(,%20),%20~/')
+        nt.assert_equal(response.headers['location'], '/users/search/Dr.%20Sportello-Fay,%20PI%20@,%20%23,%20$,%20%25,%20%5E,%20&,%20*,%20(,%20),%20~/')
 
     def test_search_user_by_username(self):
         form_data = {
@@ -444,7 +444,7 @@ def test_search_user_by_username(self):
         nt.assert_true(form.is_valid())
         response = self.view.form_valid(form)
         nt.assert_equal(response.status_code, 302)
-        nt.assert_equal(response._headers['location'][1], '/users/{}/'.format(self.user_1.guids.first()._id))
+        nt.assert_equal(response.headers['location'], '/users/{}/'.format(self.user_1.guids.first()._id))
 
     def test_search_user_by_alternate_email(self):
         form_data = {
@@ -454,7 +454,7 @@ def test_search_user_by_alternate_email(self):
         nt.assert_true(form.is_valid())
         response = self.view.form_valid(form)
         nt.assert_equal(response.status_code, 302)
-        nt.assert_equal(response._headers['location'][1], '/users/{}/'.format(self.user_2.guids.first()._id))
+        nt.assert_equal(response.headers['location'], '/users/{}/'.format(self.user_2.guids.first()._id))
 
     def test_search_user_list(self):
         view = views.UserSearchList()

api/base/exceptions.py

@@ -8,7 +8,7 @@
 
 def get_resource_object_member(error_key, context):
     from api.base.serializers import RelationshipField
-    field = context['view'].serializer_class._declared_fields.get(error_key, None)
+    field = context['view'].get_serializer_class()._declared_fields.get(error_key, None)
     if field:
         return 'relationships' if isinstance(field, RelationshipField) else 'attributes'
     # If field cannot be found (where read/write operations have different serializers,

api/draft_registrations/serializers.py

@@ -16,7 +16,9 @@
     NodeContributorsSerializer,
     NodeContributorsCreateSerializer,
     NodeContributorDetailSerializer,
+    RegistrationSchemaRelationshipField,
 )
+
 from api.taxonomies.serializers import TaxonomizableSerializerMixin
 from osf.exceptions import DraftRegistrationStateError
 from website import settings
@@ -46,6 +48,13 @@ class DraftRegistrationSerializer(DraftRegistrationLegacySerializer, Taxonomizab
     tags = ValuesListField(attr_name='name', child=ser.CharField(), required=False)
     node_license = NodeLicenseSerializer(required=False, source='license')
 
+    registration_schema = RegistrationSchemaRelationshipField(
+        related_view='schemas:registration-schema-detail',
+        related_view_kwargs={'schema_id': '<registration_schema._id>'},
+        required=True,
+        read_only=False,
+    )
+
     links = LinksField({
         'self': 'get_absolute_url',
     })
@@ -142,6 +151,7 @@ class DraftRegistrationDetailSerializer(DraftRegistrationSerializer, DraftRegist
     Overrides DraftRegistrationLegacySerializer to make id required.
     registration_supplement, node, cannot be changed after draft has been created.
     """
+    id = IDField(source='_id', required=True)
 
     links = LinksField({
         'self': 'get_self_url',
@@ -156,6 +166,13 @@ def get_self_url(self, obj):
             },
         )
 
+    registration_schema = RegistrationSchemaRelationshipField(
+        related_view='schemas:registration-schema-detail',
+        related_view_kwargs={'schema_id': '<registration_schema._id>'},
+        required=False,
+        read_only=False,
+    )
+
     def update(self, draft, validated_data):
         draft = super(DraftRegistrationDetailSerializer, self).update(draft, validated_data)
         user = self.context['request'].user