CCM-15633: Updated scripts following review

Author: gareth-allan

scripts/publish-pact-contracts.sh

@@ -5,20 +5,27 @@ published_version=$(npm view @nhsdigital/notify-digital-letters-consumer-contrac
 
 set -euo pipefail
 
+cd "$(git rev-parse --show-toplevel)"
+
 # Fail if there are uncommitted changes as this indicates unexpected changes to the contracts
 git diff --quiet tests/pact-tests
 
-local_version=$(cat pact-contracts/package.json | jq -r '.version')
-
-if [[ ! $BRANCH_NAME == "main" ]]; then
+branch_name=${BRANCH_NAME:-$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")}
+if [[ "$branch_name" != "main" ]]; then
     echo "Not publishing package because this is not the main branch"
     exit 0
 fi
 
+local_version=$(cat pact-contracts/package.json | jq -r '.version')
 if [[ $local_version == $published_version ]]; then
     echo "Local version is the same as the latest published version - skipping publish"
     exit 0
 fi
 
+if ! ls pact-contracts/pacts/**/*.json >/dev/null 2>&1; then
+    echo "Cannot publish package: no pact .json files found under pact-contracts/pacts"
+    exit 1
+fi
+
 echo "Local version is different to the latest published version - publishing new version"
 npm publish ./pact-contracts

scripts/tests/contract.sh

@@ -2,13 +2,26 @@
 
 set -euo pipefail
 
+schema_package="@nhsdigital/nhs-notify-event-schemas-status-published"
+
 cd "$(git rev-parse --show-toplevel)"
 
-if [[ $(npm outdated @nhsdigital/nhs-notify-event-schemas-status-published) ]]; then
-    echo "The provider schema package (@nhsdigital/nhs-notify-event-schemas-status-published) is outdated."
-    echo "Please run \`npm update @nhsdigital/nhs-notify-event-schemas-status-published\` to update to the latest version and re-run."
+if npm outdated "$schema_package" >/dev/null 2>&1; then
+    outdated_status=0
+else
+    outdated_status=$?
+fi
+
+if [[ $outdated_status -eq 1 ]]; then
+    echo "The provider schema package ($schema_package) is outdated."
+    echo "Please run npm update $schema_package to update to the latest version and re-run."
     echo
     exit 1
 fi
 
+if [[ $outdated_status -gt 1 ]]; then
+    echo "Failed to check provider schema package version (npm outdated exited with status $outdated_status)."
+    exit $outdated_status
+fi
+
 npm run test:contract