fix: group JSON source exports by organization (dev) #22

Merged
avm merged 2 commits from hotfix/json-source-export-dev-20260927 into dev 2026-09-27 11:44:03 +03:00
2 changed files with 10 additions and 3 deletions
Showing only changes of commit 88bd918bae - Show all commits

View File

@@ -1096,9 +1096,13 @@ def _render_json_file(
)
batch: list[tuple[str, int, str | None, str]] = []
for position, row in enumerate(_iter_spooled_rows(row_spool_path)):
raw_okpo = row.pop("ОКПО", None)
raw_okpo = row.pop("ОКПО", None) or row.pop("okpo", None)
okpo = str(raw_okpo) if raw_okpo else None
fallback = [row.get("ИНН"), row.get("ОГРН"), row.get("Наименование")]
fallback = [
row.get("ИНН") or row.get("inn"),
row.get("ОГРН") or row.get("ogrn"),
row.get("Наименование"),
]
if not any(fallback):
fallback.append(row.get("uid"))
group_key = json.dumps(

View File

@@ -257,7 +257,10 @@ class SourceRecordExportApiTest(APITestCase):
if artifact.source_group == "media_mentions"
and artifact.file_format == "json"
)
rows = json.loads(media_path.read_text(encoding="utf-8"))
rows = _source_records(
json.loads(media_path.read_text(encoding="utf-8")),
"media_mentions",
)
exported = next(row for row in rows if row["uid"] == str(mention.id))
self.assertEqual(exported["record_date"], "2023-02-15")
self.assertEqual(