WIP commit to clean up type errors

ministryofjustice · Dec 2, 2024 · 5644aa1 · 5644aa1
1 parent 080ee55
commit 5644aa1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/cypress_shared/helpers/place.ts b/cypress_shared/helpers/place.ts
@@ -24,6 +24,7 @@ import BookingNewPage from '../pages/temporary-accommodation/manage/bookingNew'
 import BookingSelectAssessmentPage from '../pages/temporary-accommodation/manage/bookingSelectAssessment'
 import BookingShowPage from '../pages/temporary-accommodation/manage/bookingShow'
 import { characteristicsToSearchAttributes } from '../utils/bedspaceSearch'
+import { OccupancyAttribute } from '../../server/@types/ui/index';
 
 export default class PlaceHelper {
   private readonly bedSearchResults: BedSearchResults
@@ -109,7 +110,7 @@ export default class PlaceHelper {
       attributes: characteristicsToSearchAttributes(this.premises),
     })
 
-    bedspaceSearchPage.completeForm(searchParameters)
+    bedspaceSearchPage.completeForm(searchParameters);
     bedspaceSearchPage.clickSubmit()
 
     // I am taken to the search results page

diff --git a/integration_tests/tests/temporary-accommodation/manage/bedspaceSearch.cy.ts b/integration_tests/tests/temporary-accommodation/manage/bedspaceSearch.cy.ts
@@ -189,7 +189,7 @@ context('Bedspace Search', () => {
     cy.task('stubBooking', { premisesId: premises.id, booking })
 
     // And when I fill out the form
-    const searchParameters = BedspaceSearchFormParametersFactory.build()
+    const searchParameters = bedspaceSearchFormParametersFactory.build()
     preSearchPage.completeForm(searchParameters)
     preSearchPage.clickSubmit()
 
@@ -237,7 +237,7 @@ context('Bedspace Search', () => {
     const results = bedSearchResultsFactory.build()
     cy.task('stubBedSearch', results)
 
-    const searchParameters = BedspaceSearchFormParametersFactory.build()
+    const searchParameters = bedspaceSearchFormParametersFactory.build()
     preSearchPage.completeForm(searchParameters)
     preSearchPage.clickSubmit()
 

diff --git a/server/controllers/temporary-accommodation/manage/bedspaceSearchController.ts b/server/controllers/temporary-accommodation/manage/bedspaceSearchController.ts
@@ -17,7 +17,9 @@ type APISearchQuery = Omit<BedspaceSearchFormParameters, 'occupancyAttribute'> &
   /**
    * The number of days the Bed will need to be free from the start_date until
    */
-  durationDays: string
+  startDate: string
+  durationDays: number
+  probationDeliveryUnits: string[]
 }
 
 export default class BedspaceSearchController {
@@ -59,8 +61,13 @@ export default class BedspaceSearchController {
 
       try {
         if (apiQueryParams) {
+
+          const startDateParam: ObjectWithDateParts<"startDate"> = {
+            startDate: apiQueryParams.startDate
+          }
+
           startDate = DateFormats.dateAndTimeInputsToIsoString(
-            apiQueryParams as ObjectWithDateParts<'startDate'>,
+            startDateParam,
             'startDate',
           ).startDate