From eed99d99ead5966359b3ca19a219fd57232eecba Mon Sep 17 00:00:00 2001
From: Miwory <miwory.uwu@gmail.com>
Date: Thu, 16 Apr 2026 18:01:05 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=81=D0=BA=D0=B0?=
 =?UTF-8?q?=D1=87=D0=B8=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=84=D0=B0=D0=B9?=
 =?UTF-8?q?=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pyproject.toml              |  3 +--
 src/apps/users/v1/router.py | 33 +++++++++++++++++++++------------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index ba5604b..52a3ccb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "HospitalAssistantBackend"
-version = "1.5.9"
+version = "1.5.10"
 description = "Backend for Hospital Assistant"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"
@@ -37,7 +37,6 @@ dependencies = [
     "typer-slim==0.16.1",
     "xsdata[cli]>=26.2",
     "xsdata-pydantic>=24.5",
-    "chardet>=7.4.3",
 ]
 
 [dependency-groups]
diff --git a/src/apps/users/v1/router.py b/src/apps/users/v1/router.py
index d206e9a..54c94ea 100644
--- a/src/apps/users/v1/router.py
+++ b/src/apps/users/v1/router.py
@@ -5,7 +5,6 @@ from logging import getLogger
 from secrets import token_urlsafe
 from typing import Annotated
 
-import chardet
 from fastapi import APIRouter, Body, Depends, UploadFile, status
 from orjson import loads
 from xsdata.formats.dataclass.parsers.config import ParserConfig
@@ -120,27 +119,37 @@ async def get_vaccs_report_download(
     """
     if resultId is not None:
         file = await c.vitacore_api.getDiagResultFile(resultId)
+
+        if file is None:
+            raise e.BadRequestException
+
+        filename = f'vaccs_report_{resultId}'
+        file_extension = 'pdf'
+        content_type = 'application/pdf'
+        xml_data = base64.b64decode(file.content)
+        xml_data = xml_data.decode('utf-8').strip()
+        xml_model = parser.from_string(xml_data, ClinicalDocument)
+        file_string = xml_model.component.non_xmlbody.text.value.strip()
+
     else:
         file = await c.vitacore_api.getVaccsReport(user.vita_id)
 
-    if file is None:
-        raise e.BadRequestException
+        if file is None:
+            raise e.BadRequestException
 
-    filename = f'vaccs_report_{resultId or user.vita_id}.pdf'
-    xml_data = base64.b64decode(file.content)
-    result = chardet.detect(xml_data)
-    xml_data = xml_data.decode(result['encoding'] or 'utf-8').strip()
-    xml_model = parser.from_string(xml_data, ClinicalDocument)
-    pdf_string = xml_model.component.non_xmlbody.text.value.strip()
+        filename = f'vaccs_report_{token_urlsafe(10)}'
+        file_extension = 'doc'
+        content_type = 'application/msword'
+        file_string = file.content
 
     temp_link_token = token_urlsafe(32)
     await cache.set(
         f'download:{temp_link_token}',
         dumps(
             {
-                'filename': filename,
-                'content_type': 'application/pdf',
-                'data': pdf_string,
+                'filename': f'{filename}.{file_extension}',
+                'content_type': content_type,
+                'data': file_string,
             }
         ),
         ex=600,