@defra-fish/sales-api-service 1.62.0-rc.2 → 1.62.0-rc.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/sales-api-service",
-  "version": "1.62.0-rc.2",
+  "version": "1.62.0-rc.4",
   "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.62.0-rc.2",
-    "@defra-fish/connectors-lib": "1.62.0-rc.2",
-    "@defra-fish/dynamics-lib": "1.62.0-rc.2",
+    "@defra-fish/business-rules-lib": "1.62.0-rc.4",
+    "@defra-fish/connectors-lib": "1.62.0-rc.4",
+    "@defra-fish/dynamics-lib": "1.62.0-rc.4",
     "@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": "6a3a2c6a81067424144382557214c49c27559cdf"
+  "gitHead": "ffb61b6f55dc319cc1afbe57f8787deeb27f1dee"
 }

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

@@ -5,9 +5,9 @@ Object {
   "agreementId": "435678",
   "cancelledDate": null,
   "cancelledReason": null,
-  "endDate": 2023-11-12T00:00:00.000Z,
-  "name": "Test Name",
-  "nextDueDate": 2023-11-02T00:00:00.000Z,
+  "endDate": "2023-11-12T00:00:00.000Z",
+  "name": "Fester Tester 2023",
+  "nextDueDate": "2023-11-02T00:00:00.000Z",
   "publicId": "abcdef99987",
   "status": 0,
 }

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

@@ -227,7 +227,14 @@ const getMockResponse = () => ({
 })
 
 describe('recurring payments service', () => {
-  const createSimpleSampleTransactionRecord = () => ({ payment: { recurring: true }, permissions: [{}] })
+  const createSimpleSampleTransactionRecord = () => ({
+    payment: {
+      recurring: {
+        nextDueDate: '2025-01-01T00:00:00.000Z'
+      }
+    },
+    permissions: [{}]
+  })
   const createSamplePermission = overrides => {
     const p = new Permission()
     p.referenceNumber = 'ABC123'
@@ -284,11 +291,10 @@ describe('recurring payments service', () => {
       const transactionRecord = {
         payment: {
           recurring: {
-            name: 'Test Name',
-            nextDueDate: new Date('2023-11-02'),
+            nextDueDate: '2023-11-02T00:00:00.000Z',
             cancelledDate: null,
             cancelledReason: null,
-            endDate: new Date('2023-11-12'),
+            endDate: '2023-11-12T00:00:00.000Z',
             agreementId: '435678',
             status: 0
           }
@@ -300,6 +306,19 @@ describe('recurring payments service', () => {
       expect(result.recurringPayment).toMatchSnapshot()
     })
 
+    it('should set a valid name on the recurringPayment', async () => {
+      const transactionRecord = {
+        payment: {
+          recurring: {
+            nextDueDate: '2023-07-07T00:00:00.000Z'
+          }
+        },
+        permissions: [getMockPermission()]
+      }
+      const result = await processRecurringPayment(transactionRecord, getMockContact())
+      expect(result.recurringPayment.name).toBe('Fester Tester 2023')
+    })
+
     it.each(['abc-123', 'def-987'])('generates a publicId %s for the recurring payment', async samplePublicId => {
       createHash.mockReturnValue({
         update: () => {},

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

@@ -65,7 +65,7 @@ export const processRecurringPayment = async (transactionRecord, contact) => {
   if (transactionRecord.payment?.recurring) {
     const recurringPayment = new RecurringPayment()
     hash.update(recurringPayment.uniqueContentId)
-    recurringPayment.name = transactionRecord.payment.recurring.name
+    recurringPayment.name = determineRecurringPaymentName(transactionRecord, contact)
     recurringPayment.nextDueDate = transactionRecord.payment.recurring.nextDueDate
     recurringPayment.cancelledDate = transactionRecord.payment.recurring.cancelledDate
     recurringPayment.cancelledReason = transactionRecord.payment.recurring.cancelledReason
@@ -148,3 +148,8 @@ export const cancelRecurringPayment = async id => {
     console.log('No matches found for cancellation')
   }
 }
+
+const determineRecurringPaymentName = (transactionRecord, contact) => {
+  const [dueYear] = transactionRecord.payment.recurring.nextDueDate.split('-')
+  return [contact.firstName, contact.lastName, dueYear].join(' ')
+}