Merge branch 'main' into feat/DTOSS-12056-UI-Exception-Filtering

Warren-Pitterson · Warren-Pitterson · commit 8469dcbbebd0 · 2026-02-18T14:29:25.000Z
diff --git a/.azuredevops/pipelines/acr-image-retag.yaml b/.azuredevops/pipelines/acr-image-retag.yaml
@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/adhoc-post-deployment-tests-dev.yaml b/.azuredevops/pipelines/adhoc-post-deployment-tests-dev.yaml
@@ -8,7 +8,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-dev-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-dev-audit.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-dev-core.yaml b/.azuredevops/pipelines/cd-infrastructure-dev-core.yaml
@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/cd-infrastructure-int-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-int-audit.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-int-core.yaml b/.azuredevops/pipelines/cd-infrastructure-int-core.yaml
@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/cd-infrastructure-nft-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-nft-audit.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-nft-core.yaml b/.azuredevops/pipelines/cd-infrastructure-nft-core.yaml
@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/cd-infrastructure-preprod-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-preprod-audit.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-preprod-core.yaml b/.azuredevops/pipelines/cd-infrastructure-preprod-core.yaml
@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/cd-infrastructure-prod-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-prod-audit.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/cd-infrastructure-prod-core.yaml b/.azuredevops/pipelines/cd-infrastructure-prod-core.yaml
@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/cd-infrastructure-sandbox-audit.yaml b/.azuredevops/pipelines/cd-infrastructure-sandbox-audit.yaml
@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/cd-infrastructure-sandbox-core.yaml b/.azuredevops/pipelines/cd-infrastructure-sandbox-core.yaml
@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/post-deployment-tests-dev.yaml b/.azuredevops/pipelines/post-deployment-tests-dev.yaml
@@ -16,7 +16,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/task_azure_sql_backup_prod.yaml b/.azuredevops/pipelines/task_azure_sql_backup_prod.yaml
@@ -17,7 +17,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 variables:
diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_dev.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_dev.yaml
@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_int.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_int.yaml
@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_nft.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_nft.yaml
@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 parameters:
diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_preprod.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_preprod.yaml
@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 parameters:
@@ -42,11 +42,11 @@ parameters:
   - name: Sku_Peak
     displayName: Peak SKU
     type: string
-    default: 'S12'
+    default: 'S2'
   - name: Sku_OffPeak
     displayName: Off-Peak SKU
     type: string
-    default: 'S9'
+    default: 'S2'
 
 variables:
   - group: PRE_core_backend
diff --git a/.azuredevops/pipelines/task_azure_sql_scaling_prod.yaml b/.azuredevops/pipelines/task_azure_sql_scaling_prod.yaml
@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 51ab3ef022f53cd62e8fb6d3eee84872a150e6a3
+      ref: aa5e5fa9f2e4c95a72993af0ac6bef51142463bd
       endpoint: NHSDigital
 
 parameters:
diff --git a/application/CohortManager/compose.deps.yaml b/application/CohortManager/compose.deps.yaml
@@ -43,7 +43,7 @@ services:
   db:
     container_name: db
     networks: [cohman-network]
-    image: mcr.microsoft.com/mssql/server
+    image: mcr.microsoft.com/mssql/server:2022-latest
     environment:
       - ACCEPT_EULA=Y
       - MSSQL_SA_PASSWORD=${PASSWORD}
