@defra-fish/sales-api-service 1.78.0-rc.1 → 1.78.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/sales-api-service",
-  "version": "1.78.0-rc.1",
+  "version": "1.78.0-rc.2",
   "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.78.0-rc.1",
-    "@defra-fish/connectors-lib": "1.78.0-rc.1",
-    "@defra-fish/dynamics-lib": "1.78.0-rc.1",
+    "@defra-fish/business-rules-lib": "1.78.0-rc.2",
+    "@defra-fish/connectors-lib": "1.78.0-rc.2",
+    "@defra-fish/dynamics-lib": "1.78.0-rc.2",
     "@hapi/boom": "9.1.2",
     "@hapi/hapi": "20.1.3",
     "@hapi/inert": "6.0.3",
@@ -53,5 +53,5 @@
     "moment-timezone": "0.5.34",
     "uuid": "8.3.2"
   },
-  "gitHead": "84c8c5803295d044cbb3c11ec3a1ee5e3b5a3aee"
+  "gitHead": "ccf5451df9750e8afcb2a3bd253bb90ec224105b"
 }

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

@@ -209,6 +209,20 @@ describe('permissions service', () => {
       const endDate = await calculateEndDate({ permitId: 'e11b34a0-0c66-e611-80dc-c4346bad0190', startDate })
       expect(endDate).toBe('2025-02-28T23:59:59.999Z')
     })
+
+    it.each([
+      ['2028-02-29T23:59:59.999Z', '2027-03-01'],
+      ['2029-02-28T23:59:59.999Z', '2028-03-01'],
+      ['2032-02-29T23:59:59.999Z', '2031-03-01'],
+      ['2033-02-28T23:59:59.999Z', '2032-03-01'],
+      ['2028-03-01T23:59:59.999Z', '2027-03-02']
+    ])('returns %s as the end date for a 12 month licence starting %s', async (expected, start) => {
+      const endDate = await calculateEndDate({
+        permitId: 'e11b34a0-0c66-e611-80dc-c4346bad0190',
+        startDate: moment(`${start}T00:00:00.000Z`)
+      })
+      expect(endDate).toBe(expected)
+    })
   })
 
   describe('sequence generator', () => {

package/src/services/permissions.service.js

@@ -50,7 +50,8 @@ export const generatePermissionNumber = async ({ permitId, startDate, licensee:
 }
 
 /**
- * Calculate the end date of a permission for a given permitId and start date
+ * Calculate the end date of a permission for a given permitId and start date.
+ * 12 month licences starting on 1st March end on the last day of February the following year, whether this is the 28th or 29th.
  * @param {string} permitId the permit ID to use when calculating the end date
  * @param {moment.Moment|string} startDate The start date to use when calculating the end date
  * @returns {Promise<moment.Moment>} The end date as a moment
@@ -59,7 +60,12 @@ export const calculateEndDateMoment = async ({ permitId, startDate }) => {
   const permit = await getReferenceDataForEntityAndId(Permit, permitId)
   const duration = moment.duration(`P${permit.durationMagnitude}${permit.durationDesignator.description}`)
   if (permit.durationMagnitude === 12 && permit.durationDesignator.description === 'M') {
-    return moment(startDate).tz(SERVICE_LOCAL_TIME).subtract(1, 'day').endOf('day').add(duration)
+    const localStart = moment(startDate).tz(SERVICE_LOCAL_TIME)
+    const endMoment = localStart.clone().subtract(1, 'day').endOf('day').add(duration)
+    if (localStart.month() === 2 && localStart.date() === 1) {
+      endMoment.endOf('month')
+    }
+    return endMoment
   }
   return moment(startDate).add(duration)
 }