diff --git a/app/db/crud.py b/app/db/crud.py
@@ -521,6 +521,7 @@ def create_user(
def remove_user(db: Session, dbuser: User):
+ dbuser.username = None
dbuser.removed = True
dbuser.activated = False
# db.query(User).filter_by(id=user_id).delete()
diff --git a/app/routes/service.py b/app/routes/service.py
@@ -72,7 +72,12 @@ def get_service_users(id: int, db: DBDep, admin: SudoAdminDep):
if not service:
raise HTTPException(status_code=404, detail="Service not found")
- query = db.query(User).join(User.services).where(Service.id == service.id)
+ query = (
+ db.query(User)
+ .join(User.services)
+ .where(Service.id == service.id)
+ .filter(User.removed != True)
+ )
return paginate(query)