Merge pull request #1668 from opengisch/QF-8457-remove-collaborators-when-org-member-removed

 feat: remove project collaborations of users removed from an organization

Author: gounux

docker-app/qfieldcloud/core/models.py

@@ -823,6 +823,13 @@ def clean(self) -> None:
     def delete(self, *args, **kwargs) -> tuple[int, dict[str, int]]:
         super().delete(*args, **kwargs)
 
+        # delete the project colloborations of this deleted org member,
+        # as they are no longer part of the organization.
+        ProjectCollaborator.objects.filter(
+            project__owner=self.organization,
+            collaborator=self.member,
+        ).delete()
+
         return TeamMember.objects.filter(
             team__team_organization=self.organization,
             member=self.member,

docker-app/qfieldcloud/core/tests/test_organization.py

@@ -15,6 +15,7 @@
     OrganizationMember,
     Person,
     Project,
+    ProjectCollaborator,
 )
 
 from .utils import set_subscription, setup_subscription_plans
@@ -148,6 +149,32 @@ def test_delete_member(self):
         members = OrganizationMember.objects.all()
         self.assertEqual(len(members), 0)
 
+    def test_delete_member_removes_project_collaborators(self):
+        # user2 is a member of organization1
+        org_member = OrganizationMember.objects.create(
+            organization=self.organization1,
+            member=self.user2,
+            role=OrganizationMember.Roles.MEMBER,
+        )
+
+        project = Project.objects.create(
+            name="the_project",
+            owner=self.organization1,
+            is_public=False,
+        )
+        # user2 is a collaborator on the project
+        ProjectCollaborator.objects.create(
+            project=project,
+            collaborator=self.user2,
+            role=ProjectCollaborator.Roles.EDITOR,
+        )
+
+        self.assertEqual(ProjectCollaborator.objects.filter(project=project).count(), 1)
+
+        org_member.delete()
+
+        self.assertEqual(ProjectCollaborator.objects.filter(project=project).count(), 0)
+
     def test_created_by_set_to_none_on_user_deletion(self):
         creator = Person.objects.create(username="creator")
         member = Person.objects.create(username="member")