Merge branch 'main' into task/FTRS-3183-add-copilot-instructuions-per-guidance

Author: AITR1

.github/workflows/pipeline-build-release.yaml

@@ -154,7 +154,7 @@ jobs:
       workspace: "rc"
       release_tag: ${{ needs.tag-release.outputs.release_tag }}
       ref: ${{ needs.tag-release.outputs.release_tag }}
-      workflow_timeout: 30
+      workflow_timeout: 60
     secrets:
       ACCOUNT_ID: ${{ secrets.ACCOUNT_ID }}
       MGMT_ACCOUNT_ID: ${{ secrets.MGMT_ACCOUNT_ID }}
@@ -255,6 +255,7 @@ jobs:
       commit_hash: ${{ needs.metadata.outputs.commit_hash }}
       test_tag: ${{ matrix.tag }}
       test_type: ${{ matrix.type }}
+      api_name: ${{ matrix.api_name || '' }}
       type: app
       deployment_type: "release-candidate"
     secrets:

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

@@ -191,7 +191,7 @@ jobs:
       environment: ${{ needs.metadata.outputs.environment }}
       workspace: ${{ needs.metadata.outputs.workspace }}
       ref: ${{ inputs.ref }}
-      workflow_timeout: 30
+      workflow_timeout: 60
       stacks: "['database', 'crud_apis', 'data_migration', 'read_only_viewer', 'opensearch', 'etl_ods', 'dos_search', 'is_performance', 'ui', 'athena']"
     secrets:
       ACCOUNT_ID: ${{ secrets.ACCOUNT_ID }}
@@ -404,6 +404,7 @@ jobs:
 
   stage-prerelease-artefacts:
     name: "Stage artefacts for prerelease ${{ needs.generate-prerelease.outputs.prerelease_tag }}"
+    if: always() && needs.generate-prerelease.result == 'success'
     needs:
       - metadata
       - generate-prerelease

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

@@ -115,7 +115,7 @@ jobs:
       workspace: default
       release_tag: ${{ inputs.release_tag }}
       ref: ${{ inputs.release_tag }}
-      workflow_timeout: 30
+      workflow_timeout: 60
     secrets:
       ACCOUNT_ID: ${{ secrets.ACCOUNT_ID }}
       MGMT_ACCOUNT_ID: ${{ secrets.MGMT_ACCOUNT_ID }}
@@ -172,6 +172,7 @@ jobs:
       ref: ${{ inputs.release_tag }}
       test_tag: ${{ matrix.tag }}
       test_type: ${{ matrix.type }}
+      api_name: ${{ matrix.api_name || '' }}
       type: app
       deployment_type: "release-candidate"
     secrets:

docs/specification/dos-ingest.yaml

@@ -140,14 +140,12 @@ paths:
         Retrieve an organization identified by an ODS code, or all organizations if no identifier is provided.
 
         ## Request requirements
-        - if the `identifier` query parameter is provided, it must be in the format `odsOrganisationCode|{CODE}` (minimum 1, maximum 12 alphanumeric characters).
-        - if the `identifier` parameter is omitted, all organizations will be returned.
+        - The `identifier` query parameter is required and it must be in the format `odsOrganisationCode|{CODE}` (minimum 1, maximum 12 alphanumeric characters).
 
         The search is performed using the FHIR-compliant identifier parameter:
         - identifier=odsOrganisationCode|{CODE}
 
         Example: /Organization?identifier=odsOrganisationCode|ABC123
-        Example (all): /Organization
 
       operationId: searchOrganizations
       parameters:
@@ -182,10 +180,8 @@ paths:
           example: 7b2f8d3a-9e5c-4f1b-8a6d-2c4e9f1a3b5d
       - in: query
         name: identifier
-        description: >
-          ODS code in the format "odsOrganisationCode|{CODE}" (FHIR identifier search).
-          If omitted, all organizations will be returned.
-          required: false
+        description: ODS code in the format "odsOrganisationCode|{CODE}" (FHIR identifier search).
+        required: true
         schema:
             type: string
             pattern: '^odsOrganisationCode\|[A-Za-z0-9]{1,12}$'

scripts/workflow/derive-workspace.sh

@@ -15,7 +15,7 @@ if [[ "$TRIGGER" == "tag" ]] ; then
   echo -e "\nTag detected - using default workspace"
   echo "Workspace: $WORKSPACE"
   export WORKSPACE
-  exit 0
+  return 0
 fi
 
 # Determine branch name based on trigger

services/crud-apis/organisations/app/models/organisation.py

@@ -135,7 +135,9 @@ class OrganisationUpdatePayload(BaseModel):
             ]
         },
     )
