@defra-fish/sales-api-service 1.63.0-rc.13 → 1.63.0-rc.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/sales-api-service",
-  "version": "1.63.0-rc.13",
+  "version": "1.63.0-rc.15",
   "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.63.0-rc.13",
-    "@defra-fish/connectors-lib": "1.63.0-rc.13",
-    "@defra-fish/dynamics-lib": "1.63.0-rc.13",
+    "@defra-fish/business-rules-lib": "1.63.0-rc.15",
+    "@defra-fish/connectors-lib": "1.63.0-rc.15",
+    "@defra-fish/dynamics-lib": "1.63.0-rc.15",
     "@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": "d3579f75016512c92605e0f8824200d33a83f589"
+  "gitHead": "af32a7debc5f14203373c2a9e87ac2c63958a7f4"
 }

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

@@ -62,7 +62,9 @@ describe('permissions service', () => {
       const number = await generatePermissionNumber(
         getSamplePermission({
           permitId: MOCK_12MONTH_DISABLED_PERMIT.id,
-          birthDate: moment().subtract(JUNIOR_MAX_AGE, 'years').format('YYYY-MM-DD')
+          birthDate: moment()
+            .subtract(JUNIOR_MAX_AGE + 1, 'years')
+            .format('YYYY-MM-DD')
         }),
         'Telesales'
       )

package/src/services/__tests__/recurring-payments.service.spec.js

@@ -95,7 +95,6 @@ jest.mock('../../services/paymentjournals/payment-journals.service.js', () => ({
 }))
 
 jest.mock('@defra-fish/business-rules-lib', () => ({
-  ADVANCED_PURCHASE_MAX_DAYS: 30,
   PAYMENT_JOURNAL_STATUS_CODES: {
     InProgress: 'InProgressCode',
     Cancelled: 'CancelledCode',
@@ -455,6 +454,17 @@ describe('recurring payments service', () => {
         '2025-11-12T00:00:00.000Z',
         '3456'
       ],
+      [
+        'starts thirty-one days after issue date - next due on issue date plus one year',
+        '9o8u7yhui89u8i9oiu8i8u7yhu',
+        {
+          startDate: '2024-12-14T00:00:00.000Z',
+          issueDate: '2024-11-12T15:00:45.922Z',
+          endDate: '2025-12-13T23:59:59.999Z'
+        },
+        '2025-11-12T00:00:00.000Z',
+        '4321'
+      ],
       [
         "issued on 29th Feb '24, starts on 30th March '24 - next due on 28th Feb '25",
         'hy7u8ijhyu78jhyu8iu8hjiujn',
@@ -511,11 +521,11 @@ describe('recurring payments service', () => {
 
     it.each([
       [
-        'start date is thirty one days after issue date',
+        'start date equals issue date',
         {
-          startDate: '2024-12-14T00:00:00.000Z',
-          issueDate: '2024-11-12T15:00:45.922Z',
-          endDate: '2025-12-13T23:59:59.999Z'
+          startDate: '2024-11-11T00:00:00.000Z',
+          issueDate: '2024-11-11T00:00:00.000Z',
+          endDate: '2025-11-10T23:59:59.999Z'
         }
       ],
       [

package/src/services/permissions.service.js

@@ -1,5 +1,5 @@
 import { Permission, Permit } from '@defra-fish/dynamics-lib'
-import { isJunior, isSenior, SERVICE_LOCAL_TIME } from '@defra-fish/business-rules-lib'
+import { SERVICE_LOCAL_TIME } from '@defra-fish/business-rules-lib'
 import { getGlobalOptionSetValue, getReferenceDataForEntityAndId } from './reference-data.service.js'
 import { redis } from './ioredis.service.js'
 import moment from 'moment-timezone'
@@ -76,6 +76,9 @@ export const calculateEndDateMoment = async ({ permitId, startDate }) => {
  */
 export const calculateEndDate = async ({ permitId, startDate }) => (await calculateEndDateMoment({ permitId, startDate })).toISOString()
 
+const ADULT_AGE = 17
+const SENIOR_AGE = 66
+
 /**
  * Determine the appropriate age category code for use in a permission number
  * @param birthDate The birth date of the licensee
@@ -85,14 +88,16 @@ export const calculateEndDate = async ({ permitId, startDate }) => (await calcul
 const getAgeCategory = (birthDate, issueDate) => {
   const dob = moment(birthDate)
   const issue = moment(issueDate)
-  const diff = issue.diff(dob, 'years', true)
+  const seventeenthBirthday = dob.clone().add(ADULT_AGE, 'years')
+  const sixtysixthBirthday = dob.clone().add(SENIOR_AGE, 'years')
 
-  if (isJunior(diff)) {
+  if (issue.isBefore(seventeenthBirthday)) {
     return 'J'
-  } else if (isSenior(diff)) {
+  } else if (issue.isSameOrAfter(sixtysixthBirthday)) {
     return 'S'
+  } else {
+    return 'F'
   }
-  return 'F'
 }
 
 /**

package/src/services/recurring-payments.service.js

@@ -10,7 +10,7 @@ import {
 import { calculateEndDate, generatePermissionNumber } from './permissions.service.js'
 import { getObfuscatedDob } from './contacts.service.js'
 import { createHash } from 'node:crypto'
-import { ADVANCED_PURCHASE_MAX_DAYS, PAYMENT_JOURNAL_STATUS_CODES, PAYMENT_TYPE, TRANSACTION_SOURCE } from '@defra-fish/business-rules-lib'
+import { PAYMENT_JOURNAL_STATUS_CODES, PAYMENT_TYPE, TRANSACTION_SOURCE } from '@defra-fish/business-rules-lib'
 import { TRANSACTION_STAGING_TABLE, TRANSACTION_QUEUE } from '../config.js'
 import { TRANSACTION_STATUS } from '../services/transactions/constants.js'
 import { retrieveStagedTransaction } from '../services/transactions/retrieve-transaction.js'
@@ -26,7 +26,7 @@ export const getRecurringPayments = date => executeQuery(findDueRecurringPayment
 
 const getNextDueDate = (startDate, issueDate, endDate) => {
   const mStart = moment(startDate)
-  if (mStart.isAfter(moment(issueDate)) && mStart.isSameOrBefore(moment(issueDate).add(ADVANCED_PURCHASE_MAX_DAYS, 'days'), 'day')) {
+  if (mStart.isAfter(moment(issueDate))) {
     if (mStart.isSame(moment(issueDate), 'day')) {
       return moment(startDate).add(1, 'year').subtract(10, 'days').startOf('day').toISOString()
     }