fix: avoid repeated worksheet scans during XLSX export
This commit is contained in:
1 parent
4aeb26abe9
commit
339dd71f63
5 files changed
+24
-11
No files matched your search
@@ -13,10 +13,6 @@ def _append(sheet, values):
|
|||||||
if any(isinstance(value, str) and len(value) > 32767 for value in values):
|
if any(isinstance(value, str) and len(value) > 32767 for value in values):
|
||||||
raise ValueError("Text exceeds Excel cell limit")
|
raise ValueError("Text exceeds Excel cell limit")
|
||||||
sheet.append(values)
|
sheet.append(values)
|
||||||
for cell in sheet[sheet.max_row]:
|
|
||||||
if isinstance(cell.value, str):
|
|
||||||
# CSV/profile content is text, never an Excel formula or error code.
|
|
||||||
cell.data_type = "s"
|
|
||||||
|
|
||||||
|
|
||||||
def council_xlsx(result: dict) -> bytes:
|
def council_xlsx(result: dict) -> bytes:
|
||||||
@@ -62,6 +58,9 @@ def council_xlsx(result: dict) -> bytes:
|
|||||||
sheet.column_dimensions[get_column_letter(column)].width = width
|
sheet.column_dimensions[get_column_letter(column)].width = width
|
||||||
for row in sheet:
|
for row in sheet:
|
||||||
for cell in row:
|
for cell in row:
|
||||||
|
if isinstance(cell.value, str):
|
||||||
|
# CSV/profile content is text, never an Excel formula or error code.
|
||||||
|
cell.data_type = "s"
|
||||||
cell.alignment = Alignment(vertical="top", wrap_text=True)
|
cell.alignment = Alignment(vertical="top", wrap_text=True)
|
||||||
for cell in sheet[1]:
|
for cell in sheet[1]:
|
||||||
cell.font = Font(bold=True, color="FFFFFF")
|
cell.font = Font(bold=True, color="FFFFFF")
|
||||||
|
|||||||
+3
-3
@@ -1,3 +1,3 @@
|
|||||||
APP_VERSION = "0.13.0"
|
APP_VERSION = "0.13.1"
|
||||||
FRONTEND_VERSION = "0.13.0"
|
FRONTEND_VERSION = "0.13.1"
|
||||||
BACKEND_VERSION = "0.13.0"
|
BACKEND_VERSION = "0.13.1"
|
||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "miem-workers"
|
name = "miem-workers"
|
||||||
version = "0.13.0"
|
version = "0.13.1"
|
||||||
description = "MIEM employees parser, admin API, and web admin"
|
description = "MIEM employees parser, admin API, and web admin"
|
||||||
requires-python = ">=3.11"
|
requires-python = ">=3.11"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
|||||||
+1
-1
@@ -18,7 +18,7 @@ def test_health_returns_versions():
|
|||||||
response = TestClient(app).get("/api/health")
|
response = TestClient(app).get("/api/health")
|
||||||
|
|
||||||
assert response.status_code == 200
|
assert response.status_code == 200
|
||||||
assert response.json()["backend_version"] == "0.13.0"
|
assert response.json()["backend_version"] == "0.13.1"
|
||||||
|
|
||||||
|
|
||||||
def test_api_employees_and_stats_require_admin_session():
|
def test_api_employees_and_stats_require_admin_session():
|
||||||
|
|||||||
+16
-2
@@ -5,13 +5,15 @@ from zipfile import ZipFile
|
|||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from fastapi.testclient import TestClient
|
from fastapi.testclient import TestClient
|
||||||
from openpyxl import load_workbook
|
from openpyxl import Workbook, load_workbook
|
||||||
|
from openpyxl.worksheet.worksheet import Worksheet
|
||||||
from sqlalchemy.exc import OperationalError
|
from sqlalchemy.exc import OperationalError
|
||||||
|
|
||||||
from app.db import get_db
|
from app.db import get_db
|
||||||
from app.main import app
|
from app.main import app
|
||||||
from app.models import Employee, EmployeePublication
|
from app.models import Employee, EmployeePublication
|
||||||
from app.services import council
|
from app.services import council
|
||||||
|
from app.services.council_export import _append
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture()
|
@pytest.fixture()
|
||||||
@@ -209,7 +211,7 @@ def test_public_page_data_minimization_and_safe_links(db_session, export):
|
|||||||
assert "<script>" in response.text and "<script>" not in response.text
|
assert "<script>" in response.text and "<script>" not in response.text
|
||||||
assert "javascript:" not in response.text and "private@example.org" not in response.text
|
assert "javascript:" not in response.text and "private@example.org" not in response.text
|
||||||
assert "/admin/employees/" not in response.text and "/admin/logout" not in response.text
|
assert "/admin/employees/" not in response.text and "/admin/logout" not in response.text
|
||||||
assert "Backend 0.13.0 · Frontend 0.13.0" in response.text
|
assert "Backend 0.13.1 · Frontend 0.13.1" in response.text
|
||||||
assert "Вход в админку" in response.text
|
assert "Вход в админку" in response.text
|
||||||
assert client.get("/admin/directory", follow_redirects=False).status_code in (302, 303, 401, 403)
|
assert client.get("/admin/directory", follow_redirects=False).status_code in (302, 303, 401, 403)
|
||||||
assert "Сотрудники не найдены" in client.get("/admin/council?q=missing").text
|
assert "Сотрудники не найдены" in client.get("/admin/council?q=missing").text
|
||||||
@@ -294,3 +296,15 @@ def test_xlsx_treats_profile_text_as_text_and_rejects_silent_truncation(db_sessi
|
|||||||
assert "content-disposition" not in failure.headers
|
assert "content-disposition" not in failure.headers
|
||||||
finally:
|
finally:
|
||||||
app.dependency_overrides.clear()
|
app.dependency_overrides.clear()
|
||||||
|
|
||||||
|
|
||||||
|
def test_xlsx_appending_rows_does_not_scan_growing_sheet(monkeypatch):
|
||||||
|
def fail_on_scan(sheet):
|
||||||
|
pytest.fail("Appending rows must not recompute worksheet bounds by scanning existing cells")
|
||||||
|
monkeypatch.setattr(Worksheet, "max_row", property(fail_on_scan))
|
||||||
|
monkeypatch.setattr(Worksheet, "max_column", property(fail_on_scan))
|
||||||
|
sheet = Workbook().active
|
||||||
|
for number in range(1000):
|
||||||
|
_append(sheet, [number, "text"])
|
||||||
|
assert sheet.cell(1000, 1).value == 999
|
||||||
|
assert sheet.cell(1000, 2).value == "text"
|
||||||
Reference in new issue
Block a user