Merge branch 'main' into 137752-cypress-sponsored-risks-and-issues

DFE-Digital · Sep 28, 2023 · 264ab2c · 264ab2c
2 parents ba5dc08 + a7069b3
commit 264ab2c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/...repareConversions/Dfe.PrepareConversions/Pages/UpdateAcademyConversionProjectPageModel.cs b/...repareConversions/Dfe.PrepareConversions/Pages/UpdateAcademyConversionProjectPageModel.cs
@@ -94,6 +94,7 @@ private void RePopDatePickerModelsAfterValidationFail()
    }
    public static decimal? CalculateGrantAmount(string type, string phase)
    {
+      if (phase is null) return 25000;
       switch (phase.ToLower())
       {
          case "primary":
@@ -102,20 +103,20 @@ private void RePopDatePickerModelsAfterValidationFail()
                SponsoredGrantType.FastTrack => 70000,
                SponsoredGrantType.Full => 110000,
                SponsoredGrantType.Intermediate => 90000,
-               _ => 0
+               _ => 25000
             };
          case "secondary":
             return type switch
             {
                SponsoredGrantType.FastTrack => 80000,
                SponsoredGrantType.Full => 150000,
                SponsoredGrantType.Intermediate => 115000,
-               _ => 0
+               _ => 25000
             };
       }
 
       // Else return default £25k
-      return 25000;
+         return 25000;
    }
 
    protected UpdateAcademyConversionProject Build()

diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl
diff --git a/terraform/README.md b/terraform/README.md
@@ -136,7 +136,7 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_azure_container_apps_hosting"></a> [azure\_container\_apps\_hosting](#module\_azure\_container\_apps\_hosting) | github.com/DFE-Digital/terraform-azurerm-container-apps-hosting | v1.0.0 |
+| <a name="module_azure_container_apps_hosting"></a> [azure\_container\_apps\_hosting](#module\_azure\_container\_apps\_hosting) | github.com/DFE-Digital/terraform-azurerm-container-apps-hosting | v1.1.0 |
 | <a name="module_azurerm_key_vault"></a> [azurerm\_key\_vault](#module\_azurerm\_key\_vault) | github.com/DFE-Digital/terraform-azurerm-key-vault-tfvars | v0.2.0 |
 
 ## Resources

diff --git a/terraform/container-apps-hosting.tf b/terraform/container-apps-hosting.tf
@@ -1,5 +1,5 @@
 module "azure_container_apps_hosting" {
-  source = "github.com/DFE-Digital/terraform-azurerm-container-apps-hosting?ref=v1.0.0"
+  source = "github.com/DFE-Digital/terraform-azurerm-container-apps-hosting?ref=v1.1.0"
 
   environment    = local.environment
   project_name   = local.project_name