Merge pull request #348 from localcontexts/develop

Merge Develop with Staging

api/base/serializers.py

@@ -102,7 +102,7 @@ class ProjectSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Project
-        fields = ('unique_id', 'providers_id', 'source_project_uuid', 'project_page', 'title', 'project_privacy', 'date_added', 'date_modified', 'created_by', 'notice', 'sub_projects', 'related_projects', 'project_boundary_geojson')
+        fields = ('unique_id', 'providers_id', 'publication_doi', 'project_data_guid', 'source_project_uuid', 'project_page', 'title', 'project_privacy', 'date_added', 'date_modified', 'created_by', 'notice', 'sub_projects', 'related_projects', 'project_boundary_geojson')
 
     def get_related_projects(self, obj):
         return [project.unique_id for project in obj.related_projects.all()]
@@ -120,7 +120,7 @@ class ProjectNoNoticeSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Project
-        fields = ('unique_id', 'providers_id', 'source_project_uuid', 'project_page', 'title', 'project_privacy', 'date_added', 'date_modified', 'created_by', 'bc_labels', 'tk_labels', 'sub_projects', 'related_projects', 'project_boundary_geojson')
+        fields = ('unique_id', 'providers_id', 'publication_doi', 'project_data_guid', 'source_project_uuid', 'project_page', 'title', 'project_privacy', 'date_added', 'date_modified', 'created_by', 'bc_labels', 'tk_labels', 'sub_projects', 'related_projects', 'project_boundary_geojson')
 
     def get_related_projects(self, obj):
         return [project.unique_id for project in obj.related_projects.all()]

api/base/views.py

@@ -47,7 +47,7 @@ class ProjectList(generics.ListAPIView):
     serializer_class = ProjectOverviewSerializer
 
     filter_backends = [filters.SearchFilter]
-    search_fields = ['^providers_id', '=unique_id', 'title']
+    search_fields = ['^providers_id', '=unique_id', 'title', 'publication_doi', 'project_data_guid']
 
     # '^' starts-with search
     # '=' exact matches

tests/unit/test_deactivation_related_helpers.py

