@defra-fish/business-rules-lib 1.30.0 → 1.31.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/business-rules-lib",
-  "version": "1.30.0",
+  "version": "1.31.0-rc.0",
   "description": "Shared business rules for the rod licensing digital services",
   "type": "module",
   "engines": {
@@ -37,5 +37,5 @@
     "moment": "^2.29.1",
     "uuid": "^8.3.2"
   },
-  "gitHead": "f5dacdf20e2841487fa641de4eed2bae64e6c205"
+  "gitHead": "2400d2924cc92d60a00883fcdf4a6c9d398a81de"
 }

package/src/util/__tests__/ages.spec.js

@@ -1,23 +1,73 @@
-import { isMinor, isJunior, isSenior, MINOR_MAX_AGE, JUNIOR_MAX_AGE, SENIOR_MIN_AGE } from '../ages.js'
+import {
+  isMinor,
+  isJunior,
+  isSenior,
+  MINOR_MAX_AGE,
+  JUNIOR_MAX_AGE,
+  SENIOR_MIN_AGE,
+  NEW_SENIOR_MIN_AGE,
+  SENIOR_AGE_CHANGE_DATE
+} from '../ages.js'
+import moment from 'moment'
 
 describe('age determination', () => {
   describe('isMinor', () => {
-    it(`allows ages less than or equal to ${MINOR_MAX_AGE}`, async () => {
-      expect(isMinor(MINOR_MAX_AGE)).toBeTruthy()
+    it.each(Array.from({ length: MINOR_MAX_AGE }, (_v, index) => index + 1))('age of %d is a minor', age => {
+      expect(isMinor(age)).toBeTruthy()
+    })
+    it(`${MINOR_MAX_AGE + 1} is not a minor`, () => {
+      expect(isMinor(MINOR_MAX_AGE + 1)).toBeFalsy()
     })
   })
   describe('isJunior', () => {
-    it(`allows ages less than or equal to ${JUNIOR_MAX_AGE} but greater than ${MINOR_MAX_AGE}`, async () => {
-      expect(isJunior(JUNIOR_MAX_AGE)).toBeTruthy()
-      expect(isJunior(MINOR_MAX_AGE + 1)).toBeTruthy()
-      expect(isJunior(MINOR_MAX_AGE)).toBeFalsy()
+    it.each(Array.from({ length: JUNIOR_MAX_AGE - MINOR_MAX_AGE }, (_v, index) => MINOR_MAX_AGE + index + 1))(
+      'Age of %d is a Junior',
+      age => {
+        expect(isJunior(age)).toBeTruthy()
+      }
+    )
+    it.each([MINOR_MAX_AGE, JUNIOR_MAX_AGE + 1])('Age of %d is not a junior', age => {
+      expect(isJunior(age)).toBeFalsy()
     })
   })
 
   describe('isSenior', () => {
-    it(`allows ages greater than or equal to ${SENIOR_MIN_AGE}`, async () => {
-      expect(isSenior(SENIOR_MIN_AGE)).toBeTruthy()
+    it.each(Array.from({ length: 10 }, (_v, index) => SENIOR_MIN_AGE + index))('age of %d is a senior', age => {
+      expect(isSenior(age)).toBeTruthy()
+    })
+
+    it(`age of ${SENIOR_MIN_AGE - 1} is not a senior`, () => {
       expect(isSenior(SENIOR_MIN_AGE - 1)).toBeFalsy()
     })
+
+    it.each([moment(SENIOR_AGE_CHANGE_DATE).format('YYYY-MM-DD'), moment(SENIOR_AGE_CHANGE_DATE).add(1, 'day').format('YYYY-MM-DD')])(
+      `age of ${SENIOR_MIN_AGE} isn't a senior for permissions starting on %s`,
+      () => {
+        expect(isSenior(SENIOR_MIN_AGE, SENIOR_AGE_CHANGE_DATE)).toBeFalsy()
+      }
+    )
+
+    it.each([
+      moment(SENIOR_AGE_CHANGE_DATE).subtract(1, 'day').format('YYYY-MM-DD'),
+      moment(SENIOR_AGE_CHANGE_DATE).subtract(2, 'day').format('YYYY-MM-DD'),
+      moment(SENIOR_AGE_CHANGE_DATE).subtract(1, 'week').format('YYYY-MM-DD'),
+      moment(SENIOR_AGE_CHANGE_DATE).subtract(1, 'month').format('YYYY-MM-DD')
+    ])(`age of ${SENIOR_MIN_AGE} is senior for permissions starting on %s (before SENIOR_AGE_CHANGE_DATE)`, startDate => {
+      expect(isSenior(SENIOR_MIN_AGE, startDate)).toBeTruthy()
+    })
+
+    it.each`
+      age                        | startDate
+      ${NEW_SENIOR_MIN_AGE}      | ${moment(SENIOR_AGE_CHANGE_DATE).format('YYYY-MM-DD')}
+      ${NEW_SENIOR_MIN_AGE}      | ${moment(SENIOR_AGE_CHANGE_DATE).add(1, 'day').format('YYYY-MM-DD')}
+      ${NEW_SENIOR_MIN_AGE}      | ${moment(SENIOR_AGE_CHANGE_DATE).add(1, 'week').format('YYYY-MM-DD')}
+      ${NEW_SENIOR_MIN_AGE}      | ${moment(SENIOR_AGE_CHANGE_DATE).add(1, 'month').format('YYYY-MM-DD')}
+      ${NEW_SENIOR_MIN_AGE + 1}  | ${moment(SENIOR_AGE_CHANGE_DATE).format('YYYY-MM-DD')}
+      ${NEW_SENIOR_MIN_AGE + 5}  | ${moment(SENIOR_AGE_CHANGE_DATE).add(1, 'day').format('YYYY-MM-DD')}
+      ${NEW_SENIOR_MIN_AGE + 10} | ${moment(SENIOR_AGE_CHANGE_DATE).add(1, 'week').format('YYYY-MM-DD')}
+      ${NEW_SENIOR_MIN_AGE + 15} | ${moment(SENIOR_AGE_CHANGE_DATE).add(1, 'month').format('YYYY-MM-DD')}
+    `('age of $age is senior for permissions starting on $startDate (on or after SENIOR_AGE_CHANGE_DATE)', ({ age, startDate }) => {
+      expect(isSenior(age, startDate)).toBeTruthy()
+    })
   })
 })

package/src/util/ages.js

@@ -1,9 +1,14 @@
+import moment from 'moment'
+
 /** The maximum age at which an angler is considered to be a minor (free licence) */
 export const MINOR_MAX_AGE = 12
 /** The maximum age at which an angler is entitled to a junior concession */
 export const JUNIOR_MAX_AGE = 16
 /** The minimum age at which an angler becomes entitled to a senior concession */
 export const SENIOR_MIN_AGE = 65
+export const NEW_SENIOR_MIN_AGE = 66
+export const SENIOR_AGE_CHANGE_DATE = '2023-04-01'
+const changeoverMoment = moment(SENIOR_AGE_CHANGE_DATE)
 
 /**
  * Determine if the provided age is classified as a minor
@@ -22,6 +27,10 @@ export const isJunior = age => age > MINOR_MAX_AGE && age <= JUNIOR_MAX_AGE
 /**
  * Determine if the provided age is classified as a senior
  * @param {number} age The age to be tested
+ * @param {string} permissionStartDate in format YYYY-MM-DD
  * @returns {boolean} true if the given age should be classified as a senior
  */
-export const isSenior = age => age >= SENIOR_MIN_AGE
+export const isSenior = (age, permissionStartDate) => {
+  const permissionStartsAfterChangeover = changeoverMoment.isSameOrBefore(permissionStartDate)
+  return permissionStartsAfterChangeover ? age >= NEW_SENIOR_MIN_AGE : age >= SENIOR_MIN_AGE
+}