From a7389287b82809209ce309644c4be9bddd48cb30 Mon Sep 17 00:00:00 2001 From: Yazan Armoush Date: Mon, 18 Dec 2023 11:33:21 -0500 Subject: [PATCH] Update users.py --- backend/routes/users.py | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/backend/routes/users.py b/backend/routes/users.py index a15eaf0..9fb7775 100644 --- a/backend/routes/users.py +++ b/backend/routes/users.py @@ -139,26 +139,21 @@ def get_current_user() -> Response: @users.route("/user", methods=["PUT"]) @carbon_auth.auth.login_required def create_user() -> Response: - try: - res: dict = request.get_json()["user"] - user = User.from_json(res) - user.email = user.email.lower() - - query = {"email": user.email} - item = CarbonTrackDB.users_coll.find_one(query) - if item is None: - user = user.to_json() - inserted_id = CarbonTrackDB.users_coll.insert_one(user).inserted_id - user = User.from_json( - CarbonTrackDB.users_coll.find_one({"_id": inserted_id}) - ).to_json() - return jsonify({"user": user}) - else: - return jsonify({"error": "User Already Exits With Same Email, Please Log In"}) - - - except CarbonTrackError as e: - abort(code=400, description=f"{e}") + res: dict = request.get_json()["user"] + user = User.from_json(res) + user.email = user.email.lower() + + query = {"email": user.email} + item = CarbonTrackDB.users_coll.find_one(query) + if item is None: + user = user.to_json() + inserted_id = CarbonTrackDB.users_coll.insert_one(user).inserted_id + user = User.from_json( + CarbonTrackDB.users_coll.find_one({"_id": inserted_id}) + ).to_json() + return jsonify({"user": user}) + else: + return jsonify({"error": "User Already Exits With Same Email, Please Log In"}) @users.route("/user/", methods=["DELETE"]) @@ -228,6 +223,6 @@ def update_user_name(user_id: str) -> Response: item = User.from_json(item).to_json() - return jsonify({"user": item}), 200 + return jsonify({"user": item}) except CarbonTrackError as e: abort(code=400, description=f"{e}")