Merge pull request #3604 from unicef/staging

Staging

Author: ntrncic

src/etools/applications/users/tasks.py

@@ -87,10 +87,11 @@ def _set_special_attr(self, obj, attr, cleaned_value):
                     logger.info('UNICEF User Group added to user {}'.format(obj.user))
 
                     # deactivate realms from previous user country
-                    Realm.objects.filter(
-                        user=obj.user,
-                        country=obj.country,
-                        organization=self.unicef_organization).update(is_active=False)
+                    # commenting out to support stretch assignments
+                    # Realm.objects.filter(
+                    #     user=obj.user,
+                    #     country=obj.country,
+                    #     organization=self.unicef_organization).update(is_active=False)
 
                     obj.country = self._get_country(cleaned_value)
                     logger.info("Country Updated for {}".format(obj))

src/etools/applications/users/tests/test_views.py

@@ -63,7 +63,7 @@ def setUpTestData(cls):
         cls.superuser = UserFactory(is_superuser=True)
         cls.unicef_organization = Organization.objects.get(name='UNICEF', vendor_number='000')
         cls.partnership_manager = UserFactory(
-            realms__data=["Partnership Manager"], email='test@unicef.org',
+            realms__data=["UNICEF User", "Partnership Manager"], email='test@unicef.org',
             profile__organization=cls.unicef_organization
         )
 
@@ -86,7 +86,7 @@ def test_post_revoke_200(self):
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         response = json.loads(response.content)
         self.assertEqual(response['status'], 'success')
-        self.assertEqual(response['details']['previous_roles'], ["Partnership Manager"])
+        self.assertEqual(response['details']['previous_roles'], ["Partnership Manager", "UNICEF User"])
         self.assertEqual(response['details']['current_roles'], [])
 
     def test_post_grant_200(self):
@@ -105,12 +105,36 @@ def test_post_grant_200(self):
 
         response = json.loads(response.content)
         self.assertEqual(response['status'], 'success')
-        self.assertEqual(response['details']['previous_roles'], ["Partnership Manager"])
+        self.assertEqual(response['details']['previous_roles'], ["Partnership Manager", "UNICEF User"])
         self.assertEqual(
             response['details']['current_roles'],
             ['Partnership Manager', 'UNICEF Audit Focal Point', 'UNICEF User']
         )
 
+    def test_post_grant_reactivate_200(self):
+        self.partnership_manager.realms.update(is_active=False)
+        for realm in self.partnership_manager.realms.all():
+            self.assertFalse(realm.is_active)
+        response = self.forced_auth_req(
+            "post",
+            self.url,
+            user=self.superuser,
+            data={
+                "user_email": self.partnership_manager.email,
+                "roles": ["UNICEF Audit Focal Point"],
+                "workspace": f"{self.tenant.business_area_code}",
+                "access_type": "grant"
+            }
+        )
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+        response = json.loads(response.content)
+        self.assertEqual(response['status'], 'success')
+        self.assertEqual(response['details']['previous_roles'], [])
+        self.assertEqual(
+            response['details']['current_roles'], ['UNICEF Audit Focal Point', 'UNICEF User']
+        )
+
     def test_post_set_200(self):
         response = self.forced_auth_req(
             "post",
@@ -127,7 +151,7 @@ def test_post_set_200(self):
 
         response = json.loads(response.content)
         self.assertEqual(response['status'], 'success')
-        self.assertEqual(response['details']['previous_roles'], ["Partnership Manager"])
+        self.assertEqual(response['details']['previous_roles'], ["Partnership Manager", "UNICEF User"])
         self.assertEqual(response['details']['current_roles'], ["UNICEF Audit Focal Point", "UNICEF User"])
 
     def test_invalid_uppercase_email(self):

src/etools/applications/users/views.py

@@ -99,7 +99,7 @@ def create(self, request, *args, **kwargs):
                     country=workspace,
                     organization=unicef_organization,
                     group=role,
-                    is_active=True
+                    defaults={"is_active": True}
                 )[0])
             if data["access_type"] == "set":
                 user.realms.exclude(id__in=[realm.id for realm in realms]).update(is_active=False)