fix pre-commit
Some checks failed
CI/CD Pipeline / Run Tests (push) Successful in 2m5s
CI/CD Pipeline / Code Quality Checks (push) Successful in 2m34s
CI/CD Pipeline / Telegram Notify Success (push) Has been cancelled

This commit is contained in:
2026-03-20 14:45:36 +01:00
parent 4c128b2e08
commit 22c41fd747
3 changed files with 39 additions and 17 deletions

View File

@@ -646,7 +646,13 @@ class FinancialReportAdmin(admin.ModelAdmin):
"load_batch", "load_batch",
"created_at", "created_at",
] ]
list_filter = ["status", "source", "load_batch", "registry_organization", "created_at"] list_filter = [
"status",
"source",
"load_batch",
"registry_organization",
"created_at",
]
search_fields = [ search_fields = [
"external_id", "external_id",
"ogrn", "ogrn",

View File

@@ -34,7 +34,9 @@ class FNSUploadService:
"""Queue uploaded FNS Excel files and ZIP archives for processing.""" """Queue uploaded FNS Excel files and ZIP archives for processing."""
@classmethod @classmethod
def queue_uploaded_files(cls, *, files, requested_by_id: int | None) -> FNSUploadResult: def queue_uploaded_files(
cls, *, files, requested_by_id: int | None
) -> FNSUploadResult:
result = FNSUploadResult() result = FNSUploadResult()
seen_hashes: set[str] = set() seen_hashes: set[str] = set()
@@ -79,7 +81,9 @@ class FNSUploadService:
) )
cls._accumulate(result=result, status=status, task_id=task_id) cls._accumulate(result=result, status=status, task_id=task_id)
except zipfile.BadZipFile as exc: except zipfile.BadZipFile as exc:
raise ValueError("Загруженный файл не является корректным ZIP архивом") from exc raise ValueError(
"Загруженный файл не является корректным ZIP архивом"
) from exc
return result return result
@@ -168,7 +172,9 @@ class FNSUploadService:
return True return True
@staticmethod @staticmethod
def _accumulate(*, result: FNSUploadResult, status: str, task_id: str | None) -> None: def _accumulate(
*, result: FNSUploadResult, status: str, task_id: str | None
) -> None:
if status == "queued": if status == "queued":
result.queued += 1 result.queued += 1
if task_id: if task_id:

View File

@@ -46,7 +46,9 @@ class CeleryModuleTest(SimpleTestCase):
) )
app_mock.autodiscover_tasks.assert_called_once_with() app_mock.autodiscover_tasks.assert_called_once_with()
self.assertEqual(module.app, app_mock) self.assertEqual(module.app, app_mock)
self.assertIn("parse-industrial-production-daily", module.app.conf.beat_schedule) self.assertIn(
"parse-industrial-production-daily", module.app.conf.beat_schedule
)
self.assertIn("parse-manufactures-daily", module.app.conf.beat_schedule) self.assertIn("parse-manufactures-daily", module.app.conf.beat_schedule)
self.assertIn("parse-industrial-products-daily", module.app.conf.beat_schedule) self.assertIn("parse-industrial-products-daily", module.app.conf.beat_schedule)
self.assertIn("parse-inspections-weekly", module.app.conf.beat_schedule) self.assertIn("parse-inspections-weekly", module.app.conf.beat_schedule)
@@ -63,12 +65,16 @@ class CeleryModuleTest(SimpleTestCase):
apply_async=apply_async_mock apply_async=apply_async_mock
) )
with patch.object(module, "settings", SimpleNamespace( with patch.object(
module,
"settings",
SimpleNamespace(
CELERY_STARTUP_REFRESH_ENABLED=True, CELERY_STARTUP_REFRESH_ENABLED=True,
CELERY_STARTUP_REFRESH_LOCK_KEY="startup-lock", CELERY_STARTUP_REFRESH_LOCK_KEY="startup-lock",
CELERY_STARTUP_REFRESH_LOCK_TTL_SECONDS=120, CELERY_STARTUP_REFRESH_LOCK_TTL_SECONDS=120,
CELERY_STARTUP_REFRESH_DELAY_SECONDS=45, CELERY_STARTUP_REFRESH_DELAY_SECONDS=45,
)), patch.object(module.cache, "add", return_value=True) as add_mock, patch.dict( ),
), patch.object(module.cache, "add", return_value=True) as add_mock, patch.dict(
sys.modules, {"apps.parsers.tasks": fake_tasks_module} sys.modules, {"apps.parsers.tasks": fake_tasks_module}
): ):
module._queue_startup_sources_refresh() module._queue_startup_sources_refresh()
@@ -88,12 +94,16 @@ class CeleryModuleTest(SimpleTestCase):
apply_async=apply_async_mock apply_async=apply_async_mock
) )
with patch.object(module, "settings", SimpleNamespace( with patch.object(
module,
"settings",
SimpleNamespace(
CELERY_STARTUP_REFRESH_ENABLED=True, CELERY_STARTUP_REFRESH_ENABLED=True,
CELERY_STARTUP_REFRESH_LOCK_KEY="startup-lock", CELERY_STARTUP_REFRESH_LOCK_KEY="startup-lock",
CELERY_STARTUP_REFRESH_LOCK_TTL_SECONDS=120, CELERY_STARTUP_REFRESH_LOCK_TTL_SECONDS=120,
CELERY_STARTUP_REFRESH_DELAY_SECONDS=45, CELERY_STARTUP_REFRESH_DELAY_SECONDS=45,
)), patch.object(module.cache, "add", return_value=False), patch.dict( ),
), patch.object(module.cache, "add", return_value=False), patch.dict(
sys.modules, {"apps.parsers.tasks": fake_tasks_module} sys.modules, {"apps.parsers.tasks": fake_tasks_module}
): ):
module._queue_startup_sources_refresh() module._queue_startup_sources_refresh()