diff --git a/src/apps/remd/v1/router.py b/src/apps/remd/v1/router.py index aad08ea..98fbec6 100644 --- a/src/apps/remd/v1/router.py +++ b/src/apps/remd/v1/router.py @@ -38,7 +38,7 @@ async def callback(request: Request): messageData = AEMDDemandContent(**loads(data)) await client.delete(f'aemd_messages:{file_request.relatesToMessage}') await client.set( - f'aemd{messageData["vitaId"]}:{messageData["emdrId"]}', + f'aemd:{messageData["vitaId"]}:{messageData["emdrId"]}', dumps(s.AEMDFileData(data=file_request.file.data)), ) diff --git a/src/apps/tmk/v1/router.py b/src/apps/tmk/v1/router.py index e13661e..4b9f099 100644 --- a/src/apps/tmk/v1/router.py +++ b/src/apps/tmk/v1/router.py @@ -1,8 +1,7 @@ from json import dumps from logging import getLogger -from typing import Annotated -from fastapi import APIRouter, Body +from fastapi import APIRouter from sqlmodel import select from apps.users.models import User @@ -11,6 +10,8 @@ from database import AsyncSessionDep from shared.exceptions import UnknownException from shared.redis import client as cache +from . import schema as s + logger = getLogger(__name__) router = APIRouter( prefix='/tmk', @@ -21,8 +22,9 @@ router = APIRouter( @router.post('/update') -async def update(session: AsyncSessionDep, tmk_id: Annotated[str, Body()]): - info = await c.tmk_api.getInfo(tmk_id) +async def update(session: AsyncSessionDep, update: s.TMKUpdate): + guid = update.tmk_guid + info = await c.tmk_api.getInfo(guid) snils = info.patient_snils try: @@ -36,6 +38,6 @@ async def update(session: AsyncSessionDep, tmk_id: Annotated[str, Body()]): if user is None: return - key = f'tmk:{user.id}:{tmk_id}' + key = f'tmk:{user.id}:{guid}' value = {'id': info.id, 'status': info.tmk_status_name, 'is_read': False} await cache.set(key, dumps(value)) diff --git a/src/apps/tmk/v1/schema.py b/src/apps/tmk/v1/schema.py new file mode 100644 index 0000000..db366f7 --- /dev/null +++ b/src/apps/tmk/v1/schema.py @@ -0,0 +1,5 @@ +from pydantic import BaseModel + + +class TMKUpdate(BaseModel): + tmk_guid: str