Merge pull request #1654 from doccano/fix/#1651

Update clean method in Member

backend/members/models.py

@@ -56,7 +56,7 @@ class Member(models.Model):
     objects = MemberManager()
 
     def clean(self):
-        members = self.objects.exclude(id=self.id)
+        members = self.__class__.objects.exclude(id=self.id)
         if members.filter(user=self.user, project=self.project).exists():
             message = 'This user is already assigned to a role in this project.'
             raise ValidationError(message)

backend/members/tests.py

@@ -1,6 +1,9 @@
 from django.conf import settings
+from django.test import TestCase
+from django.core.exceptions import ValidationError
 from rest_framework import status
 from rest_framework.reverse import reverse
+from model_mommy import mommy
 
 from roles.models import Role
 from members.models import Member
@@ -16,30 +19,30 @@ class TestMemberListAPI(CRUDMixin):
         self.data = {'user': self.non_member.id, 'role': admin_role.id, 'project': self.project.item.id}
         self.url = reverse(viewname='member_list', args=[self.project.item.id])
 
-    def test_allows_project_admin_to_get_mappings(self):
+    def test_allows_project_admin_to_know_members(self):
         self.assert_fetch(self.project.users[0], status.HTTP_200_OK)
 
-    def test_denies_non_project_admin_to_get_mappings(self):
+    def test_denies_non_project_admin_to_know_members(self):
         for member in self.project.users[1:]:
             self.assert_fetch(member, status.HTTP_403_FORBIDDEN)
 
-    def test_denies_non_project_member_to_get_mappings(self):
+    def test_denies_non_project_member_to_know_members(self):
         self.assert_fetch(self.non_member, status.HTTP_403_FORBIDDEN)
 
-    def test_denies_unauthenticated_user_to_get_mappings(self):
+    def test_denies_unauthenticated_user_to_known_members(self):
         self.assert_fetch(expected=status.HTTP_403_FORBIDDEN)
 
-    def test_allows_project_admin_to_create_mapping(self):
+    def test_allows_project_admin_to_add_member(self):
         self.assert_create(self.project.users[0], status.HTTP_201_CREATED)
 
-    def test_denies_non_project_admin_to_create_mapping(self):
+    def test_denies_non_project_admin_to_add_member(self):
         for member in self.project.users[1:]:
             self.assert_create(member, status.HTTP_403_FORBIDDEN)
 
-    def test_denies_non_project_member_to_create_mapping(self):
+    def test_denies_non_project_member_to_add_member(self):
         self.assert_create(self.non_member, status.HTTP_403_FORBIDDEN)
 
-    def test_denies_unauthenticated_user_to_create_mapping(self):
+    def test_denies_unauthenticated_user_to_add_member(self):
         self.assert_create(expected=status.HTTP_403_FORBIDDEN)
 
     def assert_bulk_delete(self, user=None, expected=status.HTTP_403_FORBIDDEN):
@@ -49,19 +52,19 @@ class TestMemberListAPI(CRUDMixin):
         response = self.client.delete(self.url, data={'ids': ids}, format='json')
         self.assertEqual(response.status_code, expected)
 
-    def test_allows_project_admin_to_bulk_delete(self):
+    def test_allows_project_admin_to_remove_members(self):
         self.assert_bulk_delete(self.project.users[0], status.HTTP_204_NO_CONTENT)
         response = self.client.get(self.url)
         self.assertEqual(len(response.data), 1)
 
-    def test_denies_non_project_admin_to_bulk_delete(self):
+    def test_denies_non_project_admin_to_remove_members(self):
         for member in self.project.users[1:]:
             self.assert_bulk_delete(member, status.HTTP_403_FORBIDDEN)
 
-    def test_denies_non_project_member_to_bulk_delete(self):
+    def test_denies_non_project_member_to_remove_members(self):
         self.assert_bulk_delete(self.non_member, status.HTTP_403_FORBIDDEN)
 
-    def test_denies_unauthenticated_user_to_bulk_delete(self):
+    def test_denies_unauthenticated_user_to_remove_members(self):
         self.assert_bulk_delete(expected=status.HTTP_403_FORBIDDEN)
 
 
@@ -71,34 +74,34 @@ class TestMemberRoleDetailAPI(CRUDMixin):
         self.project = prepare_project()
         self.non_member = make_user()
         admin_role = Role.objects.get(name=settings.ROLE_PROJECT_ADMIN)
-        mapping = Member.objects.get(user=self.project.users[1])
-        self.url = reverse(viewname='member_detail', args=[self.project.item.id, mapping.id])
+        member = Member.objects.get(user=self.project.users[1])
+        self.url = reverse(viewname='member_detail', args=[self.project.item.id, member.id])
         self.data = {'role': admin_role.id}
 
-    def test_allows_project_admin_to_get_mapping(self):
+    def test_allows_project_admin_to_known_member(self):
         self.assert_fetch(self.project.users[0], status.HTTP_200_OK)
 
-    def test_denies_non_project_admin_to_get_mapping(self):
+    def test_denies_non_project_admin_to_know_member(self):
         for member in self.project.users[1:]:
             self.assert_fetch(member, status.HTTP_403_FORBIDDEN)
 
-    def test_denies_non_project_member_to_get_mapping(self):
+    def test_denies_non_project_member_to_know_member(self):
         self.assert_fetch(self.non_member, status.HTTP_403_FORBIDDEN)
 
-    def test_denies_unauthenticated_user_to_get_mapping(self):
+    def test_denies_unauthenticated_user_to_know_member(self):
         self.assert_fetch(expected=status.HTTP_403_FORBIDDEN)
 
-    def test_allows_project_admin_to_update_mapping(self):
+    def test_allows_project_admin_to_change_member_role(self):
         self.assert_update(self.project.users[0], status.HTTP_200_OK)
 
-    def test_denies_non_project_admin_to_update_mapping(self):
+    def test_denies_non_project_admin_to_change_member_role(self):
         for member in self.project.users[1:]:
             self.assert_update(member, status.HTTP_403_FORBIDDEN)
 
-    def test_denies_non_project_member_to_update_mapping(self):
+    def test_denies_non_project_member_to_change_member_role(self):
         self.assert_update(self.non_member, status.HTTP_403_FORBIDDEN)
 
-    def test_denies_unauthenticated_user_to_update_mapping(self):
+    def test_denies_unauthenticated_user_to_change_member_role(self):
         self.assert_update(expected=status.HTTP_403_FORBIDDEN)
 
 
@@ -116,9 +119,6 @@ class TestMemberFilter(CRUDMixin):
 
 class TestMemberManager(CRUDMixin):
 
-    def setUp(self):
-        pass
-
     def test_has_role(self):
         project = prepare_project()
         admin = project.users[0]
@@ -129,3 +129,12 @@ class TestMemberManager(CRUDMixin):
         ]
         for role, expect in expected:
             self.assertEqual(Member.objects.has_role(project.item, admin, role), expect)
+
+
+class TestMember(TestCase):
+
+    def test_clean(self):
+        member = mommy.make('Member')
+        same_user = Member(project=member.project, user=member.user, role=member.role)
+        with self.assertRaises(ValidationError):
+            same_user.clean()