Merge pull request #303 from tracim/fix/168/notify_disabled_user

tracim/tracim/lib/userworkspace.py

@@ -86,6 +86,8 @@ class RoleApi(object):
     def get_one(self, user_id, workspace_id):
         return self._get_one_rsc(user_id, workspace_id).one()
 
+    # TODO - A.P - fix with_notif: bool vs with_notif: str
+    # https://github.com/tracim/tracim/issues/302
     def create_one(self, user: User, workspace: Workspace, role_level: int, with_notif: bool, flush: bool=True) -> UserRoleInWorkspace:
         role = self.create_role()
         role.user_id = user.user_id

tracim/tracim/tests/library/test_workspace.py

@@ -1,11 +1,17 @@
 # -*- coding: utf-8 -*-
-import transaction
 from nose.tools import eq_
 
 from tracim.lib.content import ContentApi
-from tracim.model import DBSession, Content, User
+from tracim.lib.user import UserApi
+from tracim.lib.userworkspace import RoleApi
+from tracim.lib.workspace import WorkspaceApi
+from tracim.model import Content
+from tracim.model import DBSession
+from tracim.model import User
+from tracim.model.data import UserRoleInWorkspace
 from tracim.model.data import Workspace
-from tracim.tests import BaseTestThread, TestStandard
+from tracim.tests import BaseTestThread
+from tracim.tests import TestStandard
 
 
 class TestThread(BaseTestThread, TestStandard):
@@ -21,3 +27,17 @@ class TestThread(BaseTestThread, TestStandard):
         workspace = DBSession.query(Workspace).filter(Workspace.label == 'workspace_1').one()
         folder = ContentApi.get_canonical_query().filter(Content.label == 'folder_1').one()
         eq_([folder, ], list(workspace.get_valid_children()))
+
+    def test_get_notifiable_roles(self):
+        admin = DBSession.query(User) \
+            .filter(User.email == 'admin@admin.admin').one()
+        wapi = WorkspaceApi(admin)
+        w = wapi.create_workspace(label='workspace w', save_now=True)
+        uapi = UserApi(admin)
+        u = uapi.create_user(email='u.u@u.u', save_now=True)
+        eq_([], wapi.get_notifiable_roles(workspace=w))
+        rapi = RoleApi(u)
+        r = rapi.create_one(u, w, UserRoleInWorkspace.READER, with_notif='on')
+        eq_([r, ], wapi.get_notifiable_roles(workspace=w))
+        u.is_active = False
+        eq_([], wapi.get_notifiable_roles(workspace=w))