From 161846ee3b2a3f0c9f053f20347d0a4d3c3bcae7 Mon Sep 17 00:00:00 2001
From: Moley-Bot <moley-bot@users.noreply.github.com>
Date: Mon, 26 Jan 2026 10:53:44 +0000
Subject: [PATCH 1/5] Add collector for BroxtoweBoroughCouncil

Closes #107

Generated with Codex CLI by Moley-Bot
---
 .../Councils/BroxtoweBoroughCouncil.cs        | 443 ++++++++++++++++++
 .../Councils/BroxtoweBoroughCouncilTests.cs   |  36 ++
 2 files changed, 479 insertions(+)
 create mode 100644 BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs
 create mode 100644 BinDays.Api.IntegrationTests/Collectors/Councils/BroxtoweBoroughCouncilTests.cs

diff --git a/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs b/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs
new file mode 100644
index 0000000..da08d89
--- /dev/null
+++ b/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs
@@ -0,0 +1,443 @@
+namespace BinDays.Api.Collectors.Collectors.Councils;
+
+using BinDays.Api.Collectors.Models;
+using BinDays.Api.Collectors.Utilities;
+using BinDays.Api.Collectors.Collectors.Vendors;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using System.Text.RegularExpressions;
+
+/// <summary>
+/// Collector implementation for Broxtowe Borough Council.
+/// </summary>
+internal sealed partial class BroxtoweBoroughCouncil : GovUkCollectorBase, ICollector
+{
+	/// <inheritdoc/>
+	public string Name => "Broxtowe Borough Council";
+
+	/// <inheritdoc/>
+	public Uri WebsiteUrl => new("https://www.broxtowe.gov.uk/");
+
+	/// <inheritdoc/>
+	public override string GovUkId => "broxtowe";
+
+	/// <summary>
+	/// The list of bin types for this collector.
+	/// </summary>
+	private readonly IReadOnlyCollection<Bin> _binTypes =
+	[
+		new()
+		{
+			Name = "Mixed Dry Recycling",
+			Colour = BinColour.Green,
+			Keys = [ "GREEN 240L" ],
+		},
+		new()
+		{
+			Name = "Glass Recycling",
+			Colour = BinColour.Green,
+			Keys = [ "GLASS BAG" ],
+			Type = BinType.Bag,
+		},
+		new()
+		{
+			Name = "Garden Waste",
+			Colour = BinColour.Brown,
+			Keys = [ "BROWN 240L" ],
+		},
+		new()
+		{
+			Name = "General Waste",
+			Colour = BinColour.Black,
+			Keys = [ "BLACK 240L" ],
+		},
+	];
+
+	private const string _formUrl = "https://selfservice.broxtowe.gov.uk/renderform.aspx?t=217&k=9D2EF214E144EE796430597FB475C3892C43C528";
+	private const string _scriptManagerTarget = "ctl00$ContentPlaceHolder1$APUP_5683";
+	private const string _searchEventTarget = "ctl00$ContentPlaceHolder1$FF5683BTN";
+	private const string _addressEventTarget = "ctl00$ContentPlaceHolder1$FF5683DDL";
+	private const string _submitEventTarget = "ctl00$ContentPlaceHolder1$btnSubmit";
+
+	/// <summary>
+	/// Regex for parsing hidden fields from AJAX responses.
+	/// </summary>
+	[GeneratedRegex(@"hiddenField\|(?<name>__VIEWSTATEGENERATOR|__EVENTVALIDATION|__VIEWSTATE)\|(?<value>[^|]+)")]
+	private static partial Regex AjaxHiddenFieldRegex();
+
+	/// <summary>
+	/// Regex for parsing hidden fields from HTML responses.
+	/// </summary>
+	[GeneratedRegex(@"name=""(?<name>__VIEWSTATEGENERATOR|__EVENTVALIDATION|__VIEWSTATE)""[^>]+value=""(?<value>[^""]+)""")]
+	private static partial Regex HtmlHiddenFieldRegex();
+
+	/// <summary>
+	/// Regex for parsing address options.
+	/// </summary>
+	[GeneratedRegex(@"<option value=""(?<uid>[^""]+)"">(?<address>[^<]+)</option>")]
+	private static partial Regex AddressRegex();
+
+	/// <summary>
+	/// Regex for parsing bin rows.
+	/// </summary>
+	[GeneratedRegex(@"<tr>\s*<td>(?<service>[^<]+)</td>\s*<td>(?<day>[^<]+)</td>\s*<td>(?<last>[^<]*)</td>\s*<td>(?<next>[^<]+)</td>\s*</tr>", RegexOptions.Singleline)]
+	private static partial Regex BinRowRegex();
+
+	/// <inheritdoc/>
+	public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? clientSideResponse)
+	{
+		// Prepare client-side request for initial form load
+		if (clientSideResponse == null)
+		{
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 1,
+				Url = _formUrl,
+				Method = "GET",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+				},
+			};
+
+			var getAddressesResponse = new GetAddressesResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getAddressesResponse;
+		}
+		// Prepare client-side request for postcode search
+		else if (clientSideResponse.RequestId == 1)
+		{
+			clientSideResponse.Headers.TryGetValue("set-cookie", out var setCookieHeader);
+			var cookie = ProcessingUtilities.ParseSetCookieHeaderForRequestCookie(setCookieHeader!);
+
+			var viewState = GetHiddenField(clientSideResponse.Content, "__VIEWSTATE");
+			var viewStateGenerator = GetHiddenField(clientSideResponse.Content, "__VIEWSTATEGENERATOR");
+			var eventValidation = GetHiddenField(clientSideResponse.Content, "__EVENTVALIDATION");
+
+			var formData = new Dictionary<string, string>
+			{
+				{ "ctl00$ScriptManager1", $"{_scriptManagerTarget}|{_searchEventTarget}" },
+				{ "__EVENTTARGET", _searchEventTarget },
+				{ "__EVENTARGUMENT", string.Empty },
+				{ "__VIEWSTATE", viewState },
+				{ "__VIEWSTATEGENERATOR", viewStateGenerator },
+				{ "__EVENTVALIDATION", eventValidation },
+				{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
+				{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
+				{ "ctl00$ContentPlaceHolder1$FF5683TB", postcode },
+				{ "__ASYNCPOST", "true" },
+			};
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 2,
+				Url = _formUrl,
+				Method = "POST",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+					{ "x-requested-with", "XMLHttpRequest" },
+					{ "x-microsoftajax", "Delta=true" },
+					{ "content-type", "application/x-www-form-urlencoded; charset=utf-8" },
+					{ "cookie", cookie },
+				},
+				Body = ProcessingUtilities.ConvertDictionaryToFormData(formData),
+			};
+
+			var getAddressesResponse = new GetAddressesResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getAddressesResponse;
+		}
+		// Process addresses from response
+		else if (clientSideResponse.RequestId == 2)
+		{
+			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 uid = rawAddress.Groups["uid"].Value;
+
+				if (string.IsNullOrWhiteSpace(uid) || uid == "0")
+				{
+					continue;
+				}
+
+				var property = WebUtility.HtmlDecode(rawAddress.Groups["address"].Value).Trim();
+
+				var address = new Address
+				{
+					Property = property,
+					Postcode = postcode,
+					Uid = uid,
+				};
+
+				addresses.Add(address);
+			}
+
+			var getAddressesResponse = new GetAddressesResponse
+			{
+				Addresses = [.. addresses],
+			};
+
+			return getAddressesResponse;
+		}
+
+		throw new InvalidOperationException("Invalid client-side request.");
+	}
+
+	/// <inheritdoc/>
+	public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? clientSideResponse)
+	{
+		// Prepare client-side request for initial form load
+		if (clientSideResponse == null)
+		{
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 1,
+				Url = _formUrl,
+				Method = "GET",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+				},
+			};
+
+			var getBinDaysResponse = new GetBinDaysResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getBinDaysResponse;
+		}
+		// Prepare client-side request for postcode search
+		else if (clientSideResponse.RequestId == 1)
+		{
+			clientSideResponse.Headers.TryGetValue("set-cookie", out var setCookieHeader);
+			var cookie = ProcessingUtilities.ParseSetCookieHeaderForRequestCookie(setCookieHeader!);
+
+			var viewState = GetHiddenField(clientSideResponse.Content, "__VIEWSTATE");
+			var viewStateGenerator = GetHiddenField(clientSideResponse.Content, "__VIEWSTATEGENERATOR");
+			var eventValidation = GetHiddenField(clientSideResponse.Content, "__EVENTVALIDATION");
+
+			var formData = new Dictionary<string, string>
+			{
+				{ "ctl00$ScriptManager1", $"{_scriptManagerTarget}|{_searchEventTarget}" },
+				{ "__EVENTTARGET", _searchEventTarget },
+				{ "__EVENTARGUMENT", string.Empty },
+				{ "__VIEWSTATE", viewState },
+				{ "__VIEWSTATEGENERATOR", viewStateGenerator },
+				{ "__EVENTVALIDATION", eventValidation },
+				{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
+				{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
+				{ "ctl00$ContentPlaceHolder1$FF5683TB", address.Postcode! },
+				{ "__ASYNCPOST", "true" },
+			};
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 2,
+				Url = _formUrl,
+				Method = "POST",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+					{ "x-requested-with", "XMLHttpRequest" },
+					{ "x-microsoftajax", "Delta=true" },
+					{ "content-type", "application/x-www-form-urlencoded; charset=utf-8" },
+					{ "cookie", cookie },
+				},
+				Body = ProcessingUtilities.ConvertDictionaryToFormData(formData),
+				Options = new ClientSideOptions
+				{
+					Metadata =
+					{
+						{ "cookie", cookie },
+					},
+				},
+			};
+
+			var getBinDaysResponse = new GetBinDaysResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getBinDaysResponse;
+		}
+		// Prepare client-side request for selecting the address
+		else if (clientSideResponse.RequestId == 2)
+		{
+			var cookie = clientSideResponse.Options.Metadata["cookie"];
+
+			var viewState = GetHiddenField(clientSideResponse.Content, "__VIEWSTATE");
+			var viewStateGenerator = GetHiddenField(clientSideResponse.Content, "__VIEWSTATEGENERATOR");
+			var eventValidation = GetHiddenField(clientSideResponse.Content, "__EVENTVALIDATION");
+
+			var formData = new Dictionary<string, string>
+			{
+				{ "ctl00$ScriptManager1", $"{_scriptManagerTarget}|{_addressEventTarget}" },
+				{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
+				{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
+				{ "ctl00$ContentPlaceHolder1$FF5683DDL", address.Uid! },
+				{ "__EVENTTARGET", _addressEventTarget },
+				{ "__EVENTARGUMENT", string.Empty },
+				{ "__LASTFOCUS", string.Empty },
+				{ "__VIEWSTATE", viewState },
+				{ "__VIEWSTATEGENERATOR", viewStateGenerator },
+				{ "__EVENTVALIDATION", eventValidation },
+				{ "__ASYNCPOST", "true" },
+			};
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 3,
+				Url = _formUrl,
+				Method = "POST",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+					{ "x-requested-with", "XMLHttpRequest" },
+					{ "x-microsoftajax", "Delta=true" },
+					{ "content-type", "application/x-www-form-urlencoded; charset=utf-8" },
+					{ "cookie", cookie },
+				},
+				Body = ProcessingUtilities.ConvertDictionaryToFormData(formData),
+				Options = new ClientSideOptions
+				{
+					Metadata =
+					{
+						{ "cookie", cookie },
+					},
+				},
+			};
+
+			var getBinDaysResponse = new GetBinDaysResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getBinDaysResponse;
+		}
+		// Prepare client-side request to fetch bin collections
+		else if (clientSideResponse.RequestId == 3)
+		{
+			var cookie = clientSideResponse.Options.Metadata["cookie"];
+
+			var viewState = GetHiddenField(clientSideResponse.Content, "__VIEWSTATE");
+			var viewStateGenerator = GetHiddenField(clientSideResponse.Content, "__VIEWSTATEGENERATOR");
+			var eventValidation = GetHiddenField(clientSideResponse.Content, "__EVENTVALIDATION");
+
+			var formData = new Dictionary<string, string>
+			{
+				{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
+				{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
+				{ "__EVENTTARGET", _submitEventTarget },
+				{ "__EVENTARGUMENT", string.Empty },
+				{ "__LASTFOCUS", string.Empty },
+				{ "__VIEWSTATE", viewState },
+				{ "__VIEWSTATEGENERATOR", viewStateGenerator },
+				{ "__EVENTVALIDATION", eventValidation },
+			};
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 4,
+				Url = _formUrl,
+				Method = "POST",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+					{ "content-type", "application/x-www-form-urlencoded" },
+					{ "cookie", cookie },
+				},
+				Body = ProcessingUtilities.ConvertDictionaryToFormData(formData),
+			};
+
+			var getBinDaysResponse = new GetBinDaysResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getBinDaysResponse;
+		}
+		// Process bin days from response
+		else if (clientSideResponse.RequestId == 4)
+		{
+			var rawBinRows = BinRowRegex().Matches(clientSideResponse.Content)!;
+
+			// Iterate through each bin row, and create a new bin day object
+			var binDays = new List<BinDay>();
+			foreach (Match rawBinRow in rawBinRows)
+			{
+				var service = WebUtility.HtmlDecode(rawBinRow.Groups["service"].Value).Trim();
+				var nextCollection = WebUtility.HtmlDecode(rawBinRow.Groups["next"].Value).Trim();
+
+				var date = DateOnly.ParseExact(
+					nextCollection,
+					"dddd, dd MMMM yyyy",
+					CultureInfo.InvariantCulture,
+					DateTimeStyles.None
+				);
+
+				var matchedBins = ProcessingUtilities.GetMatchingBins(_binTypes, service);
+
+				var binDay = new BinDay
+				{
+					Date = date,
+					Address = address,
+					Bins = matchedBins,
+				};
+
+				binDays.Add(binDay);
+			}
+
+			var getBinDaysResponse = new GetBinDaysResponse
+			{
+				BinDays = ProcessingUtilities.ProcessBinDays(binDays),
+			};
+
+			return getBinDaysResponse;
+		}
+
+		throw new InvalidOperationException("Invalid client-side request.");
+	}
+
+	/// <summary>
+	/// Extracts hidden field values from HTML or AJAX responses.
+	/// </summary>
+	private static string GetHiddenField(string content, string fieldName)
+	{
+		var ajaxFields = AjaxHiddenFieldRegex().Matches(content)!;
+
+		// Iterate through each hidden field in the AJAX response
+		foreach (Match ajaxField in ajaxFields)
+		{
+			if (ajaxField.Groups["name"].Value == fieldName)
+			{
+				return ajaxField.Groups["value"].Value;
+			}
+		}
+
+		var htmlFields = HtmlHiddenFieldRegex().Matches(content)!;
+
+		// Iterate through each hidden field in the HTML response
+		foreach (Match htmlField in htmlFields)
+		{
+			if (htmlField.Groups["name"].Value == fieldName)
+			{
+				return htmlField.Groups["value"].Value;
+			}
+		}
+
+		throw new InvalidOperationException($"{fieldName} not found.");
+	}
+}
diff --git a/BinDays.Api.IntegrationTests/Collectors/Councils/BroxtoweBoroughCouncilTests.cs b/BinDays.Api.IntegrationTests/Collectors/Councils/BroxtoweBoroughCouncilTests.cs
new file mode 100644
index 0000000..7b52db3
--- /dev/null
+++ b/BinDays.Api.IntegrationTests/Collectors/Councils/BroxtoweBoroughCouncilTests.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 BroxtoweBoroughCouncilTests
+{
+	private readonly IntegrationTestClient _client;
+	private static readonly ICollector _collector = new BroxtoweBoroughCouncil();
+	private readonly CollectorService _collectorService = new([_collector]);
+	private readonly ITestOutputHelper _outputHelper;
+
+	public BroxtoweBoroughCouncilTests(ITestOutputHelper outputHelper)
+	{
+		_outputHelper = outputHelper;
+		_client = new IntegrationTestClient(outputHelper);
+	}
+
+	[Theory]
+	[InlineData("NG16 2NB")]
+	public async Task GetBinDaysTest(string postcode)
+	{
+		await TestSteps.EndToEnd(
+			_client,
+			_collectorService,
+			_collector,
+			postcode,
+			_outputHelper
+		);
+	}
+}

