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

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@defra-fish/sales-api-service",
-  "version": "1.68.0",
+  "version": "1.69.0-rc.0",
   "description": "Rod Licensing Sales API",
   "type": "module",
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "keywords": [
     "rod",
@@ -35,9 +35,9 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@defra-fish/business-rules-lib": "1.68.0",
-    "@defra-fish/connectors-lib": "1.68.0",
-    "@defra-fish/dynamics-lib": "1.68.0",
+    "@defra-fish/business-rules-lib": "1.69.0-rc.0",
+    "@defra-fish/connectors-lib": "1.69.0-rc.0",
+    "@defra-fish/dynamics-lib": "1.69.0-rc.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": "06c0080280b167f83b426a645e187c819390de4b"
+  "gitHead": "e9eb67926528361d45ad630df84da2ad47723b97"
 }

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

@@ -58,40 +58,100 @@ describe('permissions service', () => {
   beforeEach(jest.clearAllMocks)
 
   describe('generatePermissionNumber', () => {
-    it('generates a permission number for adults', async () => {
-      const number = await generatePermissionNumber(
-        getSamplePermission({
-          permitId: MOCK_12MONTH_DISABLED_PERMIT.id,
-          birthDate: moment()
-            .subtract(JUNIOR_MAX_AGE + 1, 'years')
-            .format('YYYY-MM-DD')
-        }),
-        'Telesales'
-      )
-      const block1 = moment().subtract(1, 'day').add(1, 'year').endOf('day').format('HHDDMMYY')
-      const expected = new RegExp(`^${block1}-1TS3FFT-[A-Z0-9]{5}[0-9]$`)
-      expect(number).toMatch(expected)
+    describe('adult', () => {
+      it('generates a permission number for adults', async () => {
+        const number = await generatePermissionNumber(
+          getSamplePermission({
+            permitId: MOCK_12MONTH_DISABLED_PERMIT.id,
+            birthDate: moment()
+              .subtract(JUNIOR_MAX_AGE + 1, 'years')
+              .format('YYYY-MM-DD')
+          }),
+          'Telesales'
+        )
+        const block1 = moment().subtract(1, 'day').add(1, 'year').endOf('day').format('HHDDMMYY')
+        const expected = new RegExp(`^${block1}-1TS3FFT-[A-Z0-9]{5}[0-9]$`)
+        expect(number).toMatch(expected)
+      })
+
+      it('formats as F if startDate is on 17th birthday but issueDate is 1 week before', async () => {
+        const birthDate = moment().subtract(JUNIOR_MAX_AGE, 'years').format('YYYY-MM-DD')
+        const issueDate = moment(birthDate).add(JUNIOR_MAX_AGE, 'years').add(1, 'year').subtract(7, 'day').toISOString()
+        const startDate = moment(birthDate).add(JUNIOR_MAX_AGE, 'years').add(1, 'year').toISOString()
+        const number = await generatePermissionNumber(
+          {
+            ...getSamplePermission({
+              permitId: MOCK_12MONTH_SENIOR_PERMIT.id,
+              birthDate
+            }),
+            startDate,
+            issueDate
+          },
+          'Web Sales'
+        )
+        expect(number).toMatch(/-[A-Z0-9]{4}F/)
+      })
     })
 
-    it('generates a permission number for juniors', async () => {
-      const number = await generatePermissionNumber(
-        getSamplePermission({
-          birthDate: moment()
-            .subtract(JUNIOR_MAX_AGE - 1, 'years')
-            .format('YYYY-MM-DD')
-        }),
-        'Web Sales'
-      )
-      const block1 = moment().add(1, 'hour').startOf('hour').add(1, 'day').format('HHDDMMYY')
-      const expected = new RegExp(`^${block1}-2WC1JFT-[A-Z0-9]{5}[0-9]$`)
-      expect(number).toMatch(expected)
+    describe('senior', () => {
+      it('generates a permission number for seniors', async () => {
+        const number = await generatePermissionNumber(getSamplePermission(), 'Web Sales')
+        const block1 = moment().add(1, 'hour').startOf('hour').add(1, 'day').format('HHDDMMYY')
+        const expected = new RegExp(`^${block1}-2WC1SFT-[A-Z0-9]{5}[0-9]$`)
+        expect(number).toMatch(expected)
+      })
+
+      it('formats as S if startDate is on 66th birthday but issueDate is 1 week before', async () => {
+        const birthDate = moment().subtract(SENIOR_MIN_AGE, 'years').format('YYYY-MM-DD')
+        const issueDate = moment(birthDate).add(SENIOR_MIN_AGE, 'years').subtract(7, 'day').toISOString()
+        const startDate = moment(birthDate).add(SENIOR_MIN_AGE, 'years').toISOString()
+        const number = await generatePermissionNumber(
+          {
+            ...getSamplePermission({
+              permitId: MOCK_12MONTH_SENIOR_PERMIT.id,
+              birthDate
+            }),
+            startDate,
+            issueDate
+          },
+          'Web Sales'
+        )
+        expect(number).toMatch(/-[A-Z0-9]{4}S/)
+      })
     })
 
-    it('generates a permission number for seniors', async () => {
-      const number = await generatePermissionNumber(getSamplePermission(), 'Web Sales')
-      const block1 = moment().add(1, 'hour').startOf('hour').add(1, 'day').format('HHDDMMYY')
-      const expected = new RegExp(`^${block1}-2WC1SFT-[A-Z0-9]{5}[0-9]$`)
-      expect(number).toMatch(expected)
+    describe('junior', () => {
+      it('generates a permission number for juniors', async () => {
+        const number = await generatePermissionNumber(
+          getSamplePermission({
+            birthDate: moment()
+              .subtract(JUNIOR_MAX_AGE - 1, 'years')
+              .format('YYYY-MM-DD')
+          }),
+          'Web Sales'
+        )
+        const block1 = moment().add(1, 'hour').startOf('hour').add(1, 'day').format('HHDDMMYY')
+        const expected = new RegExp(`^${block1}-2WC1JFT-[A-Z0-9]{5}[0-9]$`)
+        expect(number).toMatch(expected)
+      })
+
+      it('formats as J if startDate is on 16th birthday but issueDate is 1 week before', async () => {
+        const birthDate = moment().subtract(JUNIOR_MAX_AGE, 'years').format('YYYY-MM-DD')
+        const startDate = moment(birthDate).add(JUNIOR_MAX_AGE, 'years').toISOString()
+        const issueDate = moment(startDate).subtract(7, 'day').toISOString()
+        const number = await generatePermissionNumber(
+          {
+            ...getSamplePermission({
+              permitId: MOCK_12MONTH_SENIOR_PERMIT.id,
+              birthDate
+            }),
+            startDate,
+            issueDate
+          },
+          'Web Sales'
+        )
+        expect(number).toMatch(/-[A-Z0-9]{4}J/)
+      })
     })
   })
 

package/src/services/permissions.service.js

@@ -16,7 +16,6 @@ const DICTIONARIES = [
  * Generate a new permission number
  *
  * @param permitId
- * @param issueDate
  * @param startDate
  * @param dataSource
  * @param firstName
@@ -24,10 +23,7 @@ const DICTIONARIES = [
  * @param birthDate
  * @returns {Promise<string>}
  */
-export const generatePermissionNumber = async (
-  { permitId, issueDate, startDate, licensee: { firstName, lastName, birthDate } },
-  dataSource
-) => {
+export const generatePermissionNumber = async ({ permitId, startDate, licensee: { firstName, lastName, birthDate } }, dataSource) => {
   const permit = await getReferenceDataForEntityAndId(Permit, permitId)
 
   const endDate = await calculateEndDateMoment({ permitId, startDate })
@@ -43,7 +39,7 @@ export const generatePermissionNumber = async (
 
   const durationInDays = moment.duration(`P${permit.durationMagnitude}${permit.durationDesignator.description}`).asDays()
   const duration = String(durationInDays).charAt(0)
-  const age = getAgeCategory(birthDate, issueDate)
+  const age = getAgeCategory(birthDate, startDate)
   const initials = (firstName.charAt(0) + lastName.charAt(0)).toUpperCase()
   const block2 = permit.numberOfRods + channel + type + duration + age + initials
 
@@ -82,18 +78,18 @@ const SENIOR_AGE = 66
 /**
  * Determine the appropriate age category code for use in a permission number
  * @param birthDate The birth date of the licensee
- * @param issueDate The date of issue of the permission
+ * @param startDate The start date of the permission
  * @returns {string} The appropriate category code (single digit string)
  */
-const getAgeCategory = (birthDate, issueDate) => {
+const getAgeCategory = (birthDate, startDate) => {
   const dob = moment(birthDate)
-  const issue = moment(issueDate)
+  const start = moment(startDate)
   const seventeenthBirthday = dob.clone().add(ADULT_AGE, 'years')
   const sixtysixthBirthday = dob.clone().add(SENIOR_AGE, 'years')
 
-  if (issue.isBefore(seventeenthBirthday)) {
+  if (start.isBefore(seventeenthBirthday)) {
     return 'J'
-  } else if (issue.isSameOrAfter(sixtysixthBirthday)) {
+  } else if (start.isSameOrAfter(sixtysixthBirthday)) {
     return 'S'
   } else {
     return 'F'