[Bristol] Convert Bristol to a Multi

bin/check-endpoints

@@ -0,0 +1,24 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use v5.14;
+
+BEGIN {
+    use File::Basename qw(dirname);
+    use File::Spec;
+    my $d = dirname(File::Spec->rel2abs($0));
+    require "$d/../setenv.pl";
+}
+
+use Getopt::Long;
+use Open311::Endpoint::Integration::UK;
+
+my ($verbose);
+GetOptions (
+    'verbose|v' => \$verbose,
+);
+
+my $uk = Open311::Endpoint::Integration::UK->new;
+
+$uk->check_endpoints($verbose);

conf/council-bristol_alloy.yml-example

@@ -0,0 +1,57 @@
+# Currently just a copy of Bucks
+{
+  "api_key": "",
+  "api_url": "",
+  "rfs_design": '',
+  "resource_attachment_attribute_id": "",
+
+  "category_list_code": "",
+  "category_title_attribute": "",
+
+  "parent_attribute_name": "",
+
+  "service_whitelist": {
+  },
+
+  "resource_attribute_defaults": {
+  },
+
+  "request_to_resource_attribute_mapping": {
+  },
+  "request_to_resource_attribute_manual_mapping": {
+  },
+
+  "created_datetime_attribute_id": '',
+
+  "inspection_attribute_mapping": {
+  },
+
+  "inspection_status_mapping": {
+  },
+
+  "inspection_closure_mapping": {
+  },
+
+  "ignored_defect_types": [
+  ],
+
+  "defect_sourcetype_category_mapping": {
+  },
+
+  "defect_status_mapping": {
+  },
+
+  "defect_resource_name": [],
+
+  "defect_attribute_mapping": {
+  },
+
+  "contact": {
+      "code": "",
+      "attribute_id": "",
+      "attribute_defaults": {
+      },
+      "attribute_mapping": {
+      },
+  }
+}

conf/council-www.bristol.gov.uk.yml-example

@@ -0,0 +1,2 @@
+endpoint: https://localhost:4000/
+api_key: 123

perllib/Integrations/AlloyV2.pm

@@ -56,6 +56,8 @@ sub api_call {
         $request->content(encode_json($body));
         $self->logger->debug($call);
         $self->logger->debug(encode_json($body));
+    } else {
+        $self->logger->debug($call);
     }
     my $response = $ua->request($request);
     if ($response->is_success) {
@@ -182,7 +184,7 @@ sub search {
     return [] unless $result_count;
 
     my $maxPages = 100;
-    my $pageSize = $result_count <= 2000 ? 20 : ( ceil($result_count / $maxPages) + 1 );
+    my $pageSize = $result_count <= 10000 ? 100 : ( ceil($result_count / $maxPages) + 1 );
     my $pages = int( $result_count / $pageSize ) + 1;
 
     my $query_body = $body_base;

perllib/Integrations/Confirm.pm

@@ -315,13 +315,18 @@ sub perform_request_graphql {
     my $body = {
         query => $query,
     };
+    my $encoded_body = encode_json($body);
 
-    $request->content(encode_json($body));
+    $request->content($encoded_body);
 
     my $response = $self->ua->request($request);
 
     my $content = decode_json($response->content);
 
+    if ($content->{errors} && @{$content->{errors}}) {
+        $self->logger->warn("Got errors in response to GraphQL query $encoded_body: " . $response->content);
+    }
+
     return $content;
 }
 

perllib/Integrations/Surrey/Boomi.pm

@@ -38,7 +38,9 @@ has ua => (
             timeout => 3 * 60, # Boomi can take longer than the default 60s when handling large/multiple photos.
         );
         $ua->ssl_opts(SSL_cipher_list => 'DEFAULT:!DH'); # Disable DH ciphers, server's key is too small apparently
-        my $hash = encode_base64($self->config->{username} . ':' . $self->config->{password}, "");
+        my $un = $self->config->{username} || '';
+        my $pw = $self->config->{password} || '';
+        my $hash = encode_base64("$un:$pw", "");
         $ua->default_header('Authorization' => "Basic $hash");
         $ua->default_header('Content-Type' => "application/json");
         return $ua;

perllib/Integrations/Symology.pm

@@ -187,13 +187,7 @@ sub current_date {
 sub SOAP::Serializer::as_ArrayOfAdditionalFieldSend {
     my ($self, $value, $name, $type, $attr) = @_;
 
-    # Allow individual integrations to provide their own values here, otherwise
-    # assume it's a simple value for the customer type field.
-    unless (ref $value eq 'ARRAY') {
-        $value = [
-            [ FieldLine => 17, ValueType => 1, DataValue => $value ],
-        ];
-    }
+    die unless ref $value eq 'ARRAY';
 
     my $elem = \SOAP::Data
         ->name('tns:AdditionalFieldSend' => map { [ make_soap_structure(@$_) ] } @$value)

perllib/Integrations/Whitespace.pm

@@ -33,7 +33,6 @@ has endpoint => (
         $ENV{PERL_LWP_SSL_CA_PATH} = '/etc/ssl/certs' unless $ENV{DEV_USE_SYSTEM_CA_PATH};
 
         my $soap = SOAP::Lite->new(
-            soapversion => 1.1,
             proxy => $self->url,
             default_ns => $self->attr,
             on_action => sub { $self->attr . $_[1] }
@@ -67,6 +66,8 @@ sub call {
 
     require SOAP::Lite;
     @params = make_soap_structure(@params);
+    # See comment in Echo.pm
+    SOAP::Lite->soapversion(1.1);
     my $som = $self->endpoint->call(
         $method => @params,
         $self->security
@@ -100,17 +101,23 @@ sub CreateWorksheet {
         die "No service mapping found for $params->{service_item_name}";
     }
 
+    my $service_id = $params->{service_code} eq 'request_new_container'
+        ? $service_params->{delivery_service_id}
+        : $params->{service_code} eq 'request_container_removal'
+        ? $service_params->{collection_service_id}
+        : $service_params->{service_id};
+
     my $worksheet = ixhash(
         Uprn => $params->{uprn},
-        ServiceId => $service_params->{service_id},
+        ServiceId => $service_id,
         WorksheetReference => $params->{worksheet_reference},
         WorksheetMessage => $params->{worksheet_message},
         ServiceItemInputs => ixhash(
             'wsap:Input.CreateWorksheetInput.ServiceItemInput' => [
                 ixhash(
                     'wsap:ServiceItemId' => $service_params->{service_item_id},
                     'wsap:ServiceItemName' => '',
-                    'wsap:ServiceItemQuantity' => 1,
+                    'wsap:ServiceItemQuantity' => $params->{quantity},
                 )
             ]
         ),
@@ -127,6 +134,12 @@ sub CreateWorksheet {
                     'wsap:ServicePropertyValue' => $params->{location_of_containers},
                 ),
             },
+            $params->{location_of_letterbox} ? ({
+                'wsap:Input.CreateWorksheetInput.ServicePropertyInput' => ixhash(
+                    'wsap:ServicePropertyId' => 82,
+                    'wsap:ServicePropertyValue' => $params->{location_of_letterbox},
+                ),
+            }) : (),
         ],
     );