#26 - repair mutations

OneSila/core/factories/multi_tenant.py

@@ -117,8 +117,7 @@ def __init__(self, user):
         self.user = user
 
     def disable_user(self):
-        self.user.is_active = False
-        self.user.save()
+        self.user.set_inactive()
 
     def send_signal(self):
         disabled.send(sender=self.user.__class__, instance=self.user)
@@ -134,8 +133,7 @@ def __init__(self, user):
         self.user = user
 
     def enable_user(self):
-        self.user.is_active = True
-        self.user.save()
+        self.user.set_active()
 
     def send_signal(self):
         enabled.send(sender=self.user.__class__, instance=self.user)

OneSila/core/models/multi_tenant.py

@@ -75,6 +75,18 @@ def save(self, *args, **kwargs):
 
         super().save(*args, **kwargs)
 
+    def set_active(self, save=True):
+        self.is_active = True
+
+        if save:
+            self.save()
+
+    def set_inactive(self, save=True):
+        self.is_active = False
+
+        if save:
+            self.save()
+
     class Meta:
         verbose_name = _("Multi tenant user")
         verbose_name_plural = _("Multi tenant users")

OneSila/core/schema/multi_tenant/mutations/fields.py

@@ -41,9 +41,9 @@ def accept_user_invitation():
 
 def disable_user():
     extensions = default_extensions
-    return EnableUserMutation(MultiTenantUserStatusInput, extensions=extensions)
+    return DisableUserMutation(MultiTenantUserStatusInput, extensions=extensions)
 
 
 def enable_user():
     extensions = default_extensions
-    return DisableUserMutation(MultiTenantUserStatusInput, extensions=extensions)
+    return EnableUserMutation(MultiTenantUserStatusInput, extensions=extensions)

OneSila/core/schema/multi_tenant/mutations/mutation_classes.py

@@ -91,10 +91,8 @@ class AcceptInvitationMutation(DjangoUpdateMutation):
     def update(self, info: Info, instance: models.Model, data: dict[str, Any]):
         # Do not optimize anything while retrieving the object to update
         with DjangoOptimizerExtension.disabled():
-            _, user_id = from_base64(data['id'])
-            user = instance.filter(id=user_id)
             fac = AcceptUserInviteFactory(
-                user=user,
+                user=instance,
                 password=data['password'],
                 language=data['language'])
             fac.run()
@@ -170,4 +168,6 @@ def update(self, info: Info, instance: models.Model, data: dict[str, Any]):
         with DjangoOptimizerExtension.disabled():
             fac = EnableUserFactory(user=instance)
             fac.run()
-            return fac.user
+
+            instance.refresh_from_db()
+            return instance

OneSila/core/schema/multi_tenant/types/types.py

@@ -12,7 +12,7 @@
 
 
 @type(MultiTenantUser, filters=MultiTenantUserOrder, order=MultiTenantUserFilter, pagination=True, fields='__all__')
-class MultiTenantUserType:
+class MultiTenantUserType(relay.Node):
     pass
 
 

OneSila/core/tests/tests_schemas/tests_mutations.py

@@ -198,8 +198,6 @@ def test_invite_user(self):
             variables={'username': username, 'password': "SomePaddk@2k2", "id": user_id}
         )
 
-        print(resp)
-
         self.assertTrue(resp.errors is None)
         self.assertTrue(resp.data['acceptUserInvitation']['isActive'])
         self.assertTrue(resp.data['acceptUserInvitation']['invitationAccepted'])
@@ -229,7 +227,7 @@ def test_enable_disable_user(self):
         )
 
         self.assertTrue(resp.errors is None)
-        self.assertTrue(resp.data['inviteUser']['isActive'])
+        self.assertTrue(resp.data['enableUser']['isActive'])
 
         disable_query = """
         mutation disableUser($id: GlobalID!){
@@ -240,5 +238,10 @@ def test_enable_disable_user(self):
         }
         """
 
+        resp = self.stawberry_test_client(
+            query=disable_query,
+            variables={"id": user_id}
+        )
+
         self.assertTrue(resp.errors is None)
-        self.assertFalse(resp.data['inviteUser']['isActive'])
+        self.assertFalse(resp.data['disableUser']['isActive'])