@defra-fish/sales-api-service 1.72.0-rc.0 → 1.72.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/sales-api-service",
-  "version": "1.72.0-rc.0",
+  "version": "1.72.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.72.0-rc.0",
-    "@defra-fish/connectors-lib": "1.72.0-rc.0",
-    "@defra-fish/dynamics-lib": "1.72.0-rc.0",
+    "@defra-fish/business-rules-lib": "1.72.0",
+    "@defra-fish/connectors-lib": "1.72.0",
+    "@defra-fish/dynamics-lib": "1.72.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": "71d4c2b6fe30d0fccbf82d2c7f62b9df77026af9"
+  "gitHead": "0af2c695993b35d37f80d4cdd5fef2beb7b2baaf"
 }

package/src/services/__tests__/concession.service.spec.js

@@ -185,7 +185,7 @@ describe('preparePermissionDataForRenewal', () => {
 
   describe('Senior', () => {
     describe('addSenior', () => {
-      it('add concession', async () => {
+      it('adds a senior concession', async () => {
         const permission = getMockPermission()
         await concessionService.addSenior(permission)
         expect(permission.concessions).toContainEqual(getSeniorConcession())
@@ -199,21 +199,29 @@ describe('preparePermissionDataForRenewal', () => {
         expect(permission.concessions).toEqual([expect.objectContaining(seniorConcession)])
       })
 
-      it('add senior to blue badge', async () => {
+      it('adds a senior concession and keeps existing Blue Badge concession', async () => {
         const permission = getMockPermission()
-        const disabledConcession = getDisabledNiConcession()
+        const disabledConcession = getDisabledBlueBadgeConcession()
         permission.concessions = [disabledConcession]
         await concessionService.addSenior(permission)
         expect(permission.concessions).toEqual([disabledConcession, getSeniorConcession()])
       })
 
-      it('add senior to NI', async () => {
+      it('adds a senior concession and keeps existing NI concession', async () => {
         const permission = getMockPermission()
-        const disabledConcession = getDisabledBlueBadgeConcession()
+        const disabledConcession = getDisabledNiConcession()
         permission.concessions = [disabledConcession]
         await concessionService.addSenior(permission)
         expect(permission.concessions).toEqual([disabledConcession, getSeniorConcession()])
       })
+
+      it('removes any existing junior concession', async () => {
+        const permission = getMockPermission()
+        const juniorConcession = getJuniorConcession()
+        permission.concessions = [juniorConcession]
+        await concessionService.addSenior(permission)
+        expect(permission.concessions).toEqual([getSeniorConcession()])
+      })
     })
 
     describe('removeSenior', () => {
@@ -265,6 +273,46 @@ describe('preparePermissionDataForRenewal', () => {
   })
 
   describe('Junior', () => {
+    describe('addJunior', () => {
+      it('adds a junior concession', async () => {
+        const permission = getMockPermission()
+        await concessionService.addJunior(permission)
+        expect(permission.concessions).toContainEqual(getJuniorConcession())
+      })
+
+      it("doesn't add second junior concession if one's already present", async () => {
+        const juniorConcession = getJuniorConcession()
+        const permission = getMockPermission()
+        permission.concessions = [juniorConcession]
+        await concessionService.addJunior(permission)
+        expect(permission.concessions).toEqual([expect.objectContaining(juniorConcession)])
+      })
+
+      it('adds a junior concession and keeps existing Blue Badge concession', async () => {
+        const permission = getMockPermission()
+        const disabledConcession = getDisabledBlueBadgeConcession()
+        permission.concessions = [disabledConcession]
+        await concessionService.addJunior(permission)
+        expect(permission.concessions).toEqual([disabledConcession, getJuniorConcession()])
+      })
+
+      it('adds a junior concession and keeps existing NI concession', async () => {
+        const permission = getMockPermission()
+        const disabledConcession = getDisabledNiConcession()
+        permission.concessions = [disabledConcession]
+        await concessionService.addJunior(permission)
+        expect(permission.concessions).toEqual([disabledConcession, getJuniorConcession()])
+      })
+
+      it('removes any existing senior concession', async () => {
+        const permission = getMockPermission()
+        const seniorConcession = getSeniorConcession()
+        permission.concessions = [seniorConcession]
+        await concessionService.addJunior(permission)
+        expect(permission.concessions).toEqual([getJuniorConcession()])
+      })
+    })
+
     describe('removeJunior', () => {
       it.each([
         ['has only a junior concession', [getJuniorConcession()], []],

package/src/services/concession.service.js

@@ -57,5 +57,21 @@ export const addSenior = async permission => {
 export const removeSenior = permission => removeConcessionType(permission, CONCESSION.SENIOR)
 export const hasSenior = permission => hasConcessionType(permission, CONCESSION.SENIOR)
 
+export const addJunior = async permission => {
+  if (!(await hasJunior(permission))) {
+    await removeSenior(permission)
+    if (!permission.concessions) {
+      permission.concessions = []
+    }
+    permission.concessions.push({
+      id: await getTypeConcessionId(CONCESSION.JUNIOR),
+      name: CONCESSION.JUNIOR,
+      proof: {
+        type: CONCESSION_PROOF.none
+      }
+    })
+  }
+}
+
 export const removeJunior = permission => removeConcessionType(permission, CONCESSION.JUNIOR)
 export const hasJunior = permission => hasConcessionType(permission, CONCESSION.JUNIOR)

package/src/services/renewals/__tests__/renewals.service.spec.js

@@ -204,6 +204,138 @@ describe('preparePermissionDataForRenewal', () => {
       const preparedPermission = await preparePermissionDataForRenewal(permission)
       expect(preparedPermission.concessions).toEqual(expect.arrayContaining([expect.objectContaining(disabledConcession)]))
     })
+
+    it('should remove incorrect senior concession if the licensee is not a senior', async () => {
+      const senior = { name: 'Senior', id: 'd0ece997-ef65-e611-80dc-c4346bad4004', proof: { type: 'No Proof' } }
+      const notReallyASeniorPermission = existingPermission({
+        concessions: [senior]
+      })
+      const ppd = await preparePermissionDataForRenewal(notReallyASeniorPermission)
+      expect(ppd.concessions).toEqual([])
+    })
+
+    it('should remove incorrect senior concession but keep disabled concession if the licensee is disabled but is not a senior', async () => {
+      const senior = { name: 'Senior', id: 'd0ece997-ef65-e611-80dc-c4346bad4004', proof: { type: 'No Proof' } }
+      const disabled = {
+        name: 'Disabled',
+        id: 'd1ece997-ef65-e611-80dc-c4346bad4004',
+        proof: { type: 'Blue Badge', referenceNumber: '123' }
+      }
+      const notReallyASeniorPermission = existingPermission({
+        concessions: [senior, disabled]
+      })
+      const ppd = await preparePermissionDataForRenewal(notReallyASeniorPermission)
+      expect(ppd.concessions).toEqual([disabled])
+    })
+  })
+
+  describe('junior to adult transition', () => {
+    describe.each`
+      description                                                                                            | birthDate       | oldEndDate
+      ${'the user is renewing at age 14 with a licence that will expire while they are 14'}                  | ${'2012-01-01'} | ${'2026-04-15'}
+      ${'the user is renewing at age 14 with a licence that expires today'}                                  | ${'2012-01-01'} | ${'2026-04-01'}
+      ${'the user is renewing at age 14 with a licence that expired while they were 14'}                     | ${'2012-01-01'} | ${'2026-03-31'}
+      ${'the user is renewing at age 16 with a licence that will expire while they are 16'}                  | ${'2010-01-01'} | ${'2026-04-15'}
+      ${'the user is renewing at age 16 with a licence that expires today'}                                  | ${'2010-01-01'} | ${'2026-04-01'}
+      ${'the user is renewing at age 16 with a licence that expired while they were 16'}                     | ${'2010-01-01'} | ${'2026-03-31'}
+      ${'the user is renewing the day before their 17th birthday with a licence that expired yesterday'}     | ${'2009-04-02'} | ${'2026-03-31'}
+      ${'the user is renewing the day before their 17th birthday with a licence that expires today'}         | ${'2009-04-02'} | ${'2026-04-01'}
+      ${'the user is renewing at age 16 with a licence that will expire the day before their 17th birthday'} | ${'2009-04-15'} | ${'2026-04-14'}
+    `('expected junior licenses', ({ description, birthDate, oldEndDate }) => {
+      it(`should keep junior concession if ${description}`, async () => {
+        jest.useFakeTimers().setSystemTime(new Date('2026-04-01'))
+        const endDate = moment(oldEndDate)
+        const junior = { name: 'Junior', id: '3230c68f-ef65-e611-80dc-c4346bad4004', proof: { type: 'No Proof' } }
+        const stillJuniorPermission = existingPermission({
+          endDate,
+          licensee: {
+            ...existingPermission().licensee,
+            birthDate
+          },
+          concessions: [junior]
+        })
+
+        const ppd = await preparePermissionDataForRenewal(stillJuniorPermission)
+        expect(ppd.concessions[0]).toEqual(junior)
+        jest.useRealTimers()
+      })
+
+      it(`should keep existing disabled concession and add junior concession if ${description}`, async () => {
+        jest.useFakeTimers().setSystemTime(new Date('2026-04-01'))
+        const endDate = moment(oldEndDate)
+        const junior = { name: 'Junior', id: '3230c68f-ef65-e611-80dc-c4346bad4004', proof: { type: 'No Proof' } }
+        const disabled = {
+          name: 'Disabled',
+          id: 'd1ece997-ef65-e611-80dc-c4346bad4004',
+          proof: { type: 'Blue Badge', referenceNumber: '123' }
+        }
+        const stillJuniorPermission = existingPermission({
+          endDate,
+          licensee: {
+            ...existingPermission().licensee,
+            birthDate
+          },
+          concessions: [disabled]
+        })
+
+        const ppd = await preparePermissionDataForRenewal(stillJuniorPermission)
+        expect(ppd.concessions).toEqual([disabled, junior])
+        jest.useRealTimers()
+      })
+    })
+
+    describe.each`
+      description                                                                                                      | birthDate       | oldEndDate
+      ${'the user is renewing at age 16 with a licence that will expire on their 17th birthday'}                       | ${'2009-04-10'} | ${'2026-04-10'}
+      ${'the user is renewing at age 16 with a licence that will expire the day after their 17th birthday'}            | ${'2009-04-10'} | ${'2026-04-11'}
+      ${'the user is renewing on the day of their 17th birthday a licence that expired yesterday'}                     | ${'2009-04-01'} | ${'2026-03-31'}
+      ${'the user is renewing on the day of their 17th birthday a licence that expires today'}                         | ${'2009-04-01'} | ${'2026-04-01'}
+      ${'the user is renewing on the day of their 17th birthday with a licence that expired a week ago'}               | ${'2009-04-01'} | ${'2026-03-25'}
+      ${'the user is renewing the day after their 17th birthday a licence that expired the day before their birthday'} | ${'2009-03-31'} | ${'2026-03-30'}
+      ${'the user is renewing the day after their 17th birthday a licence that expired on their birthday'}             | ${'2009-03-31'} | ${'2026-03-31'}
+      ${'the user is renewing the day after their 17th birthday a licence that expires today'}                         | ${'2009-03-31'} | ${'2026-04-01'}
+      ${'the user is renewing the day after their 17th birthday with a licence that expired a week ago'}               | ${'2009-03-31'} | ${'2026-03-25'}
+    `('expected junior licenses', ({ description, birthDate, oldEndDate }) => {
+      it(`should remove junior concession if ${description}`, async () => {
+        jest.useFakeTimers().setSystemTime(new Date('2026-04-01'))
+        const endDate = moment(oldEndDate)
+        const junior = { name: 'Junior', id: '3230c68f-ef65-e611-80dc-c4346bad4004', proof: { type: 'No Proof' } }
+        const nowAdultPermission = existingPermission({
+          endDate,
+          licensee: {
+            ...existingPermission().licensee,
+            birthDate
+          },
+          concessions: [junior]
+        })
+
+        const ppd = await preparePermissionDataForRenewal(nowAdultPermission)
+        expect(ppd.concessions).toEqual([])
+        jest.useRealTimers()
+      })
+
+      it(`should keep disabled concession and not add junior concession if ${description}`, async () => {
+        jest.useFakeTimers().setSystemTime(new Date('2026-04-01'))
+        const endDate = moment(oldEndDate)
+        const disabled = {
+          name: 'Disabled',
+          id: 'd1ece997-ef65-e611-80dc-c4346bad4004',
+          proof: { type: 'Blue Badge', referenceNumber: '123' }
+        }
+        const nowAdultPermission = existingPermission({
+          endDate,
+          licensee: {
+            ...existingPermission().licensee,
+            birthDate
+          },
+          concessions: [disabled]
+        })
+
+        const ppd = await preparePermissionDataForRenewal(nowAdultPermission)
+        expect(ppd.concessions).toEqual([disabled])
+        jest.useRealTimers()
+      })
+    })
   })
 
   describe('preparePermit', () => {

package/src/services/renewals/renewals.service.js

@@ -1,6 +1,6 @@
-import { isSenior, SERVICE_LOCAL_TIME } from '@defra-fish/business-rules-lib'
+import { isJunior, isSenior, SERVICE_LOCAL_TIME } from '@defra-fish/business-rules-lib'
 import moment from 'moment-timezone'
-import { addSenior } from '../concession.service.js'
+import { addJunior, addSenior, removeJunior, removeSenior } from '../concession.service.js'
 import { findPermit } from '../permit.service.js'
 
 // Replicated from GAFL - need to decide whether to move
@@ -101,6 +101,11 @@ const prepareConcessionsData = async (existingPermission, dateData) => {
 
   if (isSenior(ageAtLicenceStartDate)) {
     await addSenior(existingPermission)
+  } else if (isJunior(ageAtLicenceStartDate)) {
+    await addJunior(existingPermission)
+  } else {
+    await removeJunior(existingPermission)
+    await removeSenior(existingPermission)
   }
 
   return existingPermission.concessions