Merge branch 'main' into task/FTRS-1623-fix-address-multiline-and-not-available

Author: sylwialuczakNHS

.github/actions/deploy-to-apim/action.yaml

@@ -6,13 +6,13 @@ inputs:
     description: 'Name of the API to deploy'
     required: true
   workspace:
-    description: 'Workspace identifier (e.g., FTRS-000)'
-    required: true
+    description: 'Workspace identifier (e.g., FTRS-000). If specified, a workspaced proxy will be deployed into the APIM environment'
+    required: false
   environment:
-    description: 'FTRS environment to deploy to (e.g., dev, test, prod)'
+    description: ' The environment our target backend is deployed to. (e.g., dev, test, prod)'
     required: true
   apim_env:
-    description: 'APIM environment to deploy the API Proxy into (e.g., internal-dev)'
+    description: 'APIM environment to deploy the API Proxy into (e.g., internal-dev, internal-qa, int, ref, prod)'
     required: true
   access_token:
     description: 'Access Token for the Proxygen API'
@@ -42,19 +42,26 @@ runs:
       if: ${{ !contains(inputs.apim_env, 'sandbox') }}
       shell: bash
       run: |
-        if [[ ! "${{ inputs.workspace }}" =~ ^ftrs-[0-9]+$ ]]; then
+        # Skip validation if workspace is not provided or is 'default' (e.g., for int environment)
+        if [ -z "${{ inputs.workspace }}" ] || [ "${{ inputs.workspace }}" == "default" ]; then
+          echo "No workspace provided or default workspace - skipping validation (environment: ${{ inputs.environment }})"
+        elif [[ ! "${{ inputs.workspace }}" =~ ^ftrs-[0-9]+$ ]]; then
           echo "Error: Workspace must be in format ftrs-#### (e.g., ftrs-1234, ftrs-001, ftrs-99999)"
           exit 1
+        else
+          echo "Workspace format validated: ${{ inputs.workspace }}"
         fi
-        echo "Workspace format validated: ${{ inputs.workspace }}"
 
     - name: Modify OAS Specification
       if: ${{ !contains(inputs.apim_env, 'sandbox') }}
       id: modify-spec
       shell: bash
       run: |
         export API_NAME="${{ inputs.api_name }}"
-        export WORKSPACE="${{ inputs.workspace }}"
+        # Only set WORKSPACE if it's not empty and not 'default'
+        if [ -n "${{ inputs.workspace }}" ] && [ "${{ inputs.workspace }}" != "default" ]; then
+          export WORKSPACE="${{ inputs.workspace }}"
+        fi
         export PROXY_ENV="${{ inputs.apim_env }}"
 
         chmod +x ./scripts/workflow/modify-oas-spec.sh
@@ -94,7 +101,10 @@ runs:
       shell: bash
       run: |
         export API_NAME="${{ inputs.api_name }}"
-        export WORKSPACE="${{ inputs.workspace }}"
+        # Only set WORKSPACE if it's not empty and not 'default'
+        if [ -n "${{ inputs.workspace }}" ] && [ "${{ inputs.workspace }}" != "default" ]; then
+          export WORKSPACE="${{ inputs.workspace }}"
+        fi
         export PROXY_ENV="${{ inputs.apim_env }}"
         export ACCESS_TOKEN="${{ inputs.access_token }}"
         export PROXYGEN_URL="${{ inputs.proxygen_url }}"

.github/workflows/authenticate-and-deploy-to-apim.yaml

@@ -12,15 +12,15 @@ on:
         required: true
         type: string
       workspace:
-        description: 'Workspace identifier (e.g., FTRS-000)'
-        required: true
+        description: 'Workspace identifier (e.g., FTRS-000). Deploys a workspaced proxy into the APIM environment if specified.'
+        required: false
         type: string
       api_name:
         description: 'API name to deploy'
         required: true
         type: string
       apim_env:
-        description: 'APIM environment to deploy to (e.g., internal-dev)'
+        description: 'APIM environment to deploy to (e.g., internal-dev, internal-qa, int, ref, prod)'
         required: true
         type: string
     secrets:

.github/workflows/pipeline-deploy-application.yaml

@@ -133,8 +133,7 @@ jobs:
     secrets: inherit
 
   deploy-proxy-to-apim:
-    name: "Authenticate and Deploy ${{ matrix.api_name }} API to Proxygen in ${{ needs.metadata.outputs.environment }}"
-    if: needs.metadata.outputs.environment == 'dev' && github.ref != 'refs/heads/main' # TODO: Update condition once further environment work is complete
+    name: "Deploy ${{ matrix.api_name }} API to Proxygen"
     needs:
       - metadata
       - deploy-application-infrastructure
@@ -148,7 +147,7 @@ jobs:
       environment: ${{ needs.metadata.outputs.environment }}
       workspace: ${{ needs.metadata.outputs.workspace }}
       api_name: ${{ matrix.api_name }}
