Skip to content

Fix: [AEA-6327] - missing prescriptions fix #1860

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

Merged
jonathanwelch1-nhs merged 24 commits into from
Mar 25, 2026
Merged

Fix: [AEA-6327] - missing prescriptions fix #1860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
28c5884
first fix
jonathanwelch1-nhs Mar 3, 2026
1a25662
fixed tests
jonathanwelch1-nhs Mar 3, 2026
8409469
code coverage plus safe proofing when switching between prescriptions
jonathanwelch1-nhs Mar 4, 2026
7c83d7d
working on comments
jonathanwelch1-nhs Mar 6, 2026
078991f
addressed PR comments
jonathanwelch1-nhs Mar 9, 2026
54e08e9
sonarcloud suggestions
jonathanwelch1-nhs Mar 11, 2026
8787428
fixed broken tests
jonathanwelch1-nhs Mar 12, 2026
eb92a6a
Merge branch 'main' into aea-6327-missing-prescriptions
jonathanwelch1-nhs Mar 12, 2026
21f9d88
Merge branch 'main' into aea-6327-missing-prescriptions
connoravo-nhs Mar 13, 2026
259de88
Merge branch 'main' into aea-6327-missing-prescriptions
jonathanwelch1-nhs Mar 16, 2026
23ca8d4
refactored to remove complex unncessary logic
jonathanwelch1-nhs Mar 16, 2026
8bb89ad
Merge remote-tracking branch 'origin/aea-6327-missing-prescriptions' …
jonathanwelch1-nhs Mar 17, 2026
7483ecc
refactored to remove complex unncessary logic
jonathanwelch1-nhs Mar 17, 2026
ebbbefd
sonarcloud neatening
jonathanwelch1-nhs Mar 17, 2026
fe71227
Merge branch 'main' into aea-6327-missing-prescriptions
anthony-nhs Mar 20, 2026
ccdd7da
implemented suggestions
jonathanwelch1-nhs Mar 23, 2026
38d9a4c
Merge remote-tracking branch 'origin/aea-6327-missing-prescriptions' …
jonathanwelch1-nhs Mar 23, 2026
2b45f76
Merge remote-tracking branch 'origin/main' into aea-6327-missing-pres…
jonathanwelch1-nhs Mar 23, 2026
a2579d3
pulled in main plus copilot suggestions
jonathanwelch1-nhs Mar 23, 2026
4d3fec4
fixed tests
jonathanwelch1-nhs Mar 23, 2026
0b4d3ba
Merge branch 'main' into aea-6327-missing-prescriptions
connoravo-nhs Mar 24, 2026
3ec5519
small refactoring for neatness
jonathanwelch1-nhs Mar 25, 2026
5e7c149
Merge remote-tracking branch 'origin/aea-6327-missing-prescriptions' …
jonathanwelch1-nhs Mar 25, 2026
2481383
Merge branch 'main' into aea-6327-missing-prescriptions
connoravo-nhs Mar 25, 2026
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
42 changes: 21 additions & 21 deletions packages/cpt-ui/__tests__/EpsPrescriptionList.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
prescriptionId: "ABC123-A83008-C2D93O"
prescriptionId: "ABC123-A83008-C2D93O", searchType: "prescriptionId"
}
)

Expand All @@ -396,7 +396,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
prescriptionId: "C0C757-A83008-C2D93O"
prescriptionId: "C0C757-A83008-C2D93O", searchType: "prescriptionId"
}
)
expect(mockedAxios.get).toHaveBeenCalledTimes(1)
Expand Down Expand Up @@ -432,7 +432,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
prescriptionId: "C0C757-A83008-C2D93O"
prescriptionId: "C0C757-A83008-C2D93O", searchType: "prescriptionId"
}
)

Expand All @@ -452,7 +452,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
prescriptionId: "C0C757-A83008-C2D93O"
prescriptionId: "C0C757-A83008-C2D93O", searchType: "prescriptionId"
}
)

