Skip to content

June release 26 — issue resolution fixes + parity check - #2112

Merged
robbrad merged 6 commits into
masterfrom
june-release-26
Jun 2, 2026
Merged

robbrad merged 6 commits into
masterfrom
june-release-26

Conversation

@robbrad

@robbrad robbrad commented Jun 2, 2026 •

Copy link
Copy Markdown
Owner

Issue Resolution Fixes

Bug fixes and config corrections from the issue resolution workflow session.

Bug Fixes

Commit Issue Council Fix
65261e4 #1969 LincolnCouncil Fix zfill(None) crash when UPRN not provided (postcode-only lookup)
6f9b642 #2006 BradfordMDC Add new garden waste element ID CTID-JFhRyRPU to regex

Config Fixes

Commit Issue Council Fix
36d94d0 #1999 MidlothianCouncil Add missing web_driver field to input.json for HA config flow
55ad57a #2010 EdinburghCityCouncil Update wiki_note — scraper now uses real postcode (not "Week 1")
55ad57a #2019 ThurrockCouncil Update wiki_note — scraper now uses real postcode (not "Round B")

Issues Closed (28 total this session)

Already fixed by June release (#2110): #1517, #1546, #1825, #1839, #1912, #1965, #1998, #2005, #2011, #2025, #2078, #2107

Tested and confirmed working: #1607, #1785, #1887

Upstream/external issues: #1850, #1901, #1903, #1960, #1969, #1997

Config/wiki fixes: #1999, #2006, #2010, #2019

Parity Check Fixes

  • Added 15 missing council entries to input.json (new councils from Batch 1)
  • Corrected test params for 6 councils (house_number, postcode, UPRN)

@coderabbitai

coderabbitai Bot commented Jun 2, 2026 •

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

This PR updates council scraper configurations and fixes parsing logic across multiple implementations. It adds a new issue resolution progress tracker, updates test configuration instructions for Edinburgh, Midlothian, and Thurrock councils, expands Garden Waste pattern matching in Bradford MDC, and fixes conditional UPRN handling in Lincoln Council.

Changes

Council Scraper and Configuration Updates with Issue Tracking

Layer / File(s) Summary
Issue Resolution Progress Document
ISSUE_RESOLUTION_PROGRESS.md
New Markdown status log with next issue pointer, table of issues closed this session (with council and closure notes), table of code fixes made (commit hash, council, description), and table of remaining issues (with council, type, notes).
Council Configuration Updates
uk_bin_collection/tests/input.json
Test configuration for three councils updated: Edinburgh and Thurrock wiki_note fields now describe postcode and house-number input with automatic schedule resolution via directory; Midlothian gains web_driver field pointing to Selenium service at http://selenium:4444.
Bradford MDC Garden Waste Pattern Expansion
uk_bin_collection/uk_bin_collection/councils/BradfordMDC.py
parse_data regex selector expands to match both CTID-L8OidMPA-* and CTID-JFhRyRPU-* CTID patterns when extracting Garden Waste subscription collection dates.
Lincoln Council UPRN Zero-Padding Fix
uk_bin_collection/uk_bin_collection/councils/LincolnCouncil.py
parse_data now conditionally zero-pads user_uprn to 12 digits only when user_uprn is present, preventing zfill calls on missing values during AchieveForms lookup.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

Possibly related PRs

  • robbrad/UKBinCollectionData#2110: Both PRs modify uk_bin_collection/uk_bin_collection/councils/LincolnCouncil.py inside CouncilClass.parse_data, specifically around user_uprn handling and zero-padding for bin-date lookups.

Suggested reviewers

  • dp247

Poem

🐰 A rabbit hops through issue logs so neat,
With councils six and patterns fixed just right,
From Edinburgh to Lincoln's UPRN treat,
The scrapers bounce—configuration's tight!
Garden Waste blooms in Bradford's regex sight. 🌱

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Title check ✅ Passed The title accurately summarizes the main changes: issue resolution fixes (LincolnCouncil, BradfordMDC, test configs) and parity check implementation (ISSUE_RESOLUTION_PROGRESS.md).

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch june-release-26

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@codecov

codecov Bot commented Jun 2, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 86.67%. Comparing base (0a92e37) to head (55ad57a).
⚠️ Report is 10 commits behind head on master.
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #2112   +/-   ##
=======================================
  Coverage   86.67%   86.67%           
=======================================
  Files           9        9           
  Lines        1141     1141           
=======================================
  Hits          989      989           
  Misses        152      152           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@robbrad robbrad changed the title June release 26 June release 26 — issue resolution fixes + parity check Jun 2, 2026
@robbrad
robbrad merged commit 04ee817 into master Jun 2, 2026
15 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant