Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions tests/test_routes/test_users_get.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from time import sleep

import pytest

from userdata_api.models.db import Info, Param
Expand Down
2 changes: 0 additions & 2 deletions userdata_api/routes/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion userdata_api/utils/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions worker/consumer.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,19 @@

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


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())

Expand Down