Merge remote-tracking branch 'origin/main' into dev
All checks were successful
CI/CD Pipeline / Quality Gate (push) Successful in 33s
CI/CD Pipeline / Build and Push Images (push) Successful in 18s
CI/CD Pipeline / Internal Notify (push) Successful in 0s
CI/CD Pipeline / Deploy Dev via Compose (push) Successful in 24s

# Conflicts:
#	tests/apps/exchange/test_state_corp_services.py
This commit is contained in:
2026-07-22 17:27:04 +02:00
9 changed files with 439 additions and 48 deletions

View File

@@ -893,6 +893,11 @@ class GenericParserRecordService(BulkOperationsMixin, BaseService[GenericParserR
records_by_source: dict[str, list[SourceRecordInput]] = defaultdict(list)
for (record_source, _external_id), record in unique_records.items():
record_date = record.record_date
if record_source in cls.vacancy_record_sources | {
ParserLoadLog.Source.ARBITRATION
}:
record_date = _date_to_iso(normalize_to_date(record.record_date)) or ""
payload = dict(record.payload) if isinstance(record.payload, dict) else {}
payload.update(
{
@@ -903,7 +908,7 @@ class GenericParserRecordService(BulkOperationsMixin, BaseService[GenericParserR
"ogrn": record.ogrn,
"organisation_name": record.organisation_name,
"title": record.title,
"record_date": record.record_date,
"record_date": record_date,
"amount": str(record.amount) if record.amount is not None else None,
"status": record.status,
"url": record.url,
@@ -916,7 +921,7 @@ class GenericParserRecordService(BulkOperationsMixin, BaseService[GenericParserR
organization_name=record.organisation_name,
inn=record.inn,
ogrn=record.ogrn,
record_date=record.record_date,
record_date=record_date,
amount=record.amount,
status=record.status,
url=record.url,
@@ -1503,7 +1508,7 @@ class InspectionService(BulkOperationsMixin, BaseService[InspectionRecord]):
organization_name=insp.organisation_name,
inn=insp.inn,
ogrn=insp.ogrn,
record_date=insp.start_date,
record_date=_date_to_iso(normalize_to_date(insp.start_date)) or "",
status=insp.status,
payload={
"load_batch": batch_id,