From 069394bed30daa8be6300137eaed03623083abca Mon Sep 17 00:00:00 2001 From: Jennica Stiehl <25069483+stiehlrod@users.noreply.github.com> Date: Thu, 5 Sep 2024 08:17:51 -0600 Subject: [PATCH 1/3] Makes changes to the 526 v2 schema for internationalPostalCode, Adjusts doc/swagger files. Removes requirement validation for internationalPostalCode. --- .../v2/disability_compensation_validation.rb | 10 --- .../swagger/claims_api/v2/dev/swagger.json | 90 ++++++++++--------- .../claims_api/v2/production/swagger.json | 90 ++++++++++--------- modules/claims_api/config/schemas/v2/526.json | 14 +-- 4 files changed, 108 insertions(+), 96 deletions(-) diff --git a/modules/claims_api/app/controllers/concerns/claims_api/v2/disability_compensation_validation.rb b/modules/claims_api/app/controllers/concerns/claims_api/v2/disability_compensation_validation.rb index 07a639d5043..9bf51a7e9f0 100644 --- a/modules/claims_api/app/controllers/concerns/claims_api/v2/disability_compensation_validation.rb +++ b/modules/claims_api/app/controllers/concerns/claims_api/v2/disability_compensation_validation.rb @@ -131,11 +131,6 @@ def validate_form_526_change_of_address_zip source: '/changeOfAddress/zipFirstFive', detail: 'The zipFirstFive is required if the country is USA.' ) - elsif address['country'] != 'USA' && address['internationalPostalCode'].blank? - collect_error_messages( - source: '/changeOfAddress/internationalPostalCode', - detail: 'The internationalPostalCode is required if the country is not USA.' - ) elsif address['country'] == 'USA' && address['internationalPostalCode'].present? collect_error_messages( source: '/changeOfAddress/internationalPostalCode', @@ -198,11 +193,6 @@ def validate_form_526_current_mailing_address_zip source: '/veteranIdentification/mailingAddress/zipFirstFive', detail: 'The zipFirstFive is required if the country is USA.' ) - elsif mailing_address['country'] != 'USA' && mailing_address['internationalPostalCode'].blank? - collect_error_messages( - source: '/veteranIdentification/mailingAddress/internationalPostalCode', - detail: 'The internationalPostalCode is required if the country is not USA.' - ) elsif mailing_address['country'] == 'USA' && mailing_address['internationalPostalCode'].present? collect_error_messages( source: '/veteranIdentification/mailingAddress/internationalPostalCode', diff --git a/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json b/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json index 38cbb9691dd..6f1b80455ba 100644 --- a/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json +++ b/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json @@ -2143,10 +2143,11 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Required if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" } } }, @@ -2252,10 +2253,11 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Requried if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" }, "dates": { "type": "object", @@ -3523,10 +3525,11 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Required if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" } } }, @@ -3632,10 +3635,11 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Requried if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" }, "dates": { "type": "object", @@ -5069,7 +5073,7 @@ "202 without a transactionId": { "value": { "data": { - "id": "925698c0-acd8-4155-80ba-6aed534825da", + "id": "f4494b68-4554-42ca-a987-e37403c02e1c", "type": "forms/526", "attributes": { "claimId": "600442191", @@ -5254,7 +5258,7 @@ }, "federalActivation": { "activationDate": "2023-10-01", - "anticipatedSeparationDate": "2024-08-31" + "anticipatedSeparationDate": "2024-09-06" }, "confinements": [ { @@ -5300,7 +5304,7 @@ "202 with a transactionId": { "value": { "data": { - "id": "285b02b0-6a6b-4a57-ba90-77a7cfc01e0c", + "id": "1e89fd69-71da-4943-b015-6f9b889ac70e", "type": "forms/526", "attributes": { "claimId": "600442191", @@ -5678,10 +5682,11 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Required if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" } } }, @@ -5787,10 +5792,11 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Requried if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" }, "dates": { "type": "object", @@ -7058,10 +7064,11 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Required if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" } } }, @@ -7167,10 +7174,11 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Requried if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" }, "dates": { "type": "object", @@ -9215,10 +9223,11 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Required if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" } } }, @@ -9324,10 +9333,11 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Requried if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" }, "dates": { "type": "object", @@ -10506,7 +10516,7 @@ "application/json": { "example": { "data": { - "id": "4e010a53-2107-486a-b006-5e98b8394c15", + "id": "c4eb8b32-de64-4ca4-81d2-4fa6b558bb32", "type": "forms/526", "attributes": { "claimProcessType": "STANDARD_CLAIM_PROCESS", @@ -14166,8 +14176,8 @@ "id": "1", "type": "intent_to_file", "attributes": { - "creationDate": "2024-08-29", - "expirationDate": "2025-08-29", + "creationDate": "2024-09-04", + "expirationDate": "2025-09-04", "type": "compensation", "status": "active" } @@ -15063,7 +15073,7 @@ "application/json": { "example": { "data": { - "id": "fb3346c4-25c3-45fb-bb7c-99edeb99c5f5", + "id": "443fe731-e130-46e1-9045-dfb6a0c5fa8b", "type": "individual", "attributes": { "code": "067", @@ -15756,7 +15766,7 @@ "application/json": { "example": { "data": { - "id": "14b7e4ed-1537-479c-ab98-fb65eb97ef18", + "id": "e9e47cfe-84cc-4576-b74c-c32e916fa59a", "type": "organization", "attributes": { "code": "083", @@ -17707,10 +17717,10 @@ "application/json": { "example": { "data": { - "id": "7ab0c254-3162-45fd-87dd-dc44d14cb2f9", + "id": "ac7bf36c-6e99-4b9a-b7df-6e34a2625932", "type": "claimsApiPowerOfAttorneys", "attributes": { - "dateRequestAccepted": "2024-08-29", + "dateRequestAccepted": "2024-09-04", "previousPoa": null, "representative": { "serviceOrganization": { diff --git a/modules/claims_api/app/swagger/claims_api/v2/production/swagger.json b/modules/claims_api/app/swagger/claims_api/v2/production/swagger.json index 587d31af0d9..da8d12396c6 100644 --- a/modules/claims_api/app/swagger/claims_api/v2/production/swagger.json +++ b/modules/claims_api/app/swagger/claims_api/v2/production/swagger.json @@ -756,10 +756,11 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Required if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" } } }, @@ -865,10 +866,11 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Requried if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" }, "dates": { "type": "object", @@ -2136,10 +2138,11 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Required if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" } } }, @@ -2245,10 +2248,11 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Requried if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" }, "dates": { "type": "object", @@ -3682,7 +3686,7 @@ "202 without a transactionId": { "value": { "data": { - "id": "0db55941-4811-4fd9-80cd-f743761a64ea", + "id": "d36080f5-9bef-4d7e-8ba7-ae1923b80b5f", "type": "forms/526", "attributes": { "claimId": "600442191", @@ -3867,7 +3871,7 @@ }, "federalActivation": { "activationDate": "2023-10-01", - "anticipatedSeparationDate": "2024-08-31" + "anticipatedSeparationDate": "2024-09-06" }, "confinements": [ { @@ -3913,7 +3917,7 @@ "202 with a transactionId": { "value": { "data": { - "id": "01a05245-ad48-47c0-b044-60bd1a1cf4d5", + "id": "54e9760e-946f-41bd-aea9-c4275b1a0edf", "type": "forms/526", "attributes": { "claimId": "600442191", @@ -4291,10 +4295,11 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Required if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" } } }, @@ -4400,10 +4405,11 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Requried if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" }, "dates": { "type": "object", @@ -5671,10 +5677,11 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Required if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" } } }, @@ -5780,10 +5787,11 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Requried if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" }, "dates": { "type": "object", @@ -7828,10 +7836,11 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Required if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" } } }, @@ -7937,10 +7946,11 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Requried if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" }, "dates": { "type": "object", @@ -9119,7 +9129,7 @@ "application/json": { "example": { "data": { - "id": "746039f5-8aa5-49b5-abea-5ed07ac16b35", + "id": "cbd60d9e-eebe-4483-abbd-62341c670905", "type": "forms/526", "attributes": { "claimProcessType": "STANDARD_CLAIM_PROCESS", @@ -12779,8 +12789,8 @@ "id": "1", "type": "intent_to_file", "attributes": { - "creationDate": "2024-08-29", - "expirationDate": "2025-08-29", + "creationDate": "2024-09-04", + "expirationDate": "2025-09-04", "type": "compensation", "status": "active" } @@ -13676,7 +13686,7 @@ "application/json": { "example": { "data": { - "id": "69b82793-223a-4d60-ab61-eb67ddb77fc6", + "id": "ea085fb6-2802-42cd-9b17-bb65d86229c5", "type": "individual", "attributes": { "code": "067", @@ -14369,7 +14379,7 @@ "application/json": { "example": { "data": { - "id": "5cfd4d55-d0c5-4476-87c1-a1956c8dc02b", + "id": "e290114f-e0a9-4151-bc06-9c6156cc6f0f", "type": "organization", "attributes": { "code": "083", @@ -16320,10 +16330,10 @@ "application/json": { "example": { "data": { - "id": "22563f3d-74c4-44b8-b2a0-0da7bfe639a4", + "id": "00cf20ab-b3ac-4d3f-afe7-7ce9ae46e0f8", "type": "claimsApiPowerOfAttorneys", "attributes": { - "dateRequestAccepted": "2024-08-29", + "dateRequestAccepted": "2024-09-04", "previousPoa": null, "representative": { "serviceOrganization": { diff --git a/modules/claims_api/config/schemas/v2/526.json b/modules/claims_api/config/schemas/v2/526.json index 39f0449b2a6..01f8e0bb1f1 100644 --- a/modules/claims_api/config/schemas/v2/526.json +++ b/modules/claims_api/config/schemas/v2/526.json @@ -116,10 +116,11 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Required if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": ["string", "null"], - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" } } }, @@ -222,10 +223,11 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Requried if 'country' is not 'USA'. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": ["string", "null"], - "maxLength": 100, - "nullable": true + "maxLength": 16, + "nullable": true, + "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" }, "dates": { "type": "object", From c6e44a05c4c7842eb5f5dbe873bddebf88d548e8 Mon Sep 17 00:00:00 2001 From: Jennica Stiehl <25069483+stiehlrod@users.noreply.github.com> Date: Thu, 5 Sep 2024 08:34:36 -0600 Subject: [PATCH 2/3] Updates schema & docs --- .../swagger/claims_api/v2/dev/swagger.json | 40 +++++++++---------- .../claims_api/v2/production/swagger.json | 40 +++++++++---------- modules/claims_api/config/schemas/v2/526.json | 4 +- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json b/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json index 6f1b80455ba..86189050c8d 100644 --- a/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json +++ b/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json @@ -2143,7 +2143,7 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -2253,7 +2253,7 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -3525,7 +3525,7 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -3635,7 +3635,7 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -5073,7 +5073,7 @@ "202 without a transactionId": { "value": { "data": { - "id": "f4494b68-4554-42ca-a987-e37403c02e1c", + "id": "7eb6bb4c-abaa-4f2e-b758-cf606e967761", "type": "forms/526", "attributes": { "claimId": "600442191", @@ -5258,7 +5258,7 @@ }, "federalActivation": { "activationDate": "2023-10-01", - "anticipatedSeparationDate": "2024-09-06" + "anticipatedSeparationDate": "2024-09-07" }, "confinements": [ { @@ -5304,7 +5304,7 @@ "202 with a transactionId": { "value": { "data": { - "id": "1e89fd69-71da-4943-b015-6f9b889ac70e", + "id": "d5d8aa1a-34b3-426d-a0fb-6b5188e1ad4a", "type": "forms/526", "attributes": { "claimId": "600442191", @@ -5682,7 +5682,7 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -5792,7 +5792,7 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -7064,7 +7064,7 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -7174,7 +7174,7 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -9223,7 +9223,7 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -9333,7 +9333,7 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -10516,7 +10516,7 @@ "application/json": { "example": { "data": { - "id": "c4eb8b32-de64-4ca4-81d2-4fa6b558bb32", + "id": "c9d0c6d6-ac46-40fd-9938-437d1386d76e", "type": "forms/526", "attributes": { "claimProcessType": "STANDARD_CLAIM_PROCESS", @@ -14176,8 +14176,8 @@ "id": "1", "type": "intent_to_file", "attributes": { - "creationDate": "2024-09-04", - "expirationDate": "2025-09-04", + "creationDate": "2024-09-05", + "expirationDate": "2025-09-05", "type": "compensation", "status": "active" } @@ -15073,7 +15073,7 @@ "application/json": { "example": { "data": { - "id": "443fe731-e130-46e1-9045-dfb6a0c5fa8b", + "id": "c7eef684-bb1c-490b-a83d-64cbfea0558c", "type": "individual", "attributes": { "code": "067", @@ -15766,7 +15766,7 @@ "application/json": { "example": { "data": { - "id": "e9e47cfe-84cc-4576-b74c-c32e916fa59a", + "id": "34e5690e-6297-4650-9cd4-fde9637cbefc", "type": "organization", "attributes": { "code": "083", @@ -17717,10 +17717,10 @@ "application/json": { "example": { "data": { - "id": "ac7bf36c-6e99-4b9a-b7df-6e34a2625932", + "id": "42cdee77-a995-4e8f-9822-81f4c739c326", "type": "claimsApiPowerOfAttorneys", "attributes": { - "dateRequestAccepted": "2024-09-04", + "dateRequestAccepted": "2024-09-05", "previousPoa": null, "representative": { "serviceOrganization": { diff --git a/modules/claims_api/app/swagger/claims_api/v2/production/swagger.json b/modules/claims_api/app/swagger/claims_api/v2/production/swagger.json index da8d12396c6..f9c5b9ff494 100644 --- a/modules/claims_api/app/swagger/claims_api/v2/production/swagger.json +++ b/modules/claims_api/app/swagger/claims_api/v2/production/swagger.json @@ -756,7 +756,7 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -866,7 +866,7 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -2138,7 +2138,7 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -2248,7 +2248,7 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -3686,7 +3686,7 @@ "202 without a transactionId": { "value": { "data": { - "id": "d36080f5-9bef-4d7e-8ba7-ae1923b80b5f", + "id": "7ffd63c8-44be-4d8a-8eec-600fbe92cb18", "type": "forms/526", "attributes": { "claimId": "600442191", @@ -3871,7 +3871,7 @@ }, "federalActivation": { "activationDate": "2023-10-01", - "anticipatedSeparationDate": "2024-09-06" + "anticipatedSeparationDate": "2024-09-07" }, "confinements": [ { @@ -3917,7 +3917,7 @@ "202 with a transactionId": { "value": { "data": { - "id": "54e9760e-946f-41bd-aea9-c4275b1a0edf", + "id": "99cdfe2b-b941-434b-bfe9-a9eb897cd419", "type": "forms/526", "attributes": { "claimId": "600442191", @@ -4295,7 +4295,7 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -4405,7 +4405,7 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -5677,7 +5677,7 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -5787,7 +5787,7 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -7836,7 +7836,7 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -7946,7 +7946,7 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": "string", "maxLength": 16, "nullable": true, @@ -9129,7 +9129,7 @@ "application/json": { "example": { "data": { - "id": "cbd60d9e-eebe-4483-abbd-62341c670905", + "id": "1283625b-c196-41a4-adc2-b37a659d6916", "type": "forms/526", "attributes": { "claimProcessType": "STANDARD_CLAIM_PROCESS", @@ -12789,8 +12789,8 @@ "id": "1", "type": "intent_to_file", "attributes": { - "creationDate": "2024-09-04", - "expirationDate": "2025-09-04", + "creationDate": "2024-09-05", + "expirationDate": "2025-09-05", "type": "compensation", "status": "active" } @@ -13686,7 +13686,7 @@ "application/json": { "example": { "data": { - "id": "ea085fb6-2802-42cd-9b17-bb65d86229c5", + "id": "3d1c7072-13fc-4648-bb07-7d8574dce995", "type": "individual", "attributes": { "code": "067", @@ -14379,7 +14379,7 @@ "application/json": { "example": { "data": { - "id": "e290114f-e0a9-4151-bc06-9c6156cc6f0f", + "id": "c6d675f5-3ffb-437a-9f94-d0eaa17df3f1", "type": "organization", "attributes": { "code": "083", @@ -16330,10 +16330,10 @@ "application/json": { "example": { "data": { - "id": "00cf20ab-b3ac-4d3f-afe7-7ce9ae46e0f8", + "id": "99dfd3b1-5a2f-4ba3-a838-1851f59a64c9", "type": "claimsApiPowerOfAttorneys", "attributes": { - "dateRequestAccepted": "2024-09-04", + "dateRequestAccepted": "2024-09-05", "previousPoa": null, "representative": { "serviceOrganization": { diff --git a/modules/claims_api/config/schemas/v2/526.json b/modules/claims_api/config/schemas/v2/526.json index 01f8e0bb1f1..d0de03afbc0 100644 --- a/modules/claims_api/config/schemas/v2/526.json +++ b/modules/claims_api/config/schemas/v2/526.json @@ -116,7 +116,7 @@ "nullable": true }, "internationalPostalCode": { - "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", "type": ["string", "null"], "maxLength": 16, "nullable": true, @@ -223,7 +223,7 @@ "example": "6789" }, "internationalPostalCode": { - "description": "International postal code for the Veteran's current mailing address. Do not include if 'country' is 'USA'.", + "description": "International postal code for the Veteran's new address. Do not include if 'country' is 'USA'.", "type": ["string", "null"], "maxLength": 16, "nullable": true, From 092bb5fb33cc28a50eeb072454072e4c48ec6097 Mon Sep 17 00:00:00 2001 From: Jennica Stiehl <25069483+stiehlrod@users.noreply.github.com> Date: Thu, 5 Sep 2024 13:42:09 -0600 Subject: [PATCH 3/3] Updates regex to exclude hypens, and updates swagger files for v2 dev and prod --- .../swagger/claims_api/v2/dev/swagger.json | 32 +++++++++---------- .../claims_api/v2/production/swagger.json | 32 +++++++++---------- modules/claims_api/config/schemas/v2/526.json | 4 +-- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json b/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json index 86189050c8d..70df5321eff 100644 --- a/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json +++ b/modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json @@ -2147,7 +2147,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" } } }, @@ -2257,7 +2257,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" }, "dates": { "type": "object", @@ -3529,7 +3529,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" } } }, @@ -3639,7 +3639,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" }, "dates": { "type": "object", @@ -5073,7 +5073,7 @@ "202 without a transactionId": { "value": { "data": { - "id": "7eb6bb4c-abaa-4f2e-b758-cf606e967761", + "id": "40167e4f-703f-48bb-9c06-eea907988788", "type": "forms/526", "attributes": { "claimId": "600442191", @@ -5304,7 +5304,7 @@ "202 with a transactionId": { "value": { "data": { - "id": "d5d8aa1a-34b3-426d-a0fb-6b5188e1ad4a", + "id": "917204da-61f3-4f0d-a2a5-e5a423b44c1a", "type": "forms/526", "attributes": { "claimId": "600442191", @@ -5686,7 +5686,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" } } }, @@ -5796,7 +5796,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" }, "dates": { "type": "object", @@ -7068,7 +7068,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" } } }, @@ -7178,7 +7178,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" }, "dates": { "type": "object", @@ -9227,7 +9227,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" } } }, @@ -9337,7 +9337,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" }, "dates": { "type": "object", @@ -10516,7 +10516,7 @@ "application/json": { "example": { "data": { - "id": "c9d0c6d6-ac46-40fd-9938-437d1386d76e", + "id": "555d0e33-d296-465c-b054-ab459381dc3e", "type": "forms/526", "attributes": { "claimProcessType": "STANDARD_CLAIM_PROCESS", @@ -15073,7 +15073,7 @@ "application/json": { "example": { "data": { - "id": "c7eef684-bb1c-490b-a83d-64cbfea0558c", + "id": "2042b892-b0c9-4551-8c90-55538b3d6324", "type": "individual", "attributes": { "code": "067", @@ -15766,7 +15766,7 @@ "application/json": { "example": { "data": { - "id": "34e5690e-6297-4650-9cd4-fde9637cbefc", + "id": "378415a5-f585-44ac-9a66-f97891a7c116", "type": "organization", "attributes": { "code": "083", @@ -17717,7 +17717,7 @@ "application/json": { "example": { "data": { - "id": "42cdee77-a995-4e8f-9822-81f4c739c326", + "id": "b17376c2-39a2-44a5-a4bd-3a9d2b1de18f", "type": "claimsApiPowerOfAttorneys", "attributes": { "dateRequestAccepted": "2024-09-05", diff --git a/modules/claims_api/app/swagger/claims_api/v2/production/swagger.json b/modules/claims_api/app/swagger/claims_api/v2/production/swagger.json index f9c5b9ff494..b45b19e464d 100644 --- a/modules/claims_api/app/swagger/claims_api/v2/production/swagger.json +++ b/modules/claims_api/app/swagger/claims_api/v2/production/swagger.json @@ -760,7 +760,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" } } }, @@ -870,7 +870,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" }, "dates": { "type": "object", @@ -2142,7 +2142,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" } } }, @@ -2252,7 +2252,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" }, "dates": { "type": "object", @@ -3686,7 +3686,7 @@ "202 without a transactionId": { "value": { "data": { - "id": "7ffd63c8-44be-4d8a-8eec-600fbe92cb18", + "id": "f6c279e0-7e00-4c31-86d3-839c896e8865", "type": "forms/526", "attributes": { "claimId": "600442191", @@ -3917,7 +3917,7 @@ "202 with a transactionId": { "value": { "data": { - "id": "99cdfe2b-b941-434b-bfe9-a9eb897cd419", + "id": "d0634b7d-7919-4546-8730-da0b46241272", "type": "forms/526", "attributes": { "claimId": "600442191", @@ -4299,7 +4299,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" } } }, @@ -4409,7 +4409,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" }, "dates": { "type": "object", @@ -5681,7 +5681,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" } } }, @@ -5791,7 +5791,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" }, "dates": { "type": "object", @@ -7840,7 +7840,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" } } }, @@ -7950,7 +7950,7 @@ "type": "string", "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" }, "dates": { "type": "object", @@ -9129,7 +9129,7 @@ "application/json": { "example": { "data": { - "id": "1283625b-c196-41a4-adc2-b37a659d6916", + "id": "4f521b24-e79b-482f-b85b-7e80ca67701d", "type": "forms/526", "attributes": { "claimProcessType": "STANDARD_CLAIM_PROCESS", @@ -13686,7 +13686,7 @@ "application/json": { "example": { "data": { - "id": "3d1c7072-13fc-4648-bb07-7d8574dce995", + "id": "e3f67c59-3391-445d-9629-f215f8495484", "type": "individual", "attributes": { "code": "067", @@ -14379,7 +14379,7 @@ "application/json": { "example": { "data": { - "id": "c6d675f5-3ffb-437a-9f94-d0eaa17df3f1", + "id": "7bdfdf32-45d7-4724-9e97-ad4762cc5642", "type": "organization", "attributes": { "code": "083", @@ -16330,7 +16330,7 @@ "application/json": { "example": { "data": { - "id": "99dfd3b1-5a2f-4ba3-a838-1851f59a64c9", + "id": "50a3a1dd-2ec2-40a3-9588-7cad8377b515", "type": "claimsApiPowerOfAttorneys", "attributes": { "dateRequestAccepted": "2024-09-05", diff --git a/modules/claims_api/config/schemas/v2/526.json b/modules/claims_api/config/schemas/v2/526.json index d0de03afbc0..b38bc007ddf 100644 --- a/modules/claims_api/config/schemas/v2/526.json +++ b/modules/claims_api/config/schemas/v2/526.json @@ -120,7 +120,7 @@ "type": ["string", "null"], "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9 ]([a-zA-Z0-9 ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" } } }, @@ -227,7 +227,7 @@ "type": ["string", "null"], "maxLength": 16, "nullable": true, - "pattern": "^$|([a-zA-Z0-9\\.# ]([a-zA-Z0-9\\.# ])?)+$" + "pattern": "^[a-zA-Z0-9]*$" }, "dates": { "type": "object",