-
-
Notifications
You must be signed in to change notification settings - Fork 4
Add collector for North Tyneside Council #125
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
moley-bot
wants to merge
3
commits into
main
Choose a base branch
from
collector/NorthTynesideCouncil-issue-101-1768991569
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
265 changes: 265 additions & 0 deletions
265
BinDays.Api.Collectors/Collectors/Councils/NorthTynesideCouncil.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,265 @@ | ||
| 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" ], | ||
| }, | ||
| 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")] | ||
| 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 clientSideRequest = new ClientSideRequest | ||
| { | ||
| RequestId = 1, | ||
| Url = "https://www.northtyneside.gov.uk/waste-collection-schedule", | ||
| Method = "GET", | ||
| Headers = new() | ||
| { | ||
| { "user-agent", Constants.UserAgent }, | ||
| }, | ||
| }; | ||
|
|
||
| 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 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, | ||
| 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(formData), | ||
| }; | ||
|
|
||
| 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 = formattedPostcode, | ||
| 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 postcode = address.Postcode!; | ||
| var encodedPostcode = Uri.EscapeDataString(postcode); | ||
|
|
||
| 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 }, | ||
| }, | ||
| }; | ||
|
|
||
| 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 postcode = address.Postcode!; | ||
| var encodedPostcode = Uri.EscapeDataString(postcode); | ||
|
|
||
| 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" }, | ||
| }), | ||
| }; | ||
|
|
||
| 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."); | ||
| } | ||
| } | ||
36 changes: 36 additions & 0 deletions
36
BinDays.Api.IntegrationTests/Collectors/Councils/NorthTynesideCouncilTests.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| ); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no need for both of these