From 39c44f2affb6e1cb5e664e7dd11d75e3476c3d88 Mon Sep 17 00:00:00 2001
From: Moley-Bot <moley-bot@users.noreply.github.com>
Date: Wed, 21 Jan 2026 10:32:49 +0000
Subject: [PATCH 1/3] Add collector for NorthTynesideCouncil

Closes #101

Generated with Codex CLI by Moley-Bot
---
 .../Councils/NorthTynesideCouncil.cs          | 278 ++++++++++++++++++
 .../Councils/NorthTynesideCouncilTests.cs     |  36 +++
 2 files changed, 314 insertions(+)
 create mode 100644 BinDays.Api.Collectors/Collectors/Councils/NorthTynesideCouncil.cs
 create mode 100644 BinDays.Api.IntegrationTests/Collectors/Councils/NorthTynesideCouncilTests.cs

diff --git a/BinDays.Api.Collectors/Collectors/Councils/NorthTynesideCouncil.cs b/BinDays.Api.Collectors/Collectors/Councils/NorthTynesideCouncil.cs
new file mode 100644
index 0000000..7b7d963
--- /dev/null
+++ b/BinDays.Api.Collectors/Collectors/Councils/NorthTynesideCouncil.cs
@@ -0,0 +1,278 @@
+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;
+
+/// <summary>
+/// Collector implementation for North Tyneside Council.
+/// </summary>
+internal sealed partial class NorthTynesideCouncil : GovUkCollectorBase, ICollector
+{
+	/// <inheritdoc/>
+	public string Name => "North Tyneside Council";
+
+	/// <inheritdoc/>
+	public Uri WebsiteUrl => new("https://www.northtyneside.gov.uk/");
+
+	/// <inheritdoc/>
+	public override string GovUkId => "north-tyneside";
+
+	/// <summary>
+	/// The list of bin types for this collector.
+	/// </summary>
+	private readonly IReadOnlyCollection<Bin> _binTypes =
+	[
+		new()
+		{
+			Name = "Household Waste",
+			Colour = BinColour.Green,
+			Keys = [ "Household", "General Waste" ],
+		},
+		new()
+		{
+			Name = "Mixed Recycling",
+			Colour = BinColour.Grey,
+			Keys = [ "Recycling" ],
+		},
+		new()
+		{
+			Name = "Garden Waste",
+			Colour = BinColour.Brown,
+			Keys = [ "Garden" ],
+		},
+	];
+
+	/// <summary>
+	/// Regex for the form build id.
+	/// </summary>
+	[GeneratedRegex(@"name=""form_build_id""\s+value=""(?<formBuildId>[^""]+)""")]
+	private static partial Regex FormBuildIdRegex();
+
+	/// <summary>
+	/// Regex for the addresses from the data.
+	/// </summary>
+	[GeneratedRegex(@"<option value=""(?<uid>[^""]*)"">(?<address>[^<]+)</option>")]
+	private static partial Regex AddressRegex();
+
+	/// <summary>
+	/// Regex for the bin days from the data.
+	/// </summary>
+	[GeneratedRegex(@"<li class=""waste-collection__day[^""]*"">[\s\S]*?datetime=""(?<date>[^""]+)""[\s\S]*?waste-collection__day--type"">\s*(?<service>[^<]+)\s*<[\s\S]*?waste-collection__day--colour[^>]*>\s*(?<colour>[^<]+)")]
+	private static partial Regex BinDaysRegex();
+
+	/// <inheritdoc/>
+	public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? clientSideResponse)
+	{
+		// Prepare client-side request for getting addresses
+		if (clientSideResponse == null)
+		{
+			var formattedPostcode = ProcessingUtilities.FormatPostcode(postcode);
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 1,
+				Url = "https://www.northtyneside.gov.uk/waste-collection-schedule",
+				Method = "GET",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+				},
+				Options = new ClientSideOptions
+				{
+					Metadata =
+					{
+						{ "postcode", formattedPostcode },
+					},
+				},
+			};
+
+			var getAddressesResponse = new GetAddressesResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getAddressesResponse;
+		}
+		else if (clientSideResponse.RequestId == 1)
+		{
+			// Prepare client-side request for posting the postcode
+			var formBuildId = FormBuildIdRegex().Match(clientSideResponse.Content).Groups["formBuildId"].Value;
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 2,
+				Url = "https://www.northtyneside.gov.uk/waste-collection-schedule",
+				Method = "POST",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+					{ "content-type", "application/x-www-form-urlencoded" },
+				},
+				Body = ProcessingUtilities.ConvertDictionaryToFormData(new()
+				{
+					{ "postcode", clientSideResponse.Options.Metadata["postcode"] },
+					{ "op", "Find" },
+					{ "form_build_id", formBuildId },
+					{ "form_id", "localgov_waste_collection_postcode_form" },
+				}),
+				Options = clientSideResponse.Options,
+			};
+
+			var getAddressesResponse = new GetAddressesResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getAddressesResponse;
+		}
+		else if (clientSideResponse.RequestId == 2)
+		{
+			// Process addresses from response
+			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.Trim();
+
+				if (string.IsNullOrWhiteSpace(uid))
+				{
+					continue;
+				}
+
+				var address = new Address
+				{
+					Property = rawAddress.Groups["address"].Value.Trim(),
+					Postcode = clientSideResponse.Options.Metadata["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 getting bin days
+		if (clientSideResponse == null)
+		{
+			var formattedPostcode = ProcessingUtilities.FormatPostcode(address.Postcode!);
+			var encodedPostcode = Uri.EscapeDataString(formattedPostcode.Replace(" ", "+"));
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 1,
+				Url = $"https://www.northtyneside.gov.uk/waste-collection-schedule/find?postcode={encodedPostcode}",
+				Method = "GET",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+				},
+				Options = new ClientSideOptions
+				{
+					Metadata =
+					{
+						{ "postcode", formattedPostcode },
+					},
+				},
+			};
+
+			var getBinDaysResponse = new GetBinDaysResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getBinDaysResponse;
+		}
+		else if (clientSideResponse.RequestId == 1)
+		{
+			// Prepare client-side request for posting the UPRN
+			var formBuildId = FormBuildIdRegex().Match(clientSideResponse.Content).Groups["formBuildId"].Value;
+			var encodedPostcode = Uri.EscapeDataString(clientSideResponse.Options.Metadata["postcode"].Replace(" ", "+"));
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 2,
+				Url = $"https://www.northtyneside.gov.uk/waste-collection-schedule/find?postcode={encodedPostcode}",
+				Method = "POST",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+					{ "content-type", "application/x-www-form-urlencoded" },
+				},
+				Body = ProcessingUtilities.ConvertDictionaryToFormData(new()
+				{
+					{ "uprn", address.Uid! },
+					{ "op", "View collection days" },
+					{ "form_build_id", formBuildId },
+					{ "form_id", "localgov_waste_collection_address_select_form" },
+				}),
+				Options = clientSideResponse.Options,
+			};
+
+			var getBinDaysResponse = new GetBinDaysResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getBinDaysResponse;
+		}
+		else if (clientSideResponse.RequestId == 2)
+		{
+			// Process bin days from response
+			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.Trim();
+				var dateString = rawBinDay.Groups["date"].Value.Trim();
+
+				var date = DateOnly.ParseExact(
+					dateString,
+					"yyyy-MM-dd",
+					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.");
+	}
+}
diff --git a/BinDays.Api.IntegrationTests/Collectors/Councils/NorthTynesideCouncilTests.cs b/BinDays.Api.IntegrationTests/Collectors/Councils/NorthTynesideCouncilTests.cs
new file mode 100644
index 0000000..18f15ba
--- /dev/null
+++ b/BinDays.Api.IntegrationTests/Collectors/Councils/NorthTynesideCouncilTests.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 NorthTynesideCouncilTests
+{
+	private readonly IntegrationTestClient _client;
+	private static readonly ICollector _collector = new NorthTynesideCouncil();
+	private readonly CollectorService _collectorService = new([_collector]);
+	private readonly ITestOutputHelper _outputHelper;
+
+	public NorthTynesideCouncilTests(ITestOutputHelper outputHelper)
+	{
+		_outputHelper = outputHelper;
+		_client = new IntegrationTestClient(outputHelper);
+	}
+
+	[Theory]
+	[InlineData("NE28 7BH")]
+	public async Task GetBinDaysTest(string postcode)
+	{
+		await TestSteps.EndToEnd(
+			_client,
+			_collectorService,
+			_collector,
+			postcode,
+			_outputHelper
+		);
+	}
+}

From 43b760c56878fcd238dd4059d5e673c705ab76b2 Mon Sep 17 00:00:00 2001
From: Moley-Bot <moley-bot@users.noreply.github.com>
Date: Wed, 21 Jan 2026 10:33:36 +0000
Subject: [PATCH 2/3] Auto-format code with dotnet format

  Formatted by Moley-Bot
---
 .../Councils/NorthTynesideCouncil.cs          | 556 +++++++++---------
 .../Councils/NorthTynesideCouncilTests.cs     |  72 +--
 2 files changed, 314 insertions(+), 314 deletions(-)

diff --git a/BinDays.Api.Collectors/Collectors/Councils/NorthTynesideCouncil.cs b/BinDays.Api.Collectors/Collectors/Councils/NorthTynesideCouncil.cs
index 7b7d963..10ab9c5 100644
--- a/BinDays.Api.Collectors/Collectors/Councils/NorthTynesideCouncil.cs
+++ b/BinDays.Api.Collectors/Collectors/Councils/NorthTynesideCouncil.cs
@@ -1,278 +1,278 @@
-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;
-
-/// <summary>
-/// Collector implementation for North Tyneside Council.
-/// </summary>
-internal sealed partial class NorthTynesideCouncil : GovUkCollectorBase, ICollector
-{
-	/// <inheritdoc/>
-	public string Name => "North Tyneside Council";
-
-	/// <inheritdoc/>
-	public Uri WebsiteUrl => new("https://www.northtyneside.gov.uk/");
-
-	/// <inheritdoc/>
-	public override string GovUkId => "north-tyneside";
-
-	/// <summary>
-	/// The list of bin types for this collector.
-	/// </summary>
-	private readonly IReadOnlyCollection<Bin> _binTypes =
-	[
-		new()
-		{
-			Name = "Household Waste",
-			Colour = BinColour.Green,
-			Keys = [ "Household", "General Waste" ],
-		},
-		new()
-		{
-			Name = "Mixed Recycling",
-			Colour = BinColour.Grey,
-			Keys = [ "Recycling" ],
-		},
-		new()
-		{
-			Name = "Garden Waste",
-			Colour = BinColour.Brown,
-			Keys = [ "Garden" ],
-		},
-	];
-
-	/// <summary>
-	/// Regex for the form build id.
-	/// </summary>
-	[GeneratedRegex(@"name=""form_build_id""\s+value=""(?<formBuildId>[^""]+)""")]
-	private static partial Regex FormBuildIdRegex();
-
-	/// <summary>
-	/// Regex for the addresses from the data.
-	/// </summary>
-	[GeneratedRegex(@"<option value=""(?<uid>[^""]*)"">(?<address>[^<]+)</option>")]
-	private static partial Regex AddressRegex();
-
-	/// <summary>
-	/// Regex for the bin days from the data.
-	/// </summary>
-	[GeneratedRegex(@"<li class=""waste-collection__day[^""]*"">[\s\S]*?datetime=""(?<date>[^""]+)""[\s\S]*?waste-collection__day--type"">\s*(?<service>[^<]+)\s*<[\s\S]*?waste-collection__day--colour[^>]*>\s*(?<colour>[^<]+)")]
-	private static partial Regex BinDaysRegex();
-
-	/// <inheritdoc/>
-	public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? clientSideResponse)
-	{
-		// Prepare client-side request for getting addresses
-		if (clientSideResponse == null)
-		{
-			var formattedPostcode = ProcessingUtilities.FormatPostcode(postcode);
-
-			var clientSideRequest = new ClientSideRequest
-			{
-				RequestId = 1,
-				Url = "https://www.northtyneside.gov.uk/waste-collection-schedule",
-				Method = "GET",
-				Headers = new()
-				{
-					{ "user-agent", Constants.UserAgent },
-				},
-				Options = new ClientSideOptions
-				{
-					Metadata =
-					{
-						{ "postcode", formattedPostcode },
-					},
-				},
-			};
-
-			var getAddressesResponse = new GetAddressesResponse
-			{
-				NextClientSideRequest = clientSideRequest,
-			};
-
-			return getAddressesResponse;
-		}
-		else if (clientSideResponse.RequestId == 1)
-		{
-			// Prepare client-side request for posting the postcode
-			var formBuildId = FormBuildIdRegex().Match(clientSideResponse.Content).Groups["formBuildId"].Value;
-
-			var clientSideRequest = new ClientSideRequest
-			{
-				RequestId = 2,
-				Url = "https://www.northtyneside.gov.uk/waste-collection-schedule",
-				Method = "POST",
-				Headers = new()
-				{
-					{ "user-agent", Constants.UserAgent },
-					{ "content-type", "application/x-www-form-urlencoded" },
-				},
-				Body = ProcessingUtilities.ConvertDictionaryToFormData(new()
-				{
-					{ "postcode", clientSideResponse.Options.Metadata["postcode"] },
-					{ "op", "Find" },
-					{ "form_build_id", formBuildId },
-					{ "form_id", "localgov_waste_collection_postcode_form" },
-				}),
-				Options = clientSideResponse.Options,
-			};
-
-			var getAddressesResponse = new GetAddressesResponse
-			{
-				NextClientSideRequest = clientSideRequest,
-			};
-
-			return getAddressesResponse;
-		}
-		else if (clientSideResponse.RequestId == 2)
-		{
-			// Process addresses from response
-			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.Trim();
-
-				if (string.IsNullOrWhiteSpace(uid))
-				{
-					continue;
-				}
-
-				var address = new Address
-				{
-					Property = rawAddress.Groups["address"].Value.Trim(),
-					Postcode = clientSideResponse.Options.Metadata["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 getting bin days
-		if (clientSideResponse == null)
-		{
-			var formattedPostcode = ProcessingUtilities.FormatPostcode(address.Postcode!);
-			var encodedPostcode = Uri.EscapeDataString(formattedPostcode.Replace(" ", "+"));
-
-			var clientSideRequest = new ClientSideRequest
-			{
-				RequestId = 1,
-				Url = $"https://www.northtyneside.gov.uk/waste-collection-schedule/find?postcode={encodedPostcode}",
-				Method = "GET",
-				Headers = new()
-				{
-					{ "user-agent", Constants.UserAgent },
-				},
-				Options = new ClientSideOptions
-				{
-					Metadata =
-					{
-						{ "postcode", formattedPostcode },
-					},
-				},
-			};
-
-			var getBinDaysResponse = new GetBinDaysResponse
-			{
-				NextClientSideRequest = clientSideRequest,
-			};
-
-			return getBinDaysResponse;
-		}
-		else if (clientSideResponse.RequestId == 1)
-		{
-			// Prepare client-side request for posting the UPRN
-			var formBuildId = FormBuildIdRegex().Match(clientSideResponse.Content).Groups["formBuildId"].Value;
-			var encodedPostcode = Uri.EscapeDataString(clientSideResponse.Options.Metadata["postcode"].Replace(" ", "+"));
-
-			var clientSideRequest = new ClientSideRequest
-			{
-				RequestId = 2,
-				Url = $"https://www.northtyneside.gov.uk/waste-collection-schedule/find?postcode={encodedPostcode}",
-				Method = "POST",
-				Headers = new()
-				{
-					{ "user-agent", Constants.UserAgent },
-					{ "content-type", "application/x-www-form-urlencoded" },
-				},
-				Body = ProcessingUtilities.ConvertDictionaryToFormData(new()
-				{
-					{ "uprn", address.Uid! },
-					{ "op", "View collection days" },
-					{ "form_build_id", formBuildId },
-					{ "form_id", "localgov_waste_collection_address_select_form" },
-				}),
-				Options = clientSideResponse.Options,
-			};
-
-			var getBinDaysResponse = new GetBinDaysResponse
-			{
-				NextClientSideRequest = clientSideRequest,
-			};
-
-			return getBinDaysResponse;
-		}
-		else if (clientSideResponse.RequestId == 2)
-		{
-			// Process bin days from response
-			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.Trim();
-				var dateString = rawBinDay.Groups["date"].Value.Trim();
-
-				var date = DateOnly.ParseExact(
-					dateString,
-					"yyyy-MM-dd",
-					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.");
-	}
-}
+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;
+
+/// <summary>
+/// Collector implementation for North Tyneside Council.
+/// </summary>
+internal sealed partial class NorthTynesideCouncil : GovUkCollectorBase, ICollector
+{
+	/// <inheritdoc/>
+	public string Name => "North Tyneside Council";
+
+	/// <inheritdoc/>
+	public Uri WebsiteUrl => new("https://www.northtyneside.gov.uk/");
+
+	/// <inheritdoc/>
+	public override string GovUkId => "north-tyneside";
+
+	/// <summary>
+	/// The list of bin types for this collector.
+	/// </summary>
+	private readonly IReadOnlyCollection<Bin> _binTypes =
+	[
+		new()
+		{
+			Name = "Household Waste",
+			Colour = BinColour.Green,
+			Keys = [ "Household", "General Waste" ],
+		},
+		new()
+		{
+			Name = "Mixed Recycling",
+			Colour = BinColour.Grey,
+			Keys = [ "Recycling" ],
+		},
+		new()
+		{
+			Name = "Garden Waste",
+			Colour = BinColour.Brown,
+			Keys = [ "Garden" ],
+		},
+	];
+
+	/// <summary>
+	/// Regex for the form build id.
+	/// </summary>
+	[GeneratedRegex(@"name=""form_build_id""\s+value=""(?<formBuildId>[^""]+)""")]
+	private static partial Regex FormBuildIdRegex();
+
+	/// <summary>
+	/// Regex for the addresses from the data.
+	/// </summary>
+	[GeneratedRegex(@"<option value=""(?<uid>[^""]*)"">(?<address>[^<]+)</option>")]
+	private static partial Regex AddressRegex();
+
+	/// <summary>
+	/// Regex for the bin days from the data.
+	/// </summary>
+	[GeneratedRegex(@"<li class=""waste-collection__day[^""]*"">[\s\S]*?datetime=""(?<date>[^""]+)""[\s\S]*?waste-collection__day--type"">\s*(?<service>[^<]+)\s*<[\s\S]*?waste-collection__day--colour[^>]*>\s*(?<colour>[^<]+)")]
+	private static partial Regex BinDaysRegex();
+
+	/// <inheritdoc/>
+	public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? clientSideResponse)
+	{
+		// Prepare client-side request for getting addresses
+		if (clientSideResponse == null)
+		{
+			var formattedPostcode = ProcessingUtilities.FormatPostcode(postcode);
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 1,
+				Url = "https://www.northtyneside.gov.uk/waste-collection-schedule",
+				Method = "GET",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+				},
+				Options = new ClientSideOptions
+				{
+					Metadata =
+					{
+						{ "postcode", formattedPostcode },
+					},
+				},
+			};
+
+			var getAddressesResponse = new GetAddressesResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getAddressesResponse;
+		}
+		else if (clientSideResponse.RequestId == 1)
+		{
+			// Prepare client-side request for posting the postcode
+			var formBuildId = FormBuildIdRegex().Match(clientSideResponse.Content).Groups["formBuildId"].Value;
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 2,
+				Url = "https://www.northtyneside.gov.uk/waste-collection-schedule",
+				Method = "POST",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+					{ "content-type", "application/x-www-form-urlencoded" },
+				},
+				Body = ProcessingUtilities.ConvertDictionaryToFormData(new()
+				{
+					{ "postcode", clientSideResponse.Options.Metadata["postcode"] },
+					{ "op", "Find" },
+					{ "form_build_id", formBuildId },
+					{ "form_id", "localgov_waste_collection_postcode_form" },
+				}),
+				Options = clientSideResponse.Options,
+			};
+
+			var getAddressesResponse = new GetAddressesResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getAddressesResponse;
+		}
+		else if (clientSideResponse.RequestId == 2)
+		{
+			// Process addresses from response
+			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.Trim();
+
+				if (string.IsNullOrWhiteSpace(uid))
+				{
+					continue;
+				}
+
+				var address = new Address
+				{
+					Property = rawAddress.Groups["address"].Value.Trim(),
+					Postcode = clientSideResponse.Options.Metadata["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 getting bin days
+		if (clientSideResponse == null)
+		{
+			var formattedPostcode = ProcessingUtilities.FormatPostcode(address.Postcode!);
+			var encodedPostcode = Uri.EscapeDataString(formattedPostcode.Replace(" ", "+"));
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 1,
+				Url = $"https://www.northtyneside.gov.uk/waste-collection-schedule/find?postcode={encodedPostcode}",
+				Method = "GET",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+				},
+				Options = new ClientSideOptions
+				{
+					Metadata =
+					{
+						{ "postcode", formattedPostcode },
+					},
+				},
+			};
+
+			var getBinDaysResponse = new GetBinDaysResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getBinDaysResponse;
+		}
+		else if (clientSideResponse.RequestId == 1)
+		{
+			// Prepare client-side request for posting the UPRN
+			var formBuildId = FormBuildIdRegex().Match(clientSideResponse.Content).Groups["formBuildId"].Value;
+			var encodedPostcode = Uri.EscapeDataString(clientSideResponse.Options.Metadata["postcode"].Replace(" ", "+"));
+
+			var clientSideRequest = new ClientSideRequest
+			{
+				RequestId = 2,
+				Url = $"https://www.northtyneside.gov.uk/waste-collection-schedule/find?postcode={encodedPostcode}",
+				Method = "POST",
+				Headers = new()
+				{
+					{ "user-agent", Constants.UserAgent },
+					{ "content-type", "application/x-www-form-urlencoded" },
+				},
+				Body = ProcessingUtilities.ConvertDictionaryToFormData(new()
+				{
+					{ "uprn", address.Uid! },
+					{ "op", "View collection days" },
+					{ "form_build_id", formBuildId },
+					{ "form_id", "localgov_waste_collection_address_select_form" },
+				}),
+				Options = clientSideResponse.Options,
+			};
+
+			var getBinDaysResponse = new GetBinDaysResponse
+			{
+				NextClientSideRequest = clientSideRequest,
+			};
+
+			return getBinDaysResponse;
+		}
+		else if (clientSideResponse.RequestId == 2)
+		{
+			// Process bin days from response
+			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.Trim();
+				var dateString = rawBinDay.Groups["date"].Value.Trim();
+
+				var date = DateOnly.ParseExact(
+					dateString,
+					"yyyy-MM-dd",
+					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.");
+	}
+}
diff --git a/BinDays.Api.IntegrationTests/Collectors/Councils/NorthTynesideCouncilTests.cs b/BinDays.Api.IntegrationTests/Collectors/Councils/NorthTynesideCouncilTests.cs
index 18f15ba..62001f5 100644
--- a/BinDays.Api.IntegrationTests/Collectors/Councils/NorthTynesideCouncilTests.cs
+++ b/BinDays.Api.IntegrationTests/Collectors/Councils/NorthTynesideCouncilTests.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 NorthTynesideCouncilTests
-{
-	private readonly IntegrationTestClient _client;
-	private static readonly ICollector _collector = new NorthTynesideCouncil();
-	private readonly CollectorService _collectorService = new([_collector]);
-	private readonly ITestOutputHelper _outputHelper;
-
-	public NorthTynesideCouncilTests(ITestOutputHelper outputHelper)
-	{
-		_outputHelper = outputHelper;
-		_client = new IntegrationTestClient(outputHelper);
-	}
-
-	[Theory]
-	[InlineData("NE28 7BH")]
-	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 NorthTynesideCouncilTests
+{
+	private readonly IntegrationTestClient _client;
+	private static readonly ICollector _collector = new NorthTynesideCouncil();
+	private readonly CollectorService _collectorService = new([_collector]);
+	private readonly ITestOutputHelper _outputHelper;
+
+	public NorthTynesideCouncilTests(ITestOutputHelper outputHelper)
+	{
+		_outputHelper = outputHelper;
+		_client = new IntegrationTestClient(outputHelper);
+	}
+
+	[Theory]
+	[InlineData("NE28 7BH")]
+	public async Task GetBinDaysTest(string postcode)
+	{
+		await TestSteps.EndToEnd(
+			_client,
+			_collectorService,
+			_collector,
+			postcode,
+			_outputHelper
+		);
+	}
+}

From 34d7da62a02d68ee6861b6fba10abdf4dc463a7e Mon Sep 17 00:00:00 2001
From: "claude[bot]" <41898282+claude[bot]@users.noreply.github.com>
Date: Thu, 5 Feb 2026 23:54:34 +0000
Subject: [PATCH 3/3] Address all PR review comments for NorthTynesideCouncil
 collector

- Remove unnecessary "General Waste" key from bin types
- Remove unused "colour" capture group from BinDaysRegex
- Format postcode only once at method entry per style guide
- Remove postcode from metadata (use parameters instead)
- Move dictionary initialization to separate variable for readability
- Remove duplicate postcode formatting in GetBinDays
- Remove unnecessary string replacement operation
- Improve code clarity and adherence to style guide

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

diff --git a/BinDays.Api.Collectors/Collectors/Councils/NorthTynesideCouncil.cs b/BinDays.Api.Collectors/Collectors/Councils/NorthTynesideCouncil.cs
index 10ab9c5..221cbb2 100644
--- a/BinDays.Api.Collectors/Collectors/Councils/NorthTynesideCouncil.cs
+++ b/BinDays.Api.Collectors/Collectors/Councils/NorthTynesideCouncil.cs
@@ -31,7 +31,7 @@ internal sealed partial class NorthTynesideCouncil : GovUkCollectorBase, ICollec
 		{
 			Name = "Household Waste",
 			Colour = BinColour.Green,
-			Keys = [ "Household", "General Waste" ],
+			Keys = [ "Household" ],
 		},
 		new()
 		{
@@ -62,17 +62,17 @@ internal sealed partial class NorthTynesideCouncil : GovUkCollectorBase, ICollec
 	/// <summary>
 	/// Regex for the bin days from the data.
 	/// </summary>
-	[GeneratedRegex(@"<li class=""waste-collection__day[^""]*"">[\s\S]*?datetime=""(?<date>[^""]+)""[\s\S]*?waste-collection__day--type"">\s*(?<service>[^<]+)\s*<[\s\S]*?waste-collection__day--colour[^>]*>\s*(?<colour>[^<]+)")]
+	[GeneratedRegex(@"<li class=""waste-collection__day[^""]*"">[\s\S]*?datetime=""(?<date>[^""]+)""[\s\S]*?waste-collection__day--type"">\s*(?<service>[^<]+)\s*<[\s\S]*?waste-collection__day--colour")]
 	private static partial Regex BinDaysRegex();
 
 	/// <inheritdoc/>
 	public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? clientSideResponse)
 	{
+		var formattedPostcode = ProcessingUtilities.FormatPostcode(postcode);
+
 		// Prepare client-side request for getting addresses
 		if (clientSideResponse == null)
 		{
-			var formattedPostcode = ProcessingUtilities.FormatPostcode(postcode);
-
 			var clientSideRequest = new ClientSideRequest
 			{
 				RequestId = 1,
@@ -82,13 +82,6 @@ public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? cl
 				{
 					{ "user-agent", Constants.UserAgent },
 				},
-				Options = new ClientSideOptions
-				{
-					Metadata =
-					{
-						{ "postcode", formattedPostcode },
-					},
-				},
 			};
 
 			var getAddressesResponse = new GetAddressesResponse
@@ -103,6 +96,14 @@ public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? cl
 			// Prepare client-side request for posting the postcode
 			var formBuildId = FormBuildIdRegex().Match(clientSideResponse.Content).Groups["formBuildId"].Value;
 
+			var formData = new Dictionary<string, string>
+			{
+				{ "postcode", formattedPostcode },
+				{ "op", "Find" },
+				{ "form_build_id", formBuildId },
+				{ "form_id", "localgov_waste_collection_postcode_form" },
+			};
+
 			var clientSideRequest = new ClientSideRequest
 			{
 				RequestId = 2,
@@ -113,14 +114,7 @@ public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? cl
 					{ "user-agent", Constants.UserAgent },
 					{ "content-type", "application/x-www-form-urlencoded" },
 				},
-				Body = ProcessingUtilities.ConvertDictionaryToFormData(new()
-				{
-					{ "postcode", clientSideResponse.Options.Metadata["postcode"] },
-					{ "op", "Find" },
-					{ "form_build_id", formBuildId },
-					{ "form_id", "localgov_waste_collection_postcode_form" },
-				}),
-				Options = clientSideResponse.Options,
+				Body = ProcessingUtilities.ConvertDictionaryToFormData(formData),
 			};
 
 			var getAddressesResponse = new GetAddressesResponse
@@ -149,7 +143,7 @@ public GetAddressesResponse GetAddresses(string postcode, ClientSideResponse? cl
 				var address = new Address
 				{
 					Property = rawAddress.Groups["address"].Value.Trim(),
-					Postcode = clientSideResponse.Options.Metadata["postcode"],
+					Postcode = formattedPostcode,
 					Uid = uid,
 				};
 
@@ -173,8 +167,8 @@ public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? client
 		// Prepare client-side request for getting bin days
 		if (clientSideResponse == null)
 		{
-			var formattedPostcode = ProcessingUtilities.FormatPostcode(address.Postcode!);
-			var encodedPostcode = Uri.EscapeDataString(formattedPostcode.Replace(" ", "+"));
+			var postcode = address.Postcode!;
+			var encodedPostcode = Uri.EscapeDataString(postcode);
 
 			var clientSideRequest = new ClientSideRequest
 			{
@@ -185,13 +179,6 @@ public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? client
 				{
 					{ "user-agent", Constants.UserAgent },
 				},
-				Options = new ClientSideOptions
-				{
-					Metadata =
-					{
-						{ "postcode", formattedPostcode },
-					},
-				},
 			};
 
 			var getBinDaysResponse = new GetBinDaysResponse
@@ -205,7 +192,8 @@ public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? client
 		{
 			// Prepare client-side request for posting the UPRN
 			var formBuildId = FormBuildIdRegex().Match(clientSideResponse.Content).Groups["formBuildId"].Value;
-			var encodedPostcode = Uri.EscapeDataString(clientSideResponse.Options.Metadata["postcode"].Replace(" ", "+"));
+			var postcode = address.Postcode!;
+			var encodedPostcode = Uri.EscapeDataString(postcode);
 
 			var clientSideRequest = new ClientSideRequest
 			{
@@ -224,7 +212,6 @@ public GetBinDaysResponse GetBinDays(Address address, ClientSideResponse? client
 					{ "form_build_id", formBuildId },
 					{ "form_id", "localgov_waste_collection_address_select_form" },
 				}),
-				Options = clientSideResponse.Options,
 			};
 
 			var getBinDaysResponse = new GetBinDaysResponse