@defra-fish/dynamics-lib 1.77.0-rc.2 → 1.77.0-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/dynamics-lib",
-  "version": "1.77.0-rc.2",
+  "version": "1.77.0-rc.3",
   "description": "Framework to support integration with dynamics",
   "type": "module",
   "engines": {
@@ -43,5 +43,5 @@
     "simple-oauth2": "4.3.0",
     "uuid": "8.3.2"
   },
-  "gitHead": "d473c2103570546d9096bffc5bf3ba13909e6a3e"
+  "gitHead": "fa97e97564ae1c2a49ffb2671f690f4328205942"
 }

package/src/queries/__tests__/contact.queries.spec.js

@@ -2,6 +2,7 @@ import { contactAndPermissionForLicensee, contactForLicenseeNoReference, contact
 import { Contact } from '../../entities/contact.entity.js'
 import { Permission } from '../../entities/permission.entity.js'
 import { PredefinedQuery } from '../predefined-query.js'
+import { escapeODataStringValue } from '../../client/util.js'
 
 jest.mock('dynamics-web-api', () => {
   return {
@@ -13,11 +14,13 @@ jest.mock('dynamics-web-api', () => {
   }
 })
 
+jest.mock('../../client/util.js', () => ({
+  escapeODataStringValue: jest.fn(value => value)
+}))
+
 describe('Contact Queries', () => {
   describe('contactForLicenseeNoReference', () => {
     beforeEach(() => {
-      jest.resetAllMocks()
-
       const defaultFilter = 'statecode eq 77'
 
       jest.spyOn(Contact.definition, 'mappings', 'get').mockReturnValue({
@@ -56,8 +59,6 @@ describe('Contact Queries', () => {
 
   describe('contactAndPermissionForLicensee', () => {
     beforeEach(() => {
-      jest.resetAllMocks()
-
       const defaultFilter = 'statecode eq 77'
 
       jest.spyOn(Contact.definition, 'mappings', 'get').mockReturnValue({
@@ -146,6 +147,7 @@ describe('contactForLicenseeByPersonalDetails', () => {
     jest.spyOn(Contact.definition, 'mappings', 'get').mockReturnValue({
       firstName: { field: 'mock_firstname' },
       lastName: { field: 'mock_lastname' },
+      premises: { field: 'mock_premises' },
       postcode: { field: 'mock_postcode' },
       birthDate: { field: 'mock_birthdate' }
     })
@@ -154,18 +156,45 @@ describe('contactForLicenseeByPersonalDetails', () => {
   })
 
   it.each([
-    ['Smeagol', 'Ring', '2000-10-03', 'AB12 3CD'],
-    ['Frodo', 'Baggins', '1993-09-22', 'EF45 6GH'],
-    ['Samwise', 'Gamgee', '1998-03-06', 'IJ78 9KL']
+    { details: { licenseeFirstName: 'Brenin' }, testfield: 'first name', fieldName: 'licenseeFirstName' },
+    { details: { licenseeLastName: 'Pysgotwr' }, testfield: 'last name', fieldName: 'licenseeLastName' },
+    { details: { licenseePremises: 'Dunmanifestin' }, testfield: 'premises', fieldName: 'licenseePremises' },
+    { details: { licenseePostcode: 'GZ1 1UH' }, testfield: 'post code', fieldName: 'licenseePostcode' }
+  ])('escapes value of $testfield', ({ testfield: _t, details, fieldName }) => {
+    for (let x = 0; x < 4; x++) {
+      escapeODataStringValue.mockImplementationOnce(value => `!@£${value}$%%`)
+    }
+    const query = contactForLicenseeByPersonalDetails({
+      licenseeFirstName: 'firstName',
+      licenseeLastName: 'lastName',
+      licenseePremises: '15',
+      licenseePostcode: 'AB1 1AB',
+      licenseeBirthDate: '2000-01-01',
+      ...details
+    })
+
+    expect(query._retrieveRequest.filter).toEqual(expect.stringContaining(`!@£${details[fieldName]}$%%`))
+  })
+
+  it.each([
+    ['Smeagol', 'Ring', '2000-10-03', '12', 'AB12 3CD'],
+    ['Frodo', 'Baggins', '1993-09-22', 'Dunmanifestin', 'EF45 6GH'],
+    ['Samwise', 'Gamgee', '1998-03-06', '1507', 'IJ78 9KL']
   ])(
-    'should return correct retrieve request when first name is %s, last name is %s, birth date is %s and postcode is %s',
-    (licenseeFirstName, licenseeLastName, licenseeBirthDate, licenseePostcode) => {
-      const result = contactForLicenseeByPersonalDetails({ licenseeFirstName, licenseeLastName, licenseeBirthDate, licenseePostcode })
+    'should return correct retrieve request when first name is %s, last name is %s, birth date is %s, premises is %s and postcode is %s',
+    (licenseeFirstName, licenseeLastName, licenseeBirthDate, licenseePremises, licenseePostcode) => {
+      const result = contactForLicenseeByPersonalDetails({
+        licenseeFirstName,
+        licenseeLastName,
+        licenseeBirthDate,
+        licenseePremises,
+        licenseePostcode
+      })
 
       expect(result._retrieveRequest).toEqual({
         collection: 'contacts',
         expand: [],
-        filter: `mock_firstname eq '${licenseeFirstName}' and mock_lastname eq '${licenseeLastName}' and mock_postcode eq '${licenseePostcode}' and mock_birthdate eq ${licenseeBirthDate} and ${Contact.definition.defaultFilter}`,
+        filter: `mock_firstname eq '${licenseeFirstName}' and mock_lastname eq '${licenseeLastName}' and mock_premises eq '${licenseePremises}' and mock_postcode eq '${licenseePostcode}' and mock_birthdate eq ${licenseeBirthDate} and ${Contact.definition.defaultFilter}`,
         select: expect.any(Array)
       })
     }

package/src/queries/contact.queries.js

@@ -55,16 +55,23 @@ export const contactAndPermissionForLicensee = (permissionLast6Characters, licen
  * @param {string} licenseeFirstName
  * @param {string} licenseeLastName
  * @param {string} licenseeBirthDate
+ * @param {string} licenseePremises
  * @param {string} licenseePostcode
  * @returns {PredefinedQuery<Contact>}
  */
-export const contactForLicenseeByPersonalDetails = ({ licenseeFirstName, licenseeLastName, licenseeBirthDate, licenseePostcode }) => {
-  const { firstName, lastName, postcode, birthDate } = Contact.definition.mappings
+export const contactForLicenseeByPersonalDetails = ({
+  licenseeFirstName,
+  licenseeLastName,
+  licenseeBirthDate,
+  licenseePremises,
+  licenseePostcode
+}) => {
+  const { firstName, lastName, premises, postcode, birthDate } = Contact.definition.mappings
   const filter = `${firstName.field} eq '${escapeODataStringValue(licenseeFirstName)}' and ${lastName.field} eq '${escapeODataStringValue(
     licenseeLastName
-  )}' and ${postcode.field} eq '${escapeODataStringValue(licenseePostcode)}' and ${birthDate.field} eq ${licenseeBirthDate} and ${
-    Contact.definition.defaultFilter
-  }`
+  )}' and ${premises.field} eq '${escapeODataStringValue(licenseePremises)}' and ${postcode.field} eq '${escapeODataStringValue(
+    licenseePostcode
+  )}' and ${birthDate.field} eq ${licenseeBirthDate} and ${Contact.definition.defaultFilter}`
   return new PredefinedQuery({
     root: Contact,
     filter,