Task desenvomento para ser revisada

routers/user_router.py

@@ -12,9 +12,10 @@ def get_db():
     finally:
         db.close()
 
-@router.get("/{email}")
-def read_user(email: str, db: Session = Depends(get_db)):
-    user = get_user(email, db)
+#mudei para receber account
+@router.get("/{account}")
+def read_user(account: str, db: Session = Depends(get_db)):
+    user = get_user(account, db)
     if user:
         return user
     raise HTTPException(status_code=404, detail="User not found")
@@ -30,9 +31,10 @@ def add_user(name: str, email: str, account: str, admin: bool, db: Session = Dep
 def get_users(db: Session = Depends(get_db)):
     return list_users(db)
 
-@router.delete("/{email}")
-def remove_user(user_id: int, db: Session = Depends(get_db)):
-    user = delete_user(user_id, db)
+#coloquei para receber role_id
+@router.delete("/{role_id}")
+def remove_user( role_id: int, db: Session = Depends(get_db)):
+    user = delete_user( role_id, db)
     if user:
         return user
     raise HTTPException(status_code=404, detail="User not found")
@@ -49,4 +51,5 @@ def demote_user_to_normal(user_id: int, db: Session = Depends(get_db)):
     user = set_user_as_normal(user_id, db)
     if user:
         return user
-    raise HTTPException(status_code=404, detail="User not found")
\ No newline at end of file
+    raise HTTPException(status_code=404, detail="User not found")
+

service/user_service.py

@@ -14,12 +14,13 @@ def create_new_user(name: str, email: str, account: str, admin: bool, db: Sessio
 def list_users(db: Session):
     return user_repository.get_all_users(db)
 
-def list_users_by_account(account: str, db: Session):
-    return user_repository.get_users_by_account(db, account)
-
-def delete_user(user_id: int, db: Session):
-    return user_repository.soft_delete_user(db, user_id)
-
+#meu
+def list_users_by_account( account: str, db: Session):
+    return user_repository.get_users_by_account(db,account)
+#troquei por account e role_id
+def delete_user( role_id: int, db: Session):
+    return user_repository.soft_delete_user(db,role_id)
+#até qui
 def set_user_as_admin(user_id: int, db: Session):
     user = user_repository.get_user_by_email(db, user_id)
     if not user: