Merge pull request #1167 from ministryofjustice/update-bedspaceatrrib…

…utes Update Bedspace search param to use new values
ministryofjustice · Dec 11, 2024 · 679d407 · 679d407
2 parents c8fb265 + feb3bed
commit 679d407
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/cypress_shared/pages/temporary-accommodation/manage/bedspaceSearch.ts b/cypress_shared/pages/temporary-accommodation/manage/bedspaceSearch.ts
@@ -67,15 +67,15 @@ export default class BedspaceSearchPage extends Page {
     this.getLegend('Property attributes')
     this.getLegend('Occupancy (optional)')
     searchParameters.attributes
-      .filter(attribute => attribute === 'wheelchairAccessible')
+      .filter(attribute => attribute !== 'isWheelchairAccessible')
       .forEach(attribute => {
         this.checkCheckboxByNameAndValue('attributes[]', attribute)
       })
 
     this.getLegend('Bedspace attributes')
     this.getLegend('Accessibility (optional)')
     searchParameters.attributes
-      .filter(attribute => attribute !== 'wheelchairAccessible')
+      .filter(attribute => attribute === 'isWheelchairAccessible')
       .forEach(attribute => {
         this.checkCheckboxByNameAndValue('attributes[]', attribute)
       })

diff --git a/cypress_shared/utils/bedspaceSearch.ts b/cypress_shared/utils/bedspaceSearch.ts
@@ -4,8 +4,8 @@ export const characteristicsToSearchAttributes = (
   premises: TemporaryAccommodationPremises,
 ): Array<BedSearchAttributes> => {
   const characteristicsToSearchAttributesMap: Record<string, BedSearchAttributes> = {
-    'Shared property': 'sharedProperty',
-    'Single occupancy': 'singleOccupancy',
+    'Shared property': 'isSharedProperty',
+    'Single occupancy': 'isSingleOccupancy',
   }
 
   return premises.characteristics

diff --git a/server/testutils/factories/bedSearchParameters.ts b/server/testutils/factories/bedSearchParameters.ts
@@ -8,7 +8,11 @@ import {
 import { DateFormats } from '../../utils/dateUtils'
 import referenceData from './referenceData'
 
-const bedSearchAttributes: Array<BedSearchAttributes> = ['singleOccupancy', 'sharedProperty', 'wheelchairAccessible']
+const bedSearchAttributes: Array<BedSearchAttributes> = [
+  'isSingleOccupancy',
+  'isSharedProperty',
+  'isWheelchairAccessible',
+]
 
 export default Factory.define<BedSearchAPIParameters>(() => ({
   startDate: DateFormats.dateObjToIsoDate(faker.date.soon()),

diff --git a/server/views/temporary-accommodation/bedspace-search/partials/search-fields.njk b/server/views/temporary-accommodation/bedspace-search/partials/search-fields.njk
@@ -78,8 +78,8 @@
 		            text: "Select all that apply"
 		        },
 		        items: [
-		            { text: "Single", value: "singleOccupancy" },
-		            { text: "Shared", value: "sharedProperty" }
+		            { text: "Single", value: "isSingleOccupancy" },
+		            { text: "Shared", value: "isSharedProperty" }
 		        ]
 		    }, fetchContext()) }}
 		{% endcall %}
@@ -101,7 +101,7 @@
 		                }
 		            },
 		            items: [
-		                { text: "Wheelchair accessible", value: "wheelchairAccessible" }
+		                { text: "Wheelchair accessible", value: "isWheelchairAccessible" }
 		            ]
 		        }, fetchContext()) }}
 		{% endcall %}