-      apim_env: "internal-dev"
+      apim_env: ${{ needs.metadata.outputs.environment == 'dev' && 'internal-dev' || needs.metadata.outputs.environment == 'test' && 'internal-qa' || needs.metadata.outputs.environment }}
     secrets:
       ACCOUNT_ID: ${{ secrets.ACCOUNT_ID }}
       AWS_REGION: ${{ vars.AWS_REGION }}

application/packages/python/ftrs_common/fhir/operation_outcome.py

@@ -1,6 +1,21 @@
 from fhir.resources.R4B.operationoutcome import OperationOutcome, OperationOutcomeIssue
 from pydantic import ValidationError
 
+OPERATION_OUTCOME_SYSTEM = "http://terminology.hl7.org/CodeSystem/operation-outcome"
+
+FHIR_OPERATION_OUTCOME_CODES: dict[str, tuple[str, str]] = {
+    "invalid": ("MSG_PARAM_INVALID", "Parameter content is invalid"),
+    "not-found": ("MSG_NO_EXIST", "Resource does not exist"),
+    "exception": ("MSG_ERROR_PARSING", "Error processing request"),
+    "structure": ("MSG_BAD_SYNTAX", "Bad Syntax"),
+    "required": ("MSG_RESOURCE_REQUIRED", "A resource is required"),
+    "value": ("MSG_PARAM_INVALID", "Parameter content is invalid"),
+    "processing": ("MSG_ERROR_PARSING", "Error processing request"),
+    "duplicate": ("MSG_DUPLICATE_ID", "Duplicate Id for resource"),
+    "informational": ("MSG_UPDATED", "Existing resource updated"),
+    "success": ("MSG_UPDATED", "Existing resource updated"),
+}
+
 
 class OperationOutcomeException(Exception):
     def __init__(self, outcome: dict) -> None:
@@ -18,21 +33,47 @@ class OperationOutcomeHandler:
     """
 
     @staticmethod
-    def build(
+    def _build_details(code: str, text: str) -> dict:
+        fhir_code, display = FHIR_OPERATION_OUTCOME_CODES.get(
+            code, ("MSG_ERROR_PARSING", "Error processing request")
+        )
+        return {
+            "coding": [
+                {
+                    "system": OPERATION_OUTCOME_SYSTEM,
+                    "code": fhir_code,
+                    "display": display,
+                }
+            ],
+            "text": text,
+        }
+
+    @staticmethod
+    def build(  # noqa: PLR0913
         diagnostics: str,
         code: str = "invalid",
         severity: str = "error",
+        details_text: str | None = None,
         details: dict | None = None,
+        expression: list[str] | None = None,
         issues: list | None = None,
     ) -> dict:
         if issues is None:
-            issue_dict = {
+            if details is None:
+                details = OperationOutcomeHandler._build_details(
+                    code, details_text or diagnostics
+                )
+
+            issue_dict: dict = {
                 "severity": severity,
                 "code": code,
+                "details": details,
                 "diagnostics": diagnostics,
             }
-            if details:
-                issue_dict["details"] = details
+
+            if expression:
+                issue_dict["expression"] = expression
+
             issues = [issue_dict]
 
         fhir_issues = [OperationOutcomeIssue(**issue) for issue in issues]
@@ -48,42 +89,20 @@ def from_exception(
         """
         Build an OperationOutcome from an exception.
         """
-        details = {
-            "coding": [
-                {
-                    "system": "http://terminology.hl7.org/CodeSystem/operation-outcome",
-                    "code": "exception",
-                    "display": "Exception",
-                }
-            ],
-            "text": f"An unexpected error occurred: {str(exc)}",
-        }
-
         return OperationOutcomeHandler.build(
             diagnostics=str(exc),
             code=code,
             severity=severity,
-            details=details,
+            details_text=f"An unexpected error occurred: {exc}",
         )
 
     @staticmethod
     def from_validation_error(
         e: ValidationError,
     ) -> dict:
-        details = {
-            "coding": [
-                {
-                    "system": "http://terminology.hl7.org/CodeSystem/operation-outcome",
-                    "code": "invalid",
-                    "display": "Invalid Resource",
-                }
-            ],
-            "text": str(e),
-        }
-
         return OperationOutcomeHandler.build(
             diagnostics="Validation failed for resource.",
             code="invalid",
             severity="error",
-            details=details,
+            details_text=str(e),
         )

application/packages/python/ftrs_common/fhir/r4b/organisation_mapper.py

@@ -30,7 +30,9 @@ class OrganizationMapper(FhirMapper):
     # --- FHIR Builders ---
     def _build_meta_profile(self) -> dict:
         return {
-            "profile": ["https://fhir.nhs.uk/StructureDefinition/UKCore-Organization"]
+            "profile": [
+                "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Organization"
+            ]
         }
 
     def _build_identifier(self, ods_code: str) -> list[Identifier]: