3 Commits

Author SHA1 Message Date
avm
90a83f4f08 Merge pull request 'Parse worksheets without dimensions' (#13) from feature/frontend-exchange-corrections-20260722 into main
All checks were successful
Deploy Customer Main / Build, Push, Deploy (push) Successful in 4m18s
CI/CD Pipeline / Code Quality Checks (push) Successful in 7m48s
CI/CD Pipeline / Run Tests (push) Successful in 30m15s
CI/CD Pipeline / Build and Push Dev Images (push) Has been skipped
CI/CD Pipeline / Deploy Dev via Compose (push) Has been skipped
2026-07-22 18:21:32 +03:00
08632be39f fix: parse worksheets without dimensions
All checks were successful
CI/CD Pipeline / Code Quality Checks (pull_request) Successful in 9m1s
CI/CD Pipeline / Run Tests (pull_request) Successful in 24m1s
CI/CD Pipeline / Build and Push Dev Images (pull_request) Has been skipped
CI/CD Pipeline / Deploy Dev via Compose (pull_request) Has been skipped
2026-07-22 17:20:39 +02:00
avm
bde320efb5 Merge pull request 'Fix customer deploy transport authentication' (#12) from feature/customer-deploy-transport-fix-20260722 into main
Some checks failed
CI/CD Pipeline / Run Tests (push) Successful in 2m26s
CI/CD Pipeline / Code Quality Checks (push) Successful in 2m48s
CI/CD Pipeline / Build and Push Dev Images (push) Has been skipped
CI/CD Pipeline / Deploy Dev via Compose (push) Has been skipped
Deploy Customer Main / Build, Push, Deploy (push) Failing after 4m34s
2026-07-22 16:33:39 +03:00
2 changed files with 51 additions and 0 deletions

View File

@@ -363,6 +363,8 @@ class BaseExcelParser(ABC, Generic[T]):
self._workbook = openpyxl.load_workbook(content, read_only=True, data_only=True)
self._sheet = self._workbook.active
if self._sheet.max_row is None or self._sheet.max_column is None:
self._sheet.calculate_dimension(force=True)
def _parse_row(self, row_num: int) -> RowData | None:
"""Парсит одну строку Excel."""

View File

@@ -1,6 +1,9 @@
"""Tests for core excel parser."""
import re
from io import BytesIO
from unittest.mock import MagicMock
from zipfile import ZIP_DEFLATED, ZipFile
from apps.core.excel import (
BaseExcelParser,
@@ -15,6 +18,7 @@ from apps.core.excel import (
validate_okpo,
)
from django.test import TestCase
from openpyxl import Workbook
class ValidatorsTest(TestCase):
@@ -168,3 +172,48 @@ class BaseExcelParserTest(TestCase):
self.assertEqual(len(mappings), 2)
self.assertEqual(mappings[0].field_name, "inn")
def test_parse_recovers_missing_read_only_worksheet_dimension(self):
workbook = Workbook()
sheet = workbook.active
sheet.append(["Организация", "ОКПО", "ОГРН", "ИНН"])
sheet.append(
["Тестовая организация", "12345678", "1234567890123", "1234567890"]
)
source = BytesIO()
workbook.save(source)
workbook.close()
source.seek(0)
without_dimension = BytesIO()
with ZipFile(source, "r") as input_archive, ZipFile(
without_dimension,
"w",
compression=ZIP_DEFLATED,
) as output_archive:
for item in input_archive.infolist():
content = input_archive.read(item.filename)
if item.filename == "xl/worksheets/sheet1.xml":
content = re.sub(rb"<dimension[^>]*/>", b"", content, count=1)
output_archive.writestr(item, content)
without_dimension.seek(0)
created_rows = []
class TestParser(BaseExcelParser):
def get_column_mappings(self):
return []
def get_next_batch_id(self) -> int:
return 1
def create_record(self, row_data, batch_id):
created_rows.append((row_data, batch_id))
return MagicMock()
result = TestParser().parse(without_dimension)
self.assertEqual(result.loaded_count, 1)
self.assertEqual(result.skipped_count, 0)
self.assertEqual(created_rows[0][0].organization_name, "Тестовая организация")
self.assertEqual(created_rows[0][1], 1)