Skip to content

Conversation

@neprune
Copy link
Contributor

@neprune neprune commented Nov 14, 2025

@codecov
Copy link

codecov bot commented Nov 14, 2025

Codecov Report

❌ Patch coverage is 86.27451% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 82.61%. Comparing base (ccea3d6) to head (097c9a3).

Files with missing lines Patch % Lines
perllib/FixMyStreet/App/Controller/Waste.pm 91.66% 0 Missing and 2 partials ⚠️
perllib/FixMyStreet/App/Controller/Waste/Echo.pm 0.00% 2 Missing ⚠️
perllib/FixMyStreet/Roles/Cobrand/Waste.pm 75.00% 0 Missing and 2 partials ⚠️
perllib/FixMyStreet/Cobrand/Sutton.pm 85.71% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5742      +/-   ##
==========================================
- Coverage   82.64%   82.61%   -0.04%     
==========================================
  Files         457      458       +1     
  Lines       35710    35761      +51     
  Branches     5821     5828       +7     
==========================================
+ Hits        29514    29545      +31     
- Misses       4501     4516      +15     
- Partials     1695     1700       +5     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@neprune neprune force-pushed the sutton-container-request-cancellations-report-only branch from 702a876 to 3bd730f Compare November 14, 2025 17:17
@neprune neprune requested a review from dracos November 14, 2025 18:19
Copy link
Member

@dracos dracos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only real request is to make the Sutton specific things the default, with a feature flag; other two are just question/comments :)

@neprune neprune requested a review from dracos November 19, 2025 14:47
Copy link
Member

@dracos dracos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only the one thing, sorry :)

@neprune neprune force-pushed the sutton-container-request-cancellations-report-only branch from 4e1eaac to 254d96f Compare November 19, 2025 15:57
@neprune neprune requested a review from dracos November 19, 2025 16:52
Copy link
Member

@dracos dracos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks :)

@neprune neprune force-pushed the sutton-container-request-cancellations-report-only branch from 71bdd27 to f316a4c Compare December 9, 2025 12:45
@neprune neprune requested a review from dracos December 9, 2025 13:39
@neprune
Copy link
Contributor Author

neprune commented Dec 9, 2025

New commits address bugs from https://github.com/mysociety/societyworks/issues/5269.

Copy link
Member

@dracos dracos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good :)

@neprune
Copy link
Contributor Author

neprune commented Dec 10, 2025

@dracos taking the approach of letting the update logic filter out the echo cancellation because of the matching text & user, as discussed.

@neprune neprune force-pushed the sutton-container-request-cancellations-report-only branch from a8f77b7 to cfe14a5 Compare December 10, 2025 16:07
@neprune neprune requested a review from dracos December 10, 2025 16:07
Copy link
Member

@dracos dracos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@neprune neprune force-pushed the sutton-container-request-cancellations-report-only branch 3 times, most recently from 58594b8 to b67f7fb Compare December 17, 2025 17:47
@neprune
Copy link
Contributor Author

neprune commented Dec 17, 2025

New changes:

  1. Remove state change text in cancellation update.
  2. Don't alert on the cancellation update back from Echo.
    Both verified on staging.

@neprune neprune requested a review from dracos December 17, 2025 17:51
Copy link
Member

@dracos dracos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine - I guess only question is if in this state we don't want to have an update at all (but then, I think we won't because the text and state will match so it's about to get hidden anyway).

if ($p->category eq 'Request new container'
&& $request->{status} eq 'cancelled'
&& $p->state eq 'cancelled') {
$updates->suppress_alerts(1);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just checking (I think we discussed this, but have forgotten) - this is just in case it's not already caught/hidden by the 'identical update' checking (now that we use the template)? Do we want to only suppress the alert, or if we're here, skip the update entirely?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah on staging the update was still getting through, I guess because the template was not picked up so text wasn't matching, but I thought rather than figure that out better to just be explicit anyway. The reason I went for suppression rather than skipping was in case we wanted to keep a log on the report of when we get confirmation Echo that it was actually cancelled.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yes, the template isn't being picked up because there isn't a state change (so it's not even looking); I wonder if it should be in that case, but that seems like a bigger thing.

@dracos dracos force-pushed the sutton-container-request-cancellations-report-only branch from b67f7fb to 097c9a3 Compare January 9, 2026 17:14
@neprune neprune merged commit 483033c into master Jan 12, 2026
45 of 46 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.

3 participants