@defra-fish/sales-api-service 1.77.0-rc.1 → 1.77.0-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/sales-api-service",
-  "version": "1.77.0-rc.1",
+  "version": "1.77.0-rc.3",
   "description": "Rod Licensing Sales API",
   "type": "module",
   "engines": {
@@ -35,9 +35,9 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@defra-fish/business-rules-lib": "1.77.0-rc.1",
-    "@defra-fish/connectors-lib": "1.77.0-rc.1",
-    "@defra-fish/dynamics-lib": "1.77.0-rc.1",
+    "@defra-fish/business-rules-lib": "1.77.0-rc.3",
+    "@defra-fish/connectors-lib": "1.77.0-rc.3",
+    "@defra-fish/dynamics-lib": "1.77.0-rc.3",
     "@hapi/boom": "9.1.2",
     "@hapi/hapi": "20.1.3",
     "@hapi/inert": "6.0.3",
@@ -53,5 +53,5 @@
     "moment-timezone": "0.5.34",
     "uuid": "8.3.2"
   },
-  "gitHead": "2d2758c633c72fb22cd69fd5c9cbf0046568a9a9"
+  "gitHead": "fa97e97564ae1c2a49ffb2671f690f4328205942"
 }

package/src/schema/__tests__/licence-details.schema.spec.js

@@ -5,7 +5,8 @@ const getRequestSampleData = () => ({
   licenseeFirstName: 'Laila',
   licenseeLastName: 'Alial',
   licenseeBirthDate: '2000-10-03',
-  licenseePostcode: 'W8 7PP'
+  licenseePostcode: 'W8 7PP',
+  licenseePremises: '12'
 })
 
 const optionSetOptionSample = () => ({ id: 910400000, label: 'Example Label', description: 'Example Description' })
@@ -49,7 +50,7 @@ describe('licenceDetailsRequestQuerySchema', () => {
     expect(result).toEqual(getRequestSampleData())
   })
 
-  it.each([['licenseeFirstName'], ['licenseeLastName'], ['licenseeBirthDate'], ['licenseePostcode']])(
+  it.each([['licenseeFirstName'], ['licenseeLastName'], ['licenseeBirthDate'], ['licenseePostcode'], ['licenseePremises']])(
     'fails when %s is missing',
     async field => {
       const { [field]: _, ...invalidData } = getRequestSampleData()

package/src/schema/licence-details.schema.js

@@ -8,6 +8,7 @@ export const licenceDetailsRequestQuerySchema = Joi.object({
   licenseeFirstName: validation.contact.createFirstNameValidator(Joi).description('The first name of the licensee'),
   licenseeLastName: validation.contact.createLastNameValidator(Joi).description('The last name of the licensee'),
   licenseeBirthDate: validation.contact.createBirthDateValidator(Joi).description('The date of birth of the licensee'),
+  licenseePremises: validation.contact.createPremisesValidator(Joi).description('The premises of the licensee'),
   licenseePostcode: Joi.alternatives()
     .try(
       validation.contact.createUKPostcodeValidator(Joi).description('The postcode of the licensee'),

package/src/server/routes/__tests__/licence-details.spec.js

@@ -35,7 +35,8 @@ describe('licence-details handler', () => {
       licenseeFirstName: 'Bilbo',
       licenseeLastName: 'Baggins',
       licenseeBirthDate: '2000-10-03',
-      licenseePostcode: 'AB12 3CD'
+      licenseePostcode: 'AB12 3CD',
+      licenseePremises: '12'
     }
   }
 
@@ -78,17 +79,17 @@ describe('licence-details handler', () => {
     }
 
     expect(routeMetadata).toMatchInlineSnapshot(`
-      Object {
-        "description": "Look up licence details for a licensee using their name, postcode and date of birth",
-        "method": "GET",
-        "notes": "Look up licence details for a licensee using their name, postcode and date of birth",
-        "path": "/licenceDetails",
-        "tags": Array [
-          "api",
-          "licence-details",
-        ],
-      }
-    `)
+Object {
+  "description": "Look up licence details for a licensee using their name, premises, postcode and date of birth",
+  "method": "GET",
+  "notes": "Look up licence details for a licensee using their name, premises, postcode and date of birth",
+  "path": "/licenceDetails",
+  "tags": Array [
+    "api",
+    "licence-details",
+  ],
+}
+`)
   })
 
   it('returns 500 if executeQuery throws', async () => {
@@ -107,14 +108,14 @@ describe('licence-details handler', () => {
   })
 
   it.each([
-    ['Frodo', 'Underhill', '1993-09-22', 'EF45 6GH'],
-    ['Samwise', 'Gamgee', '1998-03-06', 'IJ78 9KL'],
-    ['Peregrin', 'Took', '1994-04-01', 'ZZ99 9ZZ']
+    ['Frodo', 'Underhill', '1993-09-22', 'Bag End', 'EF45 6GH'],
+    ['Samwise', 'Gamgee', '1998-03-06', '15', 'IJ78 9KL'],
+    ['Peregrin', 'Took', '1994-04-01', '12', 'ZZ99 9ZZ']
   ])(
-    'calls contactForLicenseeByPersonalDetails with the name, dob and postcode from the query (%s %s)',
-    async (licenseeFirstName, licenseeLastName, licenseeBirthDate, licenseePostcode) => {
+    'calls contactForLicenseeByPersonalDetails with the name, dob, premises and postcode from the query (%s %s)',
+    async (licenseeFirstName, licenseeLastName, licenseeBirthDate, licenseePremises, licenseePostcode) => {
       mockContactWithPermissions(mockPermission())
-      const query = { licenseeFirstName, licenseeLastName, licenseeBirthDate, licenseePostcode }
+      const query = { licenseeFirstName, licenseeLastName, licenseeBirthDate, licenseePremises, licenseePostcode }
 
       await getLicenceDetails({ query })
 

package/src/server/routes/licence-details.js

@@ -27,9 +27,9 @@ const isActiveTwelveMonthLicence = permission => {
 }
 
 export const getLicenceDetails = async request => {
-  const { licenseeFirstName, licenseeLastName, licenseeBirthDate, licenseePostcode } = request.query
+  const { licenseeFirstName, licenseeLastName, licenseeBirthDate, licenseePremises, licenseePostcode } = request.query
   const contacts = await executeWithErrorLog(
-    contactForLicenseeByPersonalDetails({ licenseeFirstName, licenseeLastName, licenseeBirthDate, licenseePostcode })
+    contactForLicenseeByPersonalDetails({ licenseeFirstName, licenseeLastName, licenseeBirthDate, licenseePremises, licenseePostcode })
   )
 
   if (!contacts.length) {
@@ -64,9 +64,9 @@ export default [
     path: '/licenceDetails',
     options: {
       handler,
-      description: 'Look up licence details for a licensee using their name, postcode and date of birth',
+      description: 'Look up licence details for a licensee using their name, premises, postcode and date of birth',
       notes: `
-        Look up licence details for a licensee using their name, postcode and date of birth
+        Look up licence details for a licensee using their name, premises, postcode and date of birth
       `,
       tags: ['api', 'licence-details'],
       validate: {