Merge branch 'main' into PPHA-749-replace-fewer-with-less

Author: stephhou

infrastructure/environments/live/variables.tfvars

@@ -27,7 +27,7 @@ projects = {
 }
 
 infra_key_vault_name = "kv-lungcs-live-inf"
-infra_key_vault_rg = "rg-hub-live-uks-bootstrap"
+infra_key_vault_rg   = "rg-hub-live-uks-bootstrap"
 
 diagnostic_settings = {
   metric_enabled = true

infrastructure/environments/nonlive/variables.tfvars

@@ -25,7 +25,7 @@ projects = {
 }
 
 infra_key_vault_name = "kv-lungcs-nonlive-inf"
-infra_key_vault_rg = "rg-hub-nonlive-uks-bootstrap"
+infra_key_vault_rg   = "rg-hub-nonlive-uks-bootstrap"
 
 diagnostic_settings = {
   metric_enabled = true

infrastructure/modules/container-apps/main.tf

@@ -11,8 +11,8 @@ module "webapp" {
     azurerm.hub = azurerm.hub
   }
 
-  name                             = "${var.app_short_name}-web-${var.environment}"
-  container_app_environment_id     = var.container_app_environment_id
+  name                         = "${var.app_short_name}-web-${var.environment}"
+  container_app_environment_id = var.container_app_environment_id
 
   # alerts
   action_group_id        = var.action_group_id

infrastructure/modules/infra/main.tf

@@ -62,13 +62,15 @@ module "container-app-environment" {
     azurerm.dns = azurerm.hub
   }
 
-  name                           = "cae-${var.environment}-uks-${var.app_short_name}"
-  resource_group_name            = azurerm_resource_group.main.name
-  internal_load_balancer_enabled = var.features.private_networking
-  log_analytics_workspace_id     = module.log_analytics_workspace_audit.id
-  vnet_integration_subnet_id     = module.container_app_subnet.id
-  private_dns_zone_rg_name       = var.features.private_networking ? "rg-hub-${var.hub}-uks-private-dns-zones" : null
-  zone_redundancy_enabled        = var.cae_zone_redundancy_enabled
+  name                                        = "cae-${var.environment}-uks-${var.app_short_name}"
+  resource_group_name                         = azurerm_resource_group.main.name
+  internal_load_balancer_enabled              = var.features.private_networking
+  log_analytics_workspace_id                  = module.log_analytics_workspace_audit.id
+  vnet_integration_subnet_id                  = module.container_app_subnet.id
+  private_dns_zone_rg_name                    = var.features.private_networking ? "rg-hub-${var.hub}-uks-private-dns-zones" : null
+  zone_redundancy_enabled                     = var.cae_zone_redundancy_enabled
+  logs_destination                            = "azure-monitor"
+  monitor_diagnostic_setting_cae_enabled_logs = ["ContainerAppConsoleLogs", "ContainerAppSystemLogs"]
 }
 
 module "app_insights_audit" {

lung_cancer_screening/questions/tests/unit/views/test_book_an_appointment.py

@@ -0,0 +1,20 @@
+from django.test import TestCase, tag
+from django.urls import reverse
+
+from .helpers.authentication import login_user
+
+@tag("BookAnAppointment")
+class TestGetBookAnAppointment(TestCase):
+    def setUp(self):
+        self.user = login_user(self.client)
+
+    def test_get_redirects_if_the_user_is_not_logged_in(self):
+        self.client.logout()
+
+        response = self.client.get(reverse("questions:book_an_appointment"))
+
+        self.assertRedirects(
+            response,
+            "/oidc/authenticate/?next=/call-us-to-book-an-appointment",
+            fetch_redirect_response=False,
+        )

lung_cancer_screening/questions/views/book_an_appointment.py

@@ -1,10 +1,9 @@
 from django.shortcuts import render
 from django.views import View
+from django.contrib.auth.mixins import LoginRequiredMixin
 
-from .mixins.ensure_response_set import EnsureResponseSet
 
-
-class BookAnAppointmentExitView(EnsureResponseSet, View):
+class BookAnAppointmentExitView(LoginRequiredMixin, View):
     def get(self, request):
         return render(
             request,