app/routers/users.py

@@ -145,8 +145,8 @@ async def update_users_me(current_user: Annotated[users.User, Depends(users_toke
     user_repository.save(current_user)
     return current_user
 
-@router.put("/users", tags=["users"], response_model=users.User, status_code=status.HTTP_201_CREATED)
+@router.put("/users", tags=["users"], response_model=users.User, status_code=status.HTTP_200_OK)
-async def update_users(authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))], userSingle: users.UserIn | None = None, response: Response = Response):
+async def update_users_id(authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))], userSingle: users.UserIn | None = None, response: Response = Response):
     if userSingle is None:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
@@ -154,47 +154,10 @@ async def update_users(authorize: Annotated[bool, Depends(permissions_checker.Pe
         )
     user_repository = users.UserRepository(database=database.database)
 
-    user = user_repository.find_one_by({"$or":[{"username": {'$eq': userSingle.username}}, {"email": {"$eq": userSingle.email}}]})
+    user = user_repository.find_one_by({"username": {'$eq': userSingle.username}})
-    if user is not None:
-        response.status_code = status.HTTP_201_CREATED
-        if user.username == userSingle.username:
-            raise HTTPException(
-                status_code=status.HTTP_204_NO_CONTENT,
-                detail="username"
-            )
-        if user.email == userSingle.email:
-            raise HTTPException(
-                status_code=status.HTTP_204_NO_CONTENT,
-                detail="email"
-            )
-    user.username = userSingle.username
-    user.password = users_token.get_password_hash(userSingle.password)
-    user.roles = userSingle.roles
-    user.email = userSingle.email
-    user.firstName = userSingle.firstName
-    user.name = userSingle.name
-    user.birth = userSingle.birth
-    user.updated_at = datetime.today()
-    user_repository.save(user)
-    return user
-
-
-@router.put("/users/{item_id}", tags=["users"], response_model=users.User, status_code=status.HTTP_200_OK)
-async def update_users_id(item_id: str, authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))], userSingle: users.UserIn | None = None, response: Response = Response):
-    if userSingle is None:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="Body request is empty"
-        )
-    user_repository = users.UserRepository(database=database.database)
-
-    user = user_repository.find_one_by({"id": {'$eq': ObjectId(item_id)}})
     if user is None:
-        raise HTTPException(
+        response.status_code = status.HTTP_201_CREATED
-            status_code=status.HTTP_404_NOT_FOUND,
+        user = users.User(username=userSingle.username, password=users_token.get_password_hash(userSingle.password), email=userSingle.email)
-            detail="User not found"
-        )
-        
     user.username = userSingle.username
     user.password = users_token.get_password_hash(userSingle.password)
     user.roles = userSingle.roles
@@ -207,6 +170,7 @@ async def update_users_id(item_id: str, authorize: Annotated[bool, Depends(permi
     return user
 
 
+
 @router.patch("/users/groups",tags=["users"])
 async def patch_users_groups(authorize: Annotated[bool, Depends(permissions_checker.PermissionChecker(roles=["Admin"]))], userids: users.UserIDS | None = None):
     if len(userids.ids) == 0: