From 4c62dba7fd149eb812e857a763efdd2ce525dd8d Mon Sep 17 00:00:00 2001
From: Moley-Bot <moley-bot@users.noreply.github.com>
Date: Mon, 12 Jan 2026 10:28:36 +0000
Subject: [PATCH 1/6] Add collector for WakefieldCouncil

Closes #86

Generated with Codex CLI by Moley-Bot
---
 .../Collectors/Councils/WakefieldCouncil.cs   | 246 ++++++++++++++++++
 .../Councils/WakefieldCouncilTests.cs         |  36 +++
 2 files changed, 282 insertions(+)
 create mode 100644 BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs
 create mode 100644 BinDays.Api.IntegrationTests/Collectors/Councils/WakefieldCouncilTests.cs

diff --git a/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs b/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs
new file mode 100644
index 00000000..db0284b6
--- /dev/null
+++ b/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs
@@ -0,0 +1,246 @@
+namespace BinDays.Api.Collectors.Collectors.Councils;
+
+using BinDays.Api.Collectors.Collectors.Vendors;
+using BinDays.Api.Collectors.Models;
+using BinDays.Api.Collectors.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using System.Web;
+
+/// <summary>
+/// Collector implementation for Wakefield Council.
+/// </summary>
+internal sealed partial class WakefieldCouncil : GovUkCollectorBase, ICollector
+{
+	/// <inheritdoc/>
+	public string Name => "Wakefield Council";
+
+	/// <inheritdoc/>
+	public Uri WebsiteUrl => new("https://www.wakefield.gov.uk/");
+
+	/// <inheritdoc/>
+	public override string GovUkId => "wakefield";
+
+	/// <summary>
+	/// The list of bin types for this collector.
+	/// </summary>
+	private readonly IReadOnlyCollection<Bin> _binTypes = [
+		new()
+		{
+			Name = "General Waste",
+			Colour = BinColour.Green,
+			Keys = [ "Household waste", "General waste", "Refuse" ],
+		},
+		new()
+		{
+			Name = "Recycling",
+			Colour = BinColour.Brown,
+			Keys = [ "Mixed recycling", "Recycling" ],
+		},
+		new()
+		{
+			Name = "Garden Waste",
+			Colour = BinColour.Brown,
+			Keys = [ "Garden waste" ],
+		},
+	];
+
+	/// <summary>
+	/// Regex for the addresses from the address picker links.
+	/// </summary>
+	[GeneratedRegex(@"<a[^>]*?href=""(?<href>[^""]*?where-i-live\?uprn=[^""]+)""[^>]*>(?<label>[^<]+)<\/a>")]
+	private static partial Regex AddressRegex();
+
+	/// <summary>
+	/// Regex for the bin day panels on the property page.
+	/// </summary>
+	[GeneratedRegex(@"<div class=""u-mb-4""><strong>(?<service>[^<]+)<\/strong><\/div>[\s\S]*?Next collection - (?<next>[^<]+)<\/div>[\s\S]*?<ul class=""u-mt-4"">(?<future>[\s\S]*?)<\/ul>")]
+	private static partial Regex BinDaysRegex();
+
+	/// <summary>
+	/// Regex for dates within the bin day panels.
+	/// </summary>
+	[GeneratedRegex(@"(?<date>[A-Za-z]+,\s+\d{1,2}\s+[A-Za-z]+\s+\d{4})")]
+	private static partial Regex DateRegex();
+
+	/// <inheritdoc/>
+	public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? clientSideResponse)
+	{
+		// Prepare client-side request for base page (sets affinity cookies)
+		if (clientSideResponse == null)
+		{
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 1,
+				Url = "https://www.wakefield.gov.uk/where-i-live",
+				Method = "GET",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+				},
+			};
+
+			return new GetAddressesResponse
+			{
+				NextClientSideRequest = clientSideRequest
+			};
+		}
+		// Prepare client-side request for address list
+		else if (clientSideResponse.RequestId == 1)
+		{
+			var formattedPostcode = ProcessingUtilities.FormatPostcode(postcode);
+			var requestCookies = ProcessingUtilities.ParseSetCookieHeaderForRequestCookie(
+				clientSideResponse.Headers.GetValueOrDefault("set-cookie") ?? string.Empty
+			);
+
+			var requestHeaders = new Dictionary<string, string>
+			{
+				{ "user-agent", Constants.UserAgent },
+			};
+
+			if (!string.IsNullOrWhiteSpace(requestCookies))
+			{
+				requestHeaders.Add("cookie", requestCookies);
+			}
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 2,
+				Url = $"https://www.wakefield.gov.uk/pick-your-address?where-i-live={Uri.EscapeDataString(formattedPostcode)}",
+				Method = "GET",
+				Headers = requestHeaders,
+			};
+
+			return new GetAddressesResponse
+			{
+				NextClientSideRequest = clientSideRequest
+			};
+		}
+		// Process addresses from response
+		else if (clientSideResponse.RequestId == 2)
+		{
+			var rawAddresses = AddressRegex().Matches(clientSideResponse.Content)!;
+
+			var addresses = new List<Address>();
+			foreach (Match rawAddress in rawAddresses)
+			{
+				var href = HttpUtility.HtmlDecode(rawAddress.Groups["href"].Value);
+				var normalisedHref = href.Replace(" ", "%20");
+				var addressUri = normalisedHref.StartsWith("http", StringComparison.OrdinalIgnoreCase)
+					? new Uri(normalisedHref)
+					: new Uri(new Uri("https://www.wakefield.gov.uk"), normalisedHref);
+				var queryParameters = HttpUtility.ParseQueryString(addressUri.Query);
+
+				var uprn = queryParameters["uprn"]!;
+				var property = queryParameters["a"] ?? rawAddress.Groups["label"].Value;
+				var usrn = queryParameters["usrn"];
+				var postcodeValue = ProcessingUtilities.FormatPostcode(queryParameters["p"] ?? postcode);
+
+				var address = new Address
+				{
+					Property = property,
+					Street = usrn,
+					Postcode = postcodeValue,
+					Uid = uprn,
+				};
+
+				addresses.Add(address);
+			}
+
+			return new GetAddressesResponse
+			{
+				Addresses = [.. addresses],
+			};
+		}
+
+		throw new InvalidOperationException("Invalid client-side request.");
+	}
+
+	/// <inheritdoc/>
+	public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? clientSideResponse)
+	{
+		// Prepare client-side request for bin collections page
+		if (clientSideResponse == null)
+		{
+			var queryParameters = new List<string>
+			{
+				$"uprn={address.Uid}",
+				$"a={Uri.EscapeDataString(address.Property!)}",
+			};
+
+			if (!string.IsNullOrWhiteSpace(address.Street))
+			{
+				queryParameters.Add($"usrn={Uri.EscapeDataString(address.Street)}");
+			}
+
+			if (!string.IsNullOrWhiteSpace(address.Postcode))
+			{
+				var formattedPostcode = ProcessingUtilities.FormatPostcode(address.Postcode);
+				queryParameters.Add($"p={Uri.EscapeDataString(formattedPostcode)}");
+			}
+
+			var requestUrl = $"https://www.wakefield.gov.uk/where-i-live?{string.Join("&", queryParameters)}";
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 1,
+				Url = requestUrl,
+				Method = "GET",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+				},
+			};
+
+			return new GetBinDaysResponse
+			{
+				NextClientSideRequest = clientSideRequest
+			};
+		}
+		// Process bin days from response
+		else if (clientSideResponse.RequestId == 1)
+		{
+			var rawBinDays = BinDaysRegex().Matches(clientSideResponse.Content)!;
+
+			var binDays = new List<BinDay>();
+			foreach (Match rawBinDay in rawBinDays)
+			{
+				var service = rawBinDay.Groups["service"].Value;
+				var nextCollection = rawBinDay.Groups["next"].Value.Trim();
+				var futureCollections = rawBinDay.Groups["future"].Value;
+
+				var matchingBins = ProcessingUtilities.GetMatchingBins(_binTypes, service);
+				var collectionDates = new HashSet<DateOnly>();
+
+				if (!nextCollection.Contains("n/a", StringComparison.OrdinalIgnoreCase))
+				{
+					collectionDates.Add(DateOnly.ParseExact(nextCollection, "dddd, d MMMM yyyy", CultureInfo.InvariantCulture));
+				}
+
+				foreach (Match dateMatch in DateRegex().Matches(futureCollections))
+				{
+					collectionDates.Add(DateOnly.ParseExact(dateMatch.Groups["date"].Value, "dddd, d MMMM yyyy", CultureInfo.InvariantCulture));
+				}
+
+				foreach (var collectionDate in collectionDates)
+				{
+					binDays.Add(new BinDay
+					{
+						Address = address,
+						Date = collectionDate,
+						Bins = matchingBins,
+					});
+				}
+			}
+
+			return new GetBinDaysResponse
+			{
+				BinDays = ProcessingUtilities.ProcessBinDays(binDays),
+			};
+		}
+
+		throw new InvalidOperationException("Invalid client-side request.");
+	}
+}
diff --git a/BinDays.Api.IntegrationTests/Collectors/Councils/WakefieldCouncilTests.cs b/BinDays.Api.IntegrationTests/Collectors/Councils/WakefieldCouncilTests.cs
new file mode 100644
index 00000000..9551f4cf
--- /dev/null
+++ b/BinDays.Api.IntegrationTests/Collectors/Councils/WakefieldCouncilTests.cs
@@ -0,0 +1,36 @@
+namespace BinDays.Api.IntegrationTests.Collectors.Councils;
+
+using BinDays.Api.Collectors.Collectors;
+using BinDays.Api.Collectors.Collectors.Councils;
+using BinDays.Api.Collectors.Services;
+using BinDays.Api.IntegrationTests.Helpers;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+
+public class WakefieldCouncilTests
+{
+	private readonly IntegrationTestClient _client;
+	private static readonly ICollector _collector = new WakefieldCouncil();
+	private readonly CollectorService _collectorService = new([_collector]);
+	private readonly ITestOutputHelper _outputHelper;
+
+	public WakefieldCouncilTests(ITestOutputHelper outputHelper)
+	{
+		_outputHelper = outputHelper;
+		_client = new IntegrationTestClient(outputHelper);
+	}
+
+	[Theory]
+	[InlineData("WF5 0RG")]
+	public async Task GetBinDaysTest(string postcode)
+	{
+		await TestSteps.EndToEnd(
+			_client,
+			_collectorService,
+			_collector,
+			postcode,
+			_outputHelper
+		);
+	}
+}

From 916a40d04038b2e62c536bfbccc23b4591941ffa Mon Sep 17 00:00:00 2001
From: Moley-Bot <moley-bot@users.noreply.github.com>
Date: Mon, 12 Jan 2026 10:29:13 +0000
Subject: [PATCH 2/6] Auto-format code with dotnet format

  Formatted by Moley-Bot
---
 .../Collectors/Councils/WakefieldCouncil.cs   | 492 +++++++++---------
 .../Councils/WakefieldCouncilTests.cs         |  72 +--
 2 files changed, 282 insertions(+), 282 deletions(-)

diff --git a/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs b/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs
index db0284b6..739522f0 100644
--- a/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs
+++ b/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs
@@ -1,246 +1,246 @@
-namespace BinDays.Api.Collectors.Collectors.Councils;
-
-using BinDays.Api.Collectors.Collectors.Vendors;
-using BinDays.Api.Collectors.Models;
-using BinDays.Api.Collectors.Utilities;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text.RegularExpressions;
-using System.Web;
-
-/// <summary>
-/// Collector implementation for Wakefield Council.
-/// </summary>
-internal sealed partial class WakefieldCouncil : GovUkCollectorBase, ICollector
-{
-	/// <inheritdoc/>
-	public string Name => "Wakefield Council";
-
-	/// <inheritdoc/>
-	public Uri WebsiteUrl => new("https://www.wakefield.gov.uk/");
-
-	/// <inheritdoc/>
-	public override string GovUkId => "wakefield";
-
-	/// <summary>
-	/// The list of bin types for this collector.
-	/// </summary>
-	private readonly IReadOnlyCollection<Bin> _binTypes = [
-		new()
-		{
-			Name = "General Waste",
-			Colour = BinColour.Green,
-			Keys = [ "Household waste", "General waste", "Refuse" ],
-		},
-		new()
-		{
-			Name = "Recycling",
-			Colour = BinColour.Brown,
-			Keys = [ "Mixed recycling", "Recycling" ],
-		},
-		new()
-		{
-			Name = "Garden Waste",
-			Colour = BinColour.Brown,
-			Keys = [ "Garden waste" ],
-		},
-	];
-
-	/// <summary>
-	/// Regex for the addresses from the address picker links.
-	/// </summary>
-	[GeneratedRegex(@"<a[^>]*?href=""(?<href>[^""]*?where-i-live\?uprn=[^""]+)""[^>]*>(?<label>[^<]+)<\/a>")]
-	private static partial Regex AddressRegex();
-
-	/// <summary>
-	/// Regex for the bin day panels on the property page.
-	/// </summary>
-	[GeneratedRegex(@"<div class=""u-mb-4""><strong>(?<service>[^<]+)<\/strong><\/div>[\s\S]*?Next collection - (?<next>[^<]+)<\/div>[\s\S]*?<ul class=""u-mt-4"">(?<future>[\s\S]*?)<\/ul>")]
-	private static partial Regex BinDaysRegex();
-
-	/// <summary>
-	/// Regex for dates within the bin day panels.
-	/// </summary>
-	[GeneratedRegex(@"(?<date>[A-Za-z]+,\s+\d{1,2}\s+[A-Za-z]+\s+\d{4})")]
-	private static partial Regex DateRegex();
-
-	/// <inheritdoc/>
-	public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? clientSideResponse)
-	{
-		// Prepare client-side request for base page (sets affinity cookies)
-		if (clientSideResponse == null)
-		{
-			var clientSideRequest = new ClientSideRequest
-			{
-				RequestId = 1,
-				Url = "https://www.wakefield.gov.uk/where-i-live",
-				Method = "GET",
-				Headers = new()
-				{
-					{ "user-agent", Constants.UserAgent },
-				},
-			};
-
-			return new GetAddressesResponse
-			{
-				NextClientSideRequest = clientSideRequest
-			};
-		}
-		// Prepare client-side request for address list
-		else if (clientSideResponse.RequestId == 1)
-		{
-			var formattedPostcode = ProcessingUtilities.FormatPostcode(postcode);
-			var requestCookies = ProcessingUtilities.ParseSetCookieHeaderForRequestCookie(
-				clientSideResponse.Headers.GetValueOrDefault("set-cookie") ?? string.Empty
-			);
-
-			var requestHeaders = new Dictionary<string, string>
-			{
-				{ "user-agent", Constants.UserAgent },
-			};
-
-			if (!string.IsNullOrWhiteSpace(requestCookies))
-			{
-				requestHeaders.Add("cookie", requestCookies);
-			}
-
-			var clientSideRequest = new ClientSideRequest
-			{
-				RequestId = 2,
-				Url = $"https://www.wakefield.gov.uk/pick-your-address?where-i-live={Uri.EscapeDataString(formattedPostcode)}",
-				Method = "GET",
-				Headers = requestHeaders,
-			};
-
-			return new GetAddressesResponse
-			{
-				NextClientSideRequest = clientSideRequest
-			};
-		}
-		// Process addresses from response
-		else if (clientSideResponse.RequestId == 2)
-		{
-			var rawAddresses = AddressRegex().Matches(clientSideResponse.Content)!;
-
-			var addresses = new List<Address>();
-			foreach (Match rawAddress in rawAddresses)
-			{
-				var href = HttpUtility.HtmlDecode(rawAddress.Groups["href"].Value);
-				var normalisedHref = href.Replace(" ", "%20");
-				var addressUri = normalisedHref.StartsWith("http", StringComparison.OrdinalIgnoreCase)
-					? new Uri(normalisedHref)
-					: new Uri(new Uri("https://www.wakefield.gov.uk"), normalisedHref);
-				var queryParameters = HttpUtility.ParseQueryString(addressUri.Query);
-
-				var uprn = queryParameters["uprn"]!;
-				var property = queryParameters["a"] ?? rawAddress.Groups["label"].Value;
-				var usrn = queryParameters["usrn"];
-				var postcodeValue = ProcessingUtilities.FormatPostcode(queryParameters["p"] ?? postcode);
-
-				var address = new Address
-				{
-					Property = property,
-					Street = usrn,
-					Postcode = postcodeValue,
-					Uid = uprn,
-				};
-
-				addresses.Add(address);
-			}
-
-			return new GetAddressesResponse
-			{
-				Addresses = [.. addresses],
-			};
-		}
-
-		throw new InvalidOperationException("Invalid client-side request.");
-	}
-
-	/// <inheritdoc/>
-	public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? clientSideResponse)
-	{
-		// Prepare client-side request for bin collections page
-		if (clientSideResponse == null)
-		{
-			var queryParameters = new List<string>
-			{
-				$"uprn={address.Uid}",
-				$"a={Uri.EscapeDataString(address.Property!)}",
-			};
-
-			if (!string.IsNullOrWhiteSpace(address.Street))
-			{
-				queryParameters.Add($"usrn={Uri.EscapeDataString(address.Street)}");
-			}
-
-			if (!string.IsNullOrWhiteSpace(address.Postcode))
-			{
-				var formattedPostcode = ProcessingUtilities.FormatPostcode(address.Postcode);
-				queryParameters.Add($"p={Uri.EscapeDataString(formattedPostcode)}");
-			}
-
-			var requestUrl = $"https://www.wakefield.gov.uk/where-i-live?{string.Join("&", queryParameters)}";
-
-			var clientSideRequest = new ClientSideRequest
-			{
-				RequestId = 1,
-				Url = requestUrl,
-				Method = "GET",
-				Headers = new()
-				{
-					{ "user-agent", Constants.UserAgent },
-				},
-			};
-
-			return new GetBinDaysResponse
-			{
-				NextClientSideRequest = clientSideRequest
-			};
-		}
-		// Process bin days from response
-		else if (clientSideResponse.RequestId == 1)
-		{
-			var rawBinDays = BinDaysRegex().Matches(clientSideResponse.Content)!;
-
-			var binDays = new List<BinDay>();
-			foreach (Match rawBinDay in rawBinDays)
-			{
-				var service = rawBinDay.Groups["service"].Value;
-				var nextCollection = rawBinDay.Groups["next"].Value.Trim();
-				var futureCollections = rawBinDay.Groups["future"].Value;
-
-				var matchingBins = ProcessingUtilities.GetMatchingBins(_binTypes, service);
-				var collectionDates = new HashSet<DateOnly>();
-
-				if (!nextCollection.Contains("n/a", StringComparison.OrdinalIgnoreCase))
-				{
-					collectionDates.Add(DateOnly.ParseExact(nextCollection, "dddd, d MMMM yyyy", CultureInfo.InvariantCulture));
-				}
-
-				foreach (Match dateMatch in DateRegex().Matches(futureCollections))
-				{
-					collectionDates.Add(DateOnly.ParseExact(dateMatch.Groups["date"].Value, "dddd, d MMMM yyyy", CultureInfo.InvariantCulture));
-				}
-
-				foreach (var collectionDate in collectionDates)
-				{
-					binDays.Add(new BinDay
-					{
-						Address = address,
-						Date = collectionDate,
-						Bins = matchingBins,
-					});
-				}
-			}
-
-			return new GetBinDaysResponse
-			{
-				BinDays = ProcessingUtilities.ProcessBinDays(binDays),
-			};
-		}
-
-		throw new InvalidOperationException("Invalid client-side request.");
-	}
-}
+namespace BinDays.Api.Collectors.Collectors.Councils;
+
+using BinDays.Api.Collectors.Collectors.Vendors;
+using BinDays.Api.Collectors.Models;
+using BinDays.Api.Collectors.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using System.Web;
+
+/// <summary>
+/// Collector implementation for Wakefield Council.
+/// </summary>
+internal sealed partial class WakefieldCouncil : GovUkCollectorBase, ICollector
+{
+	/// <inheritdoc/>
+	public string Name => "Wakefield Council";
+
+	/// <inheritdoc/>
+	public Uri WebsiteUrl => new("https://www.wakefield.gov.uk/");
+
+	/// <inheritdoc/>
+	public override string GovUkId => "wakefield";
+
+	/// <summary>
+	/// The list of bin types for this collector.
+	/// </summary>
+	private readonly IReadOnlyCollection<Bin> _binTypes = [
+		new()
+		{
+			Name = "General Waste",
+			Colour = BinColour.Green,
+			Keys = [ "Household waste", "General waste", "Refuse" ],
+		},
+		new()
+		{
+			Name = "Recycling",
+			Colour = BinColour.Brown,
+			Keys = [ "Mixed recycling", "Recycling" ],
+		},
+		new()
+		{
+			Name = "Garden Waste",
+			Colour = BinColour.Brown,
+			Keys = [ "Garden waste" ],
+		},
+	];
+
+	/// <summary>
+	/// Regex for the addresses from the address picker links.
+	/// </summary>
+	[GeneratedRegex(@"<a[^>]*?href=""(?<href>[^""]*?where-i-live\?uprn=[^""]+)""[^>]*>(?<label>[^<]+)<\/a>")]
+	private static partial Regex AddressRegex();
+
+	/// <summary>
+	/// Regex for the bin day panels on the property page.
+	/// </summary>
+	[GeneratedRegex(@"<div class=""u-mb-4""><strong>(?<service>[^<]+)<\/strong><\/div>[\s\S]*?Next collection - (?<next>[^<]+)<\/div>[\s\S]*?<ul class=""u-mt-4"">(?<future>[\s\S]*?)<\/ul>")]
+	private static partial Regex BinDaysRegex();
+
+	/// <summary>
+	/// Regex for dates within the bin day panels.
+	/// </summary>
+	[GeneratedRegex(@"(?<date>[A-Za-z]+,\s+\d{1,2}\s+[A-Za-z]+\s+\d{4})")]
+	private static partial Regex DateRegex();
+
+	/// <inheritdoc/>
+	public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? clientSideResponse)
+	{
+		// Prepare client-side request for base page (sets affinity cookies)
+		if (clientSideResponse == null)
+		{
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 1,
+				Url = "https://www.wakefield.gov.uk/where-i-live",
+				Method = "GET",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+				},
+			};
+
+			return new GetAddressesResponse
+			{
+				NextClientSideRequest = clientSideRequest
+			};
+		}
+		// Prepare client-side request for address list
+		else if (clientSideResponse.RequestId == 1)
+		{
+			var formattedPostcode = ProcessingUtilities.FormatPostcode(postcode);
+			var requestCookies = ProcessingUtilities.ParseSetCookieHeaderForRequestCookie(
+				clientSideResponse.Headers.GetValueOrDefault("set-cookie") ?? string.Empty
+			);
+
+			var requestHeaders = new Dictionary<string, string>
+			{
+				{ "user-agent", Constants.UserAgent },
+			};
+
+			if (!string.IsNullOrWhiteSpace(requestCookies))
+			{
+				requestHeaders.Add("cookie", requestCookies);
+			}
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 2,
+				Url = $"https://www.wakefield.gov.uk/pick-your-address?where-i-live={Uri.EscapeDataString(formattedPostcode)}",
+				Method = "GET",
+				Headers = requestHeaders,
+			};
+
+			return new GetAddressesResponse
+			{
+				NextClientSideRequest = clientSideRequest
+			};
+		}
+		// Process addresses from response
+		else if (clientSideResponse.RequestId == 2)
+		{
+			var rawAddresses = AddressRegex().Matches(clientSideResponse.Content)!;
+
+			var addresses = new List<Address>();
+			foreach (Match rawAddress in rawAddresses)
+			{
+				var href = HttpUtility.HtmlDecode(rawAddress.Groups["href"].Value);
+				var normalisedHref = href.Replace(" ", "%20");
+				var addressUri = normalisedHref.StartsWith("http", StringComparison.OrdinalIgnoreCase)
+					? new Uri(normalisedHref)
+					: new Uri(new Uri("https://www.wakefield.gov.uk"), normalisedHref);
+				var queryParameters = HttpUtility.ParseQueryString(addressUri.Query);
+
+				var uprn = queryParameters["uprn"]!;
+				var property = queryParameters["a"] ?? rawAddress.Groups["label"].Value;
+				var usrn = queryParameters["usrn"];
+				var postcodeValue = ProcessingUtilities.FormatPostcode(queryParameters["p"] ?? postcode);
+
+				var address = new Address
+				{
+					Property = property,
+					Street = usrn,
+					Postcode = postcodeValue,
+					Uid = uprn,
+				};
+
+				addresses.Add(address);
+			}
+
+			return new GetAddressesResponse
+			{
+				Addresses = [.. addresses],
+			};
+		}
+
+		throw new InvalidOperationException("Invalid client-side request.");
+	}
+
+	/// <inheritdoc/>
+	public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? clientSideResponse)
+	{
+		// Prepare client-side request for bin collections page
+		if (clientSideResponse == null)
+		{
+			var queryParameters = new List<string>
+			{
+				$"uprn={address.Uid}",
+				$"a={Uri.EscapeDataString(address.Property!)}",
+			};
+
+			if (!string.IsNullOrWhiteSpace(address.Street))
+			{
+				queryParameters.Add($"usrn={Uri.EscapeDataString(address.Street)}");
+			}
+
+			if (!string.IsNullOrWhiteSpace(address.Postcode))
+			{
+				var formattedPostcode = ProcessingUtilities.FormatPostcode(address.Postcode);
+				queryParameters.Add($"p={Uri.EscapeDataString(formattedPostcode)}");
+			}
+
+			var requestUrl = $"https://www.wakefield.gov.uk/where-i-live?{string.Join("&", queryParameters)}";
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 1,
+				Url = requestUrl,
+				Method = "GET",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+				},
+			};
+
+			return new GetBinDaysResponse
+			{
+				NextClientSideRequest = clientSideRequest
+			};
+		}
+		// Process bin days from response
+		else if (clientSideResponse.RequestId == 1)
+		{
+			var rawBinDays = BinDaysRegex().Matches(clientSideResponse.Content)!;
+
+			var binDays = new List<BinDay>();
+			foreach (Match rawBinDay in rawBinDays)
+			{
+				var service = rawBinDay.Groups["service"].Value;
+				var nextCollection = rawBinDay.Groups["next"].Value.Trim();
+				var futureCollections = rawBinDay.Groups["future"].Value;
+
+				var matchingBins = ProcessingUtilities.GetMatchingBins(_binTypes, service);
+				var collectionDates = new HashSet<DateOnly>();
+
+				if (!nextCollection.Contains("n/a", StringComparison.OrdinalIgnoreCase))
+				{
+					collectionDates.Add(DateOnly.ParseExact(nextCollection, "dddd, d MMMM yyyy", CultureInfo.InvariantCulture));
+				}
+
+				foreach (Match dateMatch in DateRegex().Matches(futureCollections))
+				{
+					collectionDates.Add(DateOnly.ParseExact(dateMatch.Groups["date"].Value, "dddd, d MMMM yyyy", CultureInfo.InvariantCulture));
+				}
+
+				foreach (var collectionDate in collectionDates)
+				{
+					binDays.Add(new BinDay
+					{
+						Address = address,
+						Date = collectionDate,
+						Bins = matchingBins,
+					});
+				}
+			}
+
+			return new GetBinDaysResponse
+			{
+				BinDays = ProcessingUtilities.ProcessBinDays(binDays),
+			};
+		}
+
+		throw new InvalidOperationException("Invalid client-side request.");
+	}
+}
diff --git a/BinDays.Api.IntegrationTests/Collectors/Councils/WakefieldCouncilTests.cs b/BinDays.Api.IntegrationTests/Collectors/Councils/WakefieldCouncilTests.cs
index 9551f4cf..20c4a997 100644
--- a/BinDays.Api.IntegrationTests/Collectors/Councils/WakefieldCouncilTests.cs
+++ b/BinDays.Api.IntegrationTests/Collectors/Councils/WakefieldCouncilTests.cs
@@ -1,36 +1,36 @@
-namespace BinDays.Api.IntegrationTests.Collectors.Councils;
-
-using BinDays.Api.Collectors.Collectors;
-using BinDays.Api.Collectors.Collectors.Councils;
-using BinDays.Api.Collectors.Services;
-using BinDays.Api.IntegrationTests.Helpers;
-using System.Threading.Tasks;
-using Xunit;
-using Xunit.Abstractions;
-
-public class WakefieldCouncilTests
-{
-	private readonly IntegrationTestClient _client;
-	private static readonly ICollector _collector = new WakefieldCouncil();
-	private readonly CollectorService _collectorService = new([_collector]);
-	private readonly ITestOutputHelper _outputHelper;
-
-	public WakefieldCouncilTests(ITestOutputHelper outputHelper)
-	{
-		_outputHelper = outputHelper;
-		_client = new IntegrationTestClient(outputHelper);
-	}
-
-	[Theory]
-	[InlineData("WF5 0RG")]
-	public async Task GetBinDaysTest(string postcode)
-	{
-		await TestSteps.EndToEnd(
-			_client,
-			_collectorService,
-			_collector,
-			postcode,
-			_outputHelper
-		);
-	}
-}
+namespace BinDays.Api.IntegrationTests.Collectors.Councils;
+
+using BinDays.Api.Collectors.Collectors;
+using BinDays.Api.Collectors.Collectors.Councils;
+using BinDays.Api.Collectors.Services;
+using BinDays.Api.IntegrationTests.Helpers;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+
+public class WakefieldCouncilTests
+{
+	private readonly IntegrationTestClient _client;
+	private static readonly ICollector _collector = new WakefieldCouncil();
+	private readonly CollectorService _collectorService = new([_collector]);
+	private readonly ITestOutputHelper _outputHelper;
+
+	public WakefieldCouncilTests(ITestOutputHelper outputHelper)
+	{
+		_outputHelper = outputHelper;
+		_client = new IntegrationTestClient(outputHelper);
+	}
+
+	[Theory]
+	[InlineData("WF5 0RG")]
+	public async Task GetBinDaysTest(string postcode)
+	{
+		await TestSteps.EndToEnd(
+			_client,
+			_collectorService,
+			_collector,
+			postcode,
+			_outputHelper
+		);
+	}
+}

From 9c5ac3222b389a3cc1336e17ce2c1e1f68725092 Mon Sep 17 00:00:00 2001
From: "claude[bot]" <41898282+claude[bot]@users.noreply.github.com>
Date: Tue, 3 Feb 2026 00:06:18 +0000
Subject: [PATCH 3/6] Refactor WakefieldCouncil collector based on PR review
 feedback

- Remove unnecessary postcode formatting in GetAddresses
- Simplify cookie handling by making it non-conditional
- Improve address parsing with better regex that directly captures query parameters
- Remove unnecessary usrn (street) and postcode query parameters from GetBinDays
- Add .Trim() to service and futureCollections strings
- Split date parsing over multiple lines for better readability
- Add standard comments before foreach loops per style guide
- Add DateTimeStyles.None parameter to DateOnly.ParseExact calls

Co-authored-by: Andrew Riggs <BadgerHobbs@users.noreply.github.com>
---
 .../Collectors/Councils/WakefieldCouncil.cs   | 82 +++++++------------
 1 file changed, 31 insertions(+), 51 deletions(-)

diff --git a/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs b/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs
index 739522f0..379d7aa6 100644
--- a/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs
+++ b/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs
@@ -50,7 +50,7 @@ internal sealed partial class WakefieldCouncil : GovUkCollectorBase, ICollector
 	/// <summary>
 	/// Regex for the addresses from the address picker links.
 	/// </summary>
-	[GeneratedRegex(@"<a[^>]*?href=""(?<href>[^""]*?where-i-live\?uprn=[^""]+)""[^>]*>(?<label>[^<]+)<\/a>")]
+	[GeneratedRegex(@"<a[^>]*?href=""[^""]*?where-i-live\?uprn=(?<uprn>[^&""]+)(?:&amp;a=(?<property>[^&""]+))?[^""]*""[^>]*>(?<label>[^<]+)<\/a>")]
 	private static partial Regex AddressRegex();
 
 	/// <summary>
@@ -90,27 +90,20 @@ public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? cl
 		// Prepare client-side request for address list
 		else if (clientSideResponse.RequestId == 1)
 		{
-			var formattedPostcode = ProcessingUtilities.FormatPostcode(postcode);
 			var requestCookies = ProcessingUtilities.ParseSetCookieHeaderForRequestCookie(
 				clientSideResponse.Headers.GetValueOrDefault("set-cookie") ?? string.Empty
 			);
 
-			var requestHeaders = new Dictionary<string, string>
-			{
-				{ "user-agent", Constants.UserAgent },
-			};
-
-			if (!string.IsNullOrWhiteSpace(requestCookies))
-			{
-				requestHeaders.Add("cookie", requestCookies);
-			}
-
 			var clientSideRequest = new ClientSideRequest
 			{
 				RequestId = 2,
-				Url = $"https://www.wakefield.gov.uk/pick-your-address?where-i-live={Uri.EscapeDataString(formattedPostcode)}",
+				Url = $"https://www.wakefield.gov.uk/pick-your-address?where-i-live={Uri.EscapeDataString(postcode)}",
 				Method = "GET",
-				Headers = requestHeaders,
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+					{ "cookie", requestCookies },
+				},
 			};
 
 			return new GetAddressesResponse
@@ -123,26 +116,19 @@ public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? cl
 		{
 			var rawAddresses = AddressRegex().Matches(clientSideResponse.Content)!;
 
+			// Iterate through each address, and create a new address object
 			var addresses = new List<Address>();
 			foreach (Match rawAddress in rawAddresses)
 			{
-				var href = HttpUtility.HtmlDecode(rawAddress.Groups["href"].Value);
-				var normalisedHref = href.Replace(" ", "%20");
-				var addressUri = normalisedHref.StartsWith("http", StringComparison.OrdinalIgnoreCase)
-					? new Uri(normalisedHref)
-					: new Uri(new Uri("https://www.wakefield.gov.uk"), normalisedHref);
-				var queryParameters = HttpUtility.ParseQueryString(addressUri.Query);
-
-				var uprn = queryParameters["uprn"]!;
-				var property = queryParameters["a"] ?? rawAddress.Groups["label"].Value;
-				var usrn = queryParameters["usrn"];
-				var postcodeValue = ProcessingUtilities.FormatPostcode(queryParameters["p"] ?? postcode);
+				var uprn = HttpUtility.UrlDecode(rawAddress.Groups["uprn"].Value).Trim();
+				var property = rawAddress.Groups["property"].Success
+					? HttpUtility.UrlDecode(rawAddress.Groups["property"].Value).Trim()
+					: rawAddress.Groups["label"].Value.Trim();
 
 				var address = new Address
 				{
 					Property = property,
-					Street = usrn,
-					Postcode = postcodeValue,
+					Postcode = postcode,
 					Uid = uprn,
 				};
 
@@ -164,29 +150,10 @@ public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? client
 		// Prepare client-side request for bin collections page
 		if (clientSideResponse == null)
 		{
-			var queryParameters = new List<string>
-			{
-				$"uprn={address.Uid}",
-				$"a={Uri.EscapeDataString(address.Property!)}",
-			};
-
-			if (!string.IsNullOrWhiteSpace(address.Street))
-			{
-				queryParameters.Add($"usrn={Uri.EscapeDataString(address.Street)}");
-			}
-
-			if (!string.IsNullOrWhiteSpace(address.Postcode))
-			{
-				var formattedPostcode = ProcessingUtilities.FormatPostcode(address.Postcode);
-				queryParameters.Add($"p={Uri.EscapeDataString(formattedPostcode)}");
-			}
-
-			var requestUrl = $"https://www.wakefield.gov.uk/where-i-live?{string.Join("&", queryParameters)}";
-
 			var clientSideRequest = new ClientSideRequest
 			{
 				RequestId = 1,
-				Url = requestUrl,
+				Url = $"https://www.wakefield.gov.uk/where-i-live?uprn={address.Uid}&a={Uri.EscapeDataString(address.Property!)}",
 				Method = "GET",
 				Headers = new()
 				{
@@ -204,24 +171,37 @@ public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? client
 		{
 			var rawBinDays = BinDaysRegex().Matches(clientSideResponse.Content)!;
 
+			// Iterate through each bin day, and create a new bin day object
 			var binDays = new List<BinDay>();
 			foreach (Match rawBinDay in rawBinDays)
 			{
-				var service = rawBinDay.Groups["service"].Value;
+				var service = rawBinDay.Groups["service"].Value.Trim();
 				var nextCollection = rawBinDay.Groups["next"].Value.Trim();
-				var futureCollections = rawBinDay.Groups["future"].Value;
+				var futureCollections = rawBinDay.Groups["future"].Value.Trim();
 
 				var matchingBins = ProcessingUtilities.GetMatchingBins(_binTypes, service);
 				var collectionDates = new HashSet<DateOnly>();
 
 				if (!nextCollection.Contains("n/a", StringComparison.OrdinalIgnoreCase))
 				{
-					collectionDates.Add(DateOnly.ParseExact(nextCollection, "dddd, d MMMM yyyy", CultureInfo.InvariantCulture));
+					var date = DateOnly.ParseExact(
+						nextCollection,
+						"dddd, d MMMM yyyy",
+						CultureInfo.InvariantCulture,
+						DateTimeStyles.None
+					);
+					collectionDates.Add(date);
 				}
 
 				foreach (Match dateMatch in DateRegex().Matches(futureCollections))
 				{
-					collectionDates.Add(DateOnly.ParseExact(dateMatch.Groups["date"].Value, "dddd, d MMMM yyyy", CultureInfo.InvariantCulture));
+					var date = DateOnly.ParseExact(
+						dateMatch.Groups["date"].Value,
+						"dddd, d MMMM yyyy",
+						CultureInfo.InvariantCulture,
+						DateTimeStyles.None
+					);
+					collectionDates.Add(date);
 				}
 
 				foreach (var collectionDate in collectionDates)

From f60f979e3e8cf2dc989656338293f389ec1b9793 Mon Sep 17 00:00:00 2001
From: "claude[bot]" <41898282+claude[bot]@users.noreply.github.com>
Date: Tue, 3 Feb 2026 22:46:32 +0000
Subject: [PATCH 4/6] Change WakefieldCouncil test postcode to WF5 0AF

Co-authored-by: Andrew Riggs <BadgerHobbs@users.noreply.github.com>
---
 .../Collectors/Councils/WakefieldCouncilTests.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BinDays.Api.IntegrationTests/Collectors/Councils/WakefieldCouncilTests.cs b/BinDays.Api.IntegrationTests/Collectors/Councils/WakefieldCouncilTests.cs
index 20c4a997..f0a564ab 100644
--- a/BinDays.Api.IntegrationTests/Collectors/Councils/WakefieldCouncilTests.cs
+++ b/BinDays.Api.IntegrationTests/Collectors/Councils/WakefieldCouncilTests.cs
@@ -22,7 +22,7 @@ public WakefieldCouncilTests(ITestOutputHelper outputHelper)
 	}
 
 	[Theory]
-	[InlineData("WF5 0RG")]
+	[InlineData("WF5 0AF")]
 	public async Task GetBinDaysTest(string postcode)
 	{
 		await TestSteps.EndToEnd(

From 4a22c7df9cae375a17d770f329aea2f7131aa001 Mon Sep 17 00:00:00 2001
From: "claude[bot]" <41898282+claude[bot]@users.noreply.github.com>
Date: Tue, 3 Feb 2026 22:54:46 +0000
Subject: [PATCH 5/6] Fix WakefieldCouncil PR review comments

- Remove conditional cookie handling - expect set-cookie header to be present
- Remove unnecessary postcode escaping in URL parameter
- Convert multi-line ternary to if-statement for readability

Co-authored-by: Andrew Riggs <BadgerHobbs@users.noreply.github.com>
---
 .../Collectors/Councils/WakefieldCouncil.cs     | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs b/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs
index 379d7aa6..4edb8cc5 100644
--- a/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs
+++ b/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs
@@ -91,13 +91,13 @@ public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? cl
 		else if (clientSideResponse.RequestId == 1)
 		{
 			var requestCookies = ProcessingUtilities.ParseSetCookieHeaderForRequestCookie(
-				clientSideResponse.Headers.GetValueOrDefault("set-cookie") ?? string.Empty
+				clientSideResponse.Headers["set-cookie"]
 			);
 
 			var clientSideRequest = new ClientSideRequest
 			{
 				RequestId = 2,
-				Url = $"https://www.wakefield.gov.uk/pick-your-address?where-i-live={Uri.EscapeDataString(postcode)}",
+				Url = $"https://www.wakefield.gov.uk/pick-your-address?where-i-live={postcode}",
 				Method = "GET",
 				Headers = new()
 				{
@@ -121,9 +121,16 @@ public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? cl
 			foreach (Match rawAddress in rawAddresses)
 			{
 				var uprn = HttpUtility.UrlDecode(rawAddress.Groups["uprn"].Value).Trim();
-				var property = rawAddress.Groups["property"].Success
-					? HttpUtility.UrlDecode(rawAddress.Groups["property"].Value).Trim()
-					: rawAddress.Groups["label"].Value.Trim();
+
+				var property = string.Empty;
+				if (rawAddress.Groups["property"].Success)
+				{
+					property = HttpUtility.UrlDecode(rawAddress.Groups["property"].Value).Trim();
+				}
+				else
+				{
+					property = rawAddress.Groups["label"].Value.Trim();
+				}
 
 				var address = new Address
 				{

From cd231899b5200f39a12e6e7f98d1e23e203ac9d4 Mon Sep 17 00:00:00 2001
From: Moley-Bot <moley-bot@users.noreply.github.com>
Date: Tue, 3 Feb 2026 22:56:45 +0000
Subject: [PATCH 6/6] Auto-format code with dotnet format

  Formatted by Moley-Bot
---
 BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs b/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs
index 4edb8cc5..bac7a2be 100644
--- a/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs
+++ b/BinDays.Api.Collectors/Collectors/Councils/WakefieldCouncil.cs
@@ -122,7 +122,7 @@ public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? cl
 			{
 				var uprn = HttpUtility.UrlDecode(rawAddress.Groups["uprn"].Value).Trim();
 
-				var property = string.Empty;
+				string? property;
 				if (rawAddress.Groups["property"].Success)
 				{
 					property = HttpUtility.UrlDecode(rawAddress.Groups["property"].Value).Trim();