Merge branch 'master' into staging

Author: dracos

perllib/Integrations/Confirm.pm

@@ -877,6 +877,7 @@ sub get_enquiry_json {
 
 sub documents_for_job {
     my ($self, $job_id) = @_;
+    return unless $job_id;
     my $data = $self->json_web_api_call("/jobs/$job_id");
     return $data->{documents} || [];
 }

perllib/Open311/Endpoint/Integration/AlloyV2.pm

@@ -203,6 +203,10 @@ sub post_service_request {
 
     $args->{service_code_alloy}
         = $self->_munge_service_code( $args->{service_code} );
+    my $rfs_design = $self->config->{rfs_design};
+    if (ref $rfs_design eq 'HASH') {
+        $rfs_design = $rfs_design->{$args->{service_code_alloy}} || $rfs_design->{$self->rfs_design_fallback};
+    }
 
     my $rfs_design = $self->config->{rfs_design};
     if (ref $rfs_design eq 'HASH') {
@@ -388,37 +392,9 @@ sub _search_for_code_by_argument {
         return undef;
     }
 
-    my $body = $self->find_item_body(
-        dodi_code      => $dodi_code,
-        attribute_code => $attribute_code,
-        search_term    => $search_term,
-    );
-
-    my $results = $self->alloy->search($body);
-
-    return undef unless @$results;
-    my $result = $results->[0];
-
-    # Sanity check that our filtering to one result is the correct result
-    my $a = $self->alloy->attributes_to_hash( $result );
-    return undef unless $a->{$attribute_code} && $a->{$attribute_code} eq $search_term;
-    $result->{attributes} = $a;
-
-    return $result;
-}
-
-=head2 find_item_body
-
-Builds query body for looking up a specific item in Alloy.
-
-=cut
-
-sub find_item_body {
-    my ( $self, %params ) = @_;
-
-    return {
+    my $body = {
         properties => {
-            dodiCode => $params{dodi_code},
+            dodiCode => $dodi_code,
             collectionCode => "Live",
             attributes => [ 'all' ],
         },
@@ -429,19 +405,31 @@ sub find_item_body {
                     {
                         type => "Attribute",
                         properties => {
-                            attributeCode => $params{attribute_code},
+                            attributeCode => $attribute_code,
                         },
                     },
                     {
                         type => "String",
                         properties => {
-                            value => [ $params{search_term} ]
+                            value => [ $search_term ]
                         }
                     }
                 ]
             }
         ]
     };
+
+    my $results = $self->alloy->search($body);
+
+    return undef unless @$results;
+    my $result = $results->[0];
+
+    # Sanity check that our filtering to one result is the correct result
+    my $a = $self->alloy->attributes_to_hash( $result );
+    return undef unless $a->{$attribute_code} && $a->{$attribute_code} eq $search_term;
+    $result->{attributes} = $a;
+
+    return $result;
 }
 
 =head2 _create_contact

perllib/Open311/Endpoint/Integration/Confirm.pm

@@ -639,7 +639,7 @@ sub photo_urls_for_update {
     my $integ = $self->get_integration;
 
     my $enquiry = $integ->get_enquiry_json($enquiry_id) or return;
-    my $job_id = $enquiry->{primaryJobNumber};
+    my $job_id = $enquiry->{jobNumber};
     my $documents = $integ->documents_for_job($job_id) or return;
 
     my @ids = map { $_->{documentNo} } grep { $self->photo_filter($_) } @$documents;

perllib/Open311/Endpoint/Integration/UK/NorthumberlandAlloy.pm

@@ -136,21 +136,21 @@ sub update_additional_attributes {
 
             # Search for existing user
             my $mapping = $self->config->{assigned_to_user_mapping};
-            my $body = $self->find_item_body(
-                dodi_code      => $mapping->{design},
-                attribute_code => $mapping->{email_attribute},
-                search_term    => $args->{attributes}{assigned_to_user_email},
+            my $res = $self->_search_for_code_by_argument(
+                {
+                    dodi_code => $mapping->{design},
+                    attribute => $mapping->{email_attribute},
+                    search    => $args->{attributes}{assigned_to_user_email},
+                }
             );
 
-            my $res = $self->alloy->search($body);
-
             # We don't update if user does not exist in Alloy
-            if (@$res) {
+            if ($res) {
                 push @$attr, {
                     attributeCode =>
                         $self->config->{inspection_attribute_mapping}
                         {assigned_to_user},
-                    value => [ $res->[0]{itemId} ],
+                    value => [ $res->{itemId} ],
                 };
             }
         } else {

t/open311/endpoint/confirm.t

@@ -779,7 +779,7 @@ subtest "fetching of completion photos" => sub {
     $lwp->mock(request => sub {
         my ($ua, $req) = @_;
         return HTTP::Response->new(200, 'OK', [], '{"access_token":"123","expires_in":3600}') if $req->uri =~ /oauth\/token/;
-        return HTTP::Response->new(200, 'OK', [], '{"primaryJobNumber":"432"}') if $req->uri =~ /enquiries\/2020/;
+        return HTTP::Response->new(200, 'OK', [], '{"jobNumber":"432"}') if $req->uri =~ /enquiries\/2020/;
         return HTTP::Response->new(200, 'OK', [], '{"documents":[
             {"documentNo":1,"fileName":"photo1.jpeg","documentNotes":"Before"},
             {"documentNo":2,"fileName":"photo2.jpeg","documentNotes":"After"}

t/open311/endpoint/lincolnshire.t

@@ -76,7 +76,7 @@ subtest "looking up of completion photos" => sub {
     $lwp->mock(request => sub {
         my ($ua, $req) = @_;
         return HTTP::Response->new(200, 'OK', [], '{"access_token":"123","expires_in":3600}') if $req->uri =~ /oauth\/token/;
-        return HTTP::Response->new(200, 'OK', [], '{"primaryJobNumber":"432"}') if $req->uri =~ /enquiries\/2020/;
+        return HTTP::Response->new(200, 'OK', [], '{"jobNumber":"432"}') if $req->uri =~ /enquiries\/2020/;
         return HTTP::Response->new(200, 'OK', [], '{"documents":[
             {"documentNo":1,"fileName":"photo1.jpeg","documentNotes":"Before"},
             {"documentNo":2,"fileName":"photo2.jpeg","documentNotes":"After"}