Fix org search (#51)

* fix: organisation name search and content changes

* fix: tests

* bump: version

Author: shivanshuit914

app/constants/species-numbers.js

@@ -1,6 +1,6 @@
 module.exports = {
-  beef: 'At least 11',
-  dairy: 'At least 11',
-  pigs: 'At least 51',
-  sheep: 'At least 21'
+  beef: 'Minimum 11',
+  dairy: 'Minimum 11',
+  pigs: 'Minimum 51',
+  sheep: 'Minimum 21'
 }

app/lib/search-validation.js

@@ -15,17 +15,17 @@ module.exports = (searchText) => {
     case sbiRegEx.test(searchText):
       searchType = 'sbi'
       break
+    default:
+      searchType = 'organisation'
+      break
   }
 
-  if (!searchType && searchText.length <= 0) {
+  if (searchText.length <= 0) {
     searchType = 'reset'
   }
-  if (searchType) {
-    return {
-      searchText,
-      searchType
-    }
-  } else {
-    throw new Error('Invalid search. It should be agreement number, organisation or single business identifier (SBI) number.')
+
+  return {
+    searchText,
+    searchType
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ffc-ahwr-backoffice",
-  "version": "1.14.3",
+  "version": "1.14.4",
   "description": "Back office of the health and welfare of your livestock",
   "homepage": "https://github.com/DEFRA/ffc-ahwr-backoffice",
   "main": "app/index.js",

test/integration/narrow/routes/applications.test.js

@@ -209,24 +209,5 @@ describe('Applications test', () => {
       const $ = cheerio.load(res.payload)
       expect($('p.govuk-error-message').text()).toMatch('No Applications found.')
     })
-
-    test.each([
-      { searchDetails: { searchText: '1233' } },
-      { searchDetails: { searchText: 'sdfgsfgsd' } }
-    ])('returns error', async ({ searchDetails }) => {
-      const options = {
-        method,
-        url,
-        payload: { crumb, searchText: searchDetails.searchText, status: [] },
-        auth,
-        headers: { cookie: `crumb=${crumb}` }
-      }
-
-      const res = await global.__SERVER__.inject(options)
-
-      const $ = cheerio.load(res.payload)
-      expect($('p.govuk-error-message').text()).toMatch('Error: Invalid search. It should be agreement number, organisation or single business identifier (SBI) number.')
-      expect(res.statusCode).toBe(400)
-    })
   })
 })

test/integration/narrow/routes/view-application.test.js

@@ -71,7 +71,7 @@ describe('View Application test', () => {
       expect($('tbody tr:nth-child(3)').text()).toContain('Type of review')
       expect($('tbody tr:nth-child(3)').text()).toContain('Sheep')
       expect($('tbody tr:nth-child(4)').text()).toContain('Number of livestock')
-      expect($('tbody tr:nth-child(4)').text()).toContain('At least 21')
+      expect($('tbody tr:nth-child(4)').text()).toContain('Minimum 21')
       expect($('tbody tr:nth-child(5)').text()).toContain('Agreement accepted')
       expect($('tbody tr:nth-child(5)').text()).toContain('Yes')
       expect($('#claim').text()).toContain('Not claimed yet')
@@ -110,7 +110,7 @@ describe('View Application test', () => {
       expect($('tbody tr:nth-child(3)').text()).toContain('Type of review')
       expect($('tbody tr:nth-child(3)').text()).toContain('Sheep')
       expect($('tbody tr:nth-child(4)').text()).toContain('Number of livestock')
-      expect($('tbody tr:nth-child(4)').text()).toContain('At least 21')
+      expect($('tbody tr:nth-child(4)').text()).toContain('Minimum 21')
       expect($('tbody tr:nth-child(5)').text()).toContain('Agreement accepted')
       expect($('tbody tr:nth-child(5)').text()).toContain('No')
       expect($('#claim').text()).toContain('Not eligible to claim')