diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index 12a0a8c21c..533c37423b 100644 --- a/Jenkinsfile_CNP +++ b/Jenkinsfile_CNP @@ -10,6 +10,9 @@ def app = "definition-store-api" def branchesToSync = ['demo', 'ithc', 'perftest', 'develop'] +// Variables to switch pipeline logic and wiring per type of build +def definitionStoreDevelopPr = "PR-1529" // This doesn't change frequently, but when it does, only change this value. + def secrets = [ 'ccd-${env}': [ secret('ccd-caseworker-autotest-email', 'CCD_CASEWORKER_AUTOTEST_EMAIL'), @@ -161,4 +164,4 @@ withPipeline(type, product, app) { } echo "env.DEFINITION_STORE_URL_BASE = ${env.DEFINITION_STORE_URL_BASE}" -} +} \ No newline at end of file diff --git a/aat/src/aat/resources/features/F-080/S-080.1.td.json b/aat/src/aat/resources/features/F-080/S-080.1.td.json index ba84377fdf..35900068a2 100644 --- a/aat/src/aat/resources/features/F-080/S-080.1.td.json +++ b/aat/src/aat/resources/features/F-080/S-080.1.td.json @@ -189,6 +189,11 @@ } ], "states": [ + { + "__operator__": "equivalent", + "__ordering__": "unordered", + "__elementId__": "id" + }, { "id": "CaseCreated", "name": "Create case", diff --git a/aat/src/aat/resources/features/F-086/S-375.td.json b/aat/src/aat/resources/features/F-086/S-375.td.json index affb8f260b..aba98410b7 100644 --- a/aat/src/aat/resources/features/F-086/S-375.td.json +++ b/aat/src/aat/resources/features/F-086/S-375.td.json @@ -84,6 +84,14 @@ "default_value" : "[Defendant]", "retain_hidden_value" : null }, { + "complex_field_element_id" : "OrganisationPolicyField2.newCase", + "display_context" : "HIDDEN", + "label" : null, + "hint_text" : null, + "show_condition" : null, + "default_value" : null, + "retain_hidden_value" : null + }, { "complex_field_element_id" : "OrganisationPolicyField2.OrgPolicyReference", "display_context" : "OPTIONAL", "label" : null, @@ -289,6 +297,14 @@ "default_value" : null, "retain_hidden_value" : null }, { + "complex_field_element_id" : "OrganisationPolicyField1.newCase", + "display_context" : "HIDDEN", + "label" : null, + "hint_text" : null, + "show_condition" : null, + "default_value" : null, + "retain_hidden_value" : null + }, { "complex_field_element_id" : "OrganisationPolicyField1.OrgPolicyCaseAssignedRole", "display_context" : "OPTIONAL", "label" : null, diff --git a/aat/src/aat/resources/features/F-089/S-089.2.td.json b/aat/src/aat/resources/features/F-089/S-089.2.td.json index df8be0234f..396dbe9d2e 100644 --- a/aat/src/aat/resources/features/F-089/S-089.2.td.json +++ b/aat/src/aat/resources/features/F-089/S-089.2.td.json @@ -580,6 +580,11 @@ } ], "states": [ + { + "__operator__": "equivalent", + "__ordering__": "unordered", + "__elementId__": "id" + }, { "id": "CaseUpdated", "name": "Updated case", @@ -1284,6 +1289,34 @@ "display_context_parameter": null, "retain_hidden_value": null, "category_id": null + }, + { + "metadata": false, + "id" : "newCase", + "case_type_id" : null, + "label" : "Indicate a new case", + "hint_text": null, + "field_type": { + "id" : "YesOrNo", + "type" : "YesOrNo", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null } ], "collection_field_type": null diff --git a/aat/src/aat/resources/features/F-090/S-090.3.td.json b/aat/src/aat/resources/features/F-090/S-090.3.td.json index bd96851863..a27f51d894 100644 --- a/aat/src/aat/resources/features/F-090/S-090.3.td.json +++ b/aat/src/aat/resources/features/F-090/S-090.3.td.json @@ -550,7 +550,13 @@ "event_enabling_condition" : null, "ttl_increment" : null } ], - "states" : [ { + "states" : [ + { + "__operator__": "equivalent", + "__ordering__": "unordered", + "__elementId__": "id" + }, + { "id" : "CaseUpdated", "name" : "Updated case", "description" : null, @@ -563,7 +569,7 @@ "update" : true, "delete" : true } ] - }, { + }, { "id" : "CaseCreated", "name" : "Create case", "description" : null, @@ -591,1304 +597,1401 @@ "categories" : [ ], "accessTypeRoles": [], "accessTypes": [], - "case_fields" : [ { - "__ordering__": "UNORDERED", - "__elementId__": "id" - }, { - "metadata" : false, - "id" : "OrganisationField", - "case_type_id" : "FT_ComplexOrganisation", - "label" : "Organisation Field 1", - "hint_text" : null, - "field_type" : { - "id" : "Organisation", - "type" : "Complex", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ { - "metadata" : false, - "id" : "OrganisationID", - "case_type_id" : null, - "label" : "Organisation ID", - "hint_text" : null, - "field_type" : { - "id" : "Text", - "type" : "Text", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "OrganisationName", - "case_type_id" : null, - "label" : "Name", - "hint_text" : null, - "field_type" : { - "id" : "Text", - "type" : "Text", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - } ], - "collection_field_type" : null + "case_fields": [ + { + "__ordering__": "UNORDERED", + "__elementId__": "id" }, - "hidden" : false, - "security_classification" : "PUBLIC", - "live_from" : "[[ANYTHING_PRESENT]]", - "live_until" : null, - "acls" : [ { - "role" : "caseworker-befta_master", - "create" : true, - "read" : true, - "update" : true, - "delete" : true - } ], - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "OrganisationPolicyField", - "case_type_id" : "FT_ComplexOrganisation", - "label" : "Organisation Policy Field 1", - "hint_text" : null, - "field_type" : { - "id" : "OrganisationPolicy", - "type" : "Complex", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ { - "metadata" : false, - "id" : "Organisation", - "case_type_id" : null, - "label" : "Organisation", - "hint_text" : null, - "field_type" : { - "id" : "Organisation", - "type" : "Complex", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ { - "metadata" : false, - "id" : "OrganisationID", - "case_type_id" : null, - "label" : "Organisation ID", - "hint_text" : null, - "field_type" : { - "id" : "Text", - "type" : "Text", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + { + "metadata": false, + "id": "OrganisationField", + "case_type_id": "FT_ComplexOrganisation", + "label": "Organisation Field 1", + "hint_text": null, + "field_type": { + "id": "Organisation", + "type": "Complex", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [ + { + "metadata": false, + "id": "OrganisationID", + "case_type_id": null, + "label": "Organisation ID", + "hint_text": null, + "field_type": { + "id": "Text", + "type": "Text", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "OrganisationName", - "case_type_id" : null, - "label" : "Name", - "hint_text" : null, - "field_type" : { - "id" : "Text", - "type" : "Text", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "OrganisationName", + "case_type_id": null, + "label": "Name", + "hint_text": null, + "field_type": { + "id": "Text", + "type": "Text", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - } ], - "collection_field_type" : null - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "OrgPolicyCaseAssignedRole", - "case_type_id" : null, - "label" : "Case Assigned Role", - "hint_text" : null, - "field_type" : { - "id" : "Text", - "type" : "Text", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "OrgPolicyReference", - "case_type_id" : null, - "label" : "Reference", - "hint_text" : null, - "field_type" : { - "id" : "Text", - "type" : "Text", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "PreviousOrganisations", - "case_type_id" : null, - "label" : "Previous Organisations", - "hint_text" : null, - "field_type" : { - "id" : "PreviousOrganisationCollection", - "type" : "Collection", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : { - "id" : "PreviousOrganisation", - "type" : "Complex", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ { - "metadata" : false, - "id" : "FromTimestamp", - "case_type_id" : null, - "label" : "From Timestamp", - "hint_text" : null, - "field_type" : { - "id" : "DateTime", - "type" : "DateTime", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "ToTimestamp", - "case_type_id" : null, - "label" : "To Timestamp", - "hint_text" : null, - "field_type" : { - "id" : "DateTime", - "type" : "DateTime", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "OrganisationName", - "case_type_id" : null, - "label" : "Organisation Name", - "hint_text" : null, - "field_type" : { - "id" : "Text", - "type" : "Text", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "OrganisationAddress", - "case_type_id" : null, - "label" : "Organisation Address", - "hint_text" : null, - "field_type" : { - "id" : "AddressUK", - "type" : "Complex", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ { - "metadata" : false, - "id" : "AddressLine1", - "case_type_id" : null, - "label" : "Building and Street", - "hint_text" : null, - "field_type" : { - "id" : "TextMax150", - "type" : "Text", - "min" : null, - "max" : "150", - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "AddressLine2", - "case_type_id" : null, - "label" : "Address Line 2", - "hint_text" : null, - "field_type" : { - "id" : "TextMax50", - "type" : "Text", - "min" : null, - "max" : "50", - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "AddressLine3", - "case_type_id" : null, - "label" : "Address Line 3", - "hint_text" : null, - "field_type" : { - "id" : "TextMax50", - "type" : "Text", - "min" : null, - "max" : "50", - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + } + ], + "collection_field_type": null + }, + "hidden": false, + "security_classification": "PUBLIC", + "live_from": "[[ANYTHING_PRESENT]]", + "live_until": null, + "acls": [ + { + "role": "caseworker-befta_master", + "create": true, + "read": true, + "update": true, + "delete": true + } + ], + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "OrganisationPolicyField", + "case_type_id": "FT_ComplexOrganisation", + "label": "Organisation Policy Field 1", + "hint_text": null, + "field_type": { + "id": "OrganisationPolicy", + "type": "Complex", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [ + { + "metadata": false, + "id": "Organisation", + "case_type_id": null, + "label": "Organisation", + "hint_text": null, + "field_type": { + "id": "Organisation", + "type": "Complex", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [ + { + "metadata": false, + "id": "OrganisationID", + "case_type_id": null, + "label": "Organisation ID", + "hint_text": null, + "field_type": { + "id": "Text", + "type": "Text", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "PostTown", - "case_type_id" : null, - "label" : "Town or City", - "hint_text" : null, - "field_type" : { - "id" : "TextMax50", - "type" : "Text", - "min" : null, - "max" : "50", - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "OrganisationName", + "case_type_id": null, + "label": "Name", + "hint_text": null, + "field_type": { + "id": "Text", + "type": "Text", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "County", - "case_type_id" : null, - "label" : "County", - "hint_text" : null, - "field_type" : { - "id" : "TextMax50", - "type" : "Text", - "min" : null, - "max" : "50", - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + } + ], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "OrgPolicyCaseAssignedRole", + "case_type_id": null, + "label": "Case Assigned Role", + "hint_text": null, + "field_type": { + "id": "Text", + "type": "Text", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "OrgPolicyReference", + "case_type_id": null, + "label": "Reference", + "hint_text": null, + "field_type": { + "id": "Text", + "type": "Text", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "PreviousOrganisations", + "case_type_id": null, + "label": "Previous Organisations", + "hint_text": null, + "field_type": { + "id": "PreviousOrganisationCollection", + "type": "Collection", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": { + "id": "PreviousOrganisation", + "type": "Complex", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [ + { + "metadata": false, + "id": "FromTimestamp", + "case_type_id": null, + "label": "From Timestamp", + "hint_text": null, + "field_type": { + "id": "DateTime", + "type": "DateTime", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "PostCode", - "case_type_id" : null, - "label" : "Postcode/Zipcode", - "hint_text" : null, - "field_type" : { - "id" : "TextMax14", - "type" : "Text", - "min" : null, - "max" : "14", - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + { + "metadata": false, + "id": "ToTimestamp", + "case_type_id": null, + "label": "To Timestamp", + "hint_text": null, + "field_type": { + "id": "DateTime", + "type": "DateTime", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "Country", - "case_type_id" : null, - "label" : "Country", - "hint_text" : null, - "field_type" : { - "id" : "TextMax50", - "type" : "Text", - "min" : null, - "max" : "50", - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + { + "metadata": false, + "id": "OrganisationName", + "case_type_id": null, + "label": "Organisation Name", + "hint_text": null, + "field_type": { + "id": "Text", + "type": "Text", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - } ], - "collection_field_type" : null - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - } ], - "collection_field_type" : null - } - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "PrepopulateToUsersOrganisation", - "case_type_id" : null, - "label" : "Prepopulate User Organisation", - "hint_text" : null, - "field_type" : { - "id" : "YesOrNo", - "type" : "YesOrNo", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "LastNoCRequestedBy", - "case_type_id" : null, - "label" : "Last NoC Requested By", - "hint_text" : null, - "field_type" : { - "id" : "Email", - "type" : "Email", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - } ], - "collection_field_type" : null - }, - "hidden" : false, - "security_classification" : "PUBLIC", - "live_from" : "[[ANYTHING_PRESENT]]", - "live_until" : null, - "acls" : [ { - "role" : "caseworker-befta_master", - "create" : true, - "read" : true, - "update" : true, - "delete" : true - } ], - "complexACLs" : [ - { - "__ordering__": "UNORDERED", - "__elementId__": "listElementCode" - }, - { - "role" : "caseworker-befta_master", - "create" : true, - "read" : true, - "update" : true, - "delete" : true, - "listElementCode" : "OrgPolicyCaseAssignedRole" - }, { - "role" : "caseworker-befta_master", - "create" : true, - "read" : true, - "update" : true, - "delete" : true, - "listElementCode" : "OrgPolicyReference" - }, { - "role" : "caseworker-befta_master", - "create" : true, - "read" : true, - "update" : true, - "delete" : true, - "listElementCode" : "Organisation" - }, { - "role" : "caseworker-befta_master", - "create" : true, - "read" : true, - "update" : true, - "delete" : true, - "listElementCode" : "Organisation.OrganisationID" - }, { - "role" : "caseworker-befta_master", - "create" : true, - "read" : true, - "update" : true, - "delete" : true, - "listElementCode" : "Organisation.OrganisationName" - } ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "ChangeOrganisationRequestField", - "case_type_id" : "FT_ComplexOrganisation", - "label" : "Change Organisation Request", - "hint_text" : null, - "field_type" : { - "id" : "ChangeOrganisationRequest", - "type" : "Complex", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ { - "metadata" : false, - "id" : "OrganisationToAdd", - "case_type_id" : null, - "label" : "Organisation To Add", - "hint_text" : null, - "field_type" : { - "id" : "Organisation", - "type" : "Complex", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ { - "metadata" : false, - "id" : "OrganisationID", - "case_type_id" : null, - "label" : "Organisation ID", - "hint_text" : null, - "field_type" : { - "id" : "Text", - "type" : "Text", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + { + "metadata": false, + "id": "OrganisationAddress", + "case_type_id": null, + "label": "Organisation Address", + "hint_text": null, + "field_type": { + "id": "AddressUK", + "type": "Complex", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [ + { + "metadata": false, + "id": "AddressLine1", + "case_type_id": null, + "label": "Building and Street", + "hint_text": null, + "field_type": { + "id": "TextMax150", + "type": "Text", + "min": null, + "max": "150", + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "AddressLine2", + "case_type_id": null, + "label": "Address Line 2", + "hint_text": null, + "field_type": { + "id": "TextMax50", + "type": "Text", + "min": null, + "max": "50", + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "AddressLine3", + "case_type_id": null, + "label": "Address Line 3", + "hint_text": null, + "field_type": { + "id": "TextMax50", + "type": "Text", + "min": null, + "max": "50", + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "PostTown", + "case_type_id": null, + "label": "Town or City", + "hint_text": null, + "field_type": { + "id": "TextMax50", + "type": "Text", + "min": null, + "max": "50", + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "County", + "case_type_id": null, + "label": "County", + "hint_text": null, + "field_type": { + "id": "TextMax50", + "type": "Text", + "min": null, + "max": "50", + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "PostCode", + "case_type_id": null, + "label": "Postcode/Zipcode", + "hint_text": null, + "field_type": { + "id": "TextMax14", + "type": "Text", + "min": null, + "max": "14", + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "Country", + "case_type_id": null, + "label": "Country", + "hint_text": null, + "field_type": { + "id": "TextMax50", + "type": "Text", + "min": null, + "max": "50", + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + } + ], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + } + ], + "collection_field_type": null + } }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "OrganisationName", - "case_type_id" : null, - "label" : "Name", - "hint_text" : null, - "field_type" : { - "id" : "Text", - "type" : "Text", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "PrepopulateToUsersOrganisation", + "case_type_id": null, + "label": "Prepopulate User Organisation", + "hint_text": null, + "field_type": { + "id": "YesOrNo", + "type": "YesOrNo", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - } ], - "collection_field_type" : null - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "OrganisationToRemove", - "case_type_id" : null, - "label" : "Organisation To Remove", - "hint_text" : null, - "field_type" : { - "id" : "Organisation", - "type" : "Complex", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ { - "metadata" : false, - "id" : "OrganisationID", - "case_type_id" : null, - "label" : "Organisation ID", - "hint_text" : null, - "field_type" : { - "id" : "Text", - "type" : "Text", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "LastNoCRequestedBy", + "case_type_id": null, + "label": "Last NoC Requested By", + "hint_text": null, + "field_type": { + "id": "Email", + "type": "Email", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "OrganisationName", - "case_type_id" : null, - "label" : "Name", - "hint_text" : null, - "field_type" : { - "id" : "Text", - "type" : "Text", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "newCase", + "case_type_id": null, + "label": "Indicate a new case", + "hint_text": null, + "field_type": { + "id": "YesOrNo", + "type": "YesOrNo", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - } ], - "collection_field_type" : null - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "CaseRoleId", - "case_type_id" : null, - "label" : "Case Role Id", - "hint_text" : null, - "field_type" : { - "id" : "DynamicList", - "type" : "DynamicList", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "Reason", - "case_type_id" : null, - "label" : "Reason", - "hint_text" : null, - "field_type" : { - "id" : "Text", - "type" : "Text", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null - }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "RequestTimestamp", - "case_type_id" : null, - "label" : "Request Timestamp", - "hint_text" : null, - "field_type" : { - "id" : "DateTime", - "type" : "DateTime", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + } + ], + "collection_field_type": null + }, + "hidden": false, + "security_classification": "PUBLIC", + "live_from": "[[ANYTHING_PRESENT]]", + "live_until": null, + "acls": [ + { + "role": "caseworker-befta_master", + "create": true, + "read": true, + "update": true, + "delete": true + } + ], + "complexACLs": [ + { + "__ordering__": "UNORDERED", + "__elementId__": "listElementCode" }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "ApprovalStatus", - "case_type_id" : null, - "label" : "Approval Status", - "hint_text" : null, - "field_type" : { - "id" : "Number", - "type" : "Number", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + { + "role": "caseworker-befta_master", + "create": true, + "read": true, + "update": true, + "delete": true, + "listElementCode": "OrgPolicyCaseAssignedRole" }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "ApprovalRejectionTimestamp", - "case_type_id" : null, - "label" : "Approval Rejection Timestamp", - "hint_text" : null, - "field_type" : { - "id" : "DateTime", - "type" : "DateTime", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + { + "role": "caseworker-befta_master", + "create": true, + "read": true, + "update": true, + "delete": true, + "listElementCode": "OrgPolicyReference" }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "NotesReason", - "case_type_id" : null, - "label" : "Notes Reason", - "hint_text" : null, - "field_type" : { - "id" : "Text", - "type" : "Text", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + { + "role": "caseworker-befta_master", + "create": true, + "read": true, + "update": true, + "delete": true, + "listElementCode": "Organisation" }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : false, - "id" : "CreatedBy", - "case_type_id" : null, - "label" : "Created By", - "hint_text" : null, - "field_type" : { - "id" : "Email", - "type" : "Email", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + { + "role": "caseworker-befta_master", + "create": true, + "read": true, + "update": true, + "delete": true, + "listElementCode": "Organisation.OrganisationID" }, - "hidden" : null, - "security_classification" : "PUBLIC", - "live_from" : null, - "live_until" : null, - "acls" : null, - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - } ], - "collection_field_type" : null + { + "role": "caseworker-befta_master", + "create": true, + "read": true, + "update": true, + "delete": true, + "listElementCode": "Organisation.OrganisationName" + } + ], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null }, - "hidden" : false, - "security_classification" : "PUBLIC", - "live_from" : "[[ANYTHING_PRESENT]]", - "live_until" : null, - "acls" : [ { - "role" : "caseworker-befta_master", - "create" : true, - "read" : true, - "update" : true, - "delete" : true - } ], - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : true, - "id" : "[STATE]", - "case_type_id" : "FT_ComplexOrganisation", - "label" : "State", - "hint_text" : null, - "field_type" : { - "id" : "FixedList-FT_ComplexOrganisation[STATE]", - "type" : "FixedList", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ { - "code" : "CaseCreated", - "label" : "Create case", - "order" : 1 - }, { - "code" : "CaseUpdated", - "label" : "Updated case", - "order" : 1 - } ], - "complex_fields" : [ ], - "collection_field_type" : null + { + "metadata": false, + "id": "ChangeOrganisationRequestField", + "case_type_id": "FT_ComplexOrganisation", + "label": "Change Organisation Request", + "hint_text": null, + "field_type": { + "id": "ChangeOrganisationRequest", + "type": "Complex", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [ + { + "metadata": false, + "id": "OrganisationToAdd", + "case_type_id": null, + "label": "Organisation To Add", + "hint_text": null, + "field_type": { + "id": "Organisation", + "type": "Complex", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [ + { + "metadata": false, + "id": "OrganisationID", + "case_type_id": null, + "label": "Organisation ID", + "hint_text": null, + "field_type": { + "id": "Text", + "type": "Text", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "OrganisationName", + "case_type_id": null, + "label": "Name", + "hint_text": null, + "field_type": { + "id": "Text", + "type": "Text", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + } + ], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "OrganisationToRemove", + "case_type_id": null, + "label": "Organisation To Remove", + "hint_text": null, + "field_type": { + "id": "Organisation", + "type": "Complex", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [ + { + "metadata": false, + "id": "OrganisationID", + "case_type_id": null, + "label": "Organisation ID", + "hint_text": null, + "field_type": { + "id": "Text", + "type": "Text", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "OrganisationName", + "case_type_id": null, + "label": "Name", + "hint_text": null, + "field_type": { + "id": "Text", + "type": "Text", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + } + ], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "CaseRoleId", + "case_type_id": null, + "label": "Case Role Id", + "hint_text": null, + "field_type": { + "id": "DynamicList", + "type": "DynamicList", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "Reason", + "case_type_id": null, + "label": "Reason", + "hint_text": null, + "field_type": { + "id": "Text", + "type": "Text", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "RequestTimestamp", + "case_type_id": null, + "label": "Request Timestamp", + "hint_text": null, + "field_type": { + "id": "DateTime", + "type": "DateTime", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "ApprovalStatus", + "case_type_id": null, + "label": "Approval Status", + "hint_text": null, + "field_type": { + "id": "Number", + "type": "Number", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "ApprovalRejectionTimestamp", + "case_type_id": null, + "label": "Approval Rejection Timestamp", + "hint_text": null, + "field_type": { + "id": "DateTime", + "type": "DateTime", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "NotesReason", + "case_type_id": null, + "label": "Notes Reason", + "hint_text": null, + "field_type": { + "id": "Text", + "type": "Text", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + }, + { + "metadata": false, + "id": "CreatedBy", + "case_type_id": null, + "label": "Created By", + "hint_text": null, + "field_type": { + "id": "Email", + "type": "Email", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + } + ], + "collection_field_type": null + }, + "hidden": false, + "security_classification": "PUBLIC", + "live_from": "[[ANYTHING_PRESENT]]", + "live_until": null, + "acls": [ + { + "role": "caseworker-befta_master", + "create": true, + "read": true, + "update": true, + "delete": true + } + ], + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null }, - "hidden" : false, - "security_classification" : "PUBLIC", - "live_from" : "[[ANYTHING_PRESENT]]", - "live_until" : null, - "acls" : [ ], - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : true, - "id" : "[CASE_REFERENCE]", - "case_type_id" : null, - "label" : "Case Reference", - "hint_text" : null, - "field_type" : { - "id" : "Text", - "type" : "Text", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + { + "metadata": true, + "id": "[STATE]", + "case_type_id": "FT_ComplexOrganisation", + "label": "State", + "hint_text": null, + "field_type": { + "id": "FixedList-FT_ComplexOrganisation[STATE]", + "type": "FixedList", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [ + { + "code": "CaseCreated", + "label": "Create case", + "order": 1 + }, + { + "code": "CaseUpdated", + "label": "Updated case", + "order": 1 + } + ], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": false, + "security_classification": "PUBLIC", + "live_from": "[[ANYTHING_PRESENT]]", + "live_until": null, + "acls": [], + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null }, - "hidden" : false, - "security_classification" : "PUBLIC", - "live_from" : "[[ANYTHING_PRESENT]]", - "live_until" : null, - "acls" : [ ], - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : true, - "id" : "[LAST_STATE_MODIFIED_DATE]", - "case_type_id" : null, - "label" : "Last State Modified Date", - "hint_text" : null, - "field_type" : { - "id" : "DateTime", - "type" : "DateTime", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + { + "metadata": true, + "id": "[CASE_REFERENCE]", + "case_type_id": null, + "label": "Case Reference", + "hint_text": null, + "field_type": { + "id": "Text", + "type": "Text", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": false, + "security_classification": "PUBLIC", + "live_from": "[[ANYTHING_PRESENT]]", + "live_until": null, + "acls": [], + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null }, - "hidden" : false, - "security_classification" : "PUBLIC", - "live_from" : "[[ANYTHING_PRESENT]]", - "live_until" : null, - "acls" : [ ], - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : true, - "id" : "[LAST_MODIFIED_DATE]", - "case_type_id" : null, - "label" : "Last Modified Date", - "hint_text" : null, - "field_type" : { - "id" : "DateTime", - "type" : "DateTime", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + { + "metadata": true, + "id": "[LAST_STATE_MODIFIED_DATE]", + "case_type_id": null, + "label": "Last State Modified Date", + "hint_text": null, + "field_type": { + "id": "DateTime", + "type": "DateTime", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": false, + "security_classification": "PUBLIC", + "live_from": "[[ANYTHING_PRESENT]]", + "live_until": null, + "acls": [], + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null }, - "hidden" : false, - "security_classification" : "PUBLIC", - "live_from" : "[[ANYTHING_PRESENT]]", - "live_until" : null, - "acls" : [ ], - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : true, - "id" : "[CREATED_DATE]", - "case_type_id" : null, - "label" : "Created Date", - "hint_text" : null, - "field_type" : { - "id" : "DateTime", - "type" : "DateTime", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + { + "metadata": true, + "id": "[LAST_MODIFIED_DATE]", + "case_type_id": null, + "label": "Last Modified Date", + "hint_text": null, + "field_type": { + "id": "DateTime", + "type": "DateTime", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": false, + "security_classification": "PUBLIC", + "live_from": "[[ANYTHING_PRESENT]]", + "live_until": null, + "acls": [], + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null }, - "hidden" : false, - "security_classification" : "PUBLIC", - "live_from" : "[[ANYTHING_PRESENT]]", - "live_until" : null, - "acls" : [ ], - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : true, - "id" : "[SECURITY_CLASSIFICATION]", - "case_type_id" : null, - "label" : "Security Classification", - "hint_text" : null, - "field_type" : { - "id" : "Text", - "type" : "Text", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + { + "metadata": true, + "id": "[CREATED_DATE]", + "case_type_id": null, + "label": "Created Date", + "hint_text": null, + "field_type": { + "id": "DateTime", + "type": "DateTime", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": false, + "security_classification": "PUBLIC", + "live_from": "[[ANYTHING_PRESENT]]", + "live_until": null, + "acls": [], + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null }, - "hidden" : false, - "security_classification" : "PUBLIC", - "live_from" : "[[ANYTHING_PRESENT]]", - "live_until" : null, - "acls" : [ ], - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : true, - "id" : "[CASE_TYPE]", - "case_type_id" : null, - "label" : "Case Type", - "hint_text" : null, - "field_type" : { - "id" : "Text", - "type" : "Text", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + { + "metadata": true, + "id": "[SECURITY_CLASSIFICATION]", + "case_type_id": null, + "label": "Security Classification", + "hint_text": null, + "field_type": { + "id": "Text", + "type": "Text", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": false, + "security_classification": "PUBLIC", + "live_from": "[[ANYTHING_PRESENT]]", + "live_until": null, + "acls": [], + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null }, - "hidden" : false, - "security_classification" : "PUBLIC", - "live_from" : "[[ANYTHING_PRESENT]]", - "live_until" : null, - "acls" : [ ], - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - }, { - "metadata" : true, - "id" : "[JURISDICTION]", - "case_type_id" : null, - "label" : "Jurisdiction", - "hint_text" : null, - "field_type" : { - "id" : "Text", - "type" : "Text", - "min" : null, - "max" : null, - "regular_expression" : null, - "fixed_list_items" : [ ], - "complex_fields" : [ ], - "collection_field_type" : null + { + "metadata": true, + "id": "[CASE_TYPE]", + "case_type_id": null, + "label": "Case Type", + "hint_text": null, + "field_type": { + "id": "Text", + "type": "Text", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": false, + "security_classification": "PUBLIC", + "live_from": "[[ANYTHING_PRESENT]]", + "live_until": null, + "acls": [], + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null }, - "hidden" : false, - "security_classification" : "PUBLIC", - "live_from" : "[[ANYTHING_PRESENT]]", - "live_until" : null, - "acls" : [ ], - "complexACLs" : [ ], - "order" : null, - "show_condition" : null, - "display_context_parameter" : null, - "retain_hidden_value" : null, - "category_id" : null - } ], - "printable_document_url" : null, - "callback_get_case_url" : null, - "retries_get_case_url" : [ ], - "security_classification" : "PUBLIC" + { + "metadata": true, + "id": "[JURISDICTION]", + "case_type_id": null, + "label": "Jurisdiction", + "hint_text": null, + "field_type": { + "id": "Text", + "type": "Text", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": false, + "security_classification": "PUBLIC", + "live_from": "[[ANYTHING_PRESENT]]", + "live_until": null, + "acls": [], + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null + } + ], + "printable_document_url": null, + "callback_get_case_url": null, + "retries_get_case_url": [], + "security_classification": "PUBLIC" } } } diff --git a/aat/src/aat/resources/features/F-095 Publish Flag in Case Event/S-095.12_Get_CaseType.td.json b/aat/src/aat/resources/features/F-095 Publish Flag in Case Event/S-095.12_Get_CaseType.td.json index 5f891473e0..17159f4f35 100644 --- a/aat/src/aat/resources/features/F-095 Publish Flag in Case Event/S-095.12_Get_CaseType.td.json +++ b/aat/src/aat/resources/features/F-095 Publish Flag in Case Event/S-095.12_Get_CaseType.td.json @@ -1573,6 +1573,34 @@ "display_context_parameter" : null, "retain_hidden_value" : null, "category_id" : null + }, + { + "metadata": false, + "id" : "newCase", + "case_type_id" : null, + "label" : "Indicate a new case", + "hint_text": null, + "field_type": { + "id" : "YesOrNo", + "type" : "YesOrNo", + "min": null, + "max": null, + "regular_expression": null, + "fixed_list_items": [], + "complex_fields": [], + "collection_field_type": null + }, + "hidden": null, + "security_classification": "PUBLIC", + "live_from": null, + "live_until": null, + "acls": null, + "complexACLs": [], + "order": null, + "show_condition": null, + "display_context_parameter": null, + "retain_hidden_value": null, + "category_id": null } ], "collection_field_type": null diff --git a/aat/src/aat/resources/features/F-095 Publish Flag in Case Event/S-095.1_Get_CaseType.td.json b/aat/src/aat/resources/features/F-095 Publish Flag in Case Event/S-095.1_Get_CaseType.td.json index 07cbee1781..e9482f1995 100644 --- a/aat/src/aat/resources/features/F-095 Publish Flag in Case Event/S-095.1_Get_CaseType.td.json +++ b/aat/src/aat/resources/features/F-095 Publish Flag in Case Event/S-095.1_Get_CaseType.td.json @@ -128,7 +128,13 @@ "can_save_draft" : null, "end_button_label" : null } ], - "states" : [ { + "states" : [ + { + "__operator__": "equivalent", + "__ordering__": "unordered", + "__elementId__": "id" + }, + { "id" : "CaseCreated", "name" : "Create case", "description" : null, diff --git a/build.gradle b/build.gradle index cbdbb1a7f4..07ded8b6c8 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ ext { gsonVersion = '2.13.2' elasticSearchVersion = '7.17.29' testcontainersVersion = '1.21.3' - ccdTestDefinitionVersion = '7.27.7-prerelease-CME-537' + ccdTestDefinitionVersion = '7.26.7-prerelease-CCD-5329' beftaFwVersion = '9.2.4' limits = [ 'instruction': 99, @@ -97,7 +97,7 @@ allprojects { // Global constraints dependencies { - // start::CVE Vulnerability dependency overrides + // start::CVE Vulnerability dependency overrides implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.6.0' // spring-cloud-starter-openfeign implementation group: 'commons-io', name: 'commons-io', version: '2.20.0' // spring-cloud-starter-openfeign @@ -195,7 +195,7 @@ subprojects { subproject -> dependencies { - // start::CVE Vulnerability dependency overrides + // start::CVE Vulnerability dependency overrides implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '10.5' // spring-boot-starter-oauth2-client implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.20.0' // azure-storage @@ -525,4 +525,4 @@ void loadEnvSecrets(String env) { project.file("./.${env}-remote-env").write(new String(os.toString().replace('\n', '').decodeBase64(), java.nio.charset.StandardCharsets.UTF_8)) } } -} \ No newline at end of file +} diff --git a/charts/ccd-definition-store-api/values.preview.template.yaml b/charts/ccd-definition-store-api/values.preview.template.yaml index 55a41d2d74..1bcd477b44 100644 --- a/charts/ccd-definition-store-api/values.preview.template.yaml +++ b/charts/ccd-definition-store-api/values.preview.template.yaml @@ -23,7 +23,8 @@ java: # enable whenever required and provide host url to match with corresponding data-store-api ELASTIC_SEARCH_ENABLED: true - ELASTIC_SEARCH_HOST: "{{ .Release.Name }}-es-master" + + ELASTIC_SEARCH_HOST: ccd-data-store-api-pr-2578-es-master USER_PROFILE_HOST: http://${SERVICE_NAME}-ccd-user-profile-api TS_TRANSLATION_SERVICE_HOST: http://${SERVICE_NAME}-translation-service diff --git a/repository/src/main/resources/db/migration/V20250115_5331__CCD-5331_organisationprofile_newcase.sql b/repository/src/main/resources/db/migration/V20250115_5331__CCD-5331_organisationprofile_newcase.sql new file mode 100644 index 0000000000..2157a428b0 --- /dev/null +++ b/repository/src/main/resources/db/migration/V20250115_5331__CCD-5331_organisationprofile_newcase.sql @@ -0,0 +1,5 @@ +INSERT INTO public.complex_field (reference, label, security_classification, field_type_id, complex_field_type_id) +VALUES ('newCase', 'Indicate a new case', 'PUBLIC', + (select id from field_type where reference = 'YesOrNo' and version = 1 and jurisdiction_id is null), + (select id from field_type where reference = 'OrganisationPolicy' and version = 1 and jurisdiction_id is null)); +