diff --git a/tests/test_routes/test_users_get.py b/tests/test_routes/test_users_get.py index 65d1753..3e779f9 100644 --- a/tests/test_routes/test_users_get.py +++ b/tests/test_routes/test_users_get.py @@ -1,5 +1,3 @@ -from time import sleep - import pytest from userdata_api.models.db import Info, Param diff --git a/userdata_api/routes/user.py b/userdata_api/routes/user.py index 3b64f0a..7ff8fe5 100644 --- a/userdata_api/routes/user.py +++ b/userdata_api/routes/user.py @@ -2,9 +2,7 @@ from auth_lib.fastapi import UnionAuth from fastapi import APIRouter, Depends, Query -from fastapi_sqlalchemy import db -from userdata_api.models.db import Category, Info from userdata_api.schemas.response_model import StatusResponseModel from userdata_api.schemas.user import UserInfoGet, UserInfoUpdate, UsersInfoGet from userdata_api.utils.user import get_user_info as get diff --git a/userdata_api/utils/user.py b/userdata_api/utils/user.py index d26328b..7060544 100644 --- a/userdata_api/utils/user.py +++ b/userdata_api/utils/user.py @@ -3,7 +3,7 @@ from re import search from fastapi_sqlalchemy import db -from sqlalchemy import String, cast, func, not_, or_ +from sqlalchemy import not_, or_ from userdata_api.exceptions import Forbidden, InvalidValidation, ObjectNotFound from userdata_api.models.db import Category, Info, Param, Source, ViewType diff --git a/worker/consumer.py b/worker/consumer.py index 81e854f..b0a418f 100644 --- a/worker/consumer.py +++ b/worker/consumer.py @@ -22,7 +22,11 @@ def process_models(key: Any, value: Any) -> tuple[UserLoginKey | None, UserLogin | None]: try: - return UserLoginKey.model_validate(key), UserLogin.model_validate(value) + processed_k = UserLoginKey.model_validate(key) + processed_v = None + if value is not None: + processed_v = UserLogin.model_validate(value) + return processed_k, processed_v except pydantic.ValidationError: log.error(f"Validation error occurred, {key=}, {value=}", exc_info=False) return None, None @@ -30,7 +34,7 @@ def process_models(key: Any, value: Any) -> tuple[UserLoginKey | None, UserLogin def process_message(message: tuple[Any, Any]) -> None: processed_k, processed_v = process_models(*message) - if not (processed_k and processed_v): + if processed_k is None: return patch_user_info(processed_v, processed_k.user_id, session=_Session())