diff --git a/application/CohortManager/src/Functions/ParticipantManagementServices/ManageServiceNowParticipant/ManageServiceNowParticipantFunction.cs b/application/CohortManager/src/Functions/ParticipantManagementServices/ManageServiceNowParticipant/ManageServiceNowParticipantFunction.cs
@@ -198,9 +198,10 @@ private async Task<bool> UpdateExistingParticipant(ServiceNowParticipant service
     {
         _logger.LogInformation("Existing participant management record found, updating record {ParticipantId}", participantManagement.ParticipantId);
 
-        participantManagement.RecordType = Actions.Amended;
+        participantManagement.RecordType = Actions.New;
         participantManagement.EligibilityFlag = 1;
         participantManagement.ReferralFlag = 1;
+        participantManagement.ExceptionFlag = 0;
         participantManagement.RecordUpdateDateTime = DateTime.UtcNow;
         participantManagement.ReasonForRemoval = pdsDemographic.ReasonForRemoval;
         participantManagement.ReasonForRemovalDate = ParseRemovalEffectiveFromDateStringToDateTime(pdsDemographic.RemovalEffectiveFromDate);
diff --git a/application/CohortManager/src/Functions/Shared/Model/BasicParticipantCsvRecord.cs b/application/CohortManager/src/Functions/Shared/Model/BasicParticipantCsvRecord.cs
@@ -24,7 +24,7 @@ public BasicParticipantCsvRecord(ServiceNowParticipant serviceNowParticipant, Pa
         {
             ScreeningId = serviceNowParticipant.ScreeningId.ToString(),
             NhsNumber = serviceNowParticipant.NhsNumber.ToString(),
-            RecordType = participantManagement is null ? Actions.New : Actions.Amended,
+            RecordType = Actions.New,
         };
         Participant = new Participant
         {
diff --git a/infrastructure/tf-audit/diagnostic_settings.tf b/infrastructure/tf-audit/diagnostic_settings.tf
@@ -23,6 +23,7 @@ locals {
   #STORAGE ACCOUNT
   monitor_diagnostic_setting_storage_account_enabled_logs = ["StorageWrite", "StorageRead", "StorageDelete"]
   monitor_diagnostic_setting_storage_account_metrics      = ["Capacity", "Transaction"]
+  monitor_diagnostic_setting_storage_account_resource_metrics = ["Transaction"]
 
   #SUBNET
   monitor_diagnostic_setting_network_security_group_enabled_logs = ["NetworkSecurityGroupEvent", "NetworkSecurityGroupRuleCounter"]
diff --git a/infrastructure/tf-audit/storage.tf b/infrastructure/tf-audit/storage.tf
@@ -9,9 +9,10 @@ module "storage" {
 
   containers = each.value.containers
 
-  log_analytics_workspace_id                              = module.log_analytics_workspace_audit[local.primary_region].id
-  monitor_diagnostic_setting_storage_account_enabled_logs = local.monitor_diagnostic_setting_storage_account_enabled_logs
-  monitor_diagnostic_setting_storage_account_metrics      = local.monitor_diagnostic_setting_storage_account_metrics
+  log_analytics_workspace_id                                  = module.log_analytics_workspace_audit[local.primary_region].id
+  monitor_diagnostic_setting_storage_account_enabled_logs     = local.monitor_diagnostic_setting_storage_account_enabled_logs
+  monitor_diagnostic_setting_storage_account_metrics          = local.monitor_diagnostic_setting_storage_account_metrics
+  monitor_diagnostic_setting_storage_account_resource_metrics = local.monitor_diagnostic_setting_storage_account_resource_metrics
 
   account_replication_type      = each.value.replication_type
   account_tier                  = each.value.account_tier
diff --git a/infrastructure/tf-core/diagnostic_settings.tf b/infrastructure/tf-core/diagnostic_settings.tf
@@ -21,9 +21,10 @@ locals {
   monitor_diagnostic_setting_sql_server_enabled_logs = ["SQLSecurityAuditEvents"]
   monitor_diagnostic_setting_sql_server_metrics      = ["Basic", "InstanceAndAppAdvanced", "WorkloadManagement"]
 
-  # STORAGE ACCOUNT
-  monitor_diagnostic_setting_storage_account_enabled_logs = ["StorageWrite", "StorageRead", "StorageDelete"]
-  monitor_diagnostic_setting_storage_account_metrics      = ["Capacity", "Transaction"]
+  # STORAGE ACCOUNT_SERVICES
+  monitor_diagnostic_setting_storage_account_enabled_logs     = ["StorageWrite", "StorageRead", "StorageDelete"]
+  monitor_diagnostic_setting_storage_account_metrics          = ["Capacity", "Transaction"]
+  monitor_diagnostic_setting_storage_account_resource_metrics = ["Transaction"]
 
   # SUBNET
   monitor_diagnostic_setting_network_security_group_enabled_logs = ["NetworkSecurityGroupEvent", "NetworkSecurityGroupRuleCounter"]
diff --git a/infrastructure/tf-core/environments/development.tfvars b/infrastructure/tf-core/environments/development.tfvars
@@ -273,10 +273,6 @@ container_apps = {
   }
 }
 
-diagnostic_settings = {
-  metric_enabled = true
-}
-
 function_apps = {
   acr_mi_name = "dtos-cohort-manager-acr-push"
   acr_name    = "acrukshubdevcohman"
diff --git a/infrastructure/tf-core/environments/integration.tfvars b/infrastructure/tf-core/environments/integration.tfvars
@@ -273,10 +273,6 @@ container_apps = {
   }
 }
 
-diagnostic_settings = {
-  metric_enabled = true
-}
-
 function_apps = {
   acr_mi_name = "dtos-cohort-manager-acr-push"
   acr_name    = "acrukshubdevcohman"
diff --git a/infrastructure/tf-core/environments/nft.tfvars b/infrastructure/tf-core/environments/nft.tfvars
@@ -273,10 +273,6 @@ container_apps = {
   }
 }
 
-diagnostic_settings = {
-  metric_enabled = true
-}
-
 function_apps = {
   acr_mi_name = "dtos-cohort-manager-acr-push"
   acr_name    = "acrukshubdevcohman"
diff --git a/infrastructure/tf-core/environments/preprod.tfvars b/infrastructure/tf-core/environments/preprod.tfvars
@@ -261,13 +261,28 @@ container_app_jobs = {
       add_user_assigned_identity    = true
       replica_retry_limit           = 1
     }
+    db-restore = {
+      container_app_environment_key = "db-management"
+      docker_image                  = "db-immutable-backup-restore"
+      docker_env_tag                = "latest"
+      container_registry_use_mi     = true
+      add_user_assigned_identity    = true
+      memory_in_gb                  = 2
+      replica_retry_limit           = 1
+      replica_timeout_in_seconds    = 3600
+      env_vars_static = {
+        SQL_SERVER_NAME        = "sqlsvr-cohman-pre-uks"
+        SQL_DATABASE_NAME      = "DToSDB_RESTORE"
+        SQL_MAX_SIZE_GB        = "100"
+        SQL_SERVICE_OBJECTIVE  = "S9"
+        STORAGE_ACCOUNT_NAME   = "stcohmanpreuksfilexptns"
+        STORAGE_CONTAINER_NAME = "sql-backups-temp"
+        BACKUP_FILE_NAME       = "filename.bacpac"
+      }
+    }
   }
 }
 
-diagnostic_settings = {
-  metric_enabled = true
-}
-
 function_apps = {
   acr_mi_name = "dtos-cohort-manager-acr-push"
   acr_name    = "acrukshubprodcohman"
@@ -1299,7 +1314,8 @@ sqlserver = {
   auditing_policy_retention_in_days    = 30
   security_alert_policy_retention_days = 30
   user_assigned_identities = [
-    "db-management"
+    "db-management",
+    "db-restore"
   ]
 
   server = {
@@ -1316,7 +1332,7 @@ sqlserver = {
       licence_type         = "LicenseIncluded"
       max_gb               = 100
       read_scale           = false
-      sku                  = "S12"
+      sku                  = "S2"
       storage_account_type = "GeoZone"
       zone_redundant       = false
 
diff --git a/infrastructure/tf-core/environments/production.tfvars b/infrastructure/tf-core/environments/production.tfvars
@@ -299,10 +299,6 @@ container_app_jobs = {
   }
 }
 
-diagnostic_settings = {
-  metric_enabled = true
-}
-
 function_apps = {
   acr_mi_name = "dtos-cohort-manager-acr-push"
   acr_name    = "acrukshubprodcohman"
diff --git a/infrastructure/tf-core/environments/sandbox.tfvars b/infrastructure/tf-core/environments/sandbox.tfvars
@@ -272,10 +272,6 @@ container_apps = {
   }
 }
 
-diagnostic_settings = {
-  metric_enabled = true
-}
-
 function_apps = {
   acr_mi_name = "dtos-cohort-manager-acr-push"
   acr_name    = "acrukshubdevcohman"
diff --git a/infrastructure/tf-core/key_vault.tf b/infrastructure/tf-core/key_vault.tf
@@ -10,7 +10,6 @@ module "key_vault" {
   log_analytics_workspace_id                       = data.terraform_remote_state.audit.outputs.log_analytics_workspace_id[local.primary_region]
   monitor_diagnostic_setting_keyvault_enabled_logs = local.monitor_diagnostic_setting_keyvault_enabled_logs
   monitor_diagnostic_setting_keyvault_metrics      = local.monitor_diagnostic_setting_keyvault_metrics
-  metric_enabled                                   = var.diagnostic_settings.metric_enabled
 
   disk_encryption          = var.key_vault.disk_encryption
   soft_delete_retention    = var.key_vault.soft_del_ret_days
diff --git a/infrastructure/tf-core/storage.tf b/infrastructure/tf-core/storage.tf
@@ -9,9 +9,10 @@ module "storage" {
 
   containers = each.value.containers
 
-  log_analytics_workspace_id                              = data.terraform_remote_state.audit.outputs.log_analytics_workspace_id[local.primary_region]
-  monitor_diagnostic_setting_storage_account_enabled_logs = local.monitor_diagnostic_setting_storage_account_enabled_logs
-  monitor_diagnostic_setting_storage_account_metrics      = local.monitor_diagnostic_setting_storage_account_metrics
+  log_analytics_workspace_id                                  = data.terraform_remote_state.audit.outputs.log_analytics_workspace_id[local.primary_region]
+  monitor_diagnostic_setting_storage_account_enabled_logs     = local.monitor_diagnostic_setting_storage_account_enabled_logs
+  monitor_diagnostic_setting_storage_account_metrics          = local.monitor_diagnostic_setting_storage_account_metrics
+  monitor_diagnostic_setting_storage_account_resource_metrics = local.monitor_diagnostic_setting_storage_account_resource_metrics
 
   account_replication_type = each.value.replication_type
   account_tier             = each.value.account_tier
diff --git a/infrastructure/tf-core/variables.tf b/infrastructure/tf-core/variables.tf
diff --git a/tests/UnitTests/ParticipantManagementServicesTests/ManageServiceNowParticipantTests/ManageServiceNowParticipantFunctionTests.cs b/tests/UnitTests/ParticipantManagementServicesTests/ManageServiceNowParticipantTests/ManageServiceNowParticipantFunctionTests.cs
