Merge branch 'main' into fix/AEA-5861_temp_disable_B0401

Author: jonathanwelch1-nhs

packages/cpt-ui/__tests__/BasicDetailsSearch.test.tsx

@@ -273,6 +273,26 @@ describe("BasicDetailsSearch", () => {
         expect(screen.getAllByText(expectedError)).toHaveLength(2)
       }
     )
+
+    it("accepts valid DOB when day and month are single digits (e.g., 1-1-2000", async () => {
+      const mockNavigate = jest.fn()
+    ;(useNavigate as jest.Mock).mockReturnValue(mockNavigate)
+
+      renderWithRouter(<BasicDetailsSearch />, defaultSearchState)
+
+      await fillForm({
+        lastName: "Keary",
+        dobDay: "1",
+        dobMonth: "1",
+        dobYear: "2012",
+        postcode: "LS6 1JL"
+      })
+      await submitForm()
+
+      await waitFor(() => {
+        expect(mockNavigate).toHaveBeenCalledWith(FRONTEND_PATHS.PATIENT_SEARCH_RESULTS)
+      })
+    })
   })
 
   it("shows error for DOB in the future", async () => {

packages/cpt-ui/src/components/prescriptionSearch/BasicDetailsSearch.tsx

@@ -126,11 +126,15 @@ export default function BasicDetailsSearch() {
       return
     }
 
+    //API requires a 2 digit format i.e. 06 instead of 6 for June
+    const formattedDobDay = dobDay.padStart(2, "0")
+    const formattedDobMonth = dobMonth.padStart(2, "0")
+
     searchContext.clearSearchParameters()
     searchContext.setFirstName(firstName)
     searchContext.setLastName(lastName)
-    searchContext.setDobDay(dobDay)
-    searchContext.setDobMonth(dobMonth)
+    searchContext.setDobDay(formattedDobDay)
+    searchContext.setDobMonth(formattedDobMonth)
     searchContext.setDobYear(dobYear)
     searchContext.setPostcode(postcode)
     navigate(FRONTEND_PATHS.PATIENT_SEARCH_RESULTS)