Merge branch 'feature/pbs-25-21' into fix/ENG-8515

Author: adlius

api/institutions/serializers.py

@@ -231,9 +231,7 @@ class Meta:
     number_of_users = ser.IntegerField(read_only=True)
 
     def get_absolute_url(self, obj):
-        institution_id = self.context['request'].parser_context['kwargs']['institution_id']
-        dept_id = obj['name'].replace(' ', '-')
-        return f'/institutions/{institution_id}/metrics/departments/{dept_id}/'
+        raise NotImplementedError()
 
 
 class InstitutionUserMetricsSerializer(JSONAPISerializer):
@@ -291,8 +289,7 @@ def get_contacts(self, obj):
         return list(results)
 
     def get_absolute_url(self, obj):
-        institution_id = self.context['request'].parser_context['kwargs']['institution_id']
-        return f'/institutions/{institution_id}/metrics/users/'
+        raise NotImplementedError()
 
 
 class InstitutionSummaryMetricsSerializer(JSONAPISerializer):
@@ -326,8 +323,7 @@ class Meta:
     )
 
     def get_absolute_url(self, obj):
-        institution_id = self.context['request'].parser_context['kwargs']['institution_id']
-        return f'/institutions/{institution_id}/metrics/summary/'
+        raise NotImplementedError()
 
 
 class InstitutionRelated(JSONAPIRelationshipSerializer):

tests/test_adding_contributor_views.py

@@ -630,7 +630,7 @@ def test_claim_user_already_registered_redirects_to_claim_user_registered(self,
         res = self.app.get(claim_url)
 
         # should redirect to 'claim_user_registered' view
-        claim_registered_url = f'/user/{unregistered_user._id}/{self.project._id}/claim/verify/{token}/'
+        claim_registered_url = f'/legacy/user/{unregistered_user._id}/{self.project._id}/claim/verify/{token}/'
         assert res.status_code == 302
         assert claim_registered_url in res.headers.get('Location')
 
@@ -672,7 +672,7 @@ def test_claim_user_already_registered_secondary_email_redirects_to_claim_user_r
         res = self.app.get(claim_url)
 
         # should redirect to 'claim_user_registered' view
-        claim_registered_url = f'/user/{unregistered_user._id}/{self.project._id}/claim/verify/{token}/'
+        claim_registered_url = f'/legacy/user/{unregistered_user._id}/{self.project._id}/claim/verify/{token}/'
         assert res.status_code == 302
         assert claim_registered_url in res.headers.get('Location')
 
@@ -797,7 +797,7 @@ def test_claim_user_form_redirects_to_password_confirm_page_if_user_is_logged_in
     def test_claim_user_when_user_is_registered_with_orcid(self, mock_response_from_ticket):
         # TODO: check in qa url encoding
         token = self.user.get_unclaimed_record(self.project._primary_key)['token']
-        url = f'/user/{self.user._id}/{self.project._id}/claim/verify/{token}/'
+        url = f'/legacy/user/{self.user._id}/{self.project._id}/claim/verify/{token}/'
         # logged out user gets redirected to cas login
         res1 = self.app.get(url)
         assert res1.status_code == 302

website/routes.py

@@ -867,7 +867,7 @@ def make_url_map(app):
         # user will be required to verify password
         # claim token must be present in query parameter
         Rule(
-            ['/user/<uid>/<pid>/claim/verify/<token>/'],
+            ['/legacy/user/<uid>/<pid>/claim/verify/<token>/'],
             ['get', 'post'],
             project_views.contributor.claim_user_registered,
             OsfWebRenderer('claim_account_registered.mako', trust=False)