Clear owner project cache when sharing project with users and add tests

Signed-off-by: Kipchirchir Sigei <[email protected]>
onaio · Apr 30, 2020 · 85dea3f · 85dea3f
1 parent 0252cd6
commit 85dea3f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/onadata/apps/api/tests/viewsets/test_project_viewset.py b/onadata/apps/api/tests/viewsets/test_project_viewset.py
@@ -10,6 +10,7 @@
 
 from django.conf import settings
 from django.db.models import Q
+from django.core.cache import cache
 from httmock import HTTMock, urlmatch
 from mock import MagicMock, patch
 import requests
@@ -26,6 +27,7 @@
 from onadata.apps.main.models import MetaData
 from onadata.libs import permissions as role
 from onadata.libs.models.share_project import ShareProject
+from onadata.libs.utils.cache_tools import PROJ_OWNER_CACHE, safe_key
 from onadata.libs.permissions import (ROLES_ORDERED, DataEntryMinorRole,
                                       DataEntryOnlyRole, DataEntryRole,
                                       EditorMinorRole, EditorRole, ManagerRole,
@@ -1700,6 +1702,8 @@ def test_project_share_inactive_user(self):
         response = view(request, pk=projectid)
 
         self.assertEqual(response.status_code, 400)
+        self.assertIsNone(
+            cache.get(safe_key(f'{PROJ_OWNER_CACHE}{self.project.pk}')))
         self.assertEqual(
             response.data,
             {'username': [u'The following user(s) is/are not active: alice']})
@@ -1729,6 +1733,8 @@ def test_project_share_remove_inactive_user(self):
         response = view(request, pk=projectid)
 
         self.assertEqual(response.status_code, 204)
+        self.assertIsNone(
+            cache.get(safe_key(f'{PROJ_OWNER_CACHE}{self.project.pk}')))
 
         self.assertTrue(ReadOnlyRole.user_has_role(alice_profile.user,
                                                    self.project))
@@ -2197,6 +2203,8 @@ def test_project_list_by_owner(self):
         response = view(request, pk=projectid)
 
         self.assertEqual(response.status_code, 204)
+        self.assertIsNone(
+            cache.get(safe_key(f'{PROJ_OWNER_CACHE}{self.project.pk}')))
 
         self.assertTrue(ReadOnlyRole.user_has_role(alice_profile.user,
                                                    self.project))

diff --git a/onadata/apps/api/viewsets/project_viewset.py b/onadata/apps/api/viewsets/project_viewset.py
@@ -29,7 +29,7 @@
     (RemoveUserFromProjectSerializer, ShareProjectSerializer)
 from onadata.libs.serializers.user_profile_serializer import \
     UserProfileSerializer
-from onadata.libs.utils.cache_tools import PROJ_OWNER_CACHE
+from onadata.libs.utils.cache_tools import PROJ_OWNER_CACHE, safe_delete
 from onadata.libs.serializers.xform_serializer import (XFormCreateSerializer,
                                                        XFormSerializer)
 from onadata.libs.utils.common_tools import merge_dicts
@@ -152,6 +152,10 @@ def share(self, request, *args, **kwargs):
         else:
             return Response(data=serializer.errors,
                             status=status.HTTP_400_BAD_REQUEST)
+
+        # clear cache
+        safe_delete(f'{PROJ_OWNER_CACHE}{self.object.pk}')
+
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     @action(methods=['DELETE', 'GET', 'POST'], detail=True)