[Bromley] Actually only resend non-waste Echo reports.

Used wrong field in 21b8c7f.
mysociety · Oct 16, 2024 · f122336 · f122336
1 parent df7b21d
commit f122336
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -549,7 +549,7 @@ sub should_skip_sending_update {
     my ($self, $update) = @_;
 
     my $report = $update->problem;
-    if ($self->_has_report_been_sent_to_echo($report) && $report->cobrand ne 'waste') {
+    if ($self->_has_report_been_sent_to_echo($report) && $report->cobrand_data ne 'waste') {
         # We need to know whether to treat this as a normal update or a referral.
         # We have the GUID but not the ID so we look this up.
         my $cfg = $self->feature('echo');

diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
@@ -890,6 +890,7 @@ subtest 'redirecting of reports between backends' => sub {
                 user => $user,
                 mark_open => 1,
             });
+            $report->cobrand_data('waste');
             $report->update;
             FixMyStreet::override_config {
                 ALLOWED_COBRANDS => 'bromley',
@@ -898,6 +899,19 @@ subtest 'redirecting of reports between backends' => sub {
                 $updates->send;
             };
 
+            $comment->discard_changes;
+            is $comment->send_state, 'unprocessed', "did not send";
+
+            $comment->update({ send_fail_count => 0 });
+            $report->update({ cobrand_data => '' });
+
+            FixMyStreet::override_config {
+                ALLOWED_COBRANDS => 'bromley',
+            }, sub {
+                my $updates = Open311::PostServiceRequestUpdates->new();
+                $updates->send;
+            };
+
             $report->discard_changes;
             is $report->get_extra_metadata('open311_category_override'), 'Street Services', 'category override applied';
             is $report->get_extra_metadata('external_status_code'), undef;