Add collector for Torbay Council #102

BadgerHobbs · 2026-01-06T10:23:29Z

Summary

This PR adds a new bin collection data collector for Torbay Council.

Implements ICollector interface
Adds integration tests
Successfully tested with example postcode from issue

Closes #26

Test Summary

 ==================== Test Summary ====================
 
 --------------------- Collector ----------------------
 
 Torbay Council
 
 ------------------- Addresses (21) -------------------
 
 - 79 Union Street, Torquay, TQ1 3DG, TQ1 3DG, U100041053685
 - 79-81 Union Street, Torquay, TQ1 3DG, TQ1 3DG, U10002985702
 - 81-83 Union Street, Torquay, TQ1 3DG, TQ1 3DG, U100041189016
 - 83-85 Union Street, Torquay, TQ1 3DG, TQ1 3DG, U100041053687
 - 85 Union Street, Torquay, TQ1 3DG, TQ1 3DG, U100041188607
 - ...
 
 -------------------- Bin Days (5) --------------------
 
 - 08/01/2026 (2 bins):
   - General Waste
   - Recycling
 
 - 14/01/2026 (2 bins):
   - Recycling
   - General Waste
 
 - 20/01/2026 (2 bins):
   - General Waste
   - Recycling
 
 - 27/01/2026 (2 bins):
   - Recycling
   - General Waste
 
 - 03/02/2026 (2 bins):
   - General Waste
   - Recycling
 
 ======================================================

Generated automatically by Codex CLI

Closes #26 Generated with Codex CLI

BadgerHobbs · 2026-01-10T01:09:25Z

/gemini review

gemini-code-assist

Code Review

This pull request introduces a new collector for Torbay Council, complete with integration tests. The implementation is well-structured and correctly follows the multi-step request pattern defined in the project. My review identifies several minor violations of the repository's C# style guide, primarily concerning missing trailing commas and an unused using directive. These are small fixes that will improve code consistency. Overall, this is a solid contribution.

BinDays.Api.Collectors/Collectors/Councils/TorbayCouncil.cs

BadgerHobbs · 2026-02-01T22:07:10Z

@claude Resolve PR comments.

moley-bot · 2026-02-01T22:07:21Z

Claude finished @BadgerHobbs's task in 2m 21s —— View job

Resolved PR Comments ✓

All review comments have been addressed and changes pushed to the PR branch.

Changes Made

From BadgerHobbs' review:

✓ Removed postcode formatting - now uses the already-formatted postcode passed by caller
✓ Removed address ordering - addresses are returned in original order
✓ Renamed vague "value" variable to "addressText" for clarity
✓ Removed empty/null/default form fields: CurrentSectionID, TriggerCtl, and FF1168lbltxt (kept only required fields)

From gemini-code-assist review:

✓ Added robust token parsing with validation - now throws InvalidOperationException if tokens are not found, failing loudly as per style guide
✓ Removed unused using BinDays.Api.Collectors.Collectors.Vendors statement
✓ Added null-forgiving operator (!) to BinDayRegex().Matches() call as per style guide rule #180
✓ Fixed postcode reference in GetBinDays to use address.Postcode directly

Note on trailing commas: The trailing commas mentioned in the gemini review were already present in the code, so no changes were needed for those.

Code duplication: The duplicated client-side request logic for getting form tokens is intentional per the style guide's step-by-step request pattern (lines 157-164 of style guide). This pattern provides clear, linear flow for debugging multi-step processes.

--- • Branch

- Remove unused using statement (Vendors namespace) - Remove postcode formatting (already formatted by caller) - Remove address ordering (not required) - Rename vague 'value' variable to 'addressText' - Remove empty/null/default form fields (CurrentSectionID, TriggerCtl, FF1168lbltxt) - Add robust token parsing with validation to fail fast if tokens not found - Add null-forgiving operator to regex Matches call - Use address.Postcode directly instead of formattedPostcode variable Co-authored-by: Andrew Riggs <BadgerHobbs@users.noreply.github.com>

BadgerHobbs · 2026-02-01T22:12:42Z

@claude Please fix the build you have broken, and make sure the tests are running.

moley-bot · 2026-02-01T22:12:54Z

Claude finished @BadgerHobbs's task —— View job

Build Fixed ✓ — Test Failure Requires Investigation

Changes Made

Fixed build error:

Added missing using BinDays.Api.Collectors.Collectors.Vendors; import that was incorrectly removed in the previous commit

Restored required form fields:

CurrentSectionID
TriggerCtl
FF1168lbltxt

These fields were removed as "empty/null/default" but are actually required by the council website's form submission.

Build Status

✅ Build now succeeds with 0 errors and 0 warnings
✅ Code compiles successfully

Test Status

❌ Integration test still fails — returns 0 bin days instead of expected results

The TorbayCouncil integration test continues to fail even after restoring the form fields. Since other council tests (e.g., PlymouthCouncil) pass successfully, this suggests the issue is specific to Torbay Council's implementation or website.

Possible Causes

Website changes: The Torbay Council website may have changed its HTML structure since the original implementation (Jan 6, 2026). The regex pattern for extracting bin day data may no longer match.
Data availability: The website might be temporarily down or returning different data for the test postcode (TQ1 3DG).
Date-related: The original test showed January 2026 collection dates. Now it's February 1st, and the website may have different data or date formats.

Recommendation

The build is now fixed and the code will compile. However, you should manually test the TorbayCouncil collector with postcode TQ1 3DG to verify if the council website has changed. If the website has changed, the regex patterns or request logic may need updating.

• Branch

- Add missing 'using BinDays.Api.Collectors.Collectors.Vendors' import - Restore CurrentSectionID, TriggerCtl, and FF1168lbltxt form fields - These fields are required by the council website form submission The previous commit incorrectly removed the Vendors namespace import and form fields, causing build failure. This commit fixes the build but the integration test still fails with 0 bin days returned, suggesting the council website may have changed since implementation. Co-authored-by: Andrew Riggs <BadgerHobbs@users.noreply.github.com>

BadgerHobbs · 2026-02-01T22:23:42Z

Claude finished @BadgerHobbs's task —— View job

Build Fixed ✓ — Test Failure Requires Investigation

Changes Made

Fixed build error:
* Added missing `using BinDays.Api.Collectors.Collectors.Vendors;` import that was incorrectly removed in the previous commit
Restored required form fields:
* `CurrentSectionID`

* `TriggerCtl`

* `FF1168lbltxt`
These fields were removed as "empty/null/default" but are actually required by the council website's form submission.

Build Status

✅ Build now succeeds with 0 errors and 0 warnings ✅ Code compiles successfully

Test Status

❌ Integration test still fails — returns 0 bin days instead of expected results

The TorbayCouncil integration test continues to fail even after restoring the form fields. Since other council tests (e.g., PlymouthCouncil) pass successfully, this suggests the issue is specific to Torbay Council's implementation or website.

Possible Causes
1. **Website changes:** The Torbay Council website may have changed its HTML structure since the original implementation (Jan 6, 2026). The regex pattern for extracting bin day data may no longer match.

2. **Data availability:** The website might be temporarily down or returning different data for the test postcode (TQ1 3DG).

3. **Date-related:** The original test showed January 2026 collection dates. Now it's February 1st, and the website may have different data or date formats.
Recommendation

The build is now fixed and the code will compile. However, you should manually test the TorbayCouncil collector with postcode TQ1 3DG to verify if the council website has changed. If the website has changed, the regex patterns or request logic may need updating.

• Branch

@claude Update to use different postcode, 'TQ1 1NX', then see if we can re-apply the changes as per the PR comments.

moley-bot · 2026-02-01T22:23:59Z

Claude finished @BadgerHobbs's task in 3m 24s —— View job

Test Postcode Updated Successfully ✓

All tasks completed successfully!

Changes Made

Updated test postcode:

Changed from TQ1 3DG to TQ1 1NX in TorbayCouncilTests.cs
The previous postcode was returning 0 bin days
New postcode successfully retrieves collection data

Test Results

✅ Build Status: Succeeded with 0 errors and 0 warnings
✅ Integration Test: Passed successfully

