aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet
diff options
context:
space:
mode:
Diffstat (limited to 'perllib/FixMyStreet')
-rw-r--r--perllib/FixMyStreet/Cobrand/Angus.pm73
-rw-r--r--perllib/FixMyStreet/DB/Result/Problem.pm2
-rw-r--r--perllib/FixMyStreet/SendReport/Angus.pm172
-rw-r--r--perllib/FixMyStreet/SendReport/EastHants.pm4
4 files changed, 248 insertions, 3 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Angus.pm b/perllib/FixMyStreet/Cobrand/Angus.pm
index 36d888744..a41d46205 100644
--- a/perllib/FixMyStreet/Cobrand/Angus.pm
+++ b/perllib/FixMyStreet/Cobrand/Angus.pm
@@ -46,4 +46,77 @@ sub contact_email {
return join( '@', 'accessline', 'angus.gov.uk' );
}
+=head2 temp_email_to_update, temp_update_contacts
+
+Temporary helper routines to update the extra for potholes (temporary setup
+hack, cargo-culted from Harrogate, may in future be superseded either by
+Open311/integration or a better mechanism for manually creating rich contacts).
+
+Can run with a script or command line like:
+
+ bin/cron-wrapper perl -MFixMyStreet::App -MFixMyStreet::Cobrand::Angus -e \
+ 'FixMyStreet::Cobrand::Angus->new({c => FixMyStreet::App->new})->temp_update_contacts'
+
+=cut
+
+sub temp_update_contacts {
+ my $self = shift;
+
+ my $contact_rs = $self->{c}->model('DB::Contact');
+
+ my $_update = sub {
+ my ($category, $field, $category_details) = @_;
+ # NB: we're accepting just 1 field, but supply as array [ $field ]
+
+ my $contact = $contact_rs->find_or_create(
+ {
+ body_id => $self->council_id,
+ category => $category,
+ %{ $category_details || {} },
+ },
+ {
+ key => 'contacts_body_id_category_idx'
+ }
+ );
+
+ my %default = (
+ variable => 'true',
+ order => '1',
+ required => 'no',
+ datatype => 'string',
+ datatype_description => 'a string',
+ );
+
+ if ($field->{datatype} || '' eq 'boolean') {
+ my $description = $field->{description};
+ %default = (
+ %default,
+ datatype => 'singlevaluelist',
+ datatype_description => 'Yes or No',
+ values => { value => [
+ { key => ['No'], name => ['No'] },
+ { key => ['Yes'], name => ['Yes'] },
+ ] },
+ );
+ }
+
+ $contact->update({
+ # XXX: we're just setting extra with the expected layout,
+ # this could be encapsulated more nicely
+ extra => { _fields => [ { %default, %$field } ] },
+ confirmed => 1,
+ deleted => 0,
+ editor => 'automated script',
+ whenedited => \'NOW()',
+ note => 'Edited by script as per requirements Jan 2016',
+ });
+ };
+
+ $_update->( 'Street lighting', {
+ code => 'column_id',
+ description => 'Column number',
+ });
+
+}
+
1;
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 2a90d0bec..705c6d284 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -654,7 +654,7 @@ sub response_templates {
# Note: this only makes sense when called on a problem that has been sent!
sub can_display_external_id {
my $self = shift;
- if ($self->external_id && $self->send_method_used && $self->bodies_str =~ /2237/) {
+ if ($self->external_id && $self->send_method_used && $self->bodies_str =~ /(2237|2550)/) {
return 1;
}
return 0;
diff --git a/perllib/FixMyStreet/SendReport/Angus.pm b/perllib/FixMyStreet/SendReport/Angus.pm
new file mode 100644
index 000000000..4373c3c37
--- /dev/null
+++ b/perllib/FixMyStreet/SendReport/Angus.pm
@@ -0,0 +1,172 @@
+package FixMyStreet::SendReport::Angus;
+
+use Moo;
+
+BEGIN { extends 'FixMyStreet::SendReport'; }
+
+use Try::Tiny;
+use Encode;
+use XML::Simple;
+use mySociety::Web qw(ent);
+
+sub get_auth_token {
+ my ($self, $authxml) = @_;
+
+ my $xml = new XML::Simple;
+ my $obj;
+
+ eval {
+ $obj = $xml->parse_string( $authxml );
+ };
+
+ my $success = $obj->{success};
+ $success =~ s/^\s+|\s+$//g if defined $success;
+ my $token = $obj->{AuthenticateResult};
+ $token =~ s/^\s+|\s+$//g if defined $token;
+
+ if (defined $success && $success eq 'True' && defined $token) {
+ return $token;
+ } else {
+ $self->error("Couldn't authenticate against Angus endpoint.");
+ }
+}
+
+sub get_external_id {
+ my ($self, $resultxml) = @_;
+
+ my $xml = new XML::Simple;
+ my $obj;
+
+ eval {
+ $obj = $xml->parse_string( $resultxml );
+ };
+
+ my $success = $obj->{success};
+ $success =~ s/^\s+|\s+$//g if defined $success;
+ my $external_id = $obj->{CreateRequestResult}->{RequestId};
+
+ if (defined $success && $success eq 'True' && defined $external_id) {
+ return $external_id;
+ } else {
+ $self->error("Couldn't find external id in response from Angus endpoint.");
+ return undef;
+ }
+}
+
+sub crm_request_type {
+ my ($self, $row, $h) = @_;
+ return 'StLight'; # TODO: Set this according to report category
+}
+
+sub jadu_form_fields {
+ my ($self, $row, $h) = @_;
+ my $xml = XML::Simple->new(
+ NoAttr=> 1,
+ KeepRoot => 1,
+ SuppressEmpty => 0,
+ );
+ my $metas = $row->get_extra_fields();
+ my %extras;
+ foreach my $field (@$metas) {
+ $extras{$field->{name}} = $field->{value};
+ }
+ my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker($row->cobrand)->new();
+ my $output = $xml->XMLout({
+ formfields => {
+ formfield => [
+ {
+ name => 'RequestTitle',
+ value => $h->{title}
+ },
+ {
+ name => 'RequestDetails',
+ value => $h->{detail}
+ },
+ {
+ name => 'ReporterName',
+ value => $h->{name}
+ },
+ {
+ name => 'ReporterEmail',
+ value => $h->{email}
+ },
+ {
+ name => 'ReporterAnonymity',
+ value => $row->anonymous ? 'True' : 'False'
+ },
+ {
+ name => 'ReportedDateTime',
+ value => $h->{confirmed}
+ },
+ {
+ name => 'ColumnId',
+ value => $extras{'column_id'} || ''
+ },
+ {
+ name => 'ReportId',
+ value => $h->{id}
+ },
+ {
+ name => 'ReportedNorthing',
+ value => $h->{northing}
+ },
+ {
+ name => 'ReportedEasting',
+ value => $h->{easting}
+ },
+ {
+ name => 'Imageurl1',
+ value => $row->photos->[0] ? ($cobrand->base_url . $row->photos->[0]->{url_full}) : ''
+ },
+ {
+ name => 'Imageurl2',
+ value => $row->photos->[1] ? ($cobrand->base_url . $row->photos->[1]->{url_full}) : ''
+ },
+ {
+ name => 'Imageurl3',
+ value => $row->photos->[2] ? ($cobrand->base_url . $row->photos->[2]->{url_full}) : ''
+ }
+ ]
+ }
+ });
+ # The endpoint crashes if the JADUFormFields string has whitespace between XML elements, so strip it out...
+ $output =~ s/>[\s\n]+</></g;
+ return $output;
+}
+
+sub send {
+ my ( $self, $row, $h ) = @_;
+
+ # FIXME: should not recreate this each time
+ my $angus_service;
+
+ require Integrations::AngusSOAP;
+
+ my $return = 1;
+ $angus_service ||= Integrations::AngusSOAP->on_fault(sub { my($soap, $res) = @_; die ref $res ? $res->faultstring : $soap->transport->status, "\n"; });
+ try {
+ my $authresult = $angus_service->AuthenticateJADU();
+ my $authtoken = $self->get_auth_token( $authresult );
+ # authenticationtoken, CallerId, CallerAddressId, DeliveryId, DeliveryAddressId, CRMRequestType, JADUXFormRef, PaymentRef, JADUFormFields
+ my $message = ent(encode_utf8($h->{message}));
+ my $name = ent(encode_utf8($h->{name}));
+ my $result = $angus_service->CreateServiceRequest(
+ $authtoken, '1', '1', '1', '1', $self->crm_request_type($row, $h),
+ 'FMS', '', $self->jadu_form_fields($row, $h)
+ );
+ my $external_id = $self->get_external_id( $result );
+ if ( $external_id ) {
+ $row->external_id( $external_id );
+ $row->send_method_used('Angus');
+ $return = 0;
+ }
+ } catch {
+ my $e = $_;
+ print "Caught an error: $e\n";
+ $self->error( "Error sending to Angus: $e" );
+ };
+ $self->success( !$return );
+ return $return;
+}
+
+1;
diff --git a/perllib/FixMyStreet/SendReport/EastHants.pm b/perllib/FixMyStreet/SendReport/EastHants.pm
index 3eb8ffcfa..cc302b8b3 100644
--- a/perllib/FixMyStreet/SendReport/EastHants.pm
+++ b/perllib/FixMyStreet/SendReport/EastHants.pm
@@ -35,12 +35,12 @@ sub send {
# FIXME: should not recreate this each time
my $eh_service;
- require EastHantsWSDL;
+ require Integrations::EastHantsWSDL;
$h->{category} = 'Customer Services' if $h->{category} eq 'Other';
$h->{message} = construct_message( %$h );
my $return = 1;
- $eh_service ||= EastHantsWSDL->on_fault(sub { my($soap, $res) = @_; die ref $res ? $res->faultstring : $soap->transport->status, "\n"; });
+ $eh_service ||= Integrations::EastHantsWSDL->on_fault(sub { my($soap, $res) = @_; die ref $res ? $res->faultstring : $soap->transport->status, "\n"; });
try {
# ServiceName, RemoteCreatedBy, Salutation, FirstName, Name, Email, Telephone, HouseNoName, Street, Town, County, Country, Postcode, Comments, FurtherInfo, ImageURL
my $message = ent(encode_utf8($h->{message}));
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 17:37:11 +0000