@defra-fish/business-rules-lib 1.33.0-rc.8 → 1.33.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/business-rules-lib",
-  "version": "1.33.0-rc.8",
+  "version": "1.33.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": "432443fdf2c5f267038d4547cf8659b28bf7e9bf"
+  "gitHead": "4d9f66bbf6842bcfa09be77e591460bedf2ba7ec"
 }

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

@@ -1,14 +1,4 @@
-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'
+import { isMinor, isJunior, isSenior, MINOR_MAX_AGE, JUNIOR_MAX_AGE, SENIOR_MIN_AGE } from '../ages.js'
 
 describe('age determination', () => {
   describe('isMinor', () => {
@@ -39,35 +29,5 @@ describe('age determination', () => {
     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/__tests__/permissions.spec.js

@@ -12,4 +12,20 @@ describe('permissions helper', () => {
     const cost = getPermissionCost(permission)
     expect(cost).toBe(expectedCost)
   })
+
+  it('returns new cost if no start date provided and current date / time is after new cost start date', () => {
+    jest.useFakeTimers()
+    jest.setSystemTime(new Date('2023-04-02T00:00:00.000Z'))
+    const permission = { permit: { cost: 10, newCost: 20, newCostStartDate: '2023-04-01T00:00:00.000' } }
+    const cost = getPermissionCost(permission)
+    expect(cost).toBe(permission.permit.newCost)
+  })
+
+  it('returns old cost if no start date provided and current date / time is before new cost start date', () => {
+    jest.useFakeTimers()
+    jest.setSystemTime(new Date('2023-03-31T00:00:00.000Z'))
+    const permission = { permit: { cost: 10, newCost: 20, newCostStartDate: '2023-04-01T00:00:00.000' } }
+    const cost = getPermissionCost(permission)
+    expect(cost).toBe(permission.permit.cost)
+  })
 })

package/src/util/ages.js

@@ -1,14 +1,9 @@
-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-01T00:00:00.000+01:00'
-const changeoverMoment = moment(SENIOR_AGE_CHANGE_DATE)
+export const SENIOR_MIN_AGE = 66
 
 /**
  * Determine if the provided age is classified as a minor
@@ -27,10 +22,6 @@ 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, permissionStartDate) => {
-  const permissionStartsAfterChangeover = changeoverMoment.isSameOrBefore(permissionStartDate)
-  return permissionStartsAfterChangeover ? age >= NEW_SENIOR_MIN_AGE : age >= SENIOR_MIN_AGE
-}
+export const isSenior = age => age >= SENIOR_MIN_AGE

package/src/util/permissions.js

@@ -1,5 +1,6 @@
 export const getPermissionCost = permission => {
-  if (Date.parse(permission.startDate) >= Date.parse(permission.permit.newCostStartDate)) {
+  const permissionStartDate = permission.startDate || new Date().toISOString()
+  if (Date.parse(permissionStartDate) >= Date.parse(permission.permit.newCostStartDate)) {
     return permission.permit.newCost
   }
   return permission.permit.cost