3 files changed, 129 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Bexley.pm b/perllib/FixMyStreet/Cobrand/Bexley.pm
new file mode 100644
index 000000000..c89fd9895
--- /dev/null
+++ b/perllib/FixMyStreet/Cobrand/Bexley.pm
@@ -0,0 +1,121 @@
+package FixMyStreet::Cobrand::Bexley;
+use parent 'FixMyStreet::Cobrand::Whitelabel';
+
+use strict;
+use warnings;
+
+sub council_area_id { 2494 }
+sub council_area { 'Bexley' }
+sub council_name { 'London Borough of Bexley' }
+sub council_url { 'bexley' }
+sub example_places { ( 'DA6 7AT', "Chieveley Road" ) }
+sub get_geocoder { 'OSM' }
+
+sub enable_category_groups { 1 }
+sub suggest_duplicates { 1 }
+
+sub base_url {
+    my $self = shift;
+    return $self->next::method() if FixMyStreet->config('STAGING_SITE');
+    # uncoverable statement
+    return 'https://fix.bexley.gov.uk';
+}
+
+sub disambiguate_location {
+    my $self    = shift;
+    my $string  = shift;
+
+    return {
+        %{ $self->SUPER::disambiguate_location() },
+        centre => '51.46088,0.142359',
+        bounds => [ 51.408484, 0.074653, 51.515542, 0.2234676 ],
+    };
+}
+
+sub on_map_default_status { 'open' }
+
+sub contact_email {
+    my $self = shift;
+    return join( '@', 'customer.services', $self->council_url . '.gov.uk' );
+}
+
+sub open311_munge_update_params {
+    my ($self, $params, $comment, $body) = @_;
+
+    $params->{service_request_id_ext} = $comment->problem->id;
+
+    my $contact = $comment->result_source->schema->resultset("Contact")->not_deleted->find({
+        body_id => $body->id,
+        category => $comment->problem->category
+    });
+    $params->{service_code} = $contact->email;
+}
+
+sub open311_get_update_munging {
+    my ($self, $comment) = @_;
+
+    # If we've received an update via Open311 that's closed
+    # or fixed the report, also close it to updates.
+    $comment->problem->set_extra_metadata(closed_updates => 1)
+        if !$comment->problem->is_open;
+}
+
+sub lookup_site_code_config {
+    # uncoverable subroutine
+    # uncoverable statement
+    {
+        buffer => 200, # metres
+        url => "https://tilma.mysociety.org/mapserver/bexley",
+        srsname => "urn:ogc:def:crs:EPSG::27700",
+        typename => "Streets",
+        property => "NSG_REF",
+        accept_feature => sub { 1 }
+    }
+}
+
+sub open311_config {
+    my ($self, $row, $h, $params) = @_;
+
+    my $extra = $row->get_extra_fields;
+
+    # Reports made via the app probably won't have a NSGRef because we don't
+    # display the road layer. Instead we'll look up the closest asset from the
+    # WFS service at the point we're sending the report over Open311.
+    if (!$row->get_extra_field_value('NSGRef')) {
+        if (my $ref = $self->lookup_site_code($row)) {
+            push @$extra, { name => 'NSGRef', description => 'NSG Ref', value => $ref };
+        }
+    }
+
+    $row->set_extra_fields(@$extra);
+}
+
+sub admin_user_domain { 'bexley.gov.uk' }
+
+sub open311_post_send {
+    my ($self, $row, $h) = @_;
+
+    # Check Open311 was successful
+    return unless $row->external_id;
+
+    return unless $row->category eq 'Abandoned and untaxed vehicles'
+        || $row->category eq 'Animal fouling';
+
+    my $mb = FixMyStreet->config('STAGING_SITE') ? 'digital-team' : 'P1sfromContactCentre';
+    my $e = join('@', $mb, $self->admin_user_domain);
+    my $sender = FixMyStreet::SendReport::Email->new( to => [ [ $e, 'Bexley P1 email' ] ] );
+
+    if ($row->category eq 'Abandoned and untaxed vehicles') {
+        my ($burnt) = grep { $_->{name} eq 'burnt' } @{$row->get_extra_fields};
+        return unless $burnt && $burnt->{value} eq 'Yes';
+    }
+
+    $self->open311_config($row); # Populate NSGRef again if needed
+
+    my $extra_data = join "; ", map { "$_->{description}: $_->{value}" } @{$row->get_extra_fields};
+    $h->{additional_information} = $extra_data;
+
+    $sender->send($row, $h);
+}
+
+1;
diff --git a/perllib/FixMyStreet/Cobrand/UK.pm b/perllib/FixMyStreet/Cobrand/UK.pm
index 1c6ebe29a..da0356664 100644
--- a/perllib/FixMyStreet/Cobrand/UK.pm
+++ b/perllib/FixMyStreet/Cobrand/UK.pm
@@ -107,6 +107,7 @@ sub short_name {
     return 'Durham+County' if $name eq 'Durham County Council';
     return 'Durham+City' if $name eq 'Durham City Council';
 
+    $name =~ s/^London Borough of //;
     $name =~ s/ (Borough|City|District|County) Council$//;
     $name =~ s/ Council$//;
     $name =~ s/ & / and /;
diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index 0926dec4a..09ca6c535 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -159,6 +159,13 @@ sub all_reports_single_body {
 sub reports_body_check {
     my ( $self, $c, $code ) = @_;
 
+    # Deal with Bexley name not starting with short name
+    if ($code =~ /bexley/i) {
+        my $body = $c->model('DB::Body')->search( { name => { -like => "%$code%" } } )->single;
+        $c->stash->{body} = $body;
+        return $body;
+    }
+
     # We want to make sure we're only on our page.
     unless ( $self->council_name =~ /^\Q$code\E/ ) {
         $c->res->redirect( 'https://www.fixmystreet.com' . $c->req->uri->path_query, 301 );