Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

API-41125-phone-num-cleanup #20559

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

API-41125-phone-num-cleanup #20559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
42c579a
Changes the phoneNumber regex for v2 2122/2122a for veteran and claim…
stiehlrod Jan 31, 2025
3be81cd
Adds tests.
stiehlrod Jan 31, 2025
5943be7
Merge branch 'master' into API-41125-phone-num-cleanup
stiehlrod Jan 31, 2025
4dea984
Updates the schema and docs for international phone - number of digit…
stiehlrod Feb 3, 2025
dae0e39
Updates the schema and docs for international phone - number of digit…
stiehlrod Feb 3, 2025
2b79116
Merge branch 'API-41125-phone-num-cleanup' of github.com:department-o…
stiehlrod Feb 3, 2025
2efe1d5
Simplifies tests.
stiehlrod Feb 4, 2025
f1def13
Updates swgger files & schema files. Linting update on 2122_spec.
stiehlrod Feb 4, 2025
443da35
Adds more to the spec file to test the regex more thoroughly.
stiehlrod Feb 4, 2025
d3d5acd
Resolves merge conflicts
stiehlrod Feb 4, 2025
47cfccb
Merge branch 'master' into API-41125-phone-num-cleanup
stiehlrod Feb 4, 2025
d6914aa
Merge branch 'master' into API-41125-phone-num-cleanup
stiehlrod Feb 5, 2025
320f020
Adjusts the regex and re-runs the swagger
stiehlrod Feb 5, 2025
2689a41
Merge branch 'API-41125-phone-num-cleanup' of github.com:department-o…
stiehlrod Feb 5, 2025
0031ecd
Merge branch 'master' into API-41125-phone-num-cleanup
stiehlrod Feb 5, 2025
4359fa0
Increases maxLength on phoneNumber on 2122 & 2122a schemas.
stiehlrod Feb 7, 2025
8b79515
Merge branch 'API-41125-phone-num-cleanup' of github.com:department-o…
stiehlrod Feb 7, 2025
efc712e
Merge branch 'master' into API-41125-phone-num-cleanup
stiehlrod Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 46 additions & 62 deletions modules/claims_api/app/swagger/claims_api/v2/dev/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@
"202 without a transactionId": {
"value": {
"data": {
"id": "db8972c4-5f94-48b8-a3fc-44a59edc97d6",
"id": "8e482717-0388-4018-9199-4c34b479840f",
"type": "forms/526",
"attributes": {
"claimId": "600442191",
Expand Down Expand Up @@ -520,7 +520,7 @@
},
"federalActivation": {
"activationDate": "2023-10-01",
"anticipatedSeparationDate": "2025-02-06"
"anticipatedSeparationDate": "2025-02-07"
},
"confinements": [
{
Expand Down Expand Up @@ -566,7 +566,7 @@
"202 with a transactionId": {
"value": {
"data": {
"id": "797c2738-5de4-4a17-b661-638a358396c9",
"id": "25bb7925-d6a2-4087-8b84-4940b5bcf2fa",
"type": "forms/526",
"attributes": {
"claimId": "600442191",
Expand Down Expand Up @@ -730,7 +730,7 @@
"serviceBranch": "Public Health Service",
"serviceComponent": "Active",
"activeDutyBeginDate": "2008-11-14",
"activeDutyEndDate": "2025-02-06",
"activeDutyEndDate": "2025-02-07",
"separationLocationCode": "98282"
}
],
Expand All @@ -751,7 +751,7 @@
},
"federalActivation": {
"activationDate": "2023-10-01",
"anticipatedSeparationDate": "2025-02-06"
"anticipatedSeparationDate": "2025-02-07"
},
"confinements": [
{
Expand Down Expand Up @@ -3994,7 +3994,7 @@
"serviceBranch": "Public Health Service",
"serviceComponent": "Active",
"activeDutyBeginDate": "2008-11-14",
"activeDutyEndDate": "2025-02-06",
"activeDutyEndDate": "2025-02-07",
"separationLocationCode": "98282"
}
],
Expand All @@ -4015,7 +4015,7 @@
},
"federalActivation": {
"activationDate": "2023-10-01",
"anticipatedSeparationDate": "2025-02-06"
"anticipatedSeparationDate": "2025-02-07"
},
"confinements": [
{
Expand Down Expand Up @@ -8537,8 +8537,8 @@
"id": "1",
"type": "intent_to_file",
"attributes": {
"creationDate": "2025-02-04",
"expirationDate": "2026-02-04",
"creationDate": "2025-02-05",
"expirationDate": "2026-02-05",
"type": "compensation",
"status": "active"
}
Expand Down Expand Up @@ -9428,7 +9428,7 @@
"application/json": {
"example": {
"data": {
"id": "2265779d-aa6a-40d5-803f-bac34543cdb7",
"id": "f748fd99-12a6-4c5c-a533-b87ad954eb37",
"type": "power-of-attorney-request",
"attributes": {
"veteran": {
Expand Down Expand Up @@ -11897,12 +11897,10 @@
"phoneNumber": {
"description": "Phone number.",
"type": "string",
"pattern": "^[0-9]{1,14}$",
"example": "555-5555"
},
"phoneNumberExt": {
"type": "string",
"pattern": "^[a-zA-Z0-9]{1,10}$"
"pattern": "^\\d(?:[- ]?\\d){0,13}$",
"example": "555-5555",
"minLength": 1,
"maxLength": 14
}
},
"if": {
Expand Down Expand Up @@ -12039,12 +12037,10 @@
"phoneNumber": {
"description": "Phone number.",
"type": "string",
"pattern": "^[0-9]{1,14}$",
"example": "555-5555"
},
"phoneNumberExt": {
"type": "string",
"pattern": "^[a-zA-Z0-9]{1,10}$"
"pattern": "^\\d(?:[- ]?\\d){0,13}$",
"example": "555-5555",
"minLength": 1,
"maxLength": 14
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I swear this is the last one! Since we allow up to 14 digits with various dashes and spaces in-between, a maxLength of 14 is too small to account for that. I don't think going deep into the math of exactly how many characters is allowed by the regex is necessary - 32 should be plenty of room.

}
},
"if": {
Expand Down Expand Up @@ -12225,7 +12221,7 @@
"application/json": {
"example": {
"data": {
"id": "4414cba8-a7fe-4e28-95d4-1c91c4172ed1",
"id": "a2637127-6b5d-4f21-8e8b-7ecd93521f56",
"type": "organization",
"attributes": {
"code": "083",
Expand Down Expand Up @@ -12590,12 +12586,10 @@
"phoneNumber": {
"description": "Phone number.",
"type": "string",
"pattern": "^[0-9]{1,14}$",
"example": "555-5555"
},
"phoneNumberExt": {
"type": "string",
"pattern": "^[a-zA-Z0-9]{1,10}$"
"pattern": "^\\d(?:[- ]?\\d){0,13}$",
"example": "555-5555",
"minLength": 1,
"maxLength": 14
}
},
"if": {
Expand Down Expand Up @@ -12732,12 +12726,10 @@
"phoneNumber": {
"description": "Phone number.",
"type": "string",
"pattern": "^[0-9]{1,14}$",
"example": "555-5555"
},
"phoneNumberExt": {
"type": "string",
"pattern": "^[a-zA-Z0-9]{1,10}$"
"pattern": "^\\d(?:[- ]?\\d){0,13}$",
"example": "555-5555",
"minLength": 1,
"maxLength": 14
}
},
"if": {
Expand Down Expand Up @@ -13346,12 +13338,10 @@
"phoneNumber": {
"description": "Phone number.",
"type": "string",
"pattern": "^[0-9]{1,14}$",
"example": "555-5555"
},
"phoneNumberExt": {
"type": "string",
"pattern": "^[a-zA-Z0-9]{1,10}$"
"pattern": "^\\d(?:[- ]?\\d){0,13}$",
"example": "555-5555",
"minLength": 1,
"maxLength": 14
}
},
"if": {
Expand Down Expand Up @@ -13474,12 +13464,10 @@
"phoneNumber": {
"description": "Phone number.",
"type": "string",
"pattern": "^[0-9]{1,14}$",
"example": "555-5555"
},
"phoneNumberExt": {
"type": "string",
"pattern": "^[a-zA-Z0-9]{1,10}$"
"pattern": "^\\d(?:[- ]?\\d){0,13}$",
"example": "555-5555",
"minLength": 1,
"maxLength": 14
}
},
"if": {
Expand Down Expand Up @@ -13723,7 +13711,7 @@
"application/json": {
"example": {
"data": {
"id": "bfac9e00-83f6-4383-84cc-22aea75f50f1",
"id": "bce45d99-e99d-4315-9700-bc5a778e2d38",
"type": "individual",
"attributes": {
"code": "067",
Expand Down Expand Up @@ -14105,12 +14093,10 @@
"phoneNumber": {
"description": "Phone number.",
"type": "string",
"pattern": "^[0-9]{1,14}$",
"example": "555-5555"
},
"phoneNumberExt": {
"type": "string",
"pattern": "^[a-zA-Z0-9]{1,10}$"
"pattern": "^\\d(?:[- ]?\\d){0,13}$",
"example": "555-5555",
"minLength": 1,
"maxLength": 14
}
},
"if": {
Expand Down Expand Up @@ -14233,12 +14219,10 @@
"phoneNumber": {
"description": "Phone number.",
"type": "string",
"pattern": "^[0-9]{1,14}$",
"example": "555-5555"
},
"phoneNumberExt": {
"type": "string",
"pattern": "^[a-zA-Z0-9]{1,10}$"
"pattern": "^\\d(?:[- ]?\\d){0,13}$",
"example": "555-5555",
"minLength": 1,
"maxLength": 14
}
},
"if": {
Expand Down Expand Up @@ -14571,10 +14555,10 @@
"application/json": {
"example": {
"data": {
"id": "14cbfe09-c52a-48ba-b1b2-b489a47ba15a",
"id": "7ea83b6f-d2fa-4370-b1c4-a40c7dc33925",
"type": "claimsApiPowerOfAttorneys",
"attributes": {
"createdAt": "2025-02-04T15:09:41.326Z",
"createdAt": "2025-02-05T21:37:11.866Z",
"representative": {
"poaCode": "074"
},
Expand Down
Loading
Loading