From 0e68e44bfecb14d9d35c7f4e5837600df7bc7123 Mon Sep 17 00:00:00 2001
From: Moley-Bot <moley-bot@users.noreply.github.com>
Date: Mon, 26 Jan 2026 10:54:21 +0000
Subject: [PATCH 2/5] Auto-format code with dotnet format

  Formatted by Moley-Bot
---
 .../Councils/BroxtoweBoroughCouncil.cs        | 886 +++++++++---------
 .../Councils/BroxtoweBoroughCouncilTests.cs   |  72 +-
 2 files changed, 479 insertions(+), 479 deletions(-)

diff --git a/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs b/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs
index da08d89..ae27603 100644
--- a/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs
+++ b/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs
@@ -1,443 +1,443 @@
-namespace BinDays.Api.Collectors.Collectors.Councils;
-
-using BinDays.Api.Collectors.Models;
-using BinDays.Api.Collectors.Utilities;
-using BinDays.Api.Collectors.Collectors.Vendors;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using System.Text.RegularExpressions;
-
-/// <summary>
-/// Collector implementation for Broxtowe Borough Council.
-/// </summary>
-internal sealed partial class BroxtoweBoroughCouncil : GovUkCollectorBase, ICollector
-{
-	/// <inheritdoc/>
-	public string Name => "Broxtowe Borough Council";
-
-	/// <inheritdoc/>
-	public Uri WebsiteUrl => new("https://www.broxtowe.gov.uk/");
-
-	/// <inheritdoc/>
-	public override string GovUkId => "broxtowe";
-
-	/// <summary>
-	/// The list of bin types for this collector.
-	/// </summary>
-	private readonly IReadOnlyCollection<Bin> _binTypes =
-	[
-		new()
-		{
-			Name = "Mixed Dry Recycling",
-			Colour = BinColour.Green,
-			Keys = [ "GREEN 240L" ],
-		},
-		new()
-		{
-			Name = "Glass Recycling",
-			Colour = BinColour.Green,
-			Keys = [ "GLASS BAG" ],
-			Type = BinType.Bag,
-		},
-		new()
-		{
-			Name = "Garden Waste",
-			Colour = BinColour.Brown,
-			Keys = [ "BROWN 240L" ],
-		},
-		new()
-		{
-			Name = "General Waste",
-			Colour = BinColour.Black,
-			Keys = [ "BLACK 240L" ],
-		},
-	];
-
-	private const string _formUrl = "https://selfservice.broxtowe.gov.uk/renderform.aspx?t=217&k=9D2EF214E144EE796430597FB475C3892C43C528";
-	private const string _scriptManagerTarget = "ctl00$ContentPlaceHolder1$APUP_5683";
-	private const string _searchEventTarget = "ctl00$ContentPlaceHolder1$FF5683BTN";
-	private const string _addressEventTarget = "ctl00$ContentPlaceHolder1$FF5683DDL";
-	private const string _submitEventTarget = "ctl00$ContentPlaceHolder1$btnSubmit";
-
-	/// <summary>
-	/// Regex for parsing hidden fields from AJAX responses.
-	/// </summary>
-	[GeneratedRegex(@"hiddenField\|(?<name>__VIEWSTATEGENERATOR|__EVENTVALIDATION|__VIEWSTATE)\|(?<value>[^|]+)")]
-	private static partial Regex AjaxHiddenFieldRegex();
-
-	/// <summary>
-	/// Regex for parsing hidden fields from HTML responses.
-	/// </summary>
-	[GeneratedRegex(@"name=""(?<name>__VIEWSTATEGENERATOR|__EVENTVALIDATION|__VIEWSTATE)""[^>]+value=""(?<value>[^""]+)""")]
-	private static partial Regex HtmlHiddenFieldRegex();
-
-	/// <summary>
-	/// Regex for parsing address options.
-	/// </summary>
-	[GeneratedRegex(@"<option value=""(?<uid>[^""]+)"">(?<address>[^<]+)</option>")]
-	private static partial Regex AddressRegex();
-
-	/// <summary>
-	/// Regex for parsing bin rows.
-	/// </summary>
-	[GeneratedRegex(@"<tr>\s*<td>(?<service>[^<]+)</td>\s*<td>(?<day>[^<]+)</td>\s*<td>(?<last>[^<]*)</td>\s*<td>(?<next>[^<]+)</td>\s*</tr>", RegexOptions.Singleline)]
-	private static partial Regex BinRowRegex();
-
-	/// <inheritdoc/>
-	public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? clientSideResponse)
-	{
-		// Prepare client-side request for initial form load
-		if (clientSideResponse == null)
-		{
-			var clientSideRequest = new ClientSideRequest
-			{
-				RequestId = 1,
-				Url = _formUrl,
-				Method = "GET",
-				Headers = new()
-				{
-					{ "user-agent", Constants.UserAgent },
-				},
-			};
-
-			var getAddressesResponse = new GetAddressesResponse
-			{
-				NextClientSideRequest = clientSideRequest,
-			};
-
-			return getAddressesResponse;
-		}
-		// Prepare client-side request for postcode search
-		else if (clientSideResponse.RequestId == 1)
-		{
-			clientSideResponse.Headers.TryGetValue("set-cookie", out var setCookieHeader);
-			var cookie = ProcessingUtilities.ParseSetCookieHeaderForRequestCookie(setCookieHeader!);
-
-			var viewState = GetHiddenField(clientSideResponse.Content, "__VIEWSTATE");
-			var viewStateGenerator = GetHiddenField(clientSideResponse.Content, "__VIEWSTATEGENERATOR");
-			var eventValidation = GetHiddenField(clientSideResponse.Content, "__EVENTVALIDATION");
-
-			var formData = new Dictionary<string, string>
-			{
-				{ "ctl00$ScriptManager1", $"{_scriptManagerTarget}|{_searchEventTarget}" },
-				{ "__EVENTTARGET", _searchEventTarget },
-				{ "__EVENTARGUMENT", string.Empty },
-				{ "__VIEWSTATE", viewState },
-				{ "__VIEWSTATEGENERATOR", viewStateGenerator },
-				{ "__EVENTVALIDATION", eventValidation },
-				{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
-				{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
-				{ "ctl00$ContentPlaceHolder1$FF5683TB", postcode },
-				{ "__ASYNCPOST", "true" },
-			};
-
-			var clientSideRequest = new ClientSideRequest
-			{
-				RequestId = 2,
-				Url = _formUrl,
-				Method = "POST",
-				Headers = new()
-				{
-					{ "user-agent", Constants.UserAgent },
-					{ "x-requested-with", "XMLHttpRequest" },
-					{ "x-microsoftajax", "Delta=true" },
-					{ "content-type", "application/x-www-form-urlencoded; charset=utf-8" },
-					{ "cookie", cookie },
-				},
-				Body = ProcessingUtilities.ConvertDictionaryToFormData(formData),
-			};
-
-			var getAddressesResponse = new GetAddressesResponse
-			{
-				NextClientSideRequest = clientSideRequest,
-			};
-
-			return getAddressesResponse;
-		}
-		// Process addresses from response
-		else if (clientSideResponse.RequestId == 2)
-		{
-			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 uid = rawAddress.Groups["uid"].Value;
-
-				if (string.IsNullOrWhiteSpace(uid) || uid == "0")
-				{
-					continue;
-				}
-
-				var property = WebUtility.HtmlDecode(rawAddress.Groups["address"].Value).Trim();
-
-				var address = new Address
-				{
-					Property = property,
-					Postcode = postcode,
-					Uid = uid,
-				};
-
-				addresses.Add(address);
-			}
-
-			var getAddressesResponse = new GetAddressesResponse
-			{
-				Addresses = [.. addresses],
-			};
-
-			return getAddressesResponse;
-		}
-
-		throw new InvalidOperationException("Invalid client-side request.");
-	}
-
-	/// <inheritdoc/>
-	public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? clientSideResponse)
-	{
-		// Prepare client-side request for initial form load
-		if (clientSideResponse == null)
-		{
-			var clientSideRequest = new ClientSideRequest
-			{
-				RequestId = 1,
-				Url = _formUrl,
-				Method = "GET",
-				Headers = new()
-				{
-					{ "user-agent", Constants.UserAgent },
-				},
-			};
-
-			var getBinDaysResponse = new GetBinDaysResponse
-			{
-				NextClientSideRequest = clientSideRequest,
-			};
-
-			return getBinDaysResponse;
-		}
-		// Prepare client-side request for postcode search
-		else if (clientSideResponse.RequestId == 1)
-		{
-			clientSideResponse.Headers.TryGetValue("set-cookie", out var setCookieHeader);
-			var cookie = ProcessingUtilities.ParseSetCookieHeaderForRequestCookie(setCookieHeader!);
-
-			var viewState = GetHiddenField(clientSideResponse.Content, "__VIEWSTATE");
-			var viewStateGenerator = GetHiddenField(clientSideResponse.Content, "__VIEWSTATEGENERATOR");
-			var eventValidation = GetHiddenField(clientSideResponse.Content, "__EVENTVALIDATION");
-
-			var formData = new Dictionary<string, string>
-			{
-				{ "ctl00$ScriptManager1", $"{_scriptManagerTarget}|{_searchEventTarget}" },
-				{ "__EVENTTARGET", _searchEventTarget },
-				{ "__EVENTARGUMENT", string.Empty },
-				{ "__VIEWSTATE", viewState },
-				{ "__VIEWSTATEGENERATOR", viewStateGenerator },
-				{ "__EVENTVALIDATION", eventValidation },
-				{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
-				{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
-				{ "ctl00$ContentPlaceHolder1$FF5683TB", address.Postcode! },
-				{ "__ASYNCPOST", "true" },
-			};
-
-			var clientSideRequest = new ClientSideRequest
-			{
-				RequestId = 2,
-				Url = _formUrl,
-				Method = "POST",
-				Headers = new()
-				{
-					{ "user-agent", Constants.UserAgent },
-					{ "x-requested-with", "XMLHttpRequest" },
-					{ "x-microsoftajax", "Delta=true" },
-					{ "content-type", "application/x-www-form-urlencoded; charset=utf-8" },
-					{ "cookie", cookie },
-				},
-				Body = ProcessingUtilities.ConvertDictionaryToFormData(formData),
-				Options = new ClientSideOptions
-				{
-					Metadata =
-					{
-						{ "cookie", cookie },
-					},
-				},
-			};
-
-			var getBinDaysResponse = new GetBinDaysResponse
-			{
-				NextClientSideRequest = clientSideRequest,
-			};
-
-			return getBinDaysResponse;
-		}
-		// Prepare client-side request for selecting the address
-		else if (clientSideResponse.RequestId == 2)
-		{
-			var cookie = clientSideResponse.Options.Metadata["cookie"];
-
-			var viewState = GetHiddenField(clientSideResponse.Content, "__VIEWSTATE");
-			var viewStateGenerator = GetHiddenField(clientSideResponse.Content, "__VIEWSTATEGENERATOR");
-			var eventValidation = GetHiddenField(clientSideResponse.Content, "__EVENTVALIDATION");
-
-			var formData = new Dictionary<string, string>
-			{
-				{ "ctl00$ScriptManager1", $"{_scriptManagerTarget}|{_addressEventTarget}" },
-				{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
-				{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
-				{ "ctl00$ContentPlaceHolder1$FF5683DDL", address.Uid! },
-				{ "__EVENTTARGET", _addressEventTarget },
-				{ "__EVENTARGUMENT", string.Empty },
-				{ "__LASTFOCUS", string.Empty },
-				{ "__VIEWSTATE", viewState },
-				{ "__VIEWSTATEGENERATOR", viewStateGenerator },
-				{ "__EVENTVALIDATION", eventValidation },
-				{ "__ASYNCPOST", "true" },
-			};
-
-			var clientSideRequest = new ClientSideRequest
-			{
-				RequestId = 3,
-				Url = _formUrl,
-				Method = "POST",
-				Headers = new()
-				{
-					{ "user-agent", Constants.UserAgent },
-					{ "x-requested-with", "XMLHttpRequest" },
-					{ "x-microsoftajax", "Delta=true" },
-					{ "content-type", "application/x-www-form-urlencoded; charset=utf-8" },
-					{ "cookie", cookie },
-				},
-				Body = ProcessingUtilities.ConvertDictionaryToFormData(formData),
-				Options = new ClientSideOptions
-				{
-					Metadata =
-					{
-						{ "cookie", cookie },
-					},
-				},
-			};
-
-			var getBinDaysResponse = new GetBinDaysResponse
-			{
-				NextClientSideRequest = clientSideRequest,
-			};
-
-			return getBinDaysResponse;
-		}
-		// Prepare client-side request to fetch bin collections
-		else if (clientSideResponse.RequestId == 3)
-		{
-			var cookie = clientSideResponse.Options.Metadata["cookie"];
-
-			var viewState = GetHiddenField(clientSideResponse.Content, "__VIEWSTATE");
-			var viewStateGenerator = GetHiddenField(clientSideResponse.Content, "__VIEWSTATEGENERATOR");
-			var eventValidation = GetHiddenField(clientSideResponse.Content, "__EVENTVALIDATION");
-
-			var formData = new Dictionary<string, string>
-			{
-				{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
-				{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
-				{ "__EVENTTARGET", _submitEventTarget },
-				{ "__EVENTARGUMENT", string.Empty },
-				{ "__LASTFOCUS", string.Empty },
-				{ "__VIEWSTATE", viewState },
-				{ "__VIEWSTATEGENERATOR", viewStateGenerator },
-				{ "__EVENTVALIDATION", eventValidation },
-			};
-
-			var clientSideRequest = new ClientSideRequest
-			{
-				RequestId = 4,
-				Url = _formUrl,
-				Method = "POST",
-				Headers = new()
-				{
-					{ "user-agent", Constants.UserAgent },
-					{ "content-type", "application/x-www-form-urlencoded" },
-					{ "cookie", cookie },
-				},
-				Body = ProcessingUtilities.ConvertDictionaryToFormData(formData),
-			};
-
-			var getBinDaysResponse = new GetBinDaysResponse
-			{
-				NextClientSideRequest = clientSideRequest,
-			};
-
-			return getBinDaysResponse;
-		}
-		// Process bin days from response
-		else if (clientSideResponse.RequestId == 4)
-		{
-			var rawBinRows = BinRowRegex().Matches(clientSideResponse.Content)!;
-
-			// Iterate through each bin row, and create a new bin day object
-			var binDays = new List<BinDay>();
-			foreach (Match rawBinRow in rawBinRows)
-			{
-				var service = WebUtility.HtmlDecode(rawBinRow.Groups["service"].Value).Trim();
-				var nextCollection = WebUtility.HtmlDecode(rawBinRow.Groups["next"].Value).Trim();
-
-				var date = DateOnly.ParseExact(
-					nextCollection,
-					"dddd, dd MMMM yyyy",
-					CultureInfo.InvariantCulture,
-					DateTimeStyles.None
-				);
-
-				var matchedBins = ProcessingUtilities.GetMatchingBins(_binTypes, service);
-
-				var binDay = new BinDay
-				{
-					Date = date,
-					Address = address,
-					Bins = matchedBins,
-				};
-
-				binDays.Add(binDay);
-			}
-
-			var getBinDaysResponse = new GetBinDaysResponse
-			{
-				BinDays = ProcessingUtilities.ProcessBinDays(binDays),
-			};
-
-			return getBinDaysResponse;
-		}
-
-		throw new InvalidOperationException("Invalid client-side request.");
-	}
-
-	/// <summary>
-	/// Extracts hidden field values from HTML or AJAX responses.
-	/// </summary>
-	private static string GetHiddenField(string content, string fieldName)
-	{
-		var ajaxFields = AjaxHiddenFieldRegex().Matches(content)!;
-
-		// Iterate through each hidden field in the AJAX response
-		foreach (Match ajaxField in ajaxFields)
-		{
-			if (ajaxField.Groups["name"].Value == fieldName)
-			{
-				return ajaxField.Groups["value"].Value;
-			}
-		}
-
-		var htmlFields = HtmlHiddenFieldRegex().Matches(content)!;
-
-		// Iterate through each hidden field in the HTML response
-		foreach (Match htmlField in htmlFields)
-		{
-			if (htmlField.Groups["name"].Value == fieldName)
-			{
-				return htmlField.Groups["value"].Value;
-			}
-		}
-
-		throw new InvalidOperationException($"{fieldName} not found.");
-	}
-}
+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.Net;
+using System.Text.RegularExpressions;
+
+/// <summary>
+/// Collector implementation for Broxtowe Borough Council.
+/// </summary>
+internal sealed partial class BroxtoweBoroughCouncil : GovUkCollectorBase, ICollector
+{
+	/// <inheritdoc/>
+	public string Name => "Broxtowe Borough Council";
+
+	/// <inheritdoc/>
+	public Uri WebsiteUrl => new("https://www.broxtowe.gov.uk/");
+
+	/// <inheritdoc/>
+	public override string GovUkId => "broxtowe";
+
+	/// <summary>
+	/// The list of bin types for this collector.
+	/// </summary>
+	private readonly IReadOnlyCollection<Bin> _binTypes =
+	[
+		new()
+		{
+			Name = "Mixed Dry Recycling",
+			Colour = BinColour.Green,
+			Keys = [ "GREEN 240L" ],
+		},
+		new()
+		{
+			Name = "Glass Recycling",
+			Colour = BinColour.Green,
+			Keys = [ "GLASS BAG" ],
+			Type = BinType.Bag,
+		},
+		new()
+		{
+			Name = "Garden Waste",
+			Colour = BinColour.Brown,
+			Keys = [ "BROWN 240L" ],
+		},
+		new()
+		{
+			Name = "General Waste",
+			Colour = BinColour.Black,
+			Keys = [ "BLACK 240L" ],
+		},
+	];
+
+	private const string _formUrl = "https://selfservice.broxtowe.gov.uk/renderform.aspx?t=217&k=9D2EF214E144EE796430597FB475C3892C43C528";
+	private const string _scriptManagerTarget = "ctl00$ContentPlaceHolder1$APUP_5683";
+	private const string _searchEventTarget = "ctl00$ContentPlaceHolder1$FF5683BTN";
+	private const string _addressEventTarget = "ctl00$ContentPlaceHolder1$FF5683DDL";
+	private const string _submitEventTarget = "ctl00$ContentPlaceHolder1$btnSubmit";
+
+	/// <summary>
+	/// Regex for parsing hidden fields from AJAX responses.
+	/// </summary>
+	[GeneratedRegex(@"hiddenField\|(?<name>__VIEWSTATEGENERATOR|__EVENTVALIDATION|__VIEWSTATE)\|(?<value>[^|]+)")]
+	private static partial Regex AjaxHiddenFieldRegex();
+
+	/// <summary>
+	/// Regex for parsing hidden fields from HTML responses.
+	/// </summary>
+	[GeneratedRegex(@"name=""(?<name>__VIEWSTATEGENERATOR|__EVENTVALIDATION|__VIEWSTATE)""[^>]+value=""(?<value>[^""]+)""")]
+	private static partial Regex HtmlHiddenFieldRegex();
+
+	/// <summary>
+	/// Regex for parsing address options.
+	/// </summary>
+	[GeneratedRegex(@"<option value=""(?<uid>[^""]+)"">(?<address>[^<]+)</option>")]
+	private static partial Regex AddressRegex();
+
+	/// <summary>
+	/// Regex for parsing bin rows.
+	/// </summary>
+	[GeneratedRegex(@"<tr>\s*<td>(?<service>[^<]+)</td>\s*<td>(?<day>[^<]+)</td>\s*<td>(?<last>[^<]*)</td>\s*<td>(?<next>[^<]+)</td>\s*</tr>", RegexOptions.Singleline)]
+	private static partial Regex BinRowRegex();
+
+	/// <inheritdoc/>
+	public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? clientSideResponse)
+	{
+		// Prepare client-side request for initial form load
+		if (clientSideResponse == null)
+		{
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 1,
+				Url = _formUrl,
+				Method = "GET",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+				},
+			};
+
+			var getAddressesResponse = new GetAddressesResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getAddressesResponse;
+		}
+		// Prepare client-side request for postcode search
+		else if (clientSideResponse.RequestId == 1)
+		{
+			clientSideResponse.Headers.TryGetValue("set-cookie", out var setCookieHeader);
+			var cookie = ProcessingUtilities.ParseSetCookieHeaderForRequestCookie(setCookieHeader!);
+
+			var viewState = GetHiddenField(clientSideResponse.Content, "__VIEWSTATE");
+			var viewStateGenerator = GetHiddenField(clientSideResponse.Content, "__VIEWSTATEGENERATOR");
+			var eventValidation = GetHiddenField(clientSideResponse.Content, "__EVENTVALIDATION");
+
+			var formData = new Dictionary<string, string>
+			{
+				{ "ctl00$ScriptManager1", $"{_scriptManagerTarget}|{_searchEventTarget}" },
+				{ "__EVENTTARGET", _searchEventTarget },
+				{ "__EVENTARGUMENT", string.Empty },
+				{ "__VIEWSTATE", viewState },
+				{ "__VIEWSTATEGENERATOR", viewStateGenerator },
+				{ "__EVENTVALIDATION", eventValidation },
+				{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
+				{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
+				{ "ctl00$ContentPlaceHolder1$FF5683TB", postcode },
+				{ "__ASYNCPOST", "true" },
+			};
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 2,
+				Url = _formUrl,
+				Method = "POST",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+					{ "x-requested-with", "XMLHttpRequest" },
+					{ "x-microsoftajax", "Delta=true" },
+					{ "content-type", "application/x-www-form-urlencoded; charset=utf-8" },
+					{ "cookie", cookie },
+				},
+				Body = ProcessingUtilities.ConvertDictionaryToFormData(formData),
+			};
+
+			var getAddressesResponse = new GetAddressesResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getAddressesResponse;
+		}
+		// Process addresses from response
+		else if (clientSideResponse.RequestId == 2)
+		{
+			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 uid = rawAddress.Groups["uid"].Value;
+
+				if (string.IsNullOrWhiteSpace(uid) || uid == "0")
+				{
+					continue;
+				}
+
+				var property = WebUtility.HtmlDecode(rawAddress.Groups["address"].Value).Trim();
+
+				var address = new Address
+				{
+					Property = property,
+					Postcode = postcode,
+					Uid = uid,
+				};
+
+				addresses.Add(address);
+			}
+
+			var getAddressesResponse = new GetAddressesResponse
+			{
+				Addresses = [.. addresses],
+			};
+
+			return getAddressesResponse;
+		}
+
+		throw new InvalidOperationException("Invalid client-side request.");
+	}
+
+	/// <inheritdoc/>
+	public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? clientSideResponse)
+	{
+		// Prepare client-side request for initial form load
+		if (clientSideResponse == null)
+		{
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 1,
+				Url = _formUrl,
+				Method = "GET",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+				},
+			};
+
+			var getBinDaysResponse = new GetBinDaysResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getBinDaysResponse;
+		}
+		// Prepare client-side request for postcode search
+		else if (clientSideResponse.RequestId == 1)
+		{
+			clientSideResponse.Headers.TryGetValue("set-cookie", out var setCookieHeader);
+			var cookie = ProcessingUtilities.ParseSetCookieHeaderForRequestCookie(setCookieHeader!);
+
+			var viewState = GetHiddenField(clientSideResponse.Content, "__VIEWSTATE");
+			var viewStateGenerator = GetHiddenField(clientSideResponse.Content, "__VIEWSTATEGENERATOR");
+			var eventValidation = GetHiddenField(clientSideResponse.Content, "__EVENTVALIDATION");
+
+			var formData = new Dictionary<string, string>
+			{
+				{ "ctl00$ScriptManager1", $"{_scriptManagerTarget}|{_searchEventTarget}" },
+				{ "__EVENTTARGET", _searchEventTarget },
+				{ "__EVENTARGUMENT", string.Empty },
+				{ "__VIEWSTATE", viewState },
+				{ "__VIEWSTATEGENERATOR", viewStateGenerator },
+				{ "__EVENTVALIDATION", eventValidation },
+				{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
+				{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
+				{ "ctl00$ContentPlaceHolder1$FF5683TB", address.Postcode! },
+				{ "__ASYNCPOST", "true" },
+			};
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 2,
+				Url = _formUrl,
+				Method = "POST",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+					{ "x-requested-with", "XMLHttpRequest" },
+					{ "x-microsoftajax", "Delta=true" },
+					{ "content-type", "application/x-www-form-urlencoded; charset=utf-8" },
+					{ "cookie", cookie },
+				},
+				Body = ProcessingUtilities.ConvertDictionaryToFormData(formData),
+				Options = new ClientSideOptions
+				{
+					Metadata =
+					{
+						{ "cookie", cookie },
+					},
+				},
+			};
+
+			var getBinDaysResponse = new GetBinDaysResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getBinDaysResponse;
+		}
+		// Prepare client-side request for selecting the address
+		else if (clientSideResponse.RequestId == 2)
+		{
+			var cookie = clientSideResponse.Options.Metadata["cookie"];
+
+			var viewState = GetHiddenField(clientSideResponse.Content, "__VIEWSTATE");
+			var viewStateGenerator = GetHiddenField(clientSideResponse.Content, "__VIEWSTATEGENERATOR");
+			var eventValidation = GetHiddenField(clientSideResponse.Content, "__EVENTVALIDATION");
+
+			var formData = new Dictionary<string, string>
+			{
+				{ "ctl00$ScriptManager1", $"{_scriptManagerTarget}|{_addressEventTarget}" },
+				{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
+				{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
+				{ "ctl00$ContentPlaceHolder1$FF5683DDL", address.Uid! },
+				{ "__EVENTTARGET", _addressEventTarget },
+				{ "__EVENTARGUMENT", string.Empty },
+				{ "__LASTFOCUS", string.Empty },
+				{ "__VIEWSTATE", viewState },
+				{ "__VIEWSTATEGENERATOR", viewStateGenerator },
+				{ "__EVENTVALIDATION", eventValidation },
+				{ "__ASYNCPOST", "true" },
+			};
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 3,
+				Url = _formUrl,
+				Method = "POST",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+					{ "x-requested-with", "XMLHttpRequest" },
+					{ "x-microsoftajax", "Delta=true" },
+					{ "content-type", "application/x-www-form-urlencoded; charset=utf-8" },
+					{ "cookie", cookie },
+				},
+				Body = ProcessingUtilities.ConvertDictionaryToFormData(formData),
+				Options = new ClientSideOptions
+				{
+					Metadata =
+					{
+						{ "cookie", cookie },
+					},
+				},
+			};
+
+			var getBinDaysResponse = new GetBinDaysResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getBinDaysResponse;
+		}
+		// Prepare client-side request to fetch bin collections
+		else if (clientSideResponse.RequestId == 3)
+		{
+			var cookie = clientSideResponse.Options.Metadata["cookie"];
+
+			var viewState = GetHiddenField(clientSideResponse.Content, "__VIEWSTATE");
+			var viewStateGenerator = GetHiddenField(clientSideResponse.Content, "__VIEWSTATEGENERATOR");
+			var eventValidation = GetHiddenField(clientSideResponse.Content, "__EVENTVALIDATION");
+
+			var formData = new Dictionary<string, string>
+			{
+				{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
+				{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
+				{ "__EVENTTARGET", _submitEventTarget },
+				{ "__EVENTARGUMENT", string.Empty },
+				{ "__LASTFOCUS", string.Empty },
+				{ "__VIEWSTATE", viewState },
+				{ "__VIEWSTATEGENERATOR", viewStateGenerator },
+				{ "__EVENTVALIDATION", eventValidation },
+			};
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 4,
+				Url = _formUrl,
+				Method = "POST",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+					{ "content-type", "application/x-www-form-urlencoded" },
+					{ "cookie", cookie },
+				},
+				Body = ProcessingUtilities.ConvertDictionaryToFormData(formData),
+			};
+
+			var getBinDaysResponse = new GetBinDaysResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getBinDaysResponse;
+		}
+		// Process bin days from response
+		else if (clientSideResponse.RequestId == 4)
+		{
+			var rawBinRows = BinRowRegex().Matches(clientSideResponse.Content)!;
+
+			// Iterate through each bin row, and create a new bin day object
+			var binDays = new List<BinDay>();
+			foreach (Match rawBinRow in rawBinRows)
+			{
+				var service = WebUtility.HtmlDecode(rawBinRow.Groups["service"].Value).Trim();
+				var nextCollection = WebUtility.HtmlDecode(rawBinRow.Groups["next"].Value).Trim();
+
+				var date = DateOnly.ParseExact(
+					nextCollection,
+					"dddd, dd MMMM yyyy",
+					CultureInfo.InvariantCulture,
+					DateTimeStyles.None
+				);
+
+				var matchedBins = ProcessingUtilities.GetMatchingBins(_binTypes, service);
+
+				var binDay = new BinDay
+				{
+					Date = date,
+					Address = address,
+					Bins = matchedBins,
+				};
+
+				binDays.Add(binDay);
+			}
+
+			var getBinDaysResponse = new GetBinDaysResponse
+			{
+				BinDays = ProcessingUtilities.ProcessBinDays(binDays),
+			};
+
+			return getBinDaysResponse;
+		}
+
+		throw new InvalidOperationException("Invalid client-side request.");
+	}
+
+	/// <summary>
+	/// Extracts hidden field values from HTML or AJAX responses.
+	/// </summary>
+	private static string GetHiddenField(string content, string fieldName)
+	{
+		var ajaxFields = AjaxHiddenFieldRegex().Matches(content)!;
+
+		// Iterate through each hidden field in the AJAX response
+		foreach (Match ajaxField in ajaxFields)
+		{
+			if (ajaxField.Groups["name"].Value == fieldName)
+			{
+				return ajaxField.Groups["value"].Value;
+			}
+		}
+
+		var htmlFields = HtmlHiddenFieldRegex().Matches(content)!;
+
+		// Iterate through each hidden field in the HTML response
+		foreach (Match htmlField in htmlFields)
+		{
+			if (htmlField.Groups["name"].Value == fieldName)
+			{
+				return htmlField.Groups["value"].Value;
+			}
+		}
+
+		throw new InvalidOperationException($"{fieldName} not found.");
+	}
+}
diff --git a/BinDays.Api.IntegrationTests/Collectors/Councils/BroxtoweBoroughCouncilTests.cs b/BinDays.Api.IntegrationTests/Collectors/Councils/BroxtoweBoroughCouncilTests.cs
index 7b52db3..206d09d 100644
--- a/BinDays.Api.IntegrationTests/Collectors/Councils/BroxtoweBoroughCouncilTests.cs
+++ b/BinDays.Api.IntegrationTests/Collectors/Councils/BroxtoweBoroughCouncilTests.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 BroxtoweBoroughCouncilTests
-{
-	private readonly IntegrationTestClient _client;
-	private static readonly ICollector _collector = new BroxtoweBoroughCouncil();
-	private readonly CollectorService _collectorService = new([_collector]);
-	private readonly ITestOutputHelper _outputHelper;
-
-	public BroxtoweBoroughCouncilTests(ITestOutputHelper outputHelper)
-	{
-		_outputHelper = outputHelper;
-		_client = new IntegrationTestClient(outputHelper);
-	}
-
-	[Theory]
-	[InlineData("NG16 2NB")]
-	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 BroxtoweBoroughCouncilTests
+{
+	private readonly IntegrationTestClient _client;
+	private static readonly ICollector _collector = new BroxtoweBoroughCouncil();
+	private readonly CollectorService _collectorService = new([_collector]);
+	private readonly ITestOutputHelper _outputHelper;
+
+	public BroxtoweBoroughCouncilTests(ITestOutputHelper outputHelper)
+	{
+		_outputHelper = outputHelper;
+		_client = new IntegrationTestClient(outputHelper);
+	}
+
+	[Theory]
+	[InlineData("NG16 2NB")]
+	public async Task GetBinDaysTest(string postcode)
+	{
+		await TestSteps.EndToEnd(
+			_client,
+			_collectorService,
+			_collector,
+			postcode,
+			_outputHelper
+		);
+	}
+}

From 7eb1b69d6086549a57cb4457319ad75e28601dd2 Mon Sep 17 00:00:00 2001
From: "claude[bot]" <41898282+claude[bot]@users.noreply.github.com>
Date: Sat, 7 Feb 2026 16:54:12 +0000
Subject: [PATCH 3/5] Resolve PR review comments for BroxtoweBoroughCouncil
 collector

- Add trailing commas to Keys arrays in _binTypes collection
- Inline single-use constant _submitEventTarget (used only once at line 266)
- Add XML summary docstrings to all private const fields
- Extract duplicated code into helper methods:
  - CreateInitialFormRequest() for initial form load (used in both GetAddresses and GetBinDays)
  - CreatePostcodeSearchRequest() for postcode search (used in both methods)
- Make error message more specific in GetHiddenField method
- Refactor GetHiddenField to use LINQ FirstOrDefault instead of foreach loops
- Add using System.Linq for LINQ support

All changes tested successfully with integration test.

Co-authored-by: Andrew Riggs <BadgerHobbs@users.noreply.github.com>
---
 .../Councils/BroxtoweBoroughCouncil.cs        | 227 ++++++++----------
 1 file changed, 105 insertions(+), 122 deletions(-)

diff --git a/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs b/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs
index ae27603..c21b131 100644
--- a/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs
+++ b/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs
@@ -6,6 +6,7 @@ namespace BinDays.Api.Collectors.Collectors.Councils;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
 
@@ -23,6 +24,9 @@ internal sealed partial class BroxtoweBoroughCouncil : GovUkCollectorBase, IColl
 	/// <inheritdoc/>
 	public override string GovUkId => "broxtowe";
 
+	/// <summary>
+	/// The list of bin types for this collector.
+	/// </summary>
 	/// <summary>
 	/// The list of bin types for this collector.
 	/// </summary>
@@ -32,34 +36,48 @@ internal sealed partial class BroxtoweBoroughCouncil : GovUkCollectorBase, IColl
 		{
 			Name = "Mixed Dry Recycling",
 			Colour = BinColour.Green,
-			Keys = [ "GREEN 240L" ],
+			Keys = [ "GREEN 240L", ],
 		},
 		new()
 		{
 			Name = "Glass Recycling",
 			Colour = BinColour.Green,
-			Keys = [ "GLASS BAG" ],
+			Keys = [ "GLASS BAG", ],
 			Type = BinType.Bag,
 		},
 		new()
 		{
 			Name = "Garden Waste",
 			Colour = BinColour.Brown,
-			Keys = [ "BROWN 240L" ],
+			Keys = [ "BROWN 240L", ],
 		},
 		new()
 		{
 			Name = "General Waste",
 			Colour = BinColour.Black,
-			Keys = [ "BLACK 240L" ],
+			Keys = [ "BLACK 240L", ],
 		},
 	];
 