Expand Down Expand Up @@ -484,7 +484,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
prescriptionId: "C0C757-A83008-C2D93O"
prescriptionId: "C0C757-A83008-C2D93O", searchType: "prescriptionId"
}
)
expect(mockedAxios.get).toHaveBeenCalledTimes(1)
Expand Down Expand Up @@ -541,7 +541,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
prescriptionId: "ABC123-A83008-C2D93O"
prescriptionId: "ABC123-A83008-C2D93O", searchType: "prescriptionId"
}
)
expect(mockedAxios.get).toHaveBeenCalledTimes(1)
Expand All @@ -567,7 +567,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
nhsNumber: "1234567890"
nhsNumber: "1234567890", searchType: "nhs"
}
)
expect(mockedAxios.get).toHaveBeenCalledTimes(1)
Expand All @@ -592,7 +592,7 @@ describe("PrescriptionListPage", () => {
renderWithRouter(url, signedInAuthState, {
...defaultSearchState,
prescriptionId: "ABC123-A83008-C2D93O",
nhsNumber: "1234567890"
nhsNumber: "1234567890", searchType: "nhs"
})
expect(mockedAxios.get).toHaveBeenCalledTimes(1)

Expand All @@ -615,7 +615,7 @@ describe("PrescriptionListPage", () => {
renderWithRouter(url, signedInAuthState, {
...defaultSearchState,
prescriptionId: "ABC123-A83008-C2D93O",
nhsNumber: "1234567890"
nhsNumber: "1234567890", searchType: "nhs"
})

await waitFor(() => {
Expand All @@ -637,7 +637,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
prescriptionId: "ABC123-A83008-C2D93O"
prescriptionId: "ABC123-A83008-C2D93O", searchType: "prescriptionId"
}
)
expect(mockedAxios.get).toHaveBeenCalledTimes(1)
Expand All @@ -660,7 +660,7 @@ describe("PrescriptionListPage", () => {

renderWithRouter(FRONTEND_PATHS.PRESCRIPTION_LIST_PAST, signedInAuthState, {
...defaultSearchState,
nhsNumber: "1234567890"
nhsNumber: "1234567890", searchType: "nhs"
})

await waitFor(() => {
Expand Down Expand Up @@ -691,7 +691,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
prescriptionId: "ABC123-ABC123-ABC123"
prescriptionId: "ABC123-ABC123-ABC123", searchType: "prescriptionId"
}
)

Expand All @@ -711,7 +711,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
prescriptionId: "002F5E-A83008-497F1Z"
prescriptionId: "002F5E-A83008-497F1Z", searchType: "prescriptionId"
}
)
expect(mockedAxios.get).toHaveBeenCalledTimes(1)
Expand All @@ -737,7 +737,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
nhsNumber: "32165649870"
nhsNumber: "32165649870", searchType: "nhs"
}
)

Expand All @@ -764,7 +764,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
nhsNumber: "32165649870"
nhsNumber: "32165649870", searchType: "nhs"
}
)

Expand All @@ -791,7 +791,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
nhsNumber: "32165649870"
nhsNumber: "32165649870", searchType: "nhs"
}

)
Expand All @@ -811,7 +811,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
nhsNumber: "32165649870"
nhsNumber: "32165649870", searchType: "nhs"
}
)

Expand All @@ -829,7 +829,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
nhsNumber: "32165649870"
nhsNumber: "32165649870", searchType: "nhs"
}

)
Expand All @@ -851,7 +851,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
prescriptionId: "C0C757-A83008-C2D93O"
prescriptionId: "C0C757-A83008-C2D93O", searchType: "prescriptionId"
}
)
expect(mockedAxios.get).toHaveBeenCalledTimes(1)
Expand All @@ -870,7 +870,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
prescriptionId: "C0C757-A83008-C2D93O"
prescriptionId: "C0C757-A83008-C2D93O", searchType: "prescriptionId"
}
)
expect(mockedAxios.get).toHaveBeenCalledTimes(1)
Expand All @@ -889,7 +889,7 @@ describe("PrescriptionListPage", () => {
signedInAuthState,
{
...defaultSearchState,
prescriptionId: "C0C757-A83008-C2D93O"
prescriptionId: "C0C757-A83008-C2D93O", searchType: "prescriptionId"
}
)
expect(mockedAxios.get).toHaveBeenCalledTimes(1)
Expand Down
Loading
Loading