Merge branch 'main' into Development

src/Dfe.ContentSupport.Web/Controllers/ContentController.cs

@@ -18,7 +18,7 @@ public class ContentController(
     : Controller
 {
     public const string ErrorActionName = "error";
-
+    
     [HttpGet("{slug}/{page?}")]
     public async Task<IActionResult> Index(string slug, string page = "", bool isPreview = false,
         [FromQuery] List<string>? tags = null)
@@ -60,7 +60,6 @@ public async Task<IActionResult> Index(string slug, string page = "", bool isPre
         }
     }
 
-
     [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
     public IActionResult Error()
     {

src/Dfe.ContentSupport.Web/Extensions/HttpClientPolicyExtensions.cs

@@ -0,0 +1,17 @@
+using Polly;
+using Polly.Extensions.Http;
+
+namespace Dfe.ContentSupport.Web.Extensions;
+
+public static class HttpClientPolicyExtensions
+{
+    public static void AddRetryPolicy(IHttpClientBuilder builder) =>
+        builder
+            .SetHandlerLifetime(TimeSpan.FromMinutes(5))
+            .AddPolicyHandler(GetRetryPolicy());
+
+    public static IAsyncPolicy<HttpResponseMessage> GetRetryPolicy() =>
+        HttpPolicyExtensions.HandleTransientHttpError()
+            .OrResult(msg => msg.StatusCode == System.Net.HttpStatusCode.NotFound)
+            .WaitAndRetryAsync(6, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
+}

src/Dfe.ContentSupport.Web/Extensions/WebApplicationBuilderExtensions.cs

@@ -1,4 +1,4 @@
-using Contentful.Core;
+using Contentful.Core;
 using Contentful.Core.Configuration;
 using Dfe.ContentSupport.Web.Configuration;
 using Dfe.ContentSupport.Web.Models.Mapped;

src/Dfe.ContentSupport.Web/Services/ModelMapper.cs

@@ -1,4 +1,4 @@
-using Contentful.Core.Models;
+using Contentful.Core.Models;
 using Dfe.ContentSupport.Web.Common;
 using Dfe.ContentSupport.Web.Configuration;
 using Dfe.ContentSupport.Web.Models;

src/Dfe.ContentSupport.Web/Services/StubContentfulService.cs

@@ -1,4 +1,4 @@
-using Contentful.Core;
+using Contentful.Core;
 using Contentful.Core.Configuration;
 using Contentful.Core.Models;
 using Dfe.ContentSupport.Web.Extensions;

tests/Dfe.ContentSupport.Web.Tests/Extensions/WebApplicationBuilderExtensionsTests.cs

@@ -1,4 +1,4 @@
-using Dfe.ContentSupport.Web.Extensions;
+using Dfe.ContentSupport.Web.Extensions;
 using Dfe.ContentSupport.Web.Models.Mapped;
 using Microsoft.AspNetCore.Builder;