Merge branch 'main' into feature/CCM-12185-addGetMiEndpoint

Author: RossFaulds171

.env.template

@@ -1,4 +1,5 @@
 # Your github Personal Access Token (PAT)
+PR_NUMBER=prxx # remove if needs to run against main
 GITHUB_TOKEN=
 
 # Apigee proxy name to be used for test execution

.github/workflows/manual-combine-dependabot-prs.yaml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: combine-prs
         id: combine-prs
-        uses: github/combine-prs@2909f404763c3177a456e052bdb7f2e85d3a7cb3 # v5.2.0
+        uses: NHSDigital/nhs-notify-shared-modules/.github/actions/combine-dependabot-prs@4.0.6
         with:
           ci_required: false
           labels: dependencies

.github/workflows/stage-3-build.yaml

@@ -189,7 +189,6 @@ jobs:
             --terraformAction "apply" \
             --overrideProjectName "nhs" \
             --overrideRoleName "nhs-main-acct-supplier-api-github-deploy"
-
   populate-config:
     name: "Populate Supplier Config"
     runs-on: ubuntu-latest

.gitignore

@@ -13,6 +13,7 @@ version.json
 # Please, add your custom content below!
 .idea
 .env
+.devcontainer/devcontainer-lock.json
 
 # dependencies
 node_modules

config/suppliers/letter-variant/client1-campaign2.json

@@ -32,7 +32,7 @@
     "client1-campaign2"
   ],
   "priority": 1,
-  "status": "INT",
+  "status": "PROD",
   "type": "STANDARD",
-  "volumeGroupId": "volumeGroup-test3"
+  "volumeGroupId": "volumeGroup-test4"
 }

config/suppliers/letter-variant/notify-first-test.json

@@ -0,0 +1,30 @@
+{
+  "constraints": {
+    "blackCoveragePercentage": {
+      "operator": "LESS_THAN",
+      "value": 20
+    },
+    "deliveryDays": {
+      "operator": "LESS_THAN",
+      "value": 2
+    },
+    "sheets": {
+      "operator": "LESS_THAN",
+      "value": 5
+    },
+    "sides": {
+      "operator": "LESS_THAN",
+      "value": 10
+    }
+  },
+  "description": "Black printing, first class postage tariff",
+  "id": "notify-first-test",
+  "name": "First class letter",
+  "packSpecificationIds": [
+    "notify-first-test"
+  ],
+  "priority": 10,
+  "status": "PROD",
+  "type": "STANDARD",
+  "volumeGroupId": "volumeGroup-test5"
+}

config/suppliers/letter-variant/notify-standard-test1.json

@@ -21,7 +21,8 @@
   "id": "notify-standard-test1",
   "name": "Dev Happy Path",
   "packSpecificationIds": [
-    "notify-c5"
+    "notify-c5",
+    "notify-c4"
   ],
   "priority": 50,
   "status": "PROD",

config/suppliers/pack-specification/client1-campaign2.json

@@ -49,7 +49,7 @@
     "maxWeightGrams": 100,
     "size": "STANDARD"
   },
-  "status": "INT",
+  "status": "PROD",
   "updatedAt": "2026-04-14T00:00:00.000Z",
   "version": 1
 }

config/suppliers/pack-specification/notify-first-test.json

@@ -0,0 +1,48 @@
+{
+  "assembly": {
+    "duplex": true,
+    "envelopeId": "first-c5",
+    "paper": {
+      "colour": "WHITE",
+      "id": "paper-std-white-80",
+      "name": "Standard White 80gsm",
+      "recycled": true,
+      "size": "A4",
+      "weightGSM": 80
+    },
+    "printColour": "BLACK"
+  },
+  "billingId": "notify-first-test",
+  "constraints": {
+    "blackCoveragePercentage": {
+      "operator": "LESS_THAN",
+      "value": 20
+    },
+    "deliveryDays": {
+      "operator": "LESS_THAN",
+      "value": 2
+    },
+    "sheets": {
+      "operator": "LESS_THAN",
+      "value": 5
+    },
+    "sides": {
+      "operator": "LESS_THAN",
+      "value": 10
+    }
+  },
+  "createdAt": "2026-01-12T00:00:00.000Z",
+  "description": "First class postage tariff",
+  "id": "notify-first-test",
+  "name": "First class",
+  "postage": {
+    "deliveryDays": 2,
+    "id": "first-class",
+    "maxThicknessMm": 5,
+    "maxWeightGrams": 100,
+    "size": "STANDARD"
+  },
+  "status": "PROD",
+  "updatedAt": "2026-01-12T00:00:00.000Z",
+  "version": 1
+}

config/suppliers/supplier-allocation/supplier1-volumeGroup-test3.json

@@ -1,5 +1,5 @@
 {
-  "allocationPercentage": 100,
+  "allocationPercentage": 50,
   "id": "supplier1-volumeGroup-test3",
   "status": "PROD",
   "supplier": "supplier1",