@defra-fish/sales-api-service 1.49.0-rc.8 → 1.49.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/sales-api-service",
-  "version": "1.49.0-rc.8",
+  "version": "1.49.0",
   "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.49.0-rc.8",
-    "@defra-fish/connectors-lib": "1.49.0-rc.8",
-    "@defra-fish/dynamics-lib": "1.49.0-rc.8",
+    "@defra-fish/business-rules-lib": "1.49.0",
+    "@defra-fish/connectors-lib": "1.49.0",
+    "@defra-fish/dynamics-lib": "1.49.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/hapi": "^20.1.3",
     "@hapi/inert": "^6.0.3",
@@ -52,5 +52,5 @@
     "moment-timezone": "^0.5.34",
     "uuid": "^8.3.2"
   },
-  "gitHead": "bf3e36c0c2bcf644b99d3752adaf9b17856e9129"
+  "gitHead": "22fe7b18f1999903cc973da64ab56a68648dee61"
 }

package/src/server/routes/__tests__/__snapshots__/renewals.spec.js.snap

@@ -463,6 +463,10 @@ exports[`permissionRenewalData should call preparePermissionDataForRenewal with
           Object {
             "id": "d0ece997-ef65-e611-80dc-c4346bad4004",
             "name": "Senior",
+            "proof": Object {
+              "referenceNumber": "AB 01 02 03 CD",
+              "type": "National Insurance Number",
+            },
           },
         ],
         "dataSource": Object {

package/src/server/routes/__tests__/renewals.spec.js

@@ -33,25 +33,16 @@ const permissionForFullReferenceNumberMock = () => ({
   entity: MOCK_EXISTING_PERMISSION_ENTITY,
   expanded: {
     licensee: { entity: MOCK_EXISTING_CONTACT_ENTITY, expanded: {} },
-    concessionProofs: [{ entity: MOCK_CONCESSION_PROOF_ENTITY }],
+    concessionProofs: [{ entity: MOCK_CONCESSION_PROOF_ENTITY, expanded: { concession: { entity: MOCK_CONCESSION } } }],
     permit: { entity: MOCK_1DAY_SENIOR_PERMIT_ENTITY, expanded: {} }
   }
 })
 
-const concessionMock = () => ({
-  expanded: {
-    concession: {
-      entity: MOCK_CONCESSION
-    }
-  }
-})
-
 describe('permissionRenewalData', () => {
   beforeEach(jest.clearAllMocks)
 
   it('should call permissionForFullReferenceNumber with referenceNumber', async () => {
     executeQuery.mockResolvedValueOnce([permissionForFullReferenceNumberMock()])
-    executeQuery.mockResolvedValueOnce([concessionMock()])
 
     const referenceNumber = 'REFERENCE123'
     const request = getMockRequest(referenceNumber)
@@ -64,13 +55,24 @@ describe('permissionRenewalData', () => {
 
   it('should call preparePermissionDataForRenewal with the expected data', async () => {
     executeQuery.mockResolvedValueOnce([permissionForFullReferenceNumberMock()])
-    executeQuery.mockResolvedValueOnce([concessionMock()])
 
     await permissionRenewalData[0].options.handler(getMockRequest(), getMockResponseToolkit())
 
     expect(preparePermissionDataForRenewal).toMatchSnapshot()
   })
 
+  it("omits concession proof reference number if it's not present", async () => {
+    const sampleData = permissionForFullReferenceNumberMock()
+    sampleData.expanded.concessionProofs[0].entity = {
+      type: { label: 'No Proof' }
+    }
+    executeQuery.mockResolvedValueOnce([sampleData])
+
+    await permissionRenewalData[0].options.handler(getMockRequest(), getMockResponseToolkit())
+
+    expect(preparePermissionDataForRenewal.mock.calls[0][0].concessions[0].proof.referenceNumber).toBeUndefined()
+  })
+
   it('should set concessions to an empty array if concessions is empty', async () => {
     const permissionMock = permissionForFullReferenceNumberMock()
     permissionMock.expanded.concessionProofs = []
@@ -83,7 +85,6 @@ describe('permissionRenewalData', () => {
 
   it('should return continue response', async () => {
     executeQuery.mockResolvedValueOnce([permissionForFullReferenceNumberMock()])
-    executeQuery.mockResolvedValueOnce([concessionMock()])
     const request = getMockRequest({})
     const responseToolkit = getMockResponseToolkit()
 

package/src/server/routes/renewals.js

@@ -2,7 +2,7 @@ import Boom from '@hapi/boom'
 import { preparePermissionDataForRenewal } from '../../services/renewals/renewals.service.js'
 import { permissionRenewalDataRequestParamsSchema, permissionRenewalDataResponseSchema } from '../../schema/renewals.schema.js'
 import db from 'debug'
-import { concessionsByIds, permissionForFullReferenceNumber, executeQuery } from '@defra-fish/dynamics-lib'
+import { permissionForFullReferenceNumber, executeQuery } from '@defra-fish/dynamics-lib'
 const debug = db('sales:permission-renewal-data')
 
 const executeWithErrorLog = async query => {
@@ -16,8 +16,13 @@ const executeWithErrorLog = async query => {
 
 const getConcessions = async permission => {
   if (permission.expanded.concessionProofs.length) {
-    const concessionProofs = await executeWithErrorLog(concessionsByIds(permission.expanded.concessionProofs.map(cp => cp.entity.id)))
-    return concessionProofs.map(cp => cp.expanded.concession.entity.toJSON())
+    return permission.expanded.concessionProofs.map(cp => ({
+      ...cp.expanded.concession.entity.toJSON(),
+      proof: {
+        ...(cp.entity.referenceNumber ? { referenceNumber: cp.entity.referenceNumber } : {}),
+        type: cp.entity.type.label
+      }
+    }))
   }
   return []
 }