Found 82 addresses for postcode TQ1 1NX
Retrieved 5 bin collection dates (Feb 5, 12, 19, 26, and Mar 5)
Correctly identifies General Waste and Recycling bins

PR Review Comments Status

The previous commit already addressed all PR review comments correctly:

✅ Token parsing validation with error handling (lines 213-216)
✅ Null-forgiving operator on regex Matches (line 258)
✅ Trailing commas throughout
✅ Clear variable naming ("addressText")
✅ No postcode formatting (uses as-is)
✅ No address ordering (preserves original order)
✅ Required using statement for GovUkCollectorBase maintained

The TorbayCouncil collector is now working correctly with the updated test postcode!

• Branch •

The previous test postcode TQ1 3DG was returning 0 bin days. Updated to TQ1 1NX which successfully returns collection data. Test now passes with 82 addresses and 5 bin days found. Co-authored-by: Andrew Riggs <BadgerHobbs@users.noreply.github.com>

Replace null coalescing operators with null-forgiving operators as per PR review feedback. Note: Empty/null/default form fields (CurrentSectionID, TriggerCtl, FF1168lbltxt) must be kept as they are required by the council website. Co-authored-by: Andrew Riggs <BadgerHobbs@users.noreply.github.com>

BadgerHobbs · 2026-02-01T22:42:36Z

@claude Update the bins returned to match those listed in the original ticket. There can be multiple bin types under a single key.

Recycling Collection Service

Recycling (Plastics/Tins): Box with Green Sticker
Recycling (Glass/Cardboard): Box with Orange Sticker
Recycling (Paper): Blue Bag
Food Waste: Brown Food Bin

Domestic Collection Service

General Waste: Grey/Black Wheelie Bin

Garden Waste Collection Service

Garden Waste: Brown Wheelie Bin

moley-bot · 2026-02-01T22:42:51Z

Claude finished @BadgerHobbs's task in 1m 59s —— View job

Bin Definitions Updated ✓

Read current TorbayCouncil.cs implementation
Update bin definitions to match ticket specifications
Build the project
Run integration tests
Commit and push changes

Changes Made

Updated the bin definitions in TorbayCouncil.cs to match the original ticket specifications:

Recycling Collection Service:

Recycling (Plastics/Tins): Green Box - Key: Recycling
Recycling (Glass/Cardboard): Orange Box - Key: Recycling
Recycling (Paper): Blue Bag - Key: Recycling
Food Waste: Brown Bin - Key: Recycling

Domestic Collection Service:

General Waste: Grey Bin - Key: Domestic

Garden Waste Collection Service:

Garden Waste: Brown Bin - Key: Garden

Key Changes

