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

Update: [AEA-4288] - Translate Format 1 collected status update #587

Merged
merged 5 commits into from
Jul 31, 2024
Merged

Update: [AEA-4288] - Translate Format 1 collected status update #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed55dc0
Add the initial comment
kris-szlapa Jul 30, 2024
83b1d6d
Add a new entry for the Collected status in the BUSINESS_STATUS_MAP a…
kris-szlapa Jul 30, 2024
881cfc8
Merge branch 'main' of https://github.com/NHSDigital/eps-prescription…
kris-szlapa Jul 30, 2024
79507a3
Merge branch 'main' into AEA-4288-translate-format-1-collected-status…
anthony-nhs Jul 31, 2024
71a52c1
Merge branch 'main' of https://github.com/NHSDigital/eps-prescription…
kris-szlapa Jul 31, 2024
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
3 changes: 2 additions & 1 deletion packages/cpsuLambda/src/schema/format_1/request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ const itemStatusSchema = {
"Cancelled",
"Expired",
"NotDispensed",
"DispensingComplete"
"DispensingComplete",
"Collected"
]
} as const satisfies JSONSchema

Expand Down
9 changes: 8 additions & 1 deletion packages/cpsuLambda/src/schema/format_1/transformer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@ const BUSINESS_STATUS_MAP: ItemStatusMap = {
"In-Store Collection": "Collected",
"Robot Collection": "Dispatched",
"Delivery required": "Dispatched"
},
Collected: {
"Not known": "Collected",
"In-Store Collection": "Collected",
"Robot Collection": "Dispatched",
"Delivery required": "Dispatched"
}
}

Expand All @@ -198,5 +204,6 @@ const TASK_STATUS_MAP: Record<itemStatusType, Task["status"]> = {
Cancelled: "completed",
Expired: "completed",
NotDispensed: "completed",
DispensingComplete: "completed"
DispensingComplete: "completed",
Collected: "completed"
}
34 changes: 33 additions & 1 deletion packages/cpsuLambda/tests/format_1/business_states.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ describe("getBusinessStatus function", () => {
{itemStatus: "Expired", deliveryType: "Robot Collection", expectedStatus: "Not Dispensed"},
{itemStatus: "DispensingComplete", deliveryType: "Robot Collection", expectedStatus: "Dispatched"},
{itemStatus: "ReadyForCollection", deliveryType: "Delivery required", expectedStatus: "Ready to Dispatch"},
{itemStatus: "DispensingComplete", deliveryType: "Delivery required", expectedStatus: "Dispatched"}
{itemStatus: "DispensingComplete", deliveryType: "Delivery required", expectedStatus: "Dispatched"},
{itemStatus: "Collected", deliveryType: "Robot Collection", expectedStatus: "Dispatched"},
{itemStatus: "Collected", deliveryType: "Delivery required", expectedStatus: "Dispatched"},
{itemStatus: "Collected", deliveryType: "In-Store Collection", expectedStatus: "Collected"},
{itemStatus: "Collected", deliveryType: "Not known", expectedStatus: "Collected"}
]

testCases.forEach(({itemStatus, deliveryType, expectedStatus}) => {
Expand Down Expand Up @@ -84,6 +88,34 @@ describe("populateTemplate function", () => {
expectedBusinessStatus: "Dispatched",
expectedTaskStatus: "completed",
expectItemDefined: true
},
{
itemStatus: "Collected",
deliveryType: "Robot Collection",
expectedBusinessStatus: "Dispatched",
expectedTaskStatus: "completed",
expectItemDefined: true
},
{
itemStatus: "Collected",
deliveryType: "Delivery required",
expectedBusinessStatus: "Dispatched",
expectedTaskStatus: "completed",
expectItemDefined: true
},
{
itemStatus: "Collected",
deliveryType: "In-Store Collection",
expectedBusinessStatus: "Collected",
expectedTaskStatus: "completed",
expectItemDefined: true
},
{
itemStatus: "Collected",
deliveryType: "Not known",
expectedBusinessStatus: "Collected",
expectedTaskStatus: "completed",
expectItemDefined: true
}
]

Expand Down