@@ -0,0 +1,201 @@
+from django.test import TransactionTestCase
+from factories.accounts_factories import UserFactory
+from factories.communities_factories import CommunityFactory
+from factories.institutions_factories import InstitutionFactory
+from factories.researchers_factories import ResearcherFactory
+from factories.projects_factories import ProjectCreatorFactory
+from factories.projects_factories import ProjectFactory
+
+from accounts.models import UserAffiliation
+from accounts.templatetags.custom_acct_tags import (
+    user_created_project_in_community,
+    user_created_project_in_institution, 
+    user_created_project_as_researcher
+)
+from accounts.utils import remove_user_from_account
+
+
+class TestDeactivationRelatedHelpers(TransactionTestCase):
+    def test_user_created_project_in_community(self):
+        # create user and communities
+        user = UserFactory()
+        community_with_project = CommunityFactory()
+        community_without_project = CommunityFactory()
+
+        # create project for the community_with_project
+        project = ProjectFactory(
+            project_creator=user
+        )
+        ProjectCreatorFactory(
+            community=community_with_project,
+            project=project
+        )
+
+        assert user_created_project_in_community(
+            user_id=user.id,
+            community_id=community_with_project.id
+        ) is True
+
+        assert user_created_project_in_community(
+            user_id=user.id,
+            community_id=community_without_project.id
+        ) is False
+
+    def test_user_created_project_in_institution(self):
+        # create user and institutions
+        user = UserFactory()
+        institution_with_project = InstitutionFactory()
+        institution_without_project = InstitutionFactory()
+
+        # create project for the institution_with_project
+        project = ProjectFactory(
+            project_creator=user
+        )
+        ProjectCreatorFactory(
+            institution=institution_with_project,
+            project=project
+        )
+
+        assert user_created_project_in_institution(
+            user_id=user.id,
+            institution_id=institution_with_project.id
+        ) is True
+
+        assert user_created_project_in_institution(
+            user_id=user.id,
+            institution_id=institution_without_project.id
+        ) is False
+
+    def test_researcher_created_project(self):
+        # create user and researcher
+        user = UserFactory()
+        researcher_with_project = ResearcherFactory()
+        researcher_without_project = ResearcherFactory()
+
+        # create project for the researcher_with_project
+        project = ProjectFactory(
+            project_creator=user
+        )
+        ProjectCreatorFactory(
+            researcher=researcher_with_project,
+            project=project
+        )
+
+        assert user_created_project_as_researcher(
+            user_id=user.id,
+            researcher_id=researcher_with_project.id
+        ) is True
+
+        assert user_created_project_as_researcher(
+            user_id=user.id,
+            researcher_id=researcher_without_project.id
+        ) is False
+
+    def test_remove_admin_user_from_community(self):
+        admin_user = UserFactory()
+        community = CommunityFactory()
+        community.admins.add(admin_user)
+        affiliation = UserAffiliation.objects.prefetch_related(
+            'communities'
+        ).get(user=admin_user)
+        affiliation.communities.add(community)
+
+        # verify admin_user is an admin
+        assert community.admins.contains(admin_user) is True
+        # verify community is in affiliation.communities
+        assert affiliation.communities.contains(community) is True
+
+        remove_user_from_account(
+            user=admin_user,
+            account=community
+        )
+
+        # verify admin_user is no longer an admin
+        assert community.admins.contains(admin_user) is False
+        # verify community is no longer in affiliation.communities
+        assert affiliation.communities.contains(community) is False
+
+    def test_remove_editor_user_from_community(self):
+        editor_user = UserFactory()
+        community = CommunityFactory()
+        community.editors.add(editor_user)
+        affiliation = UserAffiliation.objects.prefetch_related(
+            'communities'
+        ).get(user=editor_user)
+        affiliation.communities.add(community)
+
+        # verify editor_user is an editor
+        assert community.editors.contains(editor_user) is True
+        # verify community is in affiliation.communities
+        assert affiliation.communities.contains(community) is True
+
+        remove_user_from_account(
+            user=editor_user,
+            account=community
+        )
+
+        # verify editor_user is no longer an editor
+        assert community.editors.contains(editor_user) is False
+        # verify community is no longer in affiliation.communities
+        assert affiliation.communities.contains(community) is False
+
+    def test_remove_viewer_user_from_community(self):
+        viewer_user = UserFactory()
+        community = CommunityFactory()
+        community.viewers.add(viewer_user)
+        affiliation = UserAffiliation.objects.prefetch_related(
+            'communities'
+        ).get(user=viewer_user)
+        affiliation.communities.add(community)
+
+        # verify viewer_user is a viewer
+        assert community.viewers.contains(viewer_user) is True
+        # verify community is in affiliation.communities
+        assert affiliation.communities.contains(community) is True
+
+        remove_user_from_account(
+            user=viewer_user,
+            account=community
+        )
+
+        # verify viewer_user is no longer a viewer
+        assert community.viewers.contains(viewer_user) is False
+        # verify community is no longer in affiliation.communities
+        assert affiliation.communities.contains(community) is False
+
+    def test_remove_user_from_all_accounts(self):
+        community = CommunityFactory()
+        institution = InstitutionFactory()
+
+        user = UserFactory()
+
+        community.admins.add(user)
+        community.editors.add(user)
+        community.viewers.add(user)
+
+        institution.admins.add(user)
+        institution.editors.add(user)
+        institution.viewers.add(user)
+
+        affiliation = UserAffiliation.objects.prefetch_related(
+            'communities', 'institutions'
+        ).get(user=user)
+
+        affiliation.communities.add(community)
+        affiliation.institutions.add(institution)
+
+        # verify state before
+        assert community.admins.contains(user) is True
+        assert community.editors.contains(user) is True
+        assert community.viewers.contains(user) is True
+        assert affiliation.communities.contains(community) is True
+        assert affiliation.institutions.contains(institution) is True
+
+        remove_user_from_account(user=user)
+
+        # verify state after
+        assert community.admins.contains(user) is False
+        assert community.editors.contains(user) is False
+        assert community.viewers.contains(user) is False
+        assert affiliation.communities.contains(community) is False
+        assert affiliation.institutions.contains(institution) is False