format

app/dao/permissions_dao.py

@@ -68,7 +68,12 @@ def get_permissions_by_user_id_and_service_id(self, user_id, service_id):
         )
 
     def get_team_members_with_permission(self, service_id, permission):
-        permission_objs = self.Meta.model.query.filter_by(service_id=service_id, permission=permission).join(Permission.user).filter_by(state="active").all()
+        permission_objs = (
+            self.Meta.model.query.filter_by(service_id=service_id, permission=permission)
+            .join(Permission.user)
+            .filter_by(state="active")
+            .all()
+        )
         return [p.user for p in permission_objs]
 
 

app/models.py

@@ -652,6 +652,7 @@ def get_users_with_permission(self, permission):
             return permission_dao.get_team_members_with_permission(self.id, permission)
         return []
 
+
 class AnnualBilling(BaseModel):
     __tablename__ = "annual_billing"
     id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, unique=False)

tests/app/dao/test_permissions_dao.py

@@ -32,14 +32,13 @@ def test_get_permissions_by_user_id_returns_only_active_service(notify_db, notif
 
 def test_get_team_members_with_permission(notify_db, notify_db_session, sample_user):
     active_service = create_sample_service(notify_db, notify_db_session, service_name="Active service", user=sample_user)
-    
+
     users_w_permission_1 = permission_dao.get_team_members_with_permission(active_service.id, MANAGE_SETTINGS)
     assert users_w_permission_1 == [sample_user]
-    
+
     permission_dao.remove_user_service_permissions(user=sample_user, service=active_service)
     users_w_permission_2 = permission_dao.get_team_members_with_permission(active_service.id, MANAGE_SETTINGS)
     assert users_w_permission_2 == []
-    
+
     users_w_permission_3 = permission_dao.get_team_members_with_permission(active_service.id, None)
     assert users_w_permission_3 == []
-

tests/app/service/test_rest.py

@@ -1509,7 +1509,7 @@ def test_remove_user_from_service_only_user_with_manage_perm(notify_api, notify_
             endpoint = url_for(
                 "service.remove_user_from_service",
                 service_id=str(sample_user_service_permission.service.id),
-                user_id=str(sample_user_service_permission.user.id),
+                user_id=str(manage_settings_user.id),
             )
             auth_header = create_authorization_header()
             resp = client.delete(endpoint, headers=[("Content-Type", "application/json"), auth_header])