@defra/grants-reporting-publisher 0.1.1 → 0.2.0

package/.github/workflows/release.yml

@@ -54,7 +54,7 @@ jobs:
 
       - name: Create Release Pull Request or Release
         id: changesets
-        uses: changesets/action@8488615a623b1b9c987934bb89eae8af6a946ac1 #v2.1.1
+        uses: changesets/action@ae32849d5ba541f9ae29e40e22a623bc13562f51 #v2.1.2
         with:
           publish-script: npm run github:release
           commit-message: 'Create new config version'

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @defra/grants-reporting-publisher
 
+## 0.2.0
+
+### Minor Changes
+
+- 4a25189: Allow options to be sent with a status change messgae
+
+## 0.1.2
+
+### Patch Changes
+
+- 62e9659: Make some option fields optional
+
 ## 0.1.1
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/grants-reporting-publisher",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "NPM module for publishing grants reporting events",
   "engines": {
     "node": ">=24",
@@ -48,14 +48,14 @@
     "@babel/preset-env": "8.0.2",
     "@changesets/changelog-github": "1.0.0",
     "@changesets/cli": "3.0.1",
-    "@vitest/coverage-v8": "4.1.10",
+    "@vitest/coverage-v8": "5.0.0",
     "eslint": "10.7.0",
     "eslint-config-prettier": "10.1.1",
     "husky": "9.1.7",
-    "lint-staged": "17.3.0",
+    "lint-staged": "17.4.1",
     "neostandard": "0.13.0",
     "prettier": "3.9.6",
-    "vitest": "4.1.10",
+    "vitest": "5.0.0",
     "vitest-fetch-mock": "0.4.5"
   },
   "overrides": {

package/src/publish.test.js

@@ -1,5 +1,5 @@
 import { publishReportingEvent } from "./publish.js";
-import { AGREEMENT_STATUS_CHANGED } from "./constants.js";
+import { AGREEMENT_CREATED, AGREEMENT_STATUS_CHANGED } from "./constants.js";
 
 const mockSend = vi.hoisted(() =>
   vi.fn().mockResolvedValue({ MessageId: "msg-001" }),
@@ -162,6 +162,38 @@ describe("publishAuditEvent", () => {
       await publishReportingEvent(validEvent, baseConfig);
       expect(mockSend).toHaveBeenCalledTimes(1);
     });
+
+    test("publishes AGREEMENT_CREATED event with minimal options", async () => {
+      const agreementCreatedEvent = {
+        correlationId: "abc-123",
+        datetime: "2025-12-01T12:51:41.381Z",
+        version: "1.0.0",
+        application: "FCP001",
+        service: "grants",
+        eventData: {
+          eventType: AGREEMENT_CREATED,
+          agreementId: "WMP123456789",
+          agreementType: "WOODLAND",
+          agreementStatus: "ACCEPTED",
+          sbi: "200000001",
+          options: [
+            {
+              parcelReference: "SD8545-9935",
+              optionCode: "WMP1",
+              optionQuantity: 15.75,
+              optionValue: 1575.0,
+            },
+          ],
+        },
+      };
+
+      const result = await publishReportingEvent(
+        agreementCreatedEvent,
+        baseConfig,
+      );
+      expect(result).toEqual({ messageId: "msg-001" });
+      expect(mockSend).toHaveBeenCalledTimes(1);
+    });
   });
 
   describe("event validation", () => {

package/src/schema.js

@@ -8,6 +8,19 @@ const accountId = Joi.alternatives()
   .try(Joi.string().max(MAX_50), Joi.number())
   .custom(String);
 
+const optionsSchema = Joi.array().items(
+  Joi.object({
+    parcelReference: Joi.string().allow("").required(),
+    parcelSizeUnderAgreement: Joi.number().optional(),
+    optionCode: Joi.string().required(),
+    optionYear: Joi.number().integer().optional(),
+    optionStartDate: Joi.date().iso().optional(),
+    optionEndDate: Joi.date().iso().optional(),
+    optionQuantity: Joi.number().required(),
+    optionValue: Joi.number().required(),
+  }),
+);
+
 export const eventSchema = Joi.object({
   correlationId: Joi.string().max(MAX_50).required(),
   datetime: Joi.date().iso().required(),
@@ -28,20 +41,7 @@ export const eventSchema = Joi.object({
         agreementEndDate: Joi.date().iso().optional(),
         agreementValue: Joi.number().optional(),
         sbi: accountId.required(),
-        options: Joi.array()
-          .items(
-            Joi.object({
-              parcelReference: Joi.string().allow("").required(),
-              parcelSizeUnderAgreement: Joi.number().optional(),
-              optionCode: Joi.string().required(),
-              optionYear: Joi.number().integer().optional(),
-              optionStartDate: Joi.date().iso().required(),
-              optionEndDate: Joi.date().iso().required(),
-              optionQuantity: Joi.number().required(),
-              optionValue: Joi.number().required(),
-            }),
-          )
-          .required(),
+        options: optionsSchema.required(),
       }),
     })
     .when(Joi.object({ eventType: AGREEMENT_STATUS_CHANGED }).unknown(), {
@@ -53,6 +53,7 @@ export const eventSchema = Joi.object({
         agreementEndDate: Joi.date().iso().optional(),
         agreementValue: Joi.number().optional(),
         userId: Joi.string().optional(),
+        options: optionsSchema.optional(),
       }),
     })
     .unknown()

package/src/validate.test.js

@@ -187,6 +187,28 @@ describe("validateReportingEvent", () => {
     });
 
     test("accepts Agreement created event with minimal options", () => {
+      const result = validateReportingEvent({
+        ...validBase,
+        eventData: {
+          eventType: AGREEMENT_CREATED,
+          agreementId: "WMP123456789",
+          agreementType: "WOODLAND",
+          agreementStatus: "ACCEPTED",
+          sbi: "200000001",
+          options: [
+            {
+              parcelReference: "SD8545-9935",
+              optionCode: "WMP1",
+              optionQuantity: 15.75,
+              optionValue: 1575.0,
+            },
+          ],
+        },
+      });
+      expect(result.valid).toBe(true);
+    });
+
+    test("accepts Agreement created event with option containing optionStartDate only", () => {
       const result = validateReportingEvent({
         ...validBase,
         eventData: {
@@ -200,6 +222,28 @@ describe("validateReportingEvent", () => {
               parcelReference: "SD8545-9935",
               optionCode: "WMP1",
               optionStartDate: "2026-09-01",
+              optionQuantity: 15.75,
+              optionValue: 1575.0,
+            },
+          ],
+        },
+      });
+      expect(result.valid).toBe(true);
+    });
+
+    test("accepts Agreement created event with option containing optionEndDate only", () => {
+      const result = validateReportingEvent({
+        ...validBase,
+        eventData: {
+          eventType: AGREEMENT_CREATED,
+          agreementId: "WMP123456789",
+          agreementType: "WOODLAND",
+          agreementStatus: "ACCEPTED",
+          sbi: "200000001",
+          options: [
+            {
+              parcelReference: "SD8545-9935",
+              optionCode: "WMP1",
               optionEndDate: "2029-08-31",
               optionQuantity: 15.75,
               optionValue: 1575.0,
@@ -210,6 +254,58 @@ describe("validateReportingEvent", () => {
       expect(result.valid).toBe(true);
     });
 
+    test("rejects Agreement created event if optionStartDate is not a valid date", () => {
+      const result = validateReportingEvent({
+        ...validBase,
+        eventData: {
+          eventType: AGREEMENT_CREATED,
+          agreementId: "WMP123456789",
+          agreementType: "WOODLAND",
+          agreementStatus: "ACCEPTED",
+          sbi: "200000001",
+          options: [
+            {
+              parcelReference: "SD8545-9935",
+              optionCode: "WMP1",
+              optionStartDate: "invalid-date",
+              optionQuantity: 15.75,
+              optionValue: 1575.0,
+            },
+          ],
+        },
+      });
+      expect(result.valid).toBe(false);
+      expect(result.errors).toContain(
+        '"eventData.options[0].optionStartDate" must be in ISO 8601 date format',
+      );
+    });
+
+    test("rejects Agreement created event if optionEndDate is not a valid date", () => {
+      const result = validateReportingEvent({
+        ...validBase,
+        eventData: {
+          eventType: AGREEMENT_CREATED,
+          agreementId: "WMP123456789",
+          agreementType: "WOODLAND",
+          agreementStatus: "ACCEPTED",
+          sbi: "200000001",
+          options: [
+            {
+              parcelReference: "SD8545-9935",
+              optionCode: "WMP1",
+              optionEndDate: "invalid-date",
+              optionQuantity: 15.75,
+              optionValue: 1575.0,
+            },
+          ],
+        },
+      });
+      expect(result.valid).toBe(false);
+      expect(result.errors).toContain(
+        '"eventData.options[0].optionEndDate" must be in ISO 8601 date format',
+      );
+    });
+
     test("rejects Agreement created event if required fields are missing", () => {
       const result = validateReportingEvent({
         ...validBase,
@@ -298,6 +394,49 @@ describe("validateReportingEvent", () => {
       expect(result.valid).toBe(true);
     });
 
+    test("accepts a valid Agreement status changed event with options", () => {
+      const result = validateReportingEvent({
+        ...validBase,
+        eventData: {
+          eventType: AGREEMENT_STATUS_CHANGED,
+          agreementId: "WMP123456789",
+          agreementStatus: "ACCEPTED",
+          statusDate: "2026-09-02T10:00:00Z",
+          options: [
+            {
+              parcelReference: "SD8545-9935",
+              optionCode: "WMP1",
+              optionQuantity: 15.75,
+              optionValue: 1575.0,
+            },
+          ],
+        },
+      });
+      expect(result.valid).toBe(true);
+    });
+
+    test("rejects Agreement status changed event if options contain invalid data", () => {
+      const result = validateReportingEvent({
+        ...validBase,
+        eventData: {
+          eventType: AGREEMENT_STATUS_CHANGED,
+          agreementId: "WMP123456789",
+          agreementStatus: "ACCEPTED",
+          statusDate: "2026-09-02T10:00:00Z",
+          options: [
+            {
+              parcelReference: "SD8545-9935",
+              // missing mandatory option fields like optionCode
+            },
+          ],
+        },
+      });
+      expect(result.valid).toBe(false);
+      expect(result.errors).toContain(
+        '"eventData.options[0].optionCode" is required',
+      );
+    });
+
     test("rejects Agreement status changed event if required fields are missing", () => {
       const result = validateReportingEvent({
         ...validBase,