Update builds to use generated spec file

Author: nhsd-david-wass

package.json

@@ -45,17 +45,17 @@
     "react": "^19.0.0"
   },
   "scripts": {
-    "build": "npm run generate --buildver=$npm_config_buildver",
+    "build": "npm run bundle-oas && npm run generate --buildver=$npm_config_buildver",
     "bundle-oas": "mkdir -p build && redocly bundle specification/api/notify-supplier-phase1.yml --dereferenced --remove-unused-components --ext yml > build/notify-supplier.yml",
     "generate": "npm run generate:cs --buildver=$npm_config_buildver && npm run generate:html && npm run generate:ts --buildver=$npm_config_buildver && npm run generate:python",
     "generate-dependencies": "npm run generate-dependencies --workspaces --if-present",
     "generate:cs": "./sdk/generate-cs.sh $npm_config_buildver",
     "generate:cs-server": "./server/generate-cs-server.sh $npm_config_buildver",
-    "generate:html": "docker run --rm --user $(id -u) -v ${PWD}:/local openapitools/openapi-generator-cli generate -i /local/specification/api/notify-supplier.yml -g html -o /local/sdk/html --skip-validate-spec",
-    "generate:python": "docker run --rm --user $(id -u) -v ${PWD}:/local openapitools/openapi-generator-cli generate -i /local/specification/api/notify-supplier.yml -g python -o /local/sdk/python --skip-validate-spec",
+    "generate:html": "docker run --rm --user $(id -u) -v ${PWD}:/local openapitools/openapi-generator-cli generate -i /local/build/notify-supplier.yml -g html -o /local/sdk/html --skip-validate-spec",
+    "generate:python": "docker run --rm --user $(id -u) -v ${PWD}:/local openapitools/openapi-generator-cli generate -i /local/build/notify-supplier.yml -g python -o /local/sdk/python --skip-validate-spec",
     "generate:ts": "./sdk/generate-ts.sh $npm_config_buildver",
     "lint": "npm run lint --workspaces",
-    "lint-oas": "redocly lint specification/api/notify-supplier.yml",
+    "lint-oas": "redocly lint specification/api/notify-supplier-phase1.yml",
     "lint:fix": "npm run lint:fix --workspaces",
     "publish-oas": "mkdir -p build && redocly bundle specification/api/notify-supplier-phase1.yml --dereferenced --remove-unused-components --ext json > build/notify-supplier.json",
     "serve": "npm run serve-html-docs",

sdk/_config.version.yml

@@ -1 +1 @@
-version: 0.2.0-20250709.100804+10788f5
+version: 0.2.0-20250724.105025+579bd65

sdk/generate-cs.sh

@@ -12,7 +12,7 @@ generate () {
   -e VERSION="$SHORT_VERSION" \
   openapitools/openapi-generator-cli \
   generate \
-  -i /local/specification/api/notify-supplier.yml \
+  -i /local/build/notify-supplier.yml \
   -g csharp \
   --additional-properties="packageName=nhsnotifysupplier,packageVersion=$SHORT_VERSION,licenseId=MIT,targetFramework=net8.0" \
   -o /local/sdk/csharp \

sdk/generate-ts.sh

@@ -12,7 +12,7 @@ docker run \
  -e VERSION="$VERSION" \
  openapitools/openapi-generator-cli \
  generate \
- -i /local/specification/api/notify-supplier.yml \
+ -i /local/build/notify-supplier.yml \
  -g typescript \
  --additional-properties="npmRepository=https://npm.pkg.github.com,npmName=@NHSDigital/nhsnotifysupplier,npmVersion=$VERSION,licenseName=MIT" \
  -o /local/sdk/typescript \

sdk/swagger-static.sh

@@ -9,6 +9,6 @@ unzip swagger.zip "swagger-ui-$VERSION/dist/*" -d swagger
 mv swagger/swagger-ui-$VERSION/dist/* swagger
 rm -r swagger/swagger-ui-$VERSION
 cp swagger-initializer.js swagger/swagger-initializer.js
-cp ../specification/api/notify-supplier.yml swagger/swagger.json
+cp ../specification/api/notify-supplier-phase1.yml swagger/swagger.json
 cp ../specification/api/notify-supplier-next.yml swagger/swagger-vnext.json
 rm swagger.zip

server/Makefile

@@ -3,7 +3,7 @@ VERSION ?= ""
 SHELL = /bin/bash
 
 build: version # Build the project artefact @Pipeline
-	VER=$$(cat .version) && ./generate-cs-server.sh $$VER
+	VER=$$(cat .version) && npm run bundle-oas && ./generate-cs-server.sh $$VER
 
 clean: # Clean-up project resources (main) @Operations
 	rm -rf */

server/_config.version.yml

@@ -1 +1 @@
-version: 0.2.0-20250709.100758+10788f5
+version: 0.2.0-20250724.124925+dcf6731

server/generate-cs-server.sh

@@ -12,7 +12,7 @@ generate (){
   -v ${PWD}/../:/local \
   openapitools/openapi-generator-cli \
   generate \
-  -i /local/specification/api/notify-supplier.yml \
+  -i /local/build/notify-supplier.yml \
   -g aspnetcore \
   --additional-properties="aspnetCoreVersion=8.0,buildTarget=program,packageName=nhsnotifysupplierserver,packageVersion=$SHORT_VERSION,licenseId=MIT,targetFramework=net8.0" \
   -o /local/server/csharp-server \

src/server/_config.version.yml

@@ -1 +1 @@
-version: 0.2.0-20250709.093756+af49022
+version: 0.2.0-20250724.105048+579bd65