-    identifier: list[Identifier] = Field(..., description="Organization identifiers")
+    identifier: list[Identifier] = Field(
+        ..., description="Organization identifiers", min_length=1
+    )
     name: str = Field(max_length=100, example="GP Practice Name")
     active: bool = Field(..., example=True)
     telecom: Optional[list[ContactPoint]] = []
@@ -146,31 +148,48 @@ class OrganisationUpdatePayload(BaseModel):
     @field_validator("identifier", mode="before")
     @classmethod
     def validate_identifier_list(cls, v: list[dict]) -> list[dict]:
-        if not v:
-            raise ValueError(ERROR_IDENTIFIER_EMPTY)
+        if v is None or not v:
+            outcome = OperationOutcomeHandler.build(
+                diagnostics=ERROR_IDENTIFIER_EMPTY,
+                code="invalid",
+                severity="error",
+            )
+            raise OperationOutcomeException(outcome)
 
         ods_identifiers = [
             identifier
             for identifier in v
             if isinstance(identifier, dict)
-            and identifier.get("system")
-            == "https://fhir.nhs.uk/Id/ods-organization-code"
+            and identifier.get("system") == ODS_SYSTEM_URL
         ]
 
         if not ods_identifiers:
-            raise ValueError(ERROR_IDENTIFIER_NO_ODS_SYSTEM)
+            outcome = OperationOutcomeHandler.build(
+                diagnostics=ERROR_IDENTIFIER_NO_ODS_SYSTEM,
+                code="invalid",
+                severity="error",
+            )
+            raise OperationOutcomeException(outcome)
 
         for identifier in ods_identifiers:
             if not identifier.get("value") or not identifier.get("value").strip():
-                raise ValueError(ERROR_IDENTIFIER_EMPTY_VALUE)
+                outcome = OperationOutcomeHandler.build(
+                    diagnostics=ERROR_IDENTIFIER_EMPTY_VALUE,
+                    code="invalid",
+                    severity="error",
+                )
+                raise OperationOutcomeException(outcome)
 
             ods_code = identifier.get("value", "").strip()
             if not re.match(ODS_REGEX, ods_code):
-                raise ValueError(
-                    ERROR_IDENTIFIER_INVALID_FORMAT.format(
+                outcome = OperationOutcomeHandler.build(
+                    diagnostics=ERROR_IDENTIFIER_INVALID_FORMAT.format(
                         ods_code=ods_code, ODS_REGEX=ODS_REGEX
-                    )
+                    ),
+                    code="invalid",
+                    severity="error",
                 )
+                raise OperationOutcomeException(outcome)
 
         return v
 

services/crud-apis/organisations/app/router/organisation.py

@@ -46,12 +46,10 @@
 
 def _get_organization_query_params(
     identifier: str = Query(
-        None,
+        ...,
         description="Organization identifier in format 'odsOrganisationCode|{code}'",
     ),
 ) -> OrganizationQueryParams | None:
-    if identifier is None:
-        return None
     return OrganizationQueryParams(identifier=identifier)
 
 
@@ -64,7 +62,7 @@ def get_status() -> Response:
 
 @router.get(
     "/Organization",
-    summary="Get organisation uuid by ods_code or read all organisations",
+    summary="Get organisation by ods_code",
     response_class=JSONResponse,
 )
 async def get_handle_organisation_requests(
@@ -78,11 +76,9 @@ async def get_handle_organisation_requests(
     """
     try:
         organisation_service.check_organisation_params(request.query_params)
-        if organization_query_params and organization_query_params.identifier:
-            ods_code = organization_query_params.ods_code
-            result = organisation_service.get_by_ods_code(ods_code)
-        else:
-            result = organisation_service.get_all_organisations()
+
+        ods_code = organization_query_params.ods_code
+        result = organisation_service.get_by_ods_code(ods_code)
         bundle = organisation_mapper.to_fhir_bundle(result)
         return JSONResponse(
             content=bundle.model_dump(mode="json"), media_type=FHIR_MEDIA_TYPE

services/crud-apis/organisations/app/services/organisation_service.py

@@ -235,20 +235,6 @@ def check_organisation_params(self, params: dict) -> None:
             )
             raise OperationOutcomeException(outcome)
 
-    def get_all_organisations(self, limit: int = 10) -> list[Organisation]:
-        """
-        Returns all Organisation objects from the repository.
-        """
-        self.logger.log(
-            CrudApisLogBase.ORGANISATION_004,
-        )
-        organisations = list(self.org_repository.iter_records(max_results=limit))
-        organisations = [
-            org if isinstance(org, Organisation) else Organisation(**org)
-            for org in organisations
-        ]
-        return organisations
-
     def _get_outdated_fields(
         self, organisation: Organisation, payload: Organisation
     ) -> dict: