Skip to content

Commit

Permalink
Added Improvements to Backend
Browse files Browse the repository at this point in the history
  • Loading branch information
Yazan10x committed Nov 30, 2023
1 parent 2677dc0 commit 2bf3e7b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion backend/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

@app.route("/")
def home() -> Response:
return jsonify('Carbon Track APP BACKEND API :: UNAUTHORIZED ACCESS')
return jsonify('Carbon Track APP BACKEND API :: If You Can See This Message You Can Reach This API')


# Error handler for 400 Bad Request errors
Expand Down
5 changes: 3 additions & 2 deletions backend/routes/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,17 @@ 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.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:
abort(code=400, description="User Already Exits With Same Email, Please Log In")
return jsonify({'error': "User Already Exits With Same Email, Please Log In"})
except CarbonTrackError as e:
abort(code=400, description=f"{e}")

Expand Down
4 changes: 4 additions & 0 deletions backend/utils/customJSONEncoder.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
import json
from flask.json.provider import JSONProvider

from models.abstract_db_model import DB_MODEL


class CustomJSONEncoder(json.JSONEncoder):
def default(self, obj):
if isinstance(obj, ObjectId):
return obj.__str__()
if isinstance(obj, datetime):
return obj.isoformat()
if isinstance(obj, DB_MODEL):
return obj.to_json()
return super().default(obj)


Expand Down

0 comments on commit 2bf3e7b

Please sign in to comment.