diff --git a/docs/sources/exchanges.md b/docs/sources/exchanges.md index 127fd8c..f0a8935 100644 --- a/docs/sources/exchanges.md +++ b/docs/sources/exchanges.md @@ -57,3 +57,44 @@ Fixtures синтетические, получены по проверенны доступности live runtime или наличия эмитентов в canonical dev population. Расписание остаётся disabled. Remote DB/API/export приёмка и runtime TLS СПБ ещё не выполнены; источник не объявлен ready. + +## Реализация и фактические проверки + +Реализованы строгий streaming CSV reader, ограниченный ISS collector и приватный +NDJSON всех ответов (исходный текст/URL/params/SHA). Manifest содержит оба input IDs, +checksums, publication/fetch dates и отдельные adapter counters. Одно атомарное +publish; одинаковый ISIN на разных биржах сохраняет независимые UUID. Ошибка одного +входа сохраняет предыдущие записи. Миграции parsers 0046/0047, organizations 0018; +суточный template schedule disabled, включение не разрешено этой реализацией. + +Одна карточка `stock-exchange-activity`, admin refresh/run, +`parsers.stock_exchange_activity.refresh`, 8h timeout, worker/admission guard. +V2 list/detail: `source_group=stock_exchange_activity`, фильтры `exchange=moex|spb`, +`instrument_kind`, сортировки exchange/instrument_id/instrument_kind/listing_date/ +trading.traded_on. Typed metrics nullable, signed decimal strings. Amount null. +CSV/XLSX/JSON exports через штатные generations/tickets сохраняют все текущие бумаги +независимо от старой даты listing и не смешивают номинал/доходность с amount. +Демо-команды создают пустую extension, без выдуманных биржевых записей. + +- Полный СПБ CSV прочитан до EOF: 2287 строк, 251 checksum-valid legal INN, + 2036 без INN; 0.026s, max RSS 123551744 bytes (включает Django interpreter). + SHA256 `5901c8ddaf455131e8beb141a8cea24c139d95215be77f17ab3b3e1981104287`. +- MOEX полные reference pages до terminal empty: shares 526 (523 с ИНН), + bonds 3175 (3172 с ИНН); duration export 2478. Одна реальная issuer-linked + бумага проверена parameters/primary-board trading; issuer ID 484 отдельно от ИНН. + 43 HTTP requests, 12.456s, max RSS 133283840 bytes. + Raw response manifest SHA256 + `8638336249c7e3da533e3752ebb5a89f9f3b4086596d7d7a036fa85ebf2de160`. + **Повторный live GET durations HTML вернул 403**: этот отдельный ISS probe + использовал дату из ранее успешно проверенного HTML, не является полным + collector/dev acceptance и не подтверждает доступность страницы worker. +- PostgreSQL `--migrations --create-db`: 66 passed, 0 skipped, применены новые + migrations до 0047/0018; общие guards всех источников проходят реальные locks. + Обычный pytest использует `--nomigrations`, поэтому прежние PG проверки + проверяли row locks/schema, а не применение migrations; итоговый прогон это исправляет. +- Backend OpenAPI/Orval/Zod: обе биржи с одним ISIN, list/detail и refresh + 202/400/403/404/409 для пяти источников; 43 rendered JSON cases проходят без + изменения/потери ключей. Прежний refresh error DTO исправлен по реальному envelope. + +Реальный canonical dev publish/API/export, доступ Checko и production TLS trust СПБ +не выполнены. Нет push/deploy и changes в frontend/StateCorp/root/env. diff --git a/src/apps/parsers/exchange_snapshot.py b/src/apps/parsers/exchange_snapshot.py index 1db603a..941b35b 100644 --- a/src/apps/parsers/exchange_snapshot.py +++ b/src/apps/parsers/exchange_snapshot.py @@ -61,6 +61,7 @@ def _stage( row.payload["provenance"] = { **row.payload.get("provenance", {}), "artifact_id": str(raw.uid), + "fetched_at": raw.created_at.isoformat().replace("+00:00", "Z"), "source_published_at": raw.source_published_at.isoformat() if raw.source_published_at else None, @@ -107,6 +108,7 @@ def _save_manifest(aggregate, raws, counters): { "exchange": raw.metadata["dataset"], "artifact_id": str(raw.uid), + "fetched_at": raw.created_at.isoformat().replace("+00:00", "Z"), "checksum_sha256": raw.sha256, "size_bytes": raw.size_bytes, "published_at": raw.source_published_at.isoformat() diff --git a/src/apps/parsers/migrations/0047_exchange_disabled_schedule.py b/src/apps/parsers/migrations/0047_exchange_disabled_schedule.py new file mode 100644 index 0000000..6aa28c6 --- /dev/null +++ b/src/apps/parsers/migrations/0047_exchange_disabled_schedule.py @@ -0,0 +1,33 @@ +"""Keep the public combined source disabled pending runtime/dev acceptance.""" +from django.db import migrations + + +def seed(apps, schema_editor): + interval, _ = apps.get_model( + "django_celery_beat", "IntervalSchedule" + ).objects.get_or_create(every=1, period="days") + apps.get_model("django_celery_beat", "PeriodicTask").objects.update_or_create( + name="parser:stock-exchange-activity:daily", + defaults={ + "task": "parsers.stock_exchange_activity.refresh", + "interval": interval, + "enabled": False, + "args": "[]", + "kwargs": "{}", + "description": "Enable only after verified SPB runtime TLS and full combined dev acceptance.", + }, + ) + + +def unseed(apps, schema_editor): + apps.get_model("django_celery_beat", "PeriodicTask").objects.filter( + name="parser:stock-exchange-activity:daily" + ).delete() + + +class Migration(migrations.Migration): + dependencies = [ + ("parsers", "0046_stock_exchange_activity"), + ("django_celery_beat", "0018_improve_crontab_helptext"), + ] + operations = [migrations.RunPython(seed, unseed)] diff --git a/src/apps/parsers/serializers.py b/src/apps/parsers/serializers.py index be227c8..1a2e76a 100644 --- a/src/apps/parsers/serializers.py +++ b/src/apps/parsers/serializers.py @@ -1242,6 +1242,19 @@ class SourceCardRefreshFrontendResponseSerializer(serializers.Serializer): status = serializers.ChoiceField(choices=("queued", "accepted"), read_only=True) +class SourceRefreshErrorItemSerializer(serializers.Serializer): + code = serializers.CharField(read_only=True) + message = serializers.CharField(read_only=True) + details = serializers.JSONField(read_only=True, required=False) + + +class SourceRefreshErrorSerializer(serializers.Serializer): + success = serializers.BooleanField(read_only=True) + data = serializers.JSONField(read_only=True, allow_null=True) + errors = SourceRefreshErrorItemSerializer(many=True, read_only=True) + meta = serializers.DictField(read_only=True, allow_null=True) + + class SourceRefreshConflictItemSerializer(serializers.Serializer): code = serializers.ChoiceField( choices=("refresh_already_running", "upstream_access_not_approved"), diff --git a/src/apps/parsers/snapshot_metadata.py b/src/apps/parsers/snapshot_metadata.py index c70282f..058b86c 100644 --- a/src/apps/parsers/snapshot_metadata.py +++ b/src/apps/parsers/snapshot_metadata.py @@ -16,7 +16,7 @@ def attach_snapshot_artifacts(logs) -> None: load_batch__in={log.batch_id for log in logs}, ) .exclude( - Q(source="fssp_enforcement_proceedings") + Q(source__in=("fssp_enforcement_proceedings", "stock_exchange_activity")) & Q(metadata__dataset__isnull=False) ) .order_by("-created_at", "-uid") diff --git a/src/apps/parsers/source_cards.py b/src/apps/parsers/source_cards.py index 31c0627..696281c 100644 --- a/src/apps/parsers/source_cards.py +++ b/src/apps/parsers/source_cards.py @@ -46,6 +46,7 @@ STALE_PENDING_MAX_AGE_MINUTES = 24 * 60 SOURCE_CARD_STATS_CACHE_TIMEOUT_SECONDS = 7 * 24 * 60 * 60 SOURCE_CARD_STATS_CACHE_SCHEMA_VERSION = 4 SNAPSHOT_CARD_SLUGS = { + "stock_exchange_activity": "stock-exchange-activity", "checko_licenses": "checko-licenses", "checko_messages": "checko-messages", "checko_leasing": "checko-leasing", @@ -56,6 +57,7 @@ SNAPSHOT_CARD_SLUGS = { "fedresurs_company_profile": "fedresurs-company-profile", } SNAPSHOT_SOURCE_GROUPS = ( + "stock_exchange_activity", "company_licenses", "company_messages", "leasing", @@ -562,6 +564,23 @@ SOURCE_CARD_DEFINITIONS: tuple[SourceCardDefinition, ...] = ( ), refresh_interval=timedelta(days=30), ), + SourceCardDefinition( + slug="stock-exchange-activity", + title="Биржевая активность", + description="Инструменты канонических эмитентов СПБ и MOEX.", + order=200, + task_names=("parsers.stock_exchange_activity.refresh",), + source_items=( + SourceItemDefinition( + code="stock_exchange_activity", + title="Биржевая активность", + description="Сведения двух бирж с датами наблюдений.", + parser_source=ParserLoadLog.Source.STOCK_EXCHANGE_ACTIVITY, + refresh_key="stock_exchange_activity", + ), + ), + refresh_interval=timedelta(days=1), + ), SourceCardDefinition( slug="fssp-enforcement-proceedings", title="ФССП: Банк данных исполнительных производств", @@ -589,6 +608,7 @@ SOURCE_CARD_BY_PARSER_SOURCE = { if source_item.parser_source } GENERIC_RECORD_SOURCES_BY_ITEM_CODE = { + "stock_exchange_activity": ParserLoadLog.Source.STOCK_EXCHANGE_ACTIVITY, "checko_licenses": ParserLoadLog.Source.CHECKO_LICENSES, "checko_messages": ParserLoadLog.Source.CHECKO_MESSAGES, "checko_leasing": ParserLoadLog.Source.CHECKO_LEASING, @@ -1417,9 +1437,18 @@ class SourceCardService: parse_fssp_enforcement_proceedings, parse_sme_support_recipients, parse_sro_membership, + parse_stock_exchange_activity, ) - if definition.slug == "checko-leasing": + if definition.slug == "stock-exchange-activity": + task_specs = ( + ( + parse_stock_exchange_activity, + "parsers.stock_exchange_activity.refresh", + "stock_exchange_activity", + ), + ) + elif definition.slug == "checko-leasing": task_specs = ( ( parse_checko_leasing, diff --git a/src/apps/parsers/source_registry.py b/src/apps/parsers/source_registry.py index d6c9b04..7104493 100644 --- a/src/apps/parsers/source_registry.py +++ b/src/apps/parsers/source_registry.py @@ -56,6 +56,18 @@ class ParserSourceDescriptor: PARSER_SOURCES: dict[str, ParserSourceDescriptor] = { + "stock_exchange_activity": ParserSourceDescriptor( + key="stock_exchange_activity", + source=ParserLoadLog.Source.STOCK_EXCHANGE_ACTIVITY, + title="Биржевая активность", + agency="СПБ Биржа и Московская биржа", + data_scope="Инструменты канонических эмитентов двух бирж", + task_name="parsers.stock_exchange_activity.refresh", + mode="public_registry", + access_method="verified_https", + parser_strategy="two_exchange_snapshot", + admin_only=True, + ), "checko_licenses": ParserSourceDescriptor( key="checko_licenses", source=ParserLoadLog.Source.CHECKO_LICENSES, diff --git a/src/apps/parsers/tasks.py b/src/apps/parsers/tasks.py index 70ffa91..7009c28 100644 --- a/src/apps/parsers/tasks.py +++ b/src/apps/parsers/tasks.py @@ -81,6 +81,7 @@ from apps.parsers.tasks_registry_snapshots import ( # noqa: F401 parse_fssp_enforcement_proceedings, parse_sme_support_recipients, parse_sro_membership, + parse_stock_exchange_activity, ) from celery import shared_task from django.conf import settings diff --git a/src/apps/parsers/tasks_registry_snapshots.py b/src/apps/parsers/tasks_registry_snapshots.py index c6a8232..bed55bd 100644 --- a/src/apps/parsers/tasks_registry_snapshots.py +++ b/src/apps/parsers/tasks_registry_snapshots.py @@ -65,6 +65,7 @@ def _complete_snapshot_job(job, load_log, artifact, result) -> dict: if artifact.source in ( "sro_membership_check", "fssp_enforcement_proceedings", + "stock_exchange_activity", "checko_leasing", "checko_messages", "checko_licenses", @@ -89,6 +90,7 @@ def _claim_snapshot_job(job, source, task_name): "sro_membership_check", "fedresurs_company_profile", "fssp_enforcement_proceedings", + "stock_exchange_activity", "checko_leasing", "checko_messages", "checko_licenses", @@ -161,7 +163,13 @@ def _snapshot_error_message(exc: Exception) -> str: def _attach_rejected_section(job, source, load_log): if ( - source in ("checko_leasing", "checko_messages", "checko_licenses") + source + in ( + "stock_exchange_activity", + "checko_leasing", + "checko_messages", + "checko_licenses", + ) and load_log is not None ): rejected = ( @@ -169,6 +177,7 @@ def _attach_rejected_section(job, source, load_log): source=source, load_batch=load_log.batch_id, status=ParserSourceArtifact.Status.REJECTED, + metadata__dataset__isnull=True, ) .order_by("-created_at") .first() @@ -416,3 +425,21 @@ def parse_checko_licenses(self, *, requested_by_id: int | None = None) -> dict: requested_by_id=requested_by_id, track_progress=True, ) + + +@shared_task( + bind=True, + name="parsers.stock_exchange_activity.refresh", + soft_time_limit=8 * 3600, + time_limit=8 * 3600 + 300, +) +def parse_stock_exchange_activity(self, *, requested_by_id: int | None = None) -> dict: + from apps.parsers.exchange_snapshot import refresh_stock_exchange_activity + + return _run_snapshot( + self, + source="stock_exchange_activity", + refresh=refresh_stock_exchange_activity, + requested_by_id=requested_by_id, + track_progress=True, + ) diff --git a/src/apps/parsers/views.py b/src/apps/parsers/views.py index 52a9664..aaee1b2 100644 --- a/src/apps/parsers/views.py +++ b/src/apps/parsers/views.py @@ -73,6 +73,7 @@ from apps.parsers.serializers import ( SourceCardRefreshResponseSerializer, SourceCardSerializer, SourceRefreshConflictSerializer, + SourceRefreshErrorSerializer, SourceTaskStatusListResponseSerializer, SourceTaskStatusSerializer, SroParserRunRequestSerializer, @@ -146,6 +147,7 @@ SOURCE_RESULT_TAGS = { } TASKS_BY_NAME = { + "parsers.stock_exchange_activity.refresh": tasks.parse_stock_exchange_activity, "parsers.checko_licenses.refresh": tasks.parse_checko_licenses, "parsers.checko_messages.refresh": tasks.parse_checko_messages, "parsers.checko_leasing.refresh": tasks.parse_checko_leasing, @@ -1535,9 +1537,11 @@ class SourceCardRefreshView(APIView): request_body=SourceCardRefreshRequestSerializer, responses={ 202: SourceCardRefreshFrontendResponseSerializer, - 400: CommonResponses.BAD_REQUEST, - 409: SourceRefreshConflictSerializer, **ErrorResponses.ADMIN_NOT_FOUND, + 400: SourceRefreshErrorSerializer, + 403: SourceRefreshErrorSerializer, + 404: SourceRefreshErrorSerializer, + 409: SourceRefreshConflictSerializer, }, ) def post(self, request, slug: str): diff --git a/src/core/openapi.json b/src/core/openapi.json index 744a1b9..dcecc04 100644 --- a/src/core/openapi.json +++ b/src/core/openapi.json @@ -6443,31 +6443,11 @@ } }, "400": { - "description": "Некорректный запрос", + "description": "", "content": { "application/json": { "schema": { - "type": "object", - "properties": { - "success": { - "type": "boolean", - "default": false - }, - "errors": { - "type": "array", - "items": { - "type": "object", - "properties": { - "code": { - "type": "string" - }, - "message": { - "type": "string" - } - } - } - } - } + "$ref": "#/components/schemas/SourceRefreshError" } } } @@ -6489,49 +6469,21 @@ } }, "403": { - "description": "Доступ запрещён", + "description": "", "content": { "application/json": { "schema": { - "type": "object", - "properties": { - "detail": { - "type": "string", - "default": "У вас нет прав для выполнения этого действия." - } - } + "$ref": "#/components/schemas/SourceRefreshError" } } } }, "404": { - "description": "Ресурс не найден", + "description": "", "content": { "application/json": { "schema": { - "type": "object", - "properties": { - "success": { - "type": "boolean", - "default": false - }, - "errors": { - "type": "array", - "items": { - "type": "object", - "properties": { - "code": { - "type": "string", - "default": "not_found" - }, - "message": { - "type": "string", - "default": "Ресурс не найден" - } - } - } - } - } + "$ref": "#/components/schemas/SourceRefreshError" } } } @@ -9302,6 +9254,15 @@ "type": "string" } }, + { + "name": "exchange", + "in": "query", + "description": "Фильтр записей источника: exchange.", + "required": false, + "schema": { + "type": "string" + } + }, { "name": "has_bankruptcy_information", "in": "query", @@ -9347,6 +9308,15 @@ "type": "boolean" } }, + { + "name": "instrument_kind", + "in": "query", + "description": "Фильтр записей источника: instrument_kind.", + "required": false, + "schema": { + "type": "string" + } + }, { "name": "is_branch", "in": "query", @@ -9686,6 +9656,7 @@ "integrated_structure_documents", "fedresurs_company_profile", "enforcement_proceedings", + "stock_exchange_activity", "leasing", "company_messages", "company_licenses" @@ -9761,7 +9732,7 @@ { "name": "ordering", "in": "query", - "description": "Сортировка по полям: record_date, record_type, external_id, organization__name, extension__organization__name, extension__organization__full_name, created_at, updated_at, title, uid, extension__organization__inn, extension__organization__ogrn, extension__organization__okpo, status, payload__attestation_status, payload__full_name, payload__medo_address, payload__registration_number, payload__uk_hm_treasury, payload__european_union, payload__united_states, payload__switzerland, payload__united_states_sectoral, payload__uk_uksl, payload__ukraine, payload__sentiment, payload__news_source, events_count, documents_count, first_event_date, payload__publication_date, payload__message_type, payload__license_number, payload__issued_on, payload__valid_until, payload__authority, payload__document_raw, payload__terminated_on, payload__service_text, organization__full_name, organization__inn, organization__ogrn, organization__okpo, payload__classification__organization_type__name, payload__classification__establishment_kind__name, payload__budget__level__name, payload__address__region__name, payload__is_separate_division, payload__support_form__name, payload__support_kind__name, payload__support_until, payload__provider__name, payload__sme_category__name, payload__has_violation, amount, payload__membership_status, payload__region, payload__sro_name, payload__admission_date, payload__status__name, payload__executive_body_name, payload__registration_date, payload__publication_count, payload__reorganization_count, payload__captured_at. Для обратной сортировки используйте префикс -. Несколько полей перечисляются через запятую без пробелов, например -record_date,-external_id. Значения record_date с null сортируются последними.", + "description": "Сортировка по полям: record_date, record_type, external_id, organization__name, extension__organization__name, extension__organization__full_name, created_at, updated_at, title, uid, extension__organization__inn, extension__organization__ogrn, extension__organization__okpo, status, payload__attestation_status, payload__full_name, payload__medo_address, payload__registration_number, payload__uk_hm_treasury, payload__european_union, payload__united_states, payload__switzerland, payload__united_states_sectoral, payload__uk_uksl, payload__ukraine, payload__sentiment, payload__news_source, events_count, documents_count, first_event_date, payload__exchange, payload__instrument_id, payload__instrument_kind, payload__listing_date, payload__trading__traded_on, payload__publication_date, payload__message_type, payload__license_number, payload__issued_on, payload__valid_until, payload__authority, payload__document_raw, payload__terminated_on, payload__service_text, organization__full_name, organization__inn, organization__ogrn, organization__okpo, payload__classification__organization_type__name, payload__classification__establishment_kind__name, payload__budget__level__name, payload__address__region__name, payload__is_separate_division, payload__support_form__name, payload__support_kind__name, payload__support_until, payload__provider__name, payload__sme_category__name, payload__has_violation, amount, payload__membership_status, payload__region, payload__sro_name, payload__admission_date, payload__status__name, payload__executive_body_name, payload__registration_date, payload__publication_count, payload__reorganization_count, payload__captured_at. Для обратной сортировки используйте префикс -. Несколько полей перечисляются через запятую без пробелов, например -record_date,-external_id. Значения record_date с null сортируются последними.", "required": false, "schema": { "anyOf": [ @@ -10362,6 +10333,7 @@ "integrated_structure_documents", "fedresurs_company_profile", "enforcement_proceedings", + "stock_exchange_activity", "leasing", "company_messages", "company_licenses" @@ -10694,6 +10666,15 @@ "type": "boolean" } }, + { + "name": "has_stock_exchange_activity", + "in": "query", + "description": "Фильтр наличия группы источников stock_exchange_activity.", + "required": false, + "schema": { + "type": "boolean" + } + }, { "name": "has_leasing", "in": "query", @@ -12791,6 +12772,7 @@ "integrated_structure_documents", "fedresurs_company_profile", "fssp_enforcement_proceedings", + "stock_exchange_activity", "checko_leasing", "checko_messages", "checko_licenses" @@ -13076,6 +13058,7 @@ "integrated_structure_documents", "fedresurs_company_profile", "fssp_enforcement_proceedings", + "stock_exchange_activity", "checko_leasing", "checko_messages", "checko_licenses" @@ -13920,6 +13903,7 @@ "integrated_structure_documents", "fedresurs_company_profile", "fssp_enforcement_proceedings", + "stock_exchange_activity", "checko_leasing", "checko_messages", "checko_licenses" @@ -14513,6 +14497,60 @@ } } }, + "SourceRefreshErrorItem": { + "type": "object", + "properties": { + "code": { + "title": "Code", + "type": "string", + "readOnly": true, + "minLength": 1 + }, + "message": { + "title": "Message", + "type": "string", + "readOnly": true, + "minLength": 1 + }, + "details": { + "type": "object", + "additionalProperties": true + } + } + }, + "SourceRefreshError": { + "type": "object", + "properties": { + "success": { + "title": "Success", + "type": "boolean", + "readOnly": true + }, + "data": { + "title": "Data", + "type": "object", + "readOnly": true, + "nullable": true + }, + "errors": { + "type": "array", + "items": { + "$ref": "#/components/schemas/SourceRefreshErrorItem" + }, + "readOnly": true + }, + "meta": { + "title": "Meta", + "type": "object", + "additionalProperties": { + "type": "string", + "nullable": true + }, + "readOnly": true, + "nullable": true + } + } + }, "ParserLoadLogList": { "type": "object", "properties": { @@ -14554,6 +14592,7 @@ "integrated_structure_documents", "fedresurs_company_profile", "fssp_enforcement_proceedings", + "stock_exchange_activity", "checko_leasing", "checko_messages", "checko_licenses", @@ -14577,6 +14616,7 @@ "checko-leasing", "checko-messages", "checko-licenses", + "stock-exchange-activity", "fssp-enforcement-proceedings" ], "readOnly": true @@ -18287,6 +18327,9 @@ { "$ref": "#/components/schemas/SroMembershipRecordList" }, + { + "$ref": "#/components/schemas/ExchangeInstrumentRecordList" + }, { "$ref": "#/components/schemas/CheckoLeasingRecordList" }, @@ -18324,6 +18367,7 @@ "budget_process_registry": "#/components/schemas/BudgetRegistryRecordList", "government_support": "#/components/schemas/SmeSupportRecordList", "sro_membership": "#/components/schemas/SroMembershipRecordList", + "stock_exchange_activity": "#/components/schemas/ExchangeInstrumentRecordList", "leasing": "#/components/schemas/CheckoLeasingRecordList", "company_messages": "#/components/schemas/CheckoMessageRecordList", "company_licenses": "#/components/schemas/CheckoLicenseRecordList", @@ -18563,6 +18607,7 @@ "integrated_structure_documents", "fedresurs_company_profile", "enforcement_proceedings", + "stock_exchange_activity", "leasing", "company_messages", "company_licenses" @@ -19045,6 +19090,9 @@ { "$ref": "#/components/schemas/SroMembershipRecordDetail" }, + { + "$ref": "#/components/schemas/ExchangeInstrumentRecordDetail" + }, { "$ref": "#/components/schemas/CheckoLeasingRecordDetail" }, @@ -19082,6 +19130,7 @@ "budget_process_registry": "#/components/schemas/BudgetRegistryRecordDetail", "government_support": "#/components/schemas/SmeSupportRecordDetail", "sro_membership": "#/components/schemas/SroMembershipRecordDetail", + "stock_exchange_activity": "#/components/schemas/ExchangeInstrumentRecordDetail", "leasing": "#/components/schemas/CheckoLeasingRecordDetail", "company_messages": "#/components/schemas/CheckoMessageRecordDetail", "company_licenses": "#/components/schemas/CheckoLicenseRecordDetail", @@ -19123,6 +19172,7 @@ "integrated_structure_documents", "fedresurs_company_profile", "enforcement_proceedings", + "stock_exchange_activity", "leasing", "company_messages", "company_licenses" @@ -21061,6 +21111,16 @@ "-documents_count", "first_event_date", "-first_event_date", + "payload__exchange", + "-payload__exchange", + "payload__instrument_id", + "-payload__instrument_id", + "payload__instrument_kind", + "-payload__instrument_kind", + "payload__listing_date", + "-payload__listing_date", + "payload__trading__traded_on", + "-payload__trading__traded_on", "payload__publication_date", "-payload__publication_date", "payload__message_type", @@ -21135,7 +21195,7 @@ }, "SourceRecordOrderingSequence": { "type": "string", - "pattern": "^(?:record_date|-record_date|record_type|-record_type|external_id|-external_id|organization__name|-organization__name|extension__organization__name|-extension__organization__name|extension__organization__full_name|-extension__organization__full_name|created_at|-created_at|updated_at|-updated_at|title|-title|uid|-uid|extension__organization__inn|-extension__organization__inn|extension__organization__ogrn|-extension__organization__ogrn|extension__organization__okpo|-extension__organization__okpo|status|-status|payload__attestation_status|-payload__attestation_status|payload__full_name|-payload__full_name|payload__medo_address|-payload__medo_address|payload__registration_number|-payload__registration_number|payload__uk_hm_treasury|-payload__uk_hm_treasury|payload__european_union|-payload__european_union|payload__united_states|-payload__united_states|payload__switzerland|-payload__switzerland|payload__united_states_sectoral|-payload__united_states_sectoral|payload__uk_uksl|-payload__uk_uksl|payload__ukraine|-payload__ukraine|payload__sentiment|-payload__sentiment|payload__news_source|-payload__news_source|events_count|-events_count|documents_count|-documents_count|first_event_date|-first_event_date|payload__publication_date|-payload__publication_date|payload__message_type|-payload__message_type|payload__license_number|-payload__license_number|payload__issued_on|-payload__issued_on|payload__valid_until|-payload__valid_until|payload__authority|-payload__authority|payload__document_raw|-payload__document_raw|payload__terminated_on|-payload__terminated_on|payload__service_text|-payload__service_text|organization__full_name|-organization__full_name|organization__inn|-organization__inn|organization__ogrn|-organization__ogrn|organization__okpo|-organization__okpo|payload__classification__organization_type__name|-payload__classification__organization_type__name|payload__classification__establishment_kind__name|-payload__classification__establishment_kind__name|payload__budget__level__name|-payload__budget__level__name|payload__address__region__name|-payload__address__region__name|payload__is_separate_division|-payload__is_separate_division|payload__support_form__name|-payload__support_form__name|payload__support_kind__name|-payload__support_kind__name|payload__support_until|-payload__support_until|payload__provider__name|-payload__provider__name|payload__sme_category__name|-payload__sme_category__name|payload__has_violation|-payload__has_violation|amount|-amount|payload__membership_status|-payload__membership_status|payload__region|-payload__region|payload__sro_name|-payload__sro_name|payload__admission_date|-payload__admission_date|payload__status__name|-payload__status__name|payload__executive_body_name|-payload__executive_body_name|payload__registration_date|-payload__registration_date|payload__publication_count|-payload__publication_count|payload__reorganization_count|-payload__reorganization_count|payload__captured_at|-payload__captured_at)(?:,(?:record_date|-record_date|record_type|-record_type|external_id|-external_id|organization__name|-organization__name|extension__organization__name|-extension__organization__name|extension__organization__full_name|-extension__organization__full_name|created_at|-created_at|updated_at|-updated_at|title|-title|uid|-uid|extension__organization__inn|-extension__organization__inn|extension__organization__ogrn|-extension__organization__ogrn|extension__organization__okpo|-extension__organization__okpo|status|-status|payload__attestation_status|-payload__attestation_status|payload__full_name|-payload__full_name|payload__medo_address|-payload__medo_address|payload__registration_number|-payload__registration_number|payload__uk_hm_treasury|-payload__uk_hm_treasury|payload__european_union|-payload__european_union|payload__united_states|-payload__united_states|payload__switzerland|-payload__switzerland|payload__united_states_sectoral|-payload__united_states_sectoral|payload__uk_uksl|-payload__uk_uksl|payload__ukraine|-payload__ukraine|payload__sentiment|-payload__sentiment|payload__news_source|-payload__news_source|events_count|-events_count|documents_count|-documents_count|first_event_date|-first_event_date|payload__publication_date|-payload__publication_date|payload__message_type|-payload__message_type|payload__license_number|-payload__license_number|payload__issued_on|-payload__issued_on|payload__valid_until|-payload__valid_until|payload__authority|-payload__authority|payload__document_raw|-payload__document_raw|payload__terminated_on|-payload__terminated_on|payload__service_text|-payload__service_text|organization__full_name|-organization__full_name|organization__inn|-organization__inn|organization__ogrn|-organization__ogrn|organization__okpo|-organization__okpo|payload__classification__organization_type__name|-payload__classification__organization_type__name|payload__classification__establishment_kind__name|-payload__classification__establishment_kind__name|payload__budget__level__name|-payload__budget__level__name|payload__address__region__name|-payload__address__region__name|payload__is_separate_division|-payload__is_separate_division|payload__support_form__name|-payload__support_form__name|payload__support_kind__name|-payload__support_kind__name|payload__support_until|-payload__support_until|payload__provider__name|-payload__provider__name|payload__sme_category__name|-payload__sme_category__name|payload__has_violation|-payload__has_violation|amount|-amount|payload__membership_status|-payload__membership_status|payload__region|-payload__region|payload__sro_name|-payload__sro_name|payload__admission_date|-payload__admission_date|payload__status__name|-payload__status__name|payload__executive_body_name|-payload__executive_body_name|payload__registration_date|-payload__registration_date|payload__publication_count|-payload__publication_count|payload__reorganization_count|-payload__reorganization_count|payload__captured_at|-payload__captured_at))+$", + "pattern": "^(?:record_date|-record_date|record_type|-record_type|external_id|-external_id|organization__name|-organization__name|extension__organization__name|-extension__organization__name|extension__organization__full_name|-extension__organization__full_name|created_at|-created_at|updated_at|-updated_at|title|-title|uid|-uid|extension__organization__inn|-extension__organization__inn|extension__organization__ogrn|-extension__organization__ogrn|extension__organization__okpo|-extension__organization__okpo|status|-status|payload__attestation_status|-payload__attestation_status|payload__full_name|-payload__full_name|payload__medo_address|-payload__medo_address|payload__registration_number|-payload__registration_number|payload__uk_hm_treasury|-payload__uk_hm_treasury|payload__european_union|-payload__european_union|payload__united_states|-payload__united_states|payload__switzerland|-payload__switzerland|payload__united_states_sectoral|-payload__united_states_sectoral|payload__uk_uksl|-payload__uk_uksl|payload__ukraine|-payload__ukraine|payload__sentiment|-payload__sentiment|payload__news_source|-payload__news_source|events_count|-events_count|documents_count|-documents_count|first_event_date|-first_event_date|payload__exchange|-payload__exchange|payload__instrument_id|-payload__instrument_id|payload__instrument_kind|-payload__instrument_kind|payload__listing_date|-payload__listing_date|payload__trading__traded_on|-payload__trading__traded_on|payload__publication_date|-payload__publication_date|payload__message_type|-payload__message_type|payload__license_number|-payload__license_number|payload__issued_on|-payload__issued_on|payload__valid_until|-payload__valid_until|payload__authority|-payload__authority|payload__document_raw|-payload__document_raw|payload__terminated_on|-payload__terminated_on|payload__service_text|-payload__service_text|organization__full_name|-organization__full_name|organization__inn|-organization__inn|organization__ogrn|-organization__ogrn|organization__okpo|-organization__okpo|payload__classification__organization_type__name|-payload__classification__organization_type__name|payload__classification__establishment_kind__name|-payload__classification__establishment_kind__name|payload__budget__level__name|-payload__budget__level__name|payload__address__region__name|-payload__address__region__name|payload__is_separate_division|-payload__is_separate_division|payload__support_form__name|-payload__support_form__name|payload__support_kind__name|-payload__support_kind__name|payload__support_until|-payload__support_until|payload__provider__name|-payload__provider__name|payload__sme_category__name|-payload__sme_category__name|payload__has_violation|-payload__has_violation|amount|-amount|payload__membership_status|-payload__membership_status|payload__region|-payload__region|payload__sro_name|-payload__sro_name|payload__admission_date|-payload__admission_date|payload__status__name|-payload__status__name|payload__executive_body_name|-payload__executive_body_name|payload__registration_date|-payload__registration_date|payload__publication_count|-payload__publication_count|payload__reorganization_count|-payload__reorganization_count|payload__captured_at|-payload__captured_at)(?:,(?:record_date|-record_date|record_type|-record_type|external_id|-external_id|organization__name|-organization__name|extension__organization__name|-extension__organization__name|extension__organization__full_name|-extension__organization__full_name|created_at|-created_at|updated_at|-updated_at|title|-title|uid|-uid|extension__organization__inn|-extension__organization__inn|extension__organization__ogrn|-extension__organization__ogrn|extension__organization__okpo|-extension__organization__okpo|status|-status|payload__attestation_status|-payload__attestation_status|payload__full_name|-payload__full_name|payload__medo_address|-payload__medo_address|payload__registration_number|-payload__registration_number|payload__uk_hm_treasury|-payload__uk_hm_treasury|payload__european_union|-payload__european_union|payload__united_states|-payload__united_states|payload__switzerland|-payload__switzerland|payload__united_states_sectoral|-payload__united_states_sectoral|payload__uk_uksl|-payload__uk_uksl|payload__ukraine|-payload__ukraine|payload__sentiment|-payload__sentiment|payload__news_source|-payload__news_source|events_count|-events_count|documents_count|-documents_count|first_event_date|-first_event_date|payload__exchange|-payload__exchange|payload__instrument_id|-payload__instrument_id|payload__instrument_kind|-payload__instrument_kind|payload__listing_date|-payload__listing_date|payload__trading__traded_on|-payload__trading__traded_on|payload__publication_date|-payload__publication_date|payload__message_type|-payload__message_type|payload__license_number|-payload__license_number|payload__issued_on|-payload__issued_on|payload__valid_until|-payload__valid_until|payload__authority|-payload__authority|payload__document_raw|-payload__document_raw|payload__terminated_on|-payload__terminated_on|payload__service_text|-payload__service_text|organization__full_name|-organization__full_name|organization__inn|-organization__inn|organization__ogrn|-organization__ogrn|organization__okpo|-organization__okpo|payload__classification__organization_type__name|-payload__classification__organization_type__name|payload__classification__establishment_kind__name|-payload__classification__establishment_kind__name|payload__budget__level__name|-payload__budget__level__name|payload__address__region__name|-payload__address__region__name|payload__is_separate_division|-payload__is_separate_division|payload__support_form__name|-payload__support_form__name|payload__support_kind__name|-payload__support_kind__name|payload__support_until|-payload__support_until|payload__provider__name|-payload__provider__name|payload__sme_category__name|-payload__sme_category__name|payload__has_violation|-payload__has_violation|amount|-amount|payload__membership_status|-payload__membership_status|payload__region|-payload__region|payload__sro_name|-payload__sro_name|payload__admission_date|-payload__admission_date|payload__status__name|-payload__status__name|payload__executive_body_name|-payload__executive_body_name|payload__registration_date|-payload__registration_date|payload__publication_count|-payload__publication_count|payload__reorganization_count|-payload__reorganization_count|payload__captured_at|-payload__captured_at))+$", "description": "Two or more allowlisted ordering fields, separated by commas without spaces." }, "AttachmentUnavailableError": { @@ -22303,6 +22363,401 @@ } ] }, + "ExchangeMetric": { + "type": "object", + "properties": { + "value": { + "type": "string", + "nullable": true + }, + "unit": { + "type": "string", + "nullable": true + }, + "calculated_on": { + "type": "string", + "format": "date", + "nullable": true + } + }, + "required": [ + "value", + "unit", + "calculated_on" + ] + }, + "ExchangeTrading": { + "type": "object", + "properties": { + "traded_on": { + "type": "string", + "format": "date" + }, + "board_id": { + "type": "string" + }, + "upstream": { + "type": "object", + "additionalProperties": true + } + }, + "required": [ + "traded_on", + "board_id", + "upstream" + ] + }, + "ExchangeInstrumentListPayload": { + "type": "object", + "properties": { + "exchange": { + "type": "string", + "enum": [ + "moex", + "spb" + ] + }, + "instrument_id": { + "type": "string" + }, + "issuer_inn": { + "type": "string", + "pattern": "^[0-9]{10}$" + }, + "issuer_provider_id": { + "type": "string", + "nullable": true + }, + "isin": { + "type": "string", + "nullable": true + }, + "instrument_kind": { + "type": "string" + }, + "listing_date": { + "type": "string", + "format": "date", + "nullable": true + }, + "nominal_value": { + "type": "string", + "nullable": true + }, + "nominal_currency": { + "type": "string", + "nullable": true + }, + "parameters": { + "type": "object", + "additionalProperties": true + }, + "trading": { + "allOf": [ + { + "$ref": "#/components/schemas/ExchangeTrading" + } + ], + "nullable": true + }, + "duration": { + "allOf": [ + { + "$ref": "#/components/schemas/ExchangeMetric" + } + ], + "nullable": true + }, + "yield": { + "allOf": [ + { + "$ref": "#/components/schemas/ExchangeMetric" + } + ], + "nullable": true + }, + "provenance": { + "type": "object", + "additionalProperties": true + }, + "upstream": { + "type": "object", + "additionalProperties": true + } + }, + "required": [ + "exchange", + "instrument_id", + "issuer_inn", + "issuer_provider_id", + "isin", + "instrument_kind", + "listing_date", + "nominal_value", + "nominal_currency", + "parameters", + "trading", + "duration", + "yield", + "provenance", + "upstream" + ] + }, + "ExchangeInstrumentDetailPayload": { + "allOf": [ + { + "$ref": "#/components/schemas/ExchangeInstrumentListPayload" + } + ] + }, + "ExchangeInstrumentRecordList": { + "type": "object", + "properties": { + "uid": { + "title": "UID", + "type": "string", + "format": "uuid", + "readOnly": true + }, + "extension_uid": { + "title": "Extension uid", + "type": "string", + "format": "uuid", + "readOnly": true + }, + "source_group": { + "type": "string", + "enum": [ + "stock_exchange_activity" + ] + }, + "record_type": { + "type": "string", + "enum": [ + "exchange_instrument" + ] + }, + "source": { + "type": "string", + "enum": [ + "stock_exchange_activity" + ] + }, + "external_id": { + "title": "Внешний ID", + "type": "string", + "readOnly": true, + "minLength": 1 + }, + "title": { + "title": "Заголовок", + "type": "string", + "readOnly": true, + "minLength": 1 + }, + "record_date": { + "title": "Record date", + "type": "string", + "format": "date", + "readOnly": true, + "nullable": true + }, + "amount": { + "title": "Сумма", + "type": "string", + "format": "decimal", + "readOnly": true, + "nullable": true + }, + "status": { + "type": "string" + }, + "url": { + "title": "URL", + "type": "string", + "readOnly": true, + "minLength": 1 + }, + "payload": { + "$ref": "#/components/schemas/ExchangeInstrumentListPayload" + }, + "legacy_model": { + "title": "Legacy model", + "type": "string", + "readOnly": true + }, + "legacy_pk": { + "title": "Legacy pk", + "type": "string", + "readOnly": true + }, + "load_batch": { + "title": "ID пакета загрузки", + "type": "integer", + "readOnly": true, + "nullable": true + }, + "created_at": { + "title": "Дата создания", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "updated_at": { + "title": "Дата обновления", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "financial_lines": { + "type": "array", + "items": { + "$ref": "#/components/schemas/OrganizationSourceFinancialLine" + }, + "readOnly": true + }, + "organization": { + "$ref": "#/components/schemas/FsspSourceRecordOrganization" + } + }, + "required": [ + "source_group", + "uid", + "source", + "record_type", + "external_id", + "title", + "status", + "created_at", + "updated_at", + "organization", + "payload" + ] + }, + "ExchangeInstrumentRecordDetail": { + "type": "object", + "properties": { + "uid": { + "title": "UID", + "type": "string", + "format": "uuid", + "readOnly": true + }, + "extension_uid": { + "title": "Extension uid", + "type": "string", + "format": "uuid", + "readOnly": true + }, + "source_group": { + "type": "string", + "enum": [ + "stock_exchange_activity" + ] + }, + "record_type": { + "type": "string", + "enum": [ + "exchange_instrument" + ] + }, + "source": { + "type": "string", + "enum": [ + "stock_exchange_activity" + ] + }, + "external_id": { + "title": "Внешний ID", + "type": "string", + "readOnly": true, + "minLength": 1 + }, + "title": { + "title": "Заголовок", + "type": "string", + "readOnly": true, + "minLength": 1 + }, + "record_date": { + "title": "Record date", + "type": "string", + "format": "date", + "readOnly": true, + "nullable": true + }, + "amount": { + "title": "Сумма", + "type": "string", + "format": "decimal", + "readOnly": true, + "nullable": true + }, + "status": { + "type": "string" + }, + "url": { + "title": "URL", + "type": "string", + "readOnly": true, + "minLength": 1 + }, + "payload": { + "$ref": "#/components/schemas/ExchangeInstrumentDetailPayload" + }, + "legacy_model": { + "title": "Legacy model", + "type": "string", + "readOnly": true + }, + "legacy_pk": { + "title": "Legacy pk", + "type": "string", + "readOnly": true + }, + "load_batch": { + "title": "ID пакета загрузки", + "type": "integer", + "readOnly": true, + "nullable": true + }, + "created_at": { + "title": "Дата создания", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "updated_at": { + "title": "Дата обновления", + "type": "string", + "format": "date-time", + "readOnly": true + }, + "financial_lines": { + "type": "array", + "items": { + "$ref": "#/components/schemas/OrganizationSourceFinancialLine" + }, + "readOnly": true + }, + "organization": { + "$ref": "#/components/schemas/FsspSourceRecordOrganization" + } + }, + "required": [ + "source_group", + "uid", + "source", + "record_type", + "external_id", + "title", + "status", + "created_at", + "updated_at", + "organization", + "payload" + ] + }, "CheckoLeasingRecordList": { "type": "object", "properties": { diff --git a/src/organizations/exchange_payload_serializers.py b/src/organizations/exchange_payload_serializers.py new file mode 100644 index 0000000..f0ff51f --- /dev/null +++ b/src/organizations/exchange_payload_serializers.py @@ -0,0 +1,38 @@ +"""Typed instrument observations shared by the unified list/detail contract.""" +from rest_framework import serializers + + +class ExchangeMetricSerializer(serializers.Serializer): + value = serializers.CharField(allow_null=True) + unit = serializers.CharField(allow_null=True) + calculated_on = serializers.DateField(allow_null=True) + + +class ExchangeTradingSerializer(serializers.Serializer): + traded_on = serializers.DateField() + board_id = serializers.CharField() + upstream = serializers.JSONField() + + +class ExchangeInstrumentPayloadSerializer(serializers.Serializer): + exchange = serializers.ChoiceField(choices=("moex", "spb")) + instrument_id = serializers.CharField() + issuer_inn = serializers.CharField() + issuer_provider_id = serializers.CharField(allow_null=True) + isin = serializers.CharField(allow_null=True) + instrument_kind = serializers.CharField() + listing_date = serializers.DateField(allow_null=True) + nominal_value = serializers.CharField(allow_null=True) + nominal_currency = serializers.CharField(allow_null=True) + parameters = serializers.JSONField() + trading = ExchangeTradingSerializer(allow_null=True) + duration = ExchangeMetricSerializer(allow_null=True) + yield_value = ExchangeMetricSerializer(source="yield", allow_null=True) + provenance = serializers.JSONField() + upstream = serializers.JSONField() + + def get_fields(self): + fields = super().get_fields() + fields["yield"] = fields.pop("yield_value") + fields["yield"].source = None + return fields diff --git a/src/organizations/serializers.py b/src/organizations/serializers.py index 06b4511..48da52b 100644 --- a/src/organizations/serializers.py +++ b/src/organizations/serializers.py @@ -326,6 +326,12 @@ class OrganizationSourceRecordSerializer(serializers.ModelSerializer): CHECKO_PAYLOAD_SERIALIZERS, ) + if obj.source == "stock_exchange_activity": + from organizations.exchange_payload_serializers import ( + ExchangeInstrumentPayloadSerializer, + ) + + return ExchangeInstrumentPayloadSerializer(payload).data if obj.source in CHECKO_PAYLOAD_SERIALIZERS: return CHECKO_PAYLOAD_SERIALIZERS[obj.source](payload).data if obj.source == "fssp_enforcement_proceedings": diff --git a/src/organizations/source_record_export.py b/src/organizations/source_record_export.py index ea7198f..dc0c368 100644 --- a/src/organizations/source_record_export.py +++ b/src/organizations/source_record_export.py @@ -49,6 +49,7 @@ EXPORT_FORMAT_JSON = "json" EXPORT_FORMATS = (EXPORT_FORMAT_CSV, EXPORT_FORMAT_XLSX, EXPORT_FORMAT_JSON) FINANCIAL_SOURCE_GROUP = SourceGroup.FINANCIAL_INDICATORS.value ALL_HISTORY_SOURCE_GROUPS = { + "stock_exchange_activity", "leasing", "company_messages", "company_licenses", @@ -83,6 +84,7 @@ EXPORT_PROVIDER_NAME_PATTERN = re.compile( ) SNAPSHOT_EXPORT_SOURCES = { + "stock_exchange_activity": "stock_exchange_activity", "company_licenses": "checko_licenses", "company_messages": "checko_messages", "leasing": "checko_leasing", @@ -96,6 +98,7 @@ SNAPSHOT_EXPORT_SOURCES = { GENERATION_ID_PATTERN = re.compile(r"[0-9]{8}T[0-9]{6}Z-[a-f0-9]{8}") SOURCE_GROUP_EXPORT_FILE_STEMS: dict[str, str] = { + "stock_exchange_activity": "stock-exchange-activity", "company_licenses": "checko-licenses", "company_messages": "checko-messages", "leasing": "checko-leasing", @@ -1300,7 +1303,13 @@ def _build_record_row( } public_row = ( row - if record.source in ("checko_leasing", "checko_messages", "checko_licenses") + if record.source + in ( + "stock_exchange_activity", + "checko_leasing", + "checko_messages", + "checko_licenses", + ) else _sanitize_export_provider_value(row) ) serialized_row = { diff --git a/src/organizations/source_record_query.py b/src/organizations/source_record_query.py index b9ca647..a94983e 100644 --- a/src/organizations/source_record_query.py +++ b/src/organizations/source_record_query.py @@ -27,6 +27,7 @@ from drf_yasg import openapi from rest_framework.exceptions import NotFound REGISTRY_GROUPS = ( + "stock_exchange_activity", "company_licenses", "company_messages", "leasing", @@ -38,6 +39,7 @@ REGISTRY_GROUPS = ( "fedresurs_company_profile", ) REGISTRY_SOURCE_GROUPS = { + "stock_exchange_activity": "stock_exchange_activity", "checko_licenses": "company_licenses", "checko_messages": "company_messages", "checko_leasing": "leasing", @@ -50,6 +52,11 @@ REGISTRY_SOURCE_GROUPS = { } REGISTRY_ORDERING_FIELDS = ( + "payload__exchange", + "payload__instrument_id", + "payload__instrument_kind", + "payload__listing_date", + "payload__trading__traded_on", "payload__publication_date", "payload__message_type", "payload__license_number", @@ -87,6 +94,8 @@ REGISTRY_ORDERING_FIELDS = ( "payload__captured_at", ) EXACT_FILTERS = { + "exchange": "payload__exchange", + "instrument_kind": "payload__instrument_kind", "message_type": "payload__message_type", "license_number": "payload__license_number", "license_authority": "payload__authority", @@ -273,6 +282,8 @@ def _validate_aliases_and_booleans(values, error): def _validate_choices(values, error): + if "exchange" in values and values["exchange"] not in ("moex", "spb"): + error("exchange") group = values.get("source_group") or REGISTRY_SOURCE_GROUPS.get( values.get("source") ) diff --git a/src/organizations/test_companies.py b/src/organizations/test_companies.py index 998bf6e..2b408c2 100644 --- a/src/organizations/test_companies.py +++ b/src/organizations/test_companies.py @@ -44,6 +44,7 @@ CANONICAL_ONLY_TEST_SOURCES = { ParserLoadLog.Source.SRO_MEMBERSHIP_CHECK, } FILE_UPLOAD_ONLY_TEST_SOURCES = { + ParserLoadLog.Source.STOCK_EXCHANGE_ACTIVITY, "checko_leasing", "checko_messages", "checko_licenses", diff --git a/tests/apps/organizations/test_canonical_openapi.py b/tests/apps/organizations/test_canonical_openapi.py index 61a9167..d955024 100644 --- a/tests/apps/organizations/test_canonical_openapi.py +++ b/tests/apps/organizations/test_canonical_openapi.py @@ -36,7 +36,7 @@ def test_discriminated_records_keep_named_ordering_and_old_operations(contract): schemas = contract["components"]["schemas"] for name in ("OrganizationSourceRecord", "OrganizationSourceRecordList"): record = schemas[name] - assert len(record["oneOf"]) == 10 + assert len(record["oneOf"]) == 11 assert record["discriminator"]["propertyName"] == "source_group" for group, record_type in ( ("budget_process_registry", "budget_registry_organization"), diff --git a/tests/apps/organizations/test_exchange_contract.py b/tests/apps/organizations/test_exchange_contract.py new file mode 100644 index 0000000..e4768ad --- /dev/null +++ b/tests/apps/organizations/test_exchange_contract.py @@ -0,0 +1,294 @@ +"""Unified exchange card, typed observations and source API/export parity.""" +import importlib +from unittest.mock import patch + +import pytest +from apps.core.models import BackgroundJob +from apps.parsers.models import ParserLoadLog, ParserSourceArtifact +from apps.parsers.snapshot_metadata import get_snapshot_artifact +from apps.parsers.source_cards import SOURCE_CARD_DEFINITIONS, SourceCardService +from core.celery import app as celery_app +from django.core.cache import cache +from django.test import TestCase +from django.utils import timezone +from organizations.models import Organization, OrganizationSourceRecord +from organizations.source_groups import get_source_group_descriptor +from organizations.source_record_export import _build_record_row, _source_group_queryset +from rest_framework.test import APIClient + +from tests.apps.user.factories import UserFactory + +SOURCE = "stock_exchange_activity" + + +def exchange_payload(exchange="moex"): + return { + "exchange": exchange, + "instrument_id": "FIXTURE1", + "issuer_inn": "7707083893", + "issuer_provider_id": "484" if exchange == "moex" else None, + "isin": "RU0000000001", + "instrument_kind": "exchange_bond", + "listing_date": "2020-01-01", + "nominal_value": "1000.00", + "nominal_currency": "RUB", + "parameters": {"unknown": {"keep": [None, False, 0, "001"]}}, + "trading": { + "traded_on": "2026-10-05", + "board_id": "TQCB", + "upstream": {"LAST": "101.2300"}, + } + if exchange == "moex" + else None, + "duration": {"value": "260", "unit": "days", "calculated_on": "2026-10-02"} + if exchange == "moex" + else None, + "yield": {"value": None, "unit": None, "calculated_on": "2026-10-02"} + if exchange == "moex" + else None, + "provenance": {"artifact_id": "00000000-0000-0000-0000-000000000001"}, + "upstream": {"unknown": [0, None, False, "0007"]}, + } + + +class ExchangeContractTests(TestCase): + def setUp(self): + cache.clear() + self.org = Organization.objects.create( + name="Canonical issuer", + inn="7707083893", + ogrn="1027700132195", + okpo="00032537", + directory_imported_at=timezone.now(), + ) + self.extension = get_source_group_descriptor( + SOURCE + ).extension_model.objects.create(organization=self.org) + ParserSourceArtifact.objects.create( + source=SOURCE, + load_batch=1, + status="published", + original_name="exchange-manifest.json", + metadata={"snapshot_organizations_count": 1}, + published_count=2, + ) + self.rows = [ + OrganizationSourceRecord.objects.create( + extension=self.extension, + source=SOURCE, + record_type="exchange_instrument", + external_id=exchange + ":FIXTURE1", + title="Fixture", + load_batch=1, + payload=exchange_payload(exchange), + ) + for exchange in ("moex", "spb") + ] + self.client = APIClient() + self.client.force_authenticate(UserFactory.create_user()) + self.url = "/api/v2/organization-source-records/" + + def test_exact_unified_source_card_and_list_detail_export(self): + descriptor = get_source_group_descriptor(SOURCE) + assert descriptor.source_group == SOURCE + assert descriptor.record_type == "exchange_instrument" + assert ( + len( + [ + c + for c in SOURCE_CARD_DEFINITIONS + if c.slug == "stock-exchange-activity" + ] + ) + == 1 + ) + response = self.client.get(self.url, {"source_group": SOURCE}) + assert response.status_code == 200, response.data + assert len(response.data["data"]) == 2 + for row in response.data["data"]: + assert row["amount"] is None + assert row["organization"]["okpo"] == "00032537" + detail = self.client.get(self.url + row["uid"] + "/") + assert detail.data["payload"] == row["payload"] + record = _source_group_queryset(SOURCE, export_year=2026).get( + uid=row["uid"] + ) + exported = _build_record_row(record, include_financial_lines=False) + assert exported["payload.exchange"] == row["payload"]["exchange"] + assert exported["payload.nominal_value"] == "1000.00" + assert exported["amount"] is None + if row["payload"]["exchange"] == "moex": + assert exported["payload.duration.value"] == "260" + assert exported["payload.duration.unit"] == "days" + assert row["payload"]["yield"]["value"] is None + + def test_exchange_filters_ordering_and_invalid_exchange(self): + response = self.client.get( + self.url, + { + "source_group": SOURCE, + "exchange": "moex", + "instrument_kind": "exchange_bond", + "ordering": "-payload__instrument_id", + }, + ) + assert response.status_code == 200, response.data + assert len(response.data["data"]) == 1 + assert response.data["data"][0]["payload"]["exchange"] == "moex" + assert ( + self.client.get( + self.url, {"source_group": SOURCE, "exchange": "unknown"} + ).status_code + == 400 + ) + + def test_input_artifact_never_overrides_aggregate_provenance(self): + log = ParserLoadLog.objects.create(source=SOURCE, batch_id=1, status="success") + child = ParserSourceArtifact.objects.create( + source=SOURCE, + load_batch=1, + status="parsed", + original_name="moex.ndjson", + metadata={"dataset": "moex", "input_only": True}, + ) + assert get_snapshot_artifact(log).uid != child.uid + + +def test_invalid_exchange_rejected_by_named_serializer(): + module = importlib.import_module("organizations.exchange_payload_serializers") + serializer = module.ExchangeInstrumentPayloadSerializer( + data=exchange_payload("invalid") + ) + assert not serializer.is_valid() + assert "exchange" in serializer.errors + + +@pytest.mark.django_db +def test_one_job_refresh_run_shared_guard_permissions(): + importlib.import_module("apps.parsers.tasks") + task = celery_app.tasks["parsers.stock_exchange_activity.refresh"] + client = APIClient() + client.force_authenticate(UserFactory.create_user()) + urls = [ + "/api/v1/sources/stock-exchange-activity/refresh/", + "/api/v1/parsers/run/stock_exchange_activity/", + ] + assert all(client.post(url, {}, format="json").status_code == 403 for url in urls) + client.force_authenticate(UserFactory.create_user(is_staff=True)) + with patch.object(task, "apply_async"): + assert client.post(urls[0], {}, format="json").status_code == 202 + assert client.post(urls[1], {}, format="json").status_code == 409 + assert BackgroundJob.objects.count() == 1 + + +@pytest.mark.django_db +def test_worker_success_propagates_combined_manifest_counters_and_failure_keeps_success(): + from apps.parsers import exchange_snapshot + from apps.parsers.registry_snapshots import SnapshotResult, SnapshotValidationError + + importlib.import_module("apps.parsers.tasks") + task = celery_app.tasks["parsers.stock_exchange_activity.refresh"] + cache.clear() + + def refresh(**kwargs): + artifact = ParserSourceArtifact.objects.create( + source=SOURCE, + load_batch=kwargs["load_batch"], + status="published", + original_name="exchange-manifest.json", + parsed_count=5, + published_count=2, + quarantined_count=1, + metadata={ + "snapshot_organizations_count": 1, + "adapter_counters": {"spb": {"parsed": 3}, "moex": {"parsed": 2}}, + "inputs": [{"exchange": "spb"}, {"exchange": "moex"}], + }, + ) + result = SnapshotResult(parsed=5, published=2, quarantined=1, skipped=2) + kwargs["on_publish"](artifact, result) + return artifact, result + + with patch.object(exchange_snapshot, "refresh_stock_exchange_activity", refresh): + result = task.apply(throw=True).result + assert result["published_records_count"] == 2 + assert result["adapter_counters"]["spb"]["parsed"] == 3 + assert len(result["inputs"]) == 2 + before = SourceCardService.get_card("stock-exchange-activity")[ + "latest_success_load" + ]["batch_id"] + + def fail(**kwargs): + ParserSourceArtifact.objects.create( + source=SOURCE, + load_batch=kwargs["load_batch"], + status="rejected", + original_name="exchange-manifest.json", + metadata={ + "rejection_reason": "synthetic_failure", + "inputs": [{"exchange": "spb"}, {"exchange": "moex"}], + }, + ) + ParserSourceArtifact.objects.create( + source=SOURCE, + load_batch=kwargs["load_batch"], + status="rejected", + original_name="moex.ndjson", + metadata={"dataset": "moex", "input_only": True}, + ) + raise SnapshotValidationError("synthetic_failure") + + with patch.object( + exchange_snapshot, "refresh_stock_exchange_activity", fail + ), pytest.raises(SnapshotValidationError): + task.apply(throw=True) + card = SourceCardService.get_card("stock-exchange-activity") + assert card["latest_success_load"]["batch_id"] == before + job = BackgroundJob.objects.order_by("-created_at").first() + assert job.result["rejection_reason"] == "synthetic_failure" + assert len(job.result["inputs"]) == 2 + + +def test_exchange_discriminator_and_nullable_metrics_in_generated_contract(): + import json + from pathlib import Path + + document = json.loads( + (Path(__file__).parents[3] / "src/core/openapi.json").read_text() + ) + schemas = document["components"]["schemas"] + for name in ("OrganizationSourceRecord", "OrganizationSourceRecordList"): + mapping = schemas[name]["discriminator"]["mapping"] + variant = schemas[mapping[SOURCE].rsplit("/", 1)[1]] + assert variant["properties"]["record_type"]["enum"] == ["exchange_instrument"] + payload = schemas["ExchangeInstrumentListPayload"] + assert payload["properties"]["duration"]["nullable"] is True + assert payload["properties"]["yield"]["nullable"] is True + + +@pytest.mark.django_db +@pytest.mark.parametrize( + "module_name", + [ + "apps.parsers.migrations.0043_fssp_disabled_schedule", + "apps.parsers.migrations.0045_checko_disabled_schedules", + "apps.parsers.migrations.0047_exchange_disabled_schedule", + ], +) +def test_new_schedule_seed_always_disabled(module_name): + from django.apps import apps + from django_celery_beat.models import PeriodicTask + + module = importlib.import_module(module_name) + module.seed(apps, None) + tasks = PeriodicTask.objects.filter( + task__in=[ + "parsers.fssp_enforcement_proceedings.refresh", + "parsers.checko_leasing.refresh", + "parsers.checko_messages.refresh", + "parsers.checko_licenses.refresh", + "parsers.stock_exchange_activity.refresh", + ] + ) + assert tasks.exists() + assert not tasks.filter(enabled=True).exists() diff --git a/tests/apps/organizations/test_openapi_runtime_fixtures.py b/tests/apps/organizations/test_openapi_runtime_fixtures.py index 91b8684..255d412 100644 --- a/tests/apps/organizations/test_openapi_runtime_fixtures.py +++ b/tests/apps/organizations/test_openapi_runtime_fixtures.py @@ -2,8 +2,10 @@ import json import os +from importlib import import_module from io import StringIO from pathlib import Path +from unittest.mock import patch from uuid import uuid4 import pytest @@ -20,6 +22,7 @@ from organizations.models import Organization, OrganizationSourceRecord from organizations.source_groups import get_source_group_descriptor from rest_framework.test import APIClient +from tests.apps.organizations.test_exchange_contract import exchange_payload from tests.apps.parsers.test_checko_sections import client_with, fixture from tests.apps.parsers.test_registry_payload_contract import full_budget_fixture from tests.apps.parsers.test_registry_snapshots import _xml @@ -163,7 +166,29 @@ def _canonical_records(): }, ) ) - return [budget, sme, sro, fssp, *sections], raw_budget + exchange = _create_record( + fssp_org, + "stock_exchange_activity", + { + "title": "Synthetic instrument", + "record_date": "2026-10-05", + "amount": None, + "status": "", + "url": "https://iss.moex.com/iss/securities/FIXTURE1.json", + "payload": exchange_payload(), + }, + ) + spb = OrganizationSourceRecord.objects.create( + extension=exchange.extension, + source="stock_exchange_activity", + record_type="exchange_instrument", + external_id="spb:FIXTURE1", + load_batch=9001, + title="Synthetic SPB instrument", + url="https://spbexchange.ru/listing/securities/list/", + payload=exchange_payload("spb"), + ) + return [budget, sme, sro, fssp, *sections, exchange, spb], raw_budget @pytest.mark.django_db @@ -184,22 +209,31 @@ def test_source_record_runtime_fixtures(): return body mixed = capture("mixed-list", "list", client.get(list_url)) - assert len(mixed["data"]) == 7 - assert mixed["meta"]["pagination"]["total_count"] == 7 + assert len(mixed["data"]) == 9 + assert mixed["meta"]["pagination"]["total_count"] == 9 details = {} + listed_sources = set() for record in records: - listing = capture( - f"{record.source}-list", - "list", - client.get(list_url, {"source": record.source}), - ) - assert len(listing["data"]) == 1 + if record.source not in listed_sources: + listing = capture( + f"{record.source}-list", + "list", + client.get(list_url, {"source": record.source}), + ) + assert len(listing["data"]) == ( + 2 if record.source == "stock_exchange_activity" else 1 + ) + listed_sources.add(record.source) detail_url = reverse( "api_v2:organizations:organization-source-records-detail", kwargs={"uid": record.uid}, ) details[record.source] = capture( - f"{record.source}-detail", "detail", client.get(detail_url) + f"{record.source}-spb-detail" + if record is records[-1] + else f"{record.source}-detail", + "detail", + client.get(detail_url), ) budget_payload = details["budget_ubpandnubp"]["payload"] assert budget_payload["upstream"] == raw_budget @@ -238,6 +272,57 @@ def test_source_record_runtime_fixtures(): status, ) + from core.celery import app as celery_app + + import_module("apps.parsers.tasks") + sources = [ + ("fssp_enforcement_proceedings", "fssp-enforcement-proceedings"), + ("checko_leasing", "checko-leasing"), + ("checko_messages", "checko-messages"), + ("checko_licenses", "checko-licenses"), + ("stock_exchange_activity", "stock-exchange-activity"), + ] + for source, slug in sources: + capture( + f"{source}-refresh-forbidden", + "refresh", + client.post(f"/api/v1/sources/{slug}/refresh/", {}, format="json"), + 403, + ) + client.force_authenticate(UserFactory.create_user(is_staff=True)) + for source, slug in sources: + refresh_url = f"/api/v1/sources/{slug}/refresh/" + capture( + f"{source}-refresh-invalid", + "refresh", + client.post( + refresh_url, + {"params": {"file_url": "https://foreign.invalid"}}, + format="json", + ), + 400, + ) + task = celery_app.tasks[f"parsers.{source}.refresh"] + with patch.object(task, "apply_async"): + capture( + f"{source}-refresh-accepted", + "refresh", + client.post(refresh_url, {}, format="json"), + 202, + ) + capture( + f"{source}-refresh-conflict", + "refresh", + client.post(refresh_url, {}, format="json"), + 409, + ) + capture( + "missing-refresh", + "refresh", + client.post("/api/v1/sources/unknown-source/refresh/", {}, format="json"), + 404, + ) + # Ordinary pytest runs create no artifact. CI opts in with an explicit path. destination = os.environ.get("OPENAPI_RUNTIME_FIXTURES") if destination: diff --git a/tests/apps/organizations/test_source_export_snapshot_contract.py b/tests/apps/organizations/test_source_export_snapshot_contract.py index 46c179a..5d06c1e 100644 --- a/tests/apps/organizations/test_source_export_snapshot_contract.py +++ b/tests/apps/organizations/test_source_export_snapshot_contract.py @@ -69,6 +69,7 @@ def issue(client, group="budget_process_registry", file_format="json"): @pytest.mark.parametrize( "source,group", [ + ("stock_exchange_activity", "stock_exchange_activity"), ("checko_leasing", "leasing"), ("checko_messages", "company_messages"), ("checko_licenses", "company_licenses"), @@ -220,7 +221,7 @@ def test_sro_export_keeps_all_years_and_identifier_strings(export_client, file_f record_date="2001-01-01", ) generation = exports.build_source_record_export_artifacts() - assert generation.artifacts_count == 61 + assert generation.artifacts_count == 64 response = issue(export_client, "sro_membership", file_format) assert response.status_code == 201 package = exports.consume_source_record_export_download_ticket( diff --git a/tests/apps/organizations/test_source_record_export.py b/tests/apps/organizations/test_source_record_export.py index a37fff2..1cce620 100644 --- a/tests/apps/organizations/test_source_record_export.py +++ b/tests/apps/organizations/test_source_record_export.py @@ -128,9 +128,9 @@ class OrganizationSourceRecordExportApiV2Test(APITestCase): call_command("build_source_record_exports", stdout=command_output) generation = load_current_source_record_export_generation() - self.assertEqual(generation.artifacts_count, 61) + self.assertEqual(generation.artifacts_count, 64) self.assertEqual(generation.export_year, timezone.localdate().year) - self.assertIn('"artifacts_count": 61', command_output.getvalue()) + self.assertIn('"artifacts_count": 64', command_output.getvalue()) def test_sanctions_xlsx_export_uses_source_contract_columns_and_boolean_flags(self): organization = Organization.objects.create( @@ -641,7 +641,7 @@ class OrganizationSourceRecordExportApiV2Test(APITestCase): self.assertEqual( response["X-Source-Export-Generated-At"], generation.generated_at ) - self.assertEqual(generation.artifacts_count, 61) + self.assertEqual(generation.artifacts_count, 64) self.assertIn( 'filename="planned-inspections__financial-indicators_', response["Content-Disposition"], @@ -840,8 +840,8 @@ class OrganizationSourceRecordExportApiV2Test(APITestCase): key=lambda item: item.file_name, ) - self.assertEqual(generation.artifacts_count, 61) - self.assertEqual(generation.files_count, 62) + self.assertEqual(generation.artifacts_count, 64) + self.assertEqual(generation.files_count, 65) self.assertEqual( [item.file_name for item in artifacts], [ @@ -1065,7 +1065,7 @@ class OrganizationSourceRecordExportApiV2Test(APITestCase): first_generation = build_source_record_export_artifacts() current_generation = load_current_source_record_export_generation() - self.assertEqual(first_generation.artifacts_count, 61) + self.assertEqual(first_generation.artifacts_count, 64) self.assertEqual( current_generation.generation_id, first_generation.generation_id ) diff --git a/tests/apps/organizations/test_tasks.py b/tests/apps/organizations/test_tasks.py index 708a829..03b7bf9 100644 --- a/tests/apps/organizations/test_tasks.py +++ b/tests/apps/organizations/test_tasks.py @@ -147,7 +147,7 @@ class SourceRecordExportArtifactsTaskTest(TestCase): result = refresh_source_record_export_artifacts() self.assertEqual(result["status"], "success") - self.assertEqual(result["artifacts_count"], 61) + self.assertEqual(result["artifacts_count"], 64) self.assertEqual(result["export_year"], timezone.localdate().year) self.assertIsNone(cache.get(settings.SOURCE_RECORD_EXPORT_LOCK_KEY)) diff --git a/tests/apps/organizations/test_test_companies_commands.py b/tests/apps/organizations/test_test_companies_commands.py index 72aa458..ad53aa7 100644 --- a/tests/apps/organizations/test_test_companies_commands.py +++ b/tests/apps/organizations/test_test_companies_commands.py @@ -83,6 +83,7 @@ class TestCompaniesCommandsTest(TestCase): ParserLoadLog.Source.CHECKO_LEASING, ParserLoadLog.Source.CHECKO_MESSAGES, ParserLoadLog.Source.CHECKO_LICENSES, + ParserLoadLog.Source.STOCK_EXCHANGE_ACTIVITY, } } for company in companies: @@ -277,7 +278,7 @@ class TestCompaniesCommandsTest(TestCase): ) self.assertEqual( OrganizationSourceRecord.objects.count(), - 20 * (len(ParserLoadLog.Source) - 7), + 20 * (len(ParserLoadLog.Source) - 8), ) def test_create_replaces_stale_source_record_for_same_legacy_row(self): diff --git a/tests/apps/parsers/test_refresh_concurrency.py b/tests/apps/parsers/test_refresh_concurrency.py index ccba743..237ba48 100644 --- a/tests/apps/parsers/test_refresh_concurrency.py +++ b/tests/apps/parsers/test_refresh_concurrency.py @@ -31,6 +31,7 @@ def _parallel(actions): @pytest.mark.parametrize( "slug,source", [ + ("stock-exchange-activity", "stock_exchange_activity"), ("checko-leasing", "checko_leasing"), ("checko-messages", "checko_messages"), ("checko-licenses", "checko_licenses"), diff --git a/tests/apps/parsers/test_source_cards_service.py b/tests/apps/parsers/test_source_cards_service.py index de83e99..e1d0bce 100644 --- a/tests/apps/parsers/test_source_cards_service.py +++ b/tests/apps/parsers/test_source_cards_service.py @@ -100,6 +100,7 @@ class SourceCardServiceUnitTest(TestCase): "checko-leasing", "checko-messages", "checko-licenses", + "stock-exchange-activity", "fssp-enforcement-proceedings", ], ) @@ -126,6 +127,7 @@ class SourceCardServiceUnitTest(TestCase): "Лизинг", "Сообщения организаций", "Лицензии организаций", + "Биржевая активность", "ФССП: Банк данных исполнительных производств", ], ) diff --git a/tools/openapi/README.md b/tools/openapi/README.md index 55c011a..a7be343 100644 --- a/tools/openapi/README.md +++ b/tools/openapi/README.md @@ -7,7 +7,7 @@ The source is the actual DRF serializers and view annotations. `build.mjs` conve Swagger 2 to OpenAPI 3, adds the source-record discriminated variants and the named ordering enum with comma-separated ordering, then validates the resulting document. Do not edit `src/core/openapi.json` or generated TypeScript by hand. -The public-UI Fedresurs and integrated-structure DTOs live in +The FSSP, Checko sections, combined exchange, public-UI Fedresurs and integrated-structure DTOs live in `source-record-extensions.json`; `build.mjs` adds their discriminated list/detail variants and typed upload/attachment errors to the generated contract. diff --git a/tools/openapi/build.mjs b/tools/openapi/build.mjs index 191b399..3ce3557 100644 --- a/tools/openapi/build.mjs +++ b/tools/openapi/build.mjs @@ -26,6 +26,7 @@ const variants = [ ['SroMembership', 'sro_membership', 'sro_membership_check', 'sro_membership', 'SroMembership'], ]; const extendedVariants = [ + ['ExchangeInstrument', 'stock_exchange_activity', 'stock_exchange_activity', 'exchange_instrument', 'ExchangeInstrument'], ['CheckoLeasing', 'leasing', 'checko_leasing', 'leasing_contract', 'CheckoLeasing'], ['CheckoMessage', 'company_messages', 'checko_messages', 'company_message', 'CheckoMessage'], ['CheckoLicense', 'company_licenses', 'checko_licenses', 'company_license', 'CheckoLicense'], @@ -123,6 +124,12 @@ for (const name of ['OrganizationSourceRecordListResponse', 'SourceRecordMeta', } schemas.OrganizationSourceRecordListResponse.properties.errors = { type: 'object', nullable: true, enum: [null] }; +// Source refresh validation details are arbitrary structured JSON from the actual +// exception envelope; they must survive generated validators unchanged. +if (schemas.SourceRefreshErrorItem?.properties?.details) { + schemas.SourceRefreshErrorItem.properties.details = { type: 'object', additionalProperties: true }; +} + // The two richer source payloads have stable public DTOs in addition to the // generic DRF JSONField. Keep these schemas beside the canonical converter so // both backend /openapi.json and the frontend client come from one contract. @@ -147,7 +154,7 @@ for (const [prefix, group, source, recordType, payloadPrefix] of extendedVariant schema.properties.status = { type: 'string' }; schema.properties.payload = ref(payloadName); schema.properties.organization = ref('SroSourceRecordOrganization'); - if (['leasing', 'company_messages', 'company_licenses'].includes(group)) { + if (['leasing', 'company_messages', 'company_licenses', 'stock_exchange_activity'].includes(group)) { schema.properties.organization = ref('FsspSourceRecordOrganization'); } if (group === 'enforcement_proceedings') { diff --git a/tools/openapi/check-runtime.mjs b/tools/openapi/check-runtime.mjs index 76b3724..7930b63 100644 --- a/tools/openapi/check-runtime.mjs +++ b/tools/openapi/check-runtime.mjs @@ -6,9 +6,19 @@ import { ApiV2OrganizationSourceRecordsRead404Response, V2OrganizationSourceRecordsList200Response, V2OrganizationSourceRecordsList400Response, + ApiV1SourcesRefreshCreate202Response, + ApiV1SourcesRefreshCreate400Response, + ApiV1SourcesRefreshCreate403Response, + ApiV1SourcesRefreshCreate404Response, + ApiV1SourcesRefreshCreate409Response, } from './generated-zod/contract.ts'; const schemas = new Map([ + ['refresh:202', ApiV1SourcesRefreshCreate202Response], + ['refresh:400', ApiV1SourcesRefreshCreate400Response], + ['refresh:403', ApiV1SourcesRefreshCreate403Response], + ['refresh:404', ApiV1SourcesRefreshCreate404Response], + ['refresh:409', ApiV1SourcesRefreshCreate409Response], ['list:200', V2OrganizationSourceRecordsList200Response], ['list:400', V2OrganizationSourceRecordsList400Response], ['detail:200', ApiV2OrganizationSourceRecordsRead200Response], @@ -17,7 +27,10 @@ const schemas = new Map([ ]); const requiredCases = new Set([ 'mixed-list', 'empty-list', 'invalid-list', 'invalid-detail', 'missing-detail', - ...['budget_ubpandnubp', 'fns_sme_support_recipients', 'sro_membership_check', 'fssp_enforcement_proceedings', 'checko_leasing', 'checko_messages', 'checko_licenses'] + 'stock_exchange_activity-spb-detail', 'missing-refresh', + ...['fssp_enforcement_proceedings', 'checko_leasing', 'checko_messages', 'checko_licenses', 'stock_exchange_activity'] + .flatMap(source => ['forbidden', 'invalid', 'accepted', 'conflict'].map(kind => `${source}-refresh-${kind}`)), + ...['budget_ubpandnubp', 'fns_sme_support_recipients', 'sro_membership_check', 'fssp_enforcement_proceedings', 'checko_leasing', 'checko_messages', 'checko_licenses', 'stock_exchange_activity'] .flatMap(source => [`${source}-list`, `${source}-detail`]), ]); diff --git a/tools/openapi/contract.ts b/tools/openapi/contract.ts index 1187873..a591237 100644 --- a/tools/openapi/contract.ts +++ b/tools/openapi/contract.ts @@ -6,6 +6,12 @@ import type { } from './generated/schemas'; export function recordLabel(record: OrganizationSourceRecordList): string { + if (record.source_group === 'stock_exchange_activity') { + const type: 'exchange_instrument' = record.record_type; + const duration: string | null | undefined = record.payload.duration?.value; + const yieldValue: string | null | undefined = record.payload.yield?.value; + return type + record.payload.exchange + (duration || '') + (yieldValue || ''); + } if (record.source_group === 'budget_process_registry') { const type: 'budget_registry_organization' = record.record_type; return type + record.payload.registry.code; diff --git a/tools/openapi/source-record-extensions.json b/tools/openapi/source-record-extensions.json index ce9769d..8309fa4 100644 --- a/tools/openapi/source-record-extensions.json +++ b/tools/openapi/source-record-extensions.json @@ -1163,5 +1163,152 @@ "$ref": "#/components/schemas/CheckoLicenseListPayload" } ] + }, + "ExchangeMetric": { + "type": "object", + "properties": { + "value": { + "type": "string", + "nullable": true + }, + "unit": { + "type": "string", + "nullable": true + }, + "calculated_on": { + "type": "string", + "format": "date", + "nullable": true + } + }, + "required": [ + "value", + "unit", + "calculated_on" + ] + }, + "ExchangeTrading": { + "type": "object", + "properties": { + "traded_on": { + "type": "string", + "format": "date" + }, + "board_id": { + "type": "string" + }, + "upstream": { + "type": "object", + "additionalProperties": true + } + }, + "required": [ + "traded_on", + "board_id", + "upstream" + ] + }, + "ExchangeInstrumentListPayload": { + "type": "object", + "properties": { + "exchange": { + "type": "string", + "enum": [ + "moex", + "spb" + ] + }, + "instrument_id": { + "type": "string" + }, + "issuer_inn": { + "type": "string", + "pattern": "^[0-9]{10}$" + }, + "issuer_provider_id": { + "type": "string", + "nullable": true + }, + "isin": { + "type": "string", + "nullable": true + }, + "instrument_kind": { + "type": "string" + }, + "listing_date": { + "type": "string", + "format": "date", + "nullable": true + }, + "nominal_value": { + "type": "string", + "nullable": true + }, + "nominal_currency": { + "type": "string", + "nullable": true + }, + "parameters": { + "type": "object", + "additionalProperties": true + }, + "trading": { + "allOf": [ + { + "$ref": "#/components/schemas/ExchangeTrading" + } + ], + "nullable": true + }, + "duration": { + "allOf": [ + { + "$ref": "#/components/schemas/ExchangeMetric" + } + ], + "nullable": true + }, + "yield": { + "allOf": [ + { + "$ref": "#/components/schemas/ExchangeMetric" + } + ], + "nullable": true + }, + "provenance": { + "type": "object", + "additionalProperties": true + }, + "upstream": { + "type": "object", + "additionalProperties": true + } + }, + "required": [ + "exchange", + "instrument_id", + "issuer_inn", + "issuer_provider_id", + "isin", + "instrument_kind", + "listing_date", + "nominal_value", + "nominal_currency", + "parameters", + "trading", + "duration", + "yield", + "provenance", + "upstream" + ] + }, + "ExchangeInstrumentDetailPayload": { + "allOf": [ + { + "$ref": "#/components/schemas/ExchangeInstrumentListPayload" + } + ] } }