From f4fdb3d08e4ba40edf8a0aa639ec23cc5412cb9c Mon Sep 17 00:00:00 2001 From: petrCher <88943157+petrCher@users.noreply.github.com> Date: Fri, 5 Sep 2025 22:46:19 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B3=D0=BE=20=D1=81?= =?UTF-8?q?=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worker/consumer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/consumer.py b/worker/consumer.py index 81e854f..a40421e 100644 --- a/worker/consumer.py +++ b/worker/consumer.py @@ -30,7 +30,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()) From c5e46cd76b4edd6ec10fd4613fdbeefd5298ac9e Mon Sep 17 00:00:00 2001 From: petrCher <88943157+petrCher@users.noreply.github.com> Date: Fri, 5 Sep 2025 23:00:16 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B3=D0=BE=20=D1=81?= =?UTF-8?q?=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worker/consumer.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/worker/consumer.py b/worker/consumer.py index a40421e..c65b6d7 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 From 59ad5c077f3eb2d62b8478999f8527d32fbcbbf3 Mon Sep 17 00:00:00 2001 From: petrCher <88943157+petrCher@users.noreply.github.com> Date: Fri, 5 Sep 2025 23:03:28 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B3=D0=BE=20=D1=81?= =?UTF-8?q?=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_routes/test_users_get.py | 2 -- userdata_api/routes/user.py | 2 -- userdata_api/utils/user.py | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) 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 From 805c20f38655073b3f55be9e18386c5af0987666 Mon Sep 17 00:00:00 2001 From: petrCher <88943157+petrCher@users.noreply.github.com> Date: Fri, 5 Sep 2025 23:07:39 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B3=D0=BE=20=D1=81?= =?UTF-8?q?=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worker/consumer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/consumer.py b/worker/consumer.py index c65b6d7..b0a418f 100644 --- a/worker/consumer.py +++ b/worker/consumer.py @@ -25,7 +25,7 @@ def process_models(key: Any, value: Any) -> tuple[UserLoginKey | None, UserLogin processed_k = UserLoginKey.model_validate(key) processed_v = None if value is not None: - processed_v=UserLogin.model_validate(value) + 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)