5 files changed, 84 insertions, 7 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 2d0cb86f1..169175947 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -3,6 +3,7 @@ use parent 'FixMyStreet::Cobrand::UKCouncils';
 
 use strict;
 use warnings;
+use DateTime::Format::W3CDTF;
 
 sub council_id { return 2482; }
 sub council_area { return 'Bromley'; }
@@ -111,5 +112,37 @@ sub title_list {
     return ["MR", "MISS", "MRS", "MS", "DR"];
 }
 
+sub open311_config {
+    my ($self, $row, $h, $params) = @_;
+
+    my $extra = $row->get_extra_fields;
+    push @$extra,
+        { name => 'report_url',
+          value => $h->{url} },
+        { name => 'report_title',
+          value => $row->title },
+        { name => 'public_anonymity_required',
+          value => $row->anonymous ? 'TRUE' : 'FALSE' },
+        { name => 'email_alerts_requested',
+          value => 'FALSE' }, # always false as can never request them
+        { name => 'requested_datetime',
+          value => DateTime::Format::W3CDTF->format_datetime($row->confirmed->set_nanosecond(0)) },
+        { name => 'email',
+          value => $row->user->email };
+
+    # make sure we have last_name attribute present in row's extra, so
+    # it is passed correctly to Bromley as attribute[]
+    if ( $row->cobrand ne 'bromley' ) {
+        my ( $firstname, $lastname ) = ( $row->name =~ /(\w+)\.?\s+(.+)/ );
+        push @$extra, { name => 'last_name', value => $lastname };
+    }
+
+    $row->set_extra_fields(@$extra);
+
+    $params->{always_send_latlong} = 0;
+    $params->{send_notpinpointed} = 1;
+    $params->{extended_description} = 0;
+}
+
 1;
 
diff --git a/perllib/FixMyStreet/Cobrand/Greenwich.pm b/perllib/FixMyStreet/Cobrand/Greenwich.pm
index 7d6058145..700a12782 100644
--- a/perllib/FixMyStreet/Cobrand/Greenwich.pm
+++ b/perllib/FixMyStreet/Cobrand/Greenwich.pm
@@ -61,4 +61,13 @@ sub on_map_default_max_pin_age {
     return '21 days';
 }
 
+sub open311_config {
+    my ($self, $row, $h, $params) = @_;
+
+    my $extra = $row->get_extra_fields;
+    # Greenwich doesn't have category metadata to fill this
+    push @$extra, { name => 'external_id', value => $row->id };
+    $row->set_extra_fields( @$extra );
+}
+
 1;
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index 2820719b9..d585a5328 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -112,6 +112,29 @@ sub pin_colour {
     return 'yellow';
 }
 
+sub open311_config {
+    my ($self, $row, $h, $params) = @_;
+
+    my $extra = $row->get_extra_fields;
+    push @$extra, { name => 'external_id', value => $row->id };
+
+    if ($h->{closest_address}) {
+        push @$extra, { name => 'closest_address', value => $h->{closest_address} }
+    }
+    if ( $row->used_map || ( !$row->used_map && !$row->postcode ) ) {
+        push @$extra, { name => 'northing', value => $h->{northing} };
+        push @$extra, { name => 'easting', value => $h->{easting} };
+    }
+    $row->set_extra_fields( @$extra );
+
+    $params->{extended_description} = 'oxfordshire';
+}
+
+sub open311_pre_send {
+    my ($self, $row, $open311) = @_;
+    $open311->endpoints( { requests => 'open311_service_request.cgi' } );
+}
+
 sub on_map_default_status { return 'open'; }
 
 sub contact_email {
diff --git a/perllib/FixMyStreet/Cobrand/UK.pm b/perllib/FixMyStreet/Cobrand/UK.pm
index 08ecf0b7d..945af48f8 100644
--- a/perllib/FixMyStreet/Cobrand/UK.pm
+++ b/perllib/FixMyStreet/Cobrand/UK.pm
@@ -1,5 +1,6 @@
 package FixMyStreet::Cobrand::UK;
 use base 'FixMyStreet::Cobrand::Default';
+use strict;
 
 use JSON::MaybeXS;
 use mySociety::MaPit;
@@ -354,13 +355,8 @@ sub get_body_handler_for_problem {
     my @bodies = values %{$row->bodies};
     my %areas = map { %{$_->areas} } @bodies;
 
-    foreach my $avail ( FixMyStreet::Cobrand->available_cobrand_classes ) {
-        my $class = FixMyStreet::Cobrand->get_class_for_moniker($avail->{moniker});
-        my $cobrand = $class->new({});
-        next unless $cobrand->can('council_id');
-        return $cobrand if $areas{$cobrand->council_id};
-    }
-
+    my $cobrand = FixMyStreet::Cobrand->body_handler(\%areas);
+    return $cobrand if $cobrand;
     return ref $self ? $self : $self->new;
 }
 
diff --git a/perllib/FixMyStreet/Cobrand/WestBerkshire.pm b/perllib/FixMyStreet/Cobrand/WestBerkshire.pm
new file mode 100644
index 000000000..1ffdf0286
--- /dev/null
+++ b/perllib/FixMyStreet/Cobrand/WestBerkshire.pm
@@ -0,0 +1,16 @@
+package FixMyStreet::Cobrand::WestBerkshire;
+use base 'FixMyStreet::Cobrand::UKCouncils';
+
+use strict;
+use warnings;
+
+sub council_id { 2619 }
+
+# non standard west berks end points
+sub open311_pre_send {
+    my ($self, $row, $open311) = @_;
+    $open311->endpoints( { services => 'Services', requests => 'Requests' } );
+}
+
+1;
+