Split the single "Recycling" bin into three specific recycling bin types with appropriate colors and types
Multiple bins now share the same service key (Recycling), which means when the council website returns "Recycling Collection Service", all four recycling-related bins will be matched
Changed Food Waste from Caddy to Bin type and updated its key to Recycling (as it's part of the Recycling Collection Service)
Simplified General Waste key to just Domestic (removed "General" and "Refuse")

Test Results

✅ Build succeeded with 0 errors and 0 warnings
✅ Integration test passed successfully

All bins now match the specifications from the original issue #26.

View job • Branch

- Split Recycling into three specific types: - Recycling (Plastics/Tins): Green Box - Recycling (Glass/Cardboard): Orange Box - Recycling (Paper): Blue Bag - Food Waste: Changed from Caddy to Bin, now under Recycling key - General Waste: Simplified key to just "Domestic" - Garden Waste: Unchanged (Brown Bin) All bin types now match the original issue specifications, with multiple bins able to share the same service key. Co-authored-by: Andrew Riggs <BadgerHobbs@users.noreply.github.com>

BadgerHobbs · 2026-02-01T22:47:14Z

@claude Format the bin names as per the styleguide/existing conventions (e.g. Plastics & Tins Recycling not Recycling (Plastics/Tins))

moley-bot · 2026-02-01T22:47:29Z

Claude finished @BadgerHobbs's task in 2m 1s —— View job

Bin Names Updated ✓

Read styleguide and existing collectors for naming conventions
Read current TorbayCouncil.cs implementation
Update bin names to match conventions
Build the project
Run integration tests
Commit and push changes

Changes Made

Updated bin names to follow the project convention (Materials & Materials Recycling instead of Recycling (Materials/Materials)):

Before → After:

Recycling (Plastics/Tins) → Plastics & Tins Recycling
Recycling (Glass/Cardboard) → Glass & Cardboard Recycling
Recycling (Paper) → Paper Recycling

Status

✅ Build succeeded with 0 errors and 0 warnings
✅ Integration test passed successfully
✅ Changes committed and pushed to PR branch

View job • Branch

Changed bin names from 'Recycling (Materials/Materials)' format to 'Materials & Materials Recycling' format to align with project conventions. Co-authored-by: Andrew Riggs <BadgerHobbs@users.noreply.github.com>

BadgerHobbs mentioned this pull request Jan 6, 2026

Torbay Council #26

Open

This comment was marked as outdated.

Sign in to view

github-actions bot and others added 3 commits January 10, 2026 00:59

Add collector for TorbayCouncil

47b7bf6

Closes #26 Generated with Codex CLI

Auto-format code with dotnet format

f9802ea

Format TorbayCouncil

ff91863

BadgerHobbs force-pushed the collector/TorbayCouncil-issue-26-1767695008 branch from 6426af7 to ff91863 Compare January 10, 2026 01:02

gemini-code-assist bot reviewed Jan 10, 2026

View reviewed changes

BadgerHobbs commented Jan 17, 2026

View reviewed changes

BadgerHobbs added the new collector Request for a new collector to be supported label Feb 1, 2026

github-actions bot and others added 3 commits February 1, 2026 22:27

Removed blank lines.

db2e043

Update TorbayCouncil bin names to match naming conventions

c1b565f

Changed bin names from 'Recycling (Materials/Materials)' format to 'Materials & Materials Recycling' format to align with project conventions. Co-authored-by: Andrew Riggs <BadgerHobbs@users.noreply.github.com>

BadgerHobbs added the ready for deployment Implementation ready for deployment label Feb 1, 2026

Uh oh!

Add collector for Torbay Council #102

Are you sure you want to change the base?

Add collector for Torbay Council #102

Uh oh!

Conversation

BadgerHobbs commented Jan 6, 2026

Summary

Test Summary

Uh oh!

This comment was marked as outdated.

This comment was marked as outdated.

Uh oh!

BadgerHobbs commented Jan 10, 2026

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

BadgerHobbs commented Feb 1, 2026

Uh oh!

moley-bot bot commented Feb 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Resolved PR Comments ✓

Changes Made

Uh oh!

BadgerHobbs commented Feb 1, 2026

Uh oh!

moley-bot bot commented Feb 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Build Fixed ✓ — Test Failure Requires Investigation

Changes Made

Build Status

Test Status

Possible Causes

Recommendation

Uh oh!

BadgerHobbs commented Feb 1, 2026

Build Fixed ✓ — Test Failure Requires Investigation

Changes Made

Build Status

Test Status

Possible Causes

Recommendation

Uh oh!

moley-bot bot commented Feb 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Postcode Updated Successfully ✓

Changes Made

Test Results

PR Review Comments Status

Uh oh!

BadgerHobbs commented Feb 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

moley-bot bot commented Feb 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Bin Definitions Updated ✓

Changes Made

Key Changes

Test Results

Uh oh!

BadgerHobbs commented Feb 1, 2026

Uh oh!

moley-bot bot commented Feb 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Bin Names Updated ✓

Changes Made

Status

Uh oh!

moley-bot bot commented Feb 1, 2026 •

edited

Loading

moley-bot bot commented Feb 1, 2026 •

edited

Loading

moley-bot bot commented Feb 1, 2026 •

edited

Loading

BadgerHobbs commented Feb 1, 2026 •

edited

Loading

moley-bot bot commented Feb 1, 2026 •

edited

Loading

moley-bot bot commented Feb 1, 2026 •

edited

Loading