diff --git a/pom.xml b/pom.xml index f88268367b..8c3a37361f 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ uk.gov.moj.cpp.sjp sjp-parent - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT pom diff --git a/sjp-command/pom.xml b/sjp-command/pom.xml index d1b2331085..9eb3ff1999 100644 --- a/sjp-command/pom.xml +++ b/sjp-command/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-command/sjp-command-api/pom.xml b/sjp-command/sjp-command-api/pom.xml index ebb8be1fb1..0b9a62ed7c 100644 --- a/sjp-command/sjp-command-api/pom.xml +++ b/sjp-command/sjp-command-api/pom.xml @@ -3,7 +3,7 @@ sjp-command uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-command/sjp-command-controller/pom.xml b/sjp-command/sjp-command-controller/pom.xml index 8e43a47649..d99fa9b182 100644 --- a/sjp-command/sjp-command-controller/pom.xml +++ b/sjp-command/sjp-command-controller/pom.xml @@ -3,7 +3,7 @@ sjp-command uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-command/sjp-command-handler/pom.xml b/sjp-command/sjp-command-handler/pom.xml index 4690ddc1e5..a28cd40f9d 100644 --- a/sjp-command/sjp-command-handler/pom.xml +++ b/sjp-command/sjp-command-handler/pom.xml @@ -3,7 +3,7 @@ sjp-command uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-domain/pom.xml b/sjp-domain/pom.xml index 6c4ce12426..407a0afc62 100644 --- a/sjp-domain/pom.xml +++ b/sjp-domain/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-parent - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT sjp-domain diff --git a/sjp-domain/sjp-domain-aggregate/pom.xml b/sjp-domain/sjp-domain-aggregate/pom.xml index b116d7f7b8..f2cd00ee08 100644 --- a/sjp-domain/sjp-domain-aggregate/pom.xml +++ b/sjp-domain/sjp-domain-aggregate/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-domain - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT sjp-domain-aggregate diff --git a/sjp-domain/sjp-domain-common/pom.xml b/sjp-domain/sjp-domain-common/pom.xml index f5cdd1f80f..b566610ca9 100644 --- a/sjp-domain/sjp-domain-common/pom.xml +++ b/sjp-domain/sjp-domain-common/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-domain - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT diff --git a/sjp-domain/sjp-domain-event-processor/pom.xml b/sjp-domain/sjp-domain-event-processor/pom.xml index 6fd5cb0ae4..7c92f0cf41 100644 --- a/sjp-domain/sjp-domain-event-processor/pom.xml +++ b/sjp-domain/sjp-domain-event-processor/pom.xml @@ -3,7 +3,7 @@ sjp-domain uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-domain/sjp-domain-event/pom.xml b/sjp-domain/sjp-domain-event/pom.xml index 4edbadcf2a..f8c66daaf2 100644 --- a/sjp-domain/sjp-domain-event/pom.xml +++ b/sjp-domain/sjp-domain-event/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-domain - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT sjp-domain-event diff --git a/sjp-domain/sjp-domain-prosecution/pom.xml b/sjp-domain/sjp-domain-prosecution/pom.xml index 99ff7c7dcb..930a2bd502 100644 --- a/sjp-domain/sjp-domain-prosecution/pom.xml +++ b/sjp-domain/sjp-domain-prosecution/pom.xml @@ -4,7 +4,7 @@ sjp-domain uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT sjp-domain-prosecution diff --git a/sjp-domain/sjp-domain-transformation/pom.xml b/sjp-domain/sjp-domain-transformation/pom.xml index 2aa167021b..37161e4cb9 100644 --- a/sjp-domain/sjp-domain-transformation/pom.xml +++ b/sjp-domain/sjp-domain-transformation/pom.xml @@ -3,7 +3,7 @@ sjp-domain uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml index fa086ff95d..e77efb3de6 100644 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml +++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml @@ -3,7 +3,7 @@ sjp-domain-transformation uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml index 222cf24bb0..bf75947b8c 100644 --- a/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml +++ b/sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml @@ -3,7 +3,7 @@ sjp-domain-transformation uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-event-sources/pom.xml b/sjp-event-sources/pom.xml index 8c86c46ee4..834079d95b 100644 --- a/sjp-event-sources/pom.xml +++ b/sjp-event-sources/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT ../pom.xml 4.0.0 diff --git a/sjp-event/pom.xml b/sjp-event/pom.xml index 096bbf53b3..69c857b220 100644 --- a/sjp-event/pom.xml +++ b/sjp-event/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-event/sjp-event-indexer/pom.xml b/sjp-event/sjp-event-indexer/pom.xml index 8d1a5d6789..49b3fd4c46 100644 --- a/sjp-event/sjp-event-indexer/pom.xml +++ b/sjp-event/sjp-event-indexer/pom.xml @@ -3,7 +3,7 @@ sjp-event uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-event/sjp-event-listener/pom.xml b/sjp-event/sjp-event-listener/pom.xml index f38ce8c87f..ee5e6303cc 100644 --- a/sjp-event/sjp-event-listener/pom.xml +++ b/sjp-event/sjp-event-listener/pom.xml @@ -3,7 +3,7 @@ sjp-event uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-event/sjp-event-processor/pom.xml b/sjp-event/sjp-event-processor/pom.xml index 853cdacb1a..6ade8fe140 100644 --- a/sjp-event/sjp-event-processor/pom.xml +++ b/sjp-event/sjp-event-processor/pom.xml @@ -3,7 +3,7 @@ sjp-event uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-event/sjp-event-processor/src/yaml/json/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json b/sjp-event/sjp-event-processor/src/yaml/json/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json index ff9bc7113f..87ea1f2052 100644 --- a/sjp-event/sjp-event-processor/src/yaml/json/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json +++ b/sjp-event/sjp-event-processor/src/yaml/json/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json @@ -2,7 +2,17 @@ "originator": "ATCM", "requestId": "C22dA7cB-CBEE-D7ee-6BBc-ACF2cB50cBDF", "acknowledgement": { - "accountNumber": "123456780" + "accountNumber": "987654321", + "minorCreditors": [ + { + "minorCreditorId": "b2c3d4e5-6789-01bc-def0-234567890abc", + "minorCreditorAccountNumber": "MC12345678" + }, + { + "minorCreditorId": "c3d4e5f6-7890-12cd-ef01-34567890abcd", + "minorCreditorAccountNumber": "MC87654321" + } + ] }, "exportStatus": "ENFORCEMENT_REQUEST_SELECTED", "updated": "2018-06-01T09:00:00Z" diff --git a/sjp-event/sjp-event-processor/src/yaml/json/schema/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json b/sjp-event/sjp-event-processor/src/yaml/json/schema/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json index 8b50ccdfeb..44193d0324 100644 --- a/sjp-event/sjp-event-processor/src/yaml/json/schema/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json +++ b/sjp-event/sjp-event-processor/src/yaml/json/schema/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json @@ -41,7 +41,7 @@ "definitions": { "uuid": { "type": "string", - "pattern": "[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$" + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$" }, "acknowledgement": { "type": "object", @@ -52,6 +52,13 @@ "type": "string", "minLength": 9, "maxLength": 9 + }, + "minorCreditors": { + "description": "Minor creditors with GoB-generated account numbers (optional)", + "type": "array", + "items": { + "$ref": "#/definitions/minorCreditorAcknowledgement" + } } }, "additionalProperties": false, @@ -76,6 +83,25 @@ ] } ] + }, + "minorCreditorAcknowledgement": { + "type": "object", + "properties": { + "minorCreditorId": { + "description": "UUID of the minor creditor (Compensate) in Common Platform", + "type": "string", + "maxLength": 36 + }, + "minorCreditorAccountNumber": { + "description": "GoB-generated account number for the minor creditor", + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "minorCreditorId", + "minorCreditorAccountNumber" + ] } } } diff --git a/sjp-healthchecks/pom.xml b/sjp-healthchecks/pom.xml index 09fd9b879c..f094c9b6a9 100644 --- a/sjp-healthchecks/pom.xml +++ b/sjp-healthchecks/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-integration-test/pom.xml b/sjp-integration-test/pom.xml index 15b13dc437..6892d85137 100644 --- a/sjp-integration-test/pom.xml +++ b/sjp-integration-test/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.sjp sjp-parent - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-json/pom.xml b/sjp-json/pom.xml index 077572fc56..d836ddf42d 100644 --- a/sjp-json/pom.xml +++ b/sjp-json/pom.xml @@ -2,7 +2,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-query/pom.xml b/sjp-query/pom.xml index 979f3aee29..9280649360 100644 --- a/sjp-query/pom.xml +++ b/sjp-query/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-query/sjp-query-api/pom.xml b/sjp-query/sjp-query-api/pom.xml index ba39b039e6..ed64d3d044 100644 --- a/sjp-query/sjp-query-api/pom.xml +++ b/sjp-query/sjp-query-api/pom.xml @@ -3,7 +3,7 @@ sjp-query uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-query/sjp-query-view/pom.xml b/sjp-query/sjp-query-view/pom.xml index 1693d206af..5e3731466b 100644 --- a/sjp-query/sjp-query-view/pom.xml +++ b/sjp-query/sjp-query-view/pom.xml @@ -3,7 +3,7 @@ sjp-query uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 diff --git a/sjp-service/pom.xml b/sjp-service/pom.xml index 2447afa70c..aa7e83b96c 100644 --- a/sjp-service/pom.xml +++ b/sjp-service/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-parent - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT sjp-service war diff --git a/sjp-viewstore/pom.xml b/sjp-viewstore/pom.xml index 91b18a55ee..9840062e40 100644 --- a/sjp-viewstore/pom.xml +++ b/sjp-viewstore/pom.xml @@ -3,7 +3,7 @@ sjp-parent uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0 sjp-viewstore diff --git a/sjp-viewstore/sjp-viewstore-liquibase/pom.xml b/sjp-viewstore/sjp-viewstore-liquibase/pom.xml index 232cb4529c..8ceaa54186 100644 --- a/sjp-viewstore/sjp-viewstore-liquibase/pom.xml +++ b/sjp-viewstore/sjp-viewstore-liquibase/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.sjp sjp-viewstore - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT sjp-viewstore-liquibase diff --git a/sjp-viewstore/sjp-viewstore-persistence/pom.xml b/sjp-viewstore/sjp-viewstore-persistence/pom.xml index 5168a8d461..5c66683623 100644 --- a/sjp-viewstore/sjp-viewstore-persistence/pom.xml +++ b/sjp-viewstore/sjp-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ sjp-viewstore uk.gov.moj.cpp.sjp - 17.104.184-DD-41592-SNAPSHOT + 17.104.184-PEG-3295-SNAPSHOT 4.0.0