Merge remote-tracking branch 'cos/develop' into feature/azure-blob-storage

 Futa asked nicely and said Gizmo would be sad if I didn't.

Author: felliott

api/nodes/serializers.py

@@ -1301,6 +1301,12 @@ def update(self, instance, validated_data):
             validated_data,
         )
 
+class NodeContributorsUpdateSerializer(ser.Serializer):
+    def update(self, instance, validated_data):
+        if project := instance.root:
+            instance.copy_contributors_from(project)
+        return instance
+
 
 class NodeLinksSerializer(JSONAPISerializer):
 

api/nodes/views.py

@@ -109,6 +109,7 @@
     DraftRegistrationDetailLegacySerializer,
     NodeContributorsSerializer,
     NodeContributorDetailSerializer,
+    NodeContributorsUpdateSerializer,
     NodeInstitutionsRelationshipSerializer,
     NodeContributorsCreateSerializer,
     NodeViewOnlyLinkSerializer,
@@ -434,11 +435,16 @@ class NodeContributorsList(BaseContributorList, bulk_views.BulkUpdateJSONAPIView
     def get_resource(self):
         return self.get_node()
 
+    def get_object(self):
+        return self.get_node()
+
     # overrides ListBulkCreateJSONAPIView, BulkUpdateJSONAPIView, BulkDeleteJSONAPIView
     def get_serializer_class(self):
         """
         Use NodeContributorDetailSerializer which requires 'id'
         """
+        if self.request.method == 'PATCH' and self.request.query_params.get('copy_contributors_from_parent_project'):
+            return NodeContributorsUpdateSerializer
         if self.request.method == 'PUT' or self.request.method == 'PATCH' or self.request.method == 'DELETE':
             return NodeContributorDetailSerializer
         elif self.request.method == 'POST':
@@ -499,6 +505,18 @@ def get_serializer_context(self):
         context['default_email'] = 'default'
         return context
 
+    def patch(self, request, *args, **kwargs):
+        """
+        Override the default patch behavior to handle the special case
+        of updating contributors by copying contributors from the parent project.
+        """
+        if request.query_params.get('copy_contributors_from_parent_project'):
+            instance = self.get_object()
+            serializer = self.get_serializer_class()(instance, data=request.data)
+            serializer.is_valid(raise_exception=True)
+            serializer.save()
+            return Response(serializer.data, status=200)
+        return super().patch(request, *args, **kwargs)
 
 class NodeContributorDetail(BaseContributorDetail, generics.RetrieveUpdateDestroyAPIView, NodeMixin, UserMixin):
     """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_contributors_read).

api_tests/nodes/views/test_node_contributors_detail_update.py

@@ -32,6 +32,21 @@ def project(self, user, contrib):
         )
         return project
 
+    @pytest.fixture()
+    def component_project_and_parent_project(self, user, contrib):
+        # both need to be in same method to keep root same as parent
+        parent_project = ProjectFactory(creator=user)
+        parent_project.add_contributor(
+            contrib,
+            permissions=permissions.WRITE,
+            visible=True,
+            save=True
+        )
+        component_project = ProjectFactory(creator=user)
+        component_project.root = parent_project
+        component_project.save()
+        return component_project, parent_project
+
     @pytest.fixture()
     def url_creator(self, user, project):
         return f'/{API_BASE}nodes/{project._id}/contributors/{user._id}/'
@@ -414,3 +429,22 @@ def test_change_admin_self_with_other_admin(self, app, user, contrib, project, u
             attributes = res.json['data']['attributes']
             assert attributes['permission'] == permissions.WRITE
             assert project.get_permissions(user) == [permissions.READ, permissions.WRITE]
+
+    def test_update_component_project_with_parent_contributors(self, app, user, component_project_and_parent_project):
+        def exists_unique_parent_contributors(parent_project, component_project):
+            return parent_project.contributors.exclude(
+                id__in=component_project.contributors.values_list('id', flat=True)
+            ).exists()
+        component_project, parent_project = component_project_and_parent_project
+        assert exists_unique_parent_contributors(parent_project, component_project)
+        res = app.patch_json_api(
+            f'/{API_BASE}nodes/{component_project._id}/contributors/?copy_contributors_from_parent_project=true',
+            {
+                'data': {
+                    'type': 3
+                }
+            },
+            auth=user.auth
+        )
+        assert res.status_code == 200
+        assert not exists_unique_parent_contributors(parent_project, component_project)