WIP: Better error handling

extensions/exceptions.py

@@ -1,12 +1,12 @@
 from modules.app import app
 from classes.exceptions import *
-from starlette.status import HTTP_404_NOT_FOUND, HTTP_406_NOT_ACCEPTABLE, HTTP_409_CONFLICT
+from starlette.status import HTTP_400_BAD_REQUEST, HTTP_401_UNAUTHORIZED, HTTP_404_NOT_FOUND, HTTP_406_NOT_ACCEPTABLE, HTTP_409_CONFLICT
 
 @app.exception_handler(AlbumNotFoundError)
 async def album_not_found_exception_handler(request: Request, exc: AlbumNotFoundError):
     return JSONResponse(
         status_code=HTTP_404_NOT_FOUND,
-        content={"detail": f"Could not find an album with id '{exc.id}'."},
+        content={"detail": f"Could not find album with id '{exc.id}'."},
     )
 
 @app.exception_handler(AlbumAlreadyExistsError)
@@ -21,4 +21,46 @@ async def album_incorrect_exception_handler(request: Request, exc: AlbumIncorrec
     return JSONResponse(
         status_code=HTTP_406_NOT_ACCEPTABLE,
         content={"detail": f"Album {exc.place} invalid: {exc.error}"},
+    )
+
+@app.exception_handler(PhotoNotFoundError)
+async def photo_not_found_exception_handler(request: Request, exc: PhotoNotFoundError):
+    return JSONResponse(
+        status_code=HTTP_404_NOT_FOUND,
+        content={"detail": f"Could not find photo with id '{exc.id}'."},
+    )
+
+@app.exception_handler(SearchPageInvalidError)
+async def search_page_invalid_exception_handler(request: Request, exc: SearchPageInvalidError):
+    return JSONResponse(
+        status_code=HTTP_400_BAD_REQUEST,
+        content={"detail": "Parameters 'page' and 'page_size' must be greater or equal to 1."},
+    )
+
+@app.exception_handler(SearchTokenInvalidError)
+async def search_token_invalid_exception_handler(request: Request, exc: SearchTokenInvalidError):
+    return JSONResponse(
+        status_code=HTTP_401_UNAUTHORIZED,
+        content={"detail": "Parameters 'page' and 'page_size' must be greater or equal to 1."},
+    )
+
+@app.exception_handler(UserEmailCodeInvalid)
+async def user_email_code_invalid_exception_handler(request: Request, exc: UserEmailCodeInvalid):
+    return JSONResponse(
+        status_code=HTTP_400_BAD_REQUEST,
+        content={"detail": "Confirmation code is invalid."},
+    )
+
+@app.exception_handler(UserAlreadyExists)
+async def user_already_exists_exception_handler(request: Request, exc: UserAlreadyExists):
+    return JSONResponse(
+        status_code=HTTP_409_CONFLICT,
+        content={"detail": "User with this username already exists."},
+    )
+
+@app.exception_handler(UserCredentialsInvalid)
+async def user_credentials_invalid_exception_handler(request: Request, exc: UserCredentialsInvalid):
+    return JSONResponse(
+        status_code=HTTP_401_UNAUTHORIZED,
+        content={"detail": "Invalid credentials."},
     )