Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add errors related to "leave team" feature #2442

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/dao/permissions_dao.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,9 @@ def get_permissions_by_user_id_and_service_id(self, user_id, service_id):
self.Meta.model.query.filter_by(user_id=user_id).join(Permission.service).filter_by(active=True, id=service_id).all()
)

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()
return [p.user for p in permission_objs]


permission_dao = PermissionDAO()
2 changes: 1 addition & 1 deletion app/dao/users_dao.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def verify_within_time(user, age=timedelta(seconds=30)):
return query.count()


def get_user_by_id(user_id=None):
def get_user_by_id(user_id=None) -> User:
if user_id:
return User.query.filter_by(id=user_id).one()
return User.query.filter_by().all()
Expand Down
6 changes: 6 additions & 0 deletions app/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,12 @@
"research_mode": self.research_mode,
}

def get_users_with_permission(self, permission):
from app.dao.permissions_dao import permission_dao

Check notice

Code scanning / CodeQL

Cyclic import Note

Import of module
app.dao.permissions_dao
begins an import cycle.

if permission:
return permission_dao.get_team_members_with_permission(self.id, permission)
return []

class AnnualBilling(BaseModel):
__tablename__ = "annual_billing"
Expand Down
11 changes: 11 additions & 0 deletions app/service/rest.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
EMAIL_TYPE,
KEY_TYPE_NORMAL,
LETTER_TYPE,
MANAGE_SETTINGS,
NOTIFICATION_CANCELLED,
SMS_TYPE,
EmailBranding,
Expand Down Expand Up @@ -490,6 +491,8 @@ def add_user_to_service(service_id, user_id):
def remove_user_from_service(service_id, user_id):
service = dao_fetch_service_by_id(service_id)
user = get_user_by_id(user_id=user_id)
users_with_manage_settings_perm = service.get_users_with_permission(MANAGE_SETTINGS)

if user not in service.users:
error = "User not found"
raise InvalidRequest(error, status_code=404)
Expand All @@ -498,6 +501,14 @@ def remove_user_from_service(service_id, user_id):
error = "You cannot remove the only user for a service"
raise InvalidRequest(error, status_code=400)

elif len(service.users) == 2:
error = "SERVICE_CANNOT_HAVE_LT_2_MEMBERS"
raise InvalidRequest(error, status_code=400)

elif user in users_with_manage_settings_perm and len(users_with_manage_settings_perm) <= 1:
error = "SERVICE_NEEDS_USER_W_MANAGE_SETTINGS_PERM"
raise InvalidRequest(error, status_code=400)

dao_remove_user_from_service(service, user)

if current_app.config["FF_SALESFORCE_CONTACT"]:
Expand Down
Loading