+	/// <summary>
+	/// The URL of the web form for bin collection lookups.
+	/// </summary>
 	private const string _formUrl = "https://selfservice.broxtowe.gov.uk/renderform.aspx?t=217&k=9D2EF214E144EE796430597FB475C3892C43C528";
+
+	/// <summary>
+	/// The ASP.NET script manager target for AJAX requests.
+	/// </summary>
 	private const string _scriptManagerTarget = "ctl00$ContentPlaceHolder1$APUP_5683";
+
+	/// <summary>
+	/// The event target for postcode search button.
+	/// </summary>
 	private const string _searchEventTarget = "ctl00$ContentPlaceHolder1$FF5683BTN";
+
+	/// <summary>
+	/// The event target for address dropdown selection.
+	/// </summary>
 	private const string _addressEventTarget = "ctl00$ContentPlaceHolder1$FF5683DDL";
-	private const string _submitEventTarget = "ctl00$ContentPlaceHolder1$btnSubmit";
 
 	/// <summary>
 	/// Regex for parsing hidden fields from AJAX responses.
@@ -91,16 +109,7 @@ public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? cl
 		// Prepare client-side request for initial form load
 		if (clientSideResponse == null)
 		{
-			var clientSideRequest = new ClientSideRequest
-			{
-				RequestId = 1,
-				Url = _formUrl,
-				Method = "GET",
-				Headers = new()
-				{
-					{ "user-agent", Constants.UserAgent },
-				},
-			};
+			var clientSideRequest = CreateInitialFormRequest();
 
 			var getAddressesResponse = new GetAddressesResponse
 			{
@@ -112,42 +121,7 @@ public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? cl
 		// Prepare client-side request for postcode search
 		else if (clientSideResponse.RequestId == 1)
 		{
-			clientSideResponse.Headers.TryGetValue("set-cookie", out var setCookieHeader);
-			var cookie = ProcessingUtilities.ParseSetCookieHeaderForRequestCookie(setCookieHeader!);
-
-			var viewState = GetHiddenField(clientSideResponse.Content, "__VIEWSTATE");
-			var viewStateGenerator = GetHiddenField(clientSideResponse.Content, "__VIEWSTATEGENERATOR");
-			var eventValidation = GetHiddenField(clientSideResponse.Content, "__EVENTVALIDATION");
-
-			var formData = new Dictionary<string, string>
-			{
-				{ "ctl00$ScriptManager1", $"{_scriptManagerTarget}|{_searchEventTarget}" },
-				{ "__EVENTTARGET", _searchEventTarget },
-				{ "__EVENTARGUMENT", string.Empty },
-				{ "__VIEWSTATE", viewState },
-				{ "__VIEWSTATEGENERATOR", viewStateGenerator },
-				{ "__EVENTVALIDATION", eventValidation },
-				{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
-				{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
-				{ "ctl00$ContentPlaceHolder1$FF5683TB", postcode },
-				{ "__ASYNCPOST", "true" },
-			};
-
-			var clientSideRequest = new ClientSideRequest
-			{
-				RequestId = 2,
-				Url = _formUrl,
-				Method = "POST",
-				Headers = new()
-				{
-					{ "user-agent", Constants.UserAgent },
-					{ "x-requested-with", "XMLHttpRequest" },
-					{ "x-microsoftajax", "Delta=true" },
-					{ "content-type", "application/x-www-form-urlencoded; charset=utf-8" },
-					{ "cookie", cookie },
-				},
-				Body = ProcessingUtilities.ConvertDictionaryToFormData(formData),
-			};
+			var clientSideRequest = CreatePostcodeSearchRequest(clientSideResponse, postcode);
 
 			var getAddressesResponse = new GetAddressesResponse
 			{
@@ -201,16 +175,7 @@ public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? client
 		// Prepare client-side request for initial form load
 		if (clientSideResponse == null)
 		{
-			var clientSideRequest = new ClientSideRequest
-			{
-				RequestId = 1,
-				Url = _formUrl,
-				Method = "GET",
-				Headers = new()
-				{
-					{ "user-agent", Constants.UserAgent },
-				},
-			};
+			var clientSideRequest = CreateInitialFormRequest();
 
 			var getBinDaysResponse = new GetBinDaysResponse
 			{
@@ -222,49 +187,7 @@ public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? client
 		// Prepare client-side request for postcode search
 		else if (clientSideResponse.RequestId == 1)
 		{
-			clientSideResponse.Headers.TryGetValue("set-cookie", out var setCookieHeader);
-			var cookie = ProcessingUtilities.ParseSetCookieHeaderForRequestCookie(setCookieHeader!);
-
-			var viewState = GetHiddenField(clientSideResponse.Content, "__VIEWSTATE");
-			var viewStateGenerator = GetHiddenField(clientSideResponse.Content, "__VIEWSTATEGENERATOR");
-			var eventValidation = GetHiddenField(clientSideResponse.Content, "__EVENTVALIDATION");
-
-			var formData = new Dictionary<string, string>
-			{
-				{ "ctl00$ScriptManager1", $"{_scriptManagerTarget}|{_searchEventTarget}" },
-				{ "__EVENTTARGET", _searchEventTarget },
-				{ "__EVENTARGUMENT", string.Empty },
-				{ "__VIEWSTATE", viewState },
-				{ "__VIEWSTATEGENERATOR", viewStateGenerator },
-				{ "__EVENTVALIDATION", eventValidation },
-				{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
-				{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
-				{ "ctl00$ContentPlaceHolder1$FF5683TB", address.Postcode! },
-				{ "__ASYNCPOST", "true" },
-			};
-
-			var clientSideRequest = new ClientSideRequest
-			{
-				RequestId = 2,
-				Url = _formUrl,
-				Method = "POST",
-				Headers = new()
-				{
-					{ "user-agent", Constants.UserAgent },
-					{ "x-requested-with", "XMLHttpRequest" },
-					{ "x-microsoftajax", "Delta=true" },
-					{ "content-type", "application/x-www-form-urlencoded; charset=utf-8" },
-					{ "cookie", cookie },
-				},
-				Body = ProcessingUtilities.ConvertDictionaryToFormData(formData),
-				Options = new ClientSideOptions
-				{
-					Metadata =
-					{
-						{ "cookie", cookie },
-					},
-				},
-			};
+			var clientSideRequest = CreatePostcodeSearchRequest(clientSideResponse, address.Postcode!);
 
 			var getBinDaysResponse = new GetBinDaysResponse
 			{
@@ -340,7 +263,7 @@ public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? client
 			{
 				{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
 				{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
-				{ "__EVENTTARGET", _submitEventTarget },
+				{ "__EVENTTARGET", "ctl00$ContentPlaceHolder1$btnSubmit" },
 				{ "__EVENTARGUMENT", string.Empty },
 				{ "__LASTFOCUS", string.Empty },
 				{ "__VIEWSTATE", viewState },
@@ -412,32 +335,92 @@ public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? client
 	}
 
 	/// <summary>
-	/// Extracts hidden field values from HTML or AJAX responses.
+	/// Creates the initial client-side request to load the form.
 	/// </summary>
-	private static string GetHiddenField(string content, string fieldName)
+	private ClientSideRequest CreateInitialFormRequest()
 	{
-		var ajaxFields = AjaxHiddenFieldRegex().Matches(content)!;
-
-		// Iterate through each hidden field in the AJAX response
-		foreach (Match ajaxField in ajaxFields)
+		return new ClientSideRequest
 		{
-			if (ajaxField.Groups["name"].Value == fieldName)
+			RequestId = 1,
+			Url = _formUrl,
+			Method = "GET",
+			Headers = new()
 			{
-				return ajaxField.Groups["value"].Value;
-			}
-		}
+				{ "user-agent", Constants.UserAgent },
+			},
+		};
+	}
+
+	/// <summary>
+	/// Creates a client-side request for postcode search.
+	/// </summary>
+	private ClientSideRequest CreatePostcodeSearchRequest(ClientSideResponse clientSideResponse, string postcode)
+	{
+		clientSideResponse.Headers.TryGetValue("set-cookie", out var setCookieHeader);
+		var cookie = ProcessingUtilities.ParseSetCookieHeaderForRequestCookie(setCookieHeader!);
 
-		var htmlFields = HtmlHiddenFieldRegex().Matches(content)!;
+		var viewState = GetHiddenField(clientSideResponse.Content, "__VIEWSTATE");
+		var viewStateGenerator = GetHiddenField(clientSideResponse.Content, "__VIEWSTATEGENERATOR");
+		var eventValidation = GetHiddenField(clientSideResponse.Content, "__EVENTVALIDATION");
 
-		// Iterate through each hidden field in the HTML response
-		foreach (Match htmlField in htmlFields)
+		var formData = new Dictionary<string, string>
 		{
-			if (htmlField.Groups["name"].Value == fieldName)
+			{ "ctl00$ScriptManager1", $"{_scriptManagerTarget}|{_searchEventTarget}" },
+			{ "__EVENTTARGET", _searchEventTarget },
+			{ "__EVENTARGUMENT", string.Empty },
+			{ "__VIEWSTATE", viewState },
+			{ "__VIEWSTATEGENERATOR", viewStateGenerator },
+			{ "__EVENTVALIDATION", eventValidation },
+			{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
+			{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
+			{ "ctl00$ContentPlaceHolder1$FF5683TB", postcode },
+			{ "__ASYNCPOST", "true" },
+		};
+
+		return new ClientSideRequest
+		{
+			RequestId = 2,
+			Url = _formUrl,
+			Method = "POST",
+			Headers = new()
 			{
-				return htmlField.Groups["value"].Value;
-			}
+				{ "user-agent", Constants.UserAgent },
+				{ "x-requested-with", "XMLHttpRequest" },
+				{ "x-microsoftajax", "Delta=true" },
+				{ "content-type", "application/x-www-form-urlencoded; charset=utf-8" },
+				{ "cookie", cookie },
+			},
+			Body = ProcessingUtilities.ConvertDictionaryToFormData(formData),
+			Options = new ClientSideOptions
+			{
+				Metadata =
+				{
+					{ "cookie", cookie },
+				},
+			},
+		};
+	}
+
+	/// <summary>
+	/// Extracts hidden field values from HTML or AJAX responses.
+	/// </summary>
+	private static string GetHiddenField(string content, string fieldName)
+	{
+		// First, try to find the field in the AJAX response format.
+		var ajaxMatch = AjaxHiddenFieldRegex().Matches(content)!.FirstOrDefault(m => m.Groups["name"].Value == fieldName);
+		if (ajaxMatch is not null)
+		{
+			return ajaxMatch.Groups["value"].Value;
+		}
+
+		// If not found, try the standard HTML input format.
+		var htmlMatch = HtmlHiddenFieldRegex().Matches(content)!.FirstOrDefault(m => m.Groups["name"].Value == fieldName);
+		if (htmlMatch is not null)
+		{
+			return htmlMatch.Groups["value"].Value;
 		}
 
-		throw new InvalidOperationException($"{fieldName} not found.");
+		// If the field is not found in either format, throw an exception.
+		throw new InvalidOperationException($"Hidden field '{fieldName}' not found in response content.");
 	}
 }

From 8a9f5418c1970e1b469fa3c900e1fce52f06e1ed Mon Sep 17 00:00:00 2001
From: Moley-Bot <moley-bot@users.noreply.github.com>
Date: Sat, 7 Feb 2026 16:54:55 +0000
Subject: [PATCH 4/5] Auto-format code with dotnet format

  Formatted by Moley-Bot
---
 .../Collectors/Councils/BroxtoweBoroughCouncil.cs             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs b/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs
index c21b131..b38293b 100644
--- a/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs
+++ b/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs
@@ -337,7 +337,7 @@ public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? client
 	/// <summary>
 	/// Creates the initial client-side request to load the form.
 	/// </summary>
-	private ClientSideRequest CreateInitialFormRequest()
+	private static ClientSideRequest CreateInitialFormRequest()
 	{
 		return new ClientSideRequest
 		{
@@ -354,7 +354,7 @@ private ClientSideRequest CreateInitialFormRequest()
 	/// <summary>
 	/// Creates a client-side request for postcode search.
 	/// </summary>
-	private ClientSideRequest CreatePostcodeSearchRequest(ClientSideResponse clientSideResponse, string postcode)
+	private static ClientSideRequest CreatePostcodeSearchRequest(ClientSideResponse clientSideResponse, string postcode)
 	{
 		clientSideResponse.Headers.TryGetValue("set-cookie", out var setCookieHeader);
 		var cookie = ProcessingUtilities.ParseSetCookieHeaderForRequestCookie(setCookieHeader!);

From bf8ecefa0a6b98dd76cf1598cc62e47148738e6f Mon Sep 17 00:00:00 2001
From: "claude[bot]" <41898282+claude[bot]@users.noreply.github.com>
Date: Sat, 7 Feb 2026 17:04:49 +0000
Subject: [PATCH 5/5] Remove duplicate docstring and unnecessary string.Empty
 properties

- Removed duplicate summary docstring for _binTypes field
- Removed unnecessary string.Empty properties from formData dictionaries
  (txtPositionLL, txtPosition, __EVENTARGUMENT, __LASTFOCUS)
- Tests confirm these properties are not required by the form

Co-authored-by: Andrew Riggs <BadgerHobbs@users.noreply.github.com>
---
 .../Collectors/Councils/BroxtoweBoroughCouncil.cs  | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs b/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs
index b38293b..1347d0e 100644
--- a/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs
+++ b/BinDays.Api.Collectors/Collectors/Councils/BroxtoweBoroughCouncil.cs
@@ -24,9 +24,6 @@ internal sealed partial class BroxtoweBoroughCouncil : GovUkCollectorBase, IColl
 	/// <inheritdoc/>
 	public override string GovUkId => "broxtowe";
 
-	/// <summary>
-	/// The list of bin types for this collector.
-	/// </summary>
 	/// <summary>
 	/// The list of bin types for this collector.
 	/// </summary>
@@ -208,12 +205,8 @@ public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? client
 			var formData = new Dictionary<string, string>
 			{
 				{ "ctl00$ScriptManager1", $"{_scriptManagerTarget}|{_addressEventTarget}" },
-				{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
-				{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
 				{ "ctl00$ContentPlaceHolder1$FF5683DDL", address.Uid! },
 				{ "__EVENTTARGET", _addressEventTarget },
-				{ "__EVENTARGUMENT", string.Empty },
-				{ "__LASTFOCUS", string.Empty },
 				{ "__VIEWSTATE", viewState },
 				{ "__VIEWSTATEGENERATOR", viewStateGenerator },
 				{ "__EVENTVALIDATION", eventValidation },
@@ -261,11 +254,7 @@ public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? client
 
 			var formData = new Dictionary<string, string>
 			{
-				{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
-				{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
 				{ "__EVENTTARGET", "ctl00$ContentPlaceHolder1$btnSubmit" },
-				{ "__EVENTARGUMENT", string.Empty },
-				{ "__LASTFOCUS", string.Empty },
 				{ "__VIEWSTATE", viewState },
 				{ "__VIEWSTATEGENERATOR", viewStateGenerator },
 				{ "__EVENTVALIDATION", eventValidation },
@@ -367,12 +356,9 @@ private static ClientSideRequest CreatePostcodeSearchRequest(ClientSideResponse
 		{
 			{ "ctl00$ScriptManager1", $"{_scriptManagerTarget}|{_searchEventTarget}" },
 			{ "__EVENTTARGET", _searchEventTarget },
-			{ "__EVENTARGUMENT", string.Empty },
 			{ "__VIEWSTATE", viewState },
 			{ "__VIEWSTATEGENERATOR", viewStateGenerator },
 			{ "__EVENTVALIDATION", eventValidation },
-			{ "ctl00$ContentPlaceHolder1$txtPositionLL", string.Empty },
-			{ "ctl00$ContentPlaceHolder1$txtPosition", string.Empty },
 			{ "ctl00$ContentPlaceHolder1$FF5683TB", postcode },
 			{ "__ASYNCPOST", "true" },
 		};