diff --git a/edi/json-schema/document.json b/edi/json-schema/document.json index 7831bd8..17ef9d8 100644 --- a/edi/json-schema/document.json +++ b/edi/json-schema/document.json @@ -36,6 +36,11 @@ "type": "string", "description": "MD5 hash of the stringified document's body", "pattern": "^[0-9a-f]{32}$" + }, + "msg_for": { + "type": "string", + "description": "User id to proxy message for", + "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" } } } diff --git a/edi/json-schema/event_parcel.json b/edi/json-schema/event_parcel.json index 9ea1228..0f49d19 100644 --- a/edi/json-schema/event_parcel.json +++ b/edi/json-schema/event_parcel.json @@ -74,6 +74,11 @@ "document_id": { "type": "string", "description": "Corresonding document identifier" + }, + "msg_for": { + "type": "string", + "description": "User id to proxy message for", + "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" } } }, @@ -143,6 +148,11 @@ "type": "boolean", "description": "Is the parcel is of quasi-parcel type", "default": false + }, + "msg_for": { + "type": "string", + "description": "User id to proxy message for", + "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" } } } diff --git a/edi/json-schema/fms_contragent_announcement.json b/edi/json-schema/fms_contragent_announcement.json index 9704acd..87d862e 100644 --- a/edi/json-schema/fms_contragent_announcement.json +++ b/edi/json-schema/fms_contragent_announcement.json @@ -68,6 +68,11 @@ "comment": { "type": "string", "description": "Additional info" + }, + "msg_for": { + "type": "string", + "description": "User id to proxy message for", + "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" } } } diff --git a/edi/json-schema/fms_emoney_event.json b/edi/json-schema/fms_emoney_event.json index a4f573c..a798e80 100644 --- a/edi/json-schema/fms_emoney_event.json +++ b/edi/json-schema/fms_emoney_event.json @@ -113,6 +113,11 @@ "target_wallet": { "type": "string", "description": "Target wallet reference, informal" + }, + "msg_for": { + "type": "string", + "description": "User id to proxy message for", + "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" } } } \ No newline at end of file diff --git a/edi/json-schema/order_payment.json b/edi/json-schema/order_payment.json index fece619..431ae74 100644 --- a/edi/json-schema/order_payment.json +++ b/edi/json-schema/order_payment.json @@ -71,6 +71,11 @@ "type": "string", "description": "Optionally identifies correction", "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" + }, + "msg_for": { + "type": "string", + "description": "User id to proxy message for", + "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" } } } diff --git a/edi/json-schema/refill_payment.json b/edi/json-schema/refill_payment.json index d3fd303..6474e5d 100644 --- a/edi/json-schema/refill_payment.json +++ b/edi/json-schema/refill_payment.json @@ -57,6 +57,11 @@ "comment": { "type": "string", "description": "Additional info" + }, + "msg_for": { + "type": "string", + "description": "User id to proxy message for", + "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" } } } diff --git a/edi/json-schema/wms_event.json b/edi/json-schema/wms_event.json index b31c185..0b3907b 100644 --- a/edi/json-schema/wms_event.json +++ b/edi/json-schema/wms_event.json @@ -85,6 +85,11 @@ }, "owner": { "$ref": "#/definitions/uuid" + }, + "msg_for": { + "type": "string", + "description": "User id to proxy message for", + "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" } } } diff --git a/edi/json-schema/wms_item_announcement.json b/edi/json-schema/wms_item_announcement.json index 141d00f..023c388 100644 --- a/edi/json-schema/wms_item_announcement.json +++ b/edi/json-schema/wms_item_announcement.json @@ -1,61 +1,65 @@ { - "$schema": "http://json-schema.org/draft-04/schema#", - "description": "WMS item (movement) anouncement", - "definitions": { - "uuid": { - "type": "string", - "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$" - }, - "uuid_v1": { - "type": "string", - "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-1[0-9a-fA-F]{3}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$" - } - }, - "type": "object", - "required": [ - "serial", - "item", - "reference" - ], - "properties": { - "serial": { - "$ref": "#/definitions/uuid_v1" - }, - "item": { - "oneOf": [ - { + "$schema": "http://json-schema.org/draft-04/schema#", + "description": "WMS item (movement) anouncement", + "definitions": { + "uuid": { + "type": "string", + "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$" + }, + "uuid_v1": { + "type": "string", + "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-1[0-9a-fA-F]{3}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$" + } + }, + "type": "object", + "required": [ + "serial", + "item", + "reference" + ], + "properties": { + "serial": { + "$ref": "#/definitions/uuid_v1" + }, + "item": { + "oneOf": [ + { + "type": "string", + "pattern": "^[^ ]{3,24}$" + }, + { + "type": "array", + "items": { "type": "string", "pattern": "^[^ ]{3,24}$" - }, - { - "type": "array", - "items": { - "type": "string", - "pattern": "^[^ ]{3,24}$" - } } - ] - }, - "zone_from": { - "type": "string", - "pattern": "^[^ ]{3,64}$" - }, - "zone_to": { - "type": "string", - "pattern": "^[^ ]{3,64}$" - }, - "reference": { - "$ref": "#/definitions/uuid" - }, - "version": { - "type": "string" - }, - "origin": { - "$ref": "#/definitions/uuid" - }, - "owner": { - "$ref": "#/definitions/uuid" - } + } + ] + }, + "zone_from": { + "type": "string", + "pattern": "^[^ ]{3,64}$" + }, + "zone_to": { + "type": "string", + "pattern": "^[^ ]{3,64}$" + }, + "reference": { + "$ref": "#/definitions/uuid" + }, + "version": { + "type": "string" + }, + "origin": { + "$ref": "#/definitions/uuid" + }, + "owner": { + "$ref": "#/definitions/uuid" + }, + "msg_for": { + "type": "string", + "description": "User id to proxy message for", + "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" } } - \ No newline at end of file +} diff --git a/edi/json-schema/wms_registry_announcement.json b/edi/json-schema/wms_registry_announcement.json index 9e66e96..93794e1 100644 --- a/edi/json-schema/wms_registry_announcement.json +++ b/edi/json-schema/wms_registry_announcement.json @@ -39,6 +39,11 @@ "type": "string", "description": "Event", "enum": ["created", "updated", "closed"] + }, + "msg_for": { + "type": "string", + "description": "User id to proxy message for", + "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" } } } diff --git a/edi/json-schema/wms_stocktaking_message.json b/edi/json-schema/wms_stocktaking_message.json index 59d11eb..ad2c304 100644 --- a/edi/json-schema/wms_stocktaking_message.json +++ b/edi/json-schema/wms_stocktaking_message.json @@ -1,66 +1,70 @@ { - "$schema": "http://json-schema.org/draft-04/schema#", - "description": "WMS stocktaking message", - "definitions": { - "uuid": { - "type": "string", - "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$" - }, - "uuid_v1": { - "type": "string", - "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-1[0-9a-fA-F]{3}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$" - } + "$schema": "http://json-schema.org/draft-04/schema#", + "description": "WMS stocktaking message", + "definitions": { + "uuid": { + "type": "string", + "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$" }, - "type": "object", - "required": [ - "serial", - "reference", - "message_type" - ], - "properties": { - "serial": { - "$ref": "#/definitions/uuid_v1" - }, - "reference": { - "$ref": "#/definitions/uuid" - }, - "label":{ - "type": "string", - "pattern": "^[^ ]{3,128}$" - }, - "message_type": { - "type": "string", - "enum": [ - "start", - "evaluation", - "error", - "finish" - ] - }, - "item": { - "oneOf": [ - { + "uuid_v1": { + "type": "string", + "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-1[0-9a-fA-F]{3}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$" + } + }, + "type": "object", + "required": [ + "serial", + "reference", + "message_type" + ], + "properties": { + "serial": { + "$ref": "#/definitions/uuid_v1" + }, + "reference": { + "$ref": "#/definitions/uuid" + }, + "label": { + "type": "string", + "pattern": "^[^ ]{3,128}$" + }, + "message_type": { + "type": "string", + "enum": [ + "start", + "evaluation", + "error", + "finish" + ] + }, + "item": { + "oneOf": [ + { + "type": "string", + "pattern": "^[^ ]{3,24}$" + }, + { + "type": "array", + "items": { "type": "string", "pattern": "^[^ ]{3,24}$" - }, - { - "type": "array", - "items": { - "type": "string", - "pattern": "^[^ ]{3,24}$" - } } - ] - }, - "version": { - "type": "string" - }, - "origin": { - "$ref": "#/definitions/uuid" - }, - "owner": { - "$ref": "#/definitions/uuid" - } + } + ] + }, + "version": { + "type": "string" + }, + "origin": { + "$ref": "#/definitions/uuid" + }, + "owner": { + "$ref": "#/definitions/uuid" } + }, + "msg_for": { + "type": "string", + "description": "User id to proxy message for", + "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$" } - \ No newline at end of file +} diff --git a/tests/edi/json-schema/document.json b/tests/edi/json-schema/document.json index 2cda2a4..37eb797 100644 --- a/tests/edi/json-schema/document.json +++ b/tests/edi/json-schema/document.json @@ -6,5 +6,6 @@ "body": { "some": "body" }, - "checksum": "fd6b34c54a331ccbbfacade3ea4bd225" + "checksum": "fd6b34c54a331ccbbfacade3ea4bd225", + "msg_for": "deeaea34-ff10-48dd-bf54-82add4b931de" } diff --git a/tests/edi/json-schema/event_parcel.change_state.json b/tests/edi/json-schema/event_parcel.change_state.json index 213bd39..d327141 100644 --- a/tests/edi/json-schema/event_parcel.change_state.json +++ b/tests/edi/json-schema/event_parcel.change_state.json @@ -12,6 +12,8 @@ 3 ], "parcel_source": "external", + "external_ref": "some_ref", "delivery_service": "novaposhta", - "is_quasi": true + "is_quasi": true, + "msg_for": "deeaea34-ff10-48dd-bf54-82add4b931de" } \ No newline at end of file diff --git a/tests/edi/json-schema/event_parcel.order_cacel.json b/tests/edi/json-schema/event_parcel.order_cacel.json index 5c0f5d0..ec47b0f 100644 --- a/tests/edi/json-schema/event_parcel.order_cacel.json +++ b/tests/edi/json-schema/event_parcel.order_cacel.json @@ -9,5 +9,6 @@ "total_price": 310.12, "money_back": true, "money_dest": "card", - "document_id": "ABCDEFGHIJKLMNOP" + "document_id": "ABCDEFGHIJKLMNOP", + "msg_for": "deeaea34-ff10-48dd-bf54-82add4b931de" } diff --git a/tests/edi/json-schema/fms_contragent_announcement.json b/tests/edi/json-schema/fms_contragent_announcement.json index 5f970c2..c61b66f 100644 --- a/tests/edi/json-schema/fms_contragent_announcement.json +++ b/tests/edi/json-schema/fms_contragent_announcement.json @@ -6,5 +6,6 @@ "action": "deleted", "reason": "self", "merchant_id": "ABCDEFGHIJKLMNOPQR", - "comment": "ABCDEFGHIJK" + "comment": "ABCDEFGHIJK", + "msg_for": "deeaea34-ff10-48dd-bf54-82add4b931de" } \ No newline at end of file diff --git a/tests/edi/json-schema/fms_emoney_event.json b/tests/edi/json-schema/fms_emoney_event.json index 9deb138..6d0a79e 100644 --- a/tests/edi/json-schema/fms_emoney_event.json +++ b/tests/edi/json-schema/fms_emoney_event.json @@ -15,5 +15,6 @@ "merchant_id": "ABCDEFGHIJKLMNOPQ", "note": "ABCDEFGHIJKLMNOPQ", "source_wallet": "ABCDEFGHIJKLMNOPQRSTU", - "target_wallet": "ABCD" + "target_wallet": "ABCD", + "msg_for": "deeaea34-ff10-48dd-bf54-82add4b931de" } \ No newline at end of file diff --git a/tests/edi/json-schema/order_payment.json b/tests/edi/json-schema/order_payment.json index abce10f..17b643a 100644 --- a/tests/edi/json-schema/order_payment.json +++ b/tests/edi/json-schema/order_payment.json @@ -9,5 +9,8 @@ "merchant_id": "672", "amount": "25", "payer_phone": "380110913888", - "comment": "{\"account\": \"K3BZZ2A\", \"ucode\": \"K3BZZ2A:__delivery\", \"identity\": \"0\", \"terminal_id\": \"8515\", \"date\": \"20200323190742\"}" + "comment": "{\"account\": \"K3BZZ2A\", \"ucode\": \"K3BZZ2A:__delivery\", \"identity\": \"0\", \"terminal_id\": \"8515\", \"date\": \"20200323190742\"}", + "operation": "payment", + "correction_id": "974f1826-0648-4ba8-8b12-7fb95f8eaeb9", + "msg_for": "deeaea34-ff10-48dd-bf54-82add4b931de" } \ No newline at end of file diff --git a/tests/edi/json-schema/refill_payment.json b/tests/edi/json-schema/refill_payment.json index b25348c..5ec9a5c 100644 --- a/tests/edi/json-schema/refill_payment.json +++ b/tests/edi/json-schema/refill_payment.json @@ -9,5 +9,6 @@ "posorder_id": "ABCDEF", "merchant_id": "ABCDEFGHIJKLMNOPQRSTUVWX", "amount": "3.90", - "comment": "ABCDEFGHIJKLMNOPQRSTU" + "comment": "ABCDEFGHIJKLMNOPQRSTU", + "msg_for": "deeaea34-ff10-48dd-bf54-82add4b931de" } diff --git a/tests/edi/json-schema/wms_event.json b/tests/edi/json-schema/wms_event.json index a0aeec3..c56b5f7 100644 --- a/tests/edi/json-schema/wms_event.json +++ b/tests/edi/json-schema/wms_event.json @@ -14,5 +14,6 @@ "reason": "ABCDEFGHI", "version": "v2019.2", "origin": "aac099d5-f520-4c00-95ab-cc445bec8920", - "owner": "46f69d00-4389-444b-9174-26b1f6f0bafa" + "owner": "46f69d00-4389-444b-9174-26b1f6f0bafa", + "msg_for": "deeaea34-ff10-48dd-bf54-82add4b931de" } diff --git a/tests/edi/json-schema/wms_item_announcement.json b/tests/edi/json-schema/wms_item_announcement.json index 24efa90..5a6b4fc 100644 --- a/tests/edi/json-schema/wms_item_announcement.json +++ b/tests/edi/json-schema/wms_item_announcement.json @@ -6,5 +6,6 @@ "zone_to": "D:workspace", "version": "1.8.0", "origin": "0df0a05d-a0b3-4f50-a161-5cc6e906a05a", - "owner": "46f69d00-4389-444b-9174-26b1f6f0bafa" + "owner": "46f69d00-4389-444b-9174-26b1f6f0bafa", + "msg_for": "deeaea34-ff10-48dd-bf54-82add4b931de" } \ No newline at end of file diff --git a/tests/edi/json-schema/wms_registry_announcement.json b/tests/edi/json-schema/wms_registry_announcement.json index 80f2144..3c7a636 100644 --- a/tests/edi/json-schema/wms_registry_announcement.json +++ b/tests/edi/json-schema/wms_registry_announcement.json @@ -5,5 +5,6 @@ "serial": 544, "uid": "9cddc19f-1db0-6ae6-4320-0ccfc800a6f6", "userial": "fce0382a-0315-157d-68eb-d355c04efd09", - "state": "updated" + "state": "updated", + "msg_for": "deeaea34-ff10-48dd-bf54-82add4b931de" } diff --git a/tests/edi/json-schema/wms_stocktaking_message.json b/tests/edi/json-schema/wms_stocktaking_message.json index c651d77..7a8cbd6 100644 --- a/tests/edi/json-schema/wms_stocktaking_message.json +++ b/tests/edi/json-schema/wms_stocktaking_message.json @@ -6,5 +6,6 @@ "item": ["some", "items"], "version": "abcdefghijklmnopqrstuvw", "origin": "f68f6c63-8eee-1efc-79a8-fc8e443f7afe", - "owner": "dfde514f-ddaf-ec1b-e78e-af1fd6cce9ec" + "owner": "dfde514f-ddaf-ec1b-e78e-af1fd6cce9ec", + "msg_for": "deeaea34-ff10-48dd-bf54-82add4b931de" }