aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perllib/FixMyStreet/Cobrand/Bexley.pm28
-rw-r--r--t/cobrand/bexley.t91
2 files changed, 77 insertions, 42 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Bexley.pm b/perllib/FixMyStreet/Cobrand/Bexley.pm
index 8720f42d8..d3787ef67 100644
--- a/perllib/FixMyStreet/Cobrand/Bexley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bexley.pm
@@ -103,16 +103,26 @@ sub open311_post_send {
my %lighting = map { $_ => 1 } @lighting;
my $emails = $self->feature('open311_email') || return;
- my ($e, $n);
- if ($row->category eq 'Abandoned and untaxed vehicles' || $row->category eq 'Dead animal') {
- $e = $emails->{p1};
- $n = 'Bexley P1 email';
- } elsif ($lighting{$row->category}) {
- $e = $emails->{lighting};
- $n = 'FixMyStreet Bexley Street Lighting';
+ my $dangerous = $row->get_extra_field_value('dangerous') || '';
+ my $reportType = $row->get_extra_field_value('reportType') || '';
+
+ my $p1_email = 0;
+ if ($row->category eq 'Parks and open spaces') {
+ $p1_email = 1 if $reportType =~ /locked in a park|Wild animal/;
+ $p1_email = 1 if $dangerous eq 'Yes' && $reportType =~ /Playgrounds|park furniture|gates are broken|Vandalism|Other/;
+ } else {
+ $p1_email = 1 if $dangerous eq 'Yes';
}
- return unless $e;
- my $sender = FixMyStreet::SendReport::Email->new( to => [ [ $e, $n ] ] );
+
+ my @to;
+ if ($row->category eq 'Abandoned and untaxed vehicles' || $row->category eq 'Dead animal' || $p1_email) {
+ push @to, [ $emails->{p1}, 'Bexley P1 email' ] if $emails->{p1};
+ }
+ if ($lighting{$row->category}) {
+ push @to, [ $emails->{lighting}, 'FixMyStreet Bexley Street Lighting' ] if $emails->{lighting};
+ }
+ return unless @to;
+ my $sender = FixMyStreet::SendReport::Email->new( to => \@to );
$self->open311_config($row); # Populate NSGRef again if needed
diff --git a/t/cobrand/bexley.t b/t/cobrand/bexley.t
index f6ec1014d..07d7ed91b 100644
--- a/t/cobrand/bexley.t
+++ b/t/cobrand/bexley.t
@@ -31,6 +31,9 @@ my $body = $mech->create_body_ok(2494, 'London Borough of Bexley', {
send_method => 'Open311', api_key => 'key', 'endpoint' => 'e', 'jurisdiction' => 'j' });
$mech->create_contact_ok(body_id => $body->id, category => 'Abandoned and untaxed vehicles', email => "ABAN");
$mech->create_contact_ok(body_id => $body->id, category => 'Lamp post', email => "LAMP");
+$mech->create_contact_ok(body_id => $body->id, category => 'Parks and open spaces', email => "PARK");
+$mech->create_contact_ok(body_id => $body->id, category => 'Dead animal', email => "ANIM");
+$mech->create_contact_ok(body_id => $body->id, category => 'Something dangerous', email => "DANG");
FixMyStreet::override_config {
ALLOWED_COBRANDS => [ 'bexley' ],
@@ -50,40 +53,62 @@ FixMyStreet::override_config {
$mech->content_contains('Bexley');
};
- my ($report) = $mech->create_problems_for_body(1, $body->id, 'On Road', {
- category => 'Abandoned and untaxed vehicles', cobrand => 'bexley',
- latitude => 51.408484, longitude => 0.074653,
- });
- $report->set_extra_fields({ 'name' => 'burnt', description => 'Was it burnt?', 'value' => 'Yes' });
- $report->update;
-
- subtest 'Server-side NSGRef included' => sub {
- my $test_data = FixMyStreet::Script::Reports::send();
- my $req = $test_data->{test_req_used};
- my $c = CGI::Simple->new($req->content);
- is $c->param('service_code'), 'ABAN';
- is $c->param('attribute[NSGRef]'), 'Road ID';
-
- my $email = $mech->get_email;
- like $email->header('To'), qr/"Bexley P1 email".*bexley/;
- like $mech->get_text_body_from_email($email), qr/NSG Ref: Road ID/;
- $mech->clear_emails_ok;
- };
-
- ($report) = $mech->create_problems_for_body(1, $body->id, 'Lamp', {
- category => 'Lamp post', cobrand => 'bexley',
- latitude => 51.408484, longitude => 0.074653,
- });
-
- subtest 'Correct email sent' => sub {
- my $test_data = FixMyStreet::Script::Reports::send();
- my $req = $test_data->{test_req_used};
- my $c = CGI::Simple->new($req->content);
- is $c->param('service_code'), 'LAMP';
+ foreach my $test (
+ { category => 'Abandoned and untaxed vehicles', email => 1, code => 'ABAN',
+ extra => { 'name' => 'burnt', description => 'Was it burnt?', 'value' => 'Yes' } },
+ { category => 'Abandoned and untaxed vehicles', code => 'ABAN',
+ extra => { 'name' => 'burnt', description => 'Was it burnt?', 'value' => 'No' } },
+ { category => 'Dead animal', email => 1, code => 'ANIM' },
+ { category => 'Something dangerous', email => 1, code => 'DANG',
+ extra => { 'name' => 'dangerous', description => 'Was it dangerous?', 'value' => 'Yes' } },
+ { category => 'Something dangerous', code => 'DANG',
+ extra => { 'name' => 'dangerous', description => 'Was it dangerous?', 'value' => 'No' } },
+ { category => 'Parks and open spaces', email => 1, code => 'PARK',
+ extra => { 'name' => 'reportType', description => 'Type of report', 'value' => 'Wild animal' } },
+ { category => 'Parks and open spaces', code => 'PARK',
+ extra => { 'name' => 'reportType', description => 'Type of report', 'value' => 'Maintenance' } },
+ { category => 'Parks and open spaces', code => 'PARK',
+ extra => { 'name' => 'dangerous', description => 'Was it dangerous?', 'value' => 'Yes' } },
+ { category => 'Parks and open spaces', email => 1, code => 'PARK',
+ extra => [
+ { 'name' => 'dangerous', description => 'Was it dangerous?', 'value' => 'Yes' },
+ { 'name' => 'reportType', description => 'Type of report', 'value' => 'Vandalism' },
+ ] },
+ { category => 'Lamp post', code => 'LAMP', email => 'thirdparty',
+ extra => { 'name' => 'dangerous', description => 'Was it dangerous?', 'value' => 'No' } },
+ { category => 'Lamp post', code => 'LAMP', email => 'p1.*thirdparty',
+ extra => { 'name' => 'dangerous', description => 'Was it dangerous?', 'value' => 'Yes' } },
+ ) {
+ my ($report) = $mech->create_problems_for_body(1, $body->id, 'On Road', {
+ category => $test->{category}, cobrand => 'bexley',
+ latitude => 51.408484, longitude => 0.074653,
+ });
+ if ($test->{extra}) {
+ $report->set_extra_fields(ref $test->{extra} eq 'ARRAY' ? @{$test->{extra}} : $test->{extra});
+ $report->update;
+ }
- my $email = $mech->get_email;
- like $email->header('To'), qr/thirdparty/;
- };
+ subtest 'NSGRef and correct email config' => sub {
+ my $test_data = FixMyStreet::Script::Reports::send();
+ my $req = $test_data->{test_req_used};
+ my $c = CGI::Simple->new($req->content);
+ is $c->param('service_code'), $test->{code};
+ is $c->param('attribute[NSGRef]'), 'Road ID';
+
+ if (my $t = $test->{email}) {
+ my $email = $mech->get_email;
+ if ($t eq 1) {
+ like $email->header('To'), qr/"Bexley P1 email".*bexley/;
+ } else {
+ like $email->header('To'), qr/$t/;
+ }
+ like $mech->get_text_body_from_email($email), qr/NSG Ref: Road ID/;
+ $mech->clear_emails_ok;
+ } else {
+ $mech->email_count_is(0);
+ }
+ };
+ }
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-21 20:24:16 +0000