[Bromley] Include Veolia Notes in update if provided.

perllib/FixMyStreet/Cobrand/Bromley.pm

@@ -427,24 +427,24 @@ sub open311_get_update_munging {
         return;
     }
 
+    # Fetch outgoing notes
+    my $echo = $self->feature('echo');
+    $echo = Integrations::Echo->new(%$echo);
+    my $event = $echo->GetEvent($request->{service_request_id}); # From the event, not the report
+    $echo->log($event->{Data});
+    my $data = Integrations::Echo::force_arrayref($event->{Data}, 'ExtensibleDatum');
+    my $notes = "";
+    foreach (@$data) {
+        $notes = $_->{Value} if $_->{DatatypeName} eq 'Veolia Notes';
+    }
+
     # An update from Echo with resolution code 1252
     my $code = $comment->get_extra_metadata('external_status_code') || '';
     if ($code eq '1252') {
         my $problem = $comment->problem;
         $problem->category(REFERRED_TO_BROMLEY); # Will be LBB_RRE_FROM_VEOLIA_STREETS
         $problem->state('in progress');
         $comment->problem_state('in progress');
-
-        # Fetch outgoing notes
-        my $echo = $self->feature('echo');
-        $echo = Integrations::Echo->new(%$echo);
-        my $event = $echo->GetEvent($request->{service_request_id}); # From the event, not the report
-        $echo->log($event->{Data});
-        my $data = Integrations::Echo::force_arrayref($event->{Data}, 'ExtensibleDatum');
-        my $notes = "";
-        foreach (@$data) {
-            $notes = $_->{Value} if $_->{DatatypeName} eq 'Veolia Notes';
-        }
         $problem->set_extra_metadata(handover_notes => $notes);
 
         if (my $original_external_id = $problem->get_extra_metadata('original_bromley_external_id')) {
@@ -461,6 +461,8 @@ sub open311_get_update_munging {
             $comment->problem_state(REFERRED_TO_BROMLEY);
             $comment->send_state('unprocessed');
         }
+    } elsif ($notes) {
+        $comment->text($comment->text . "\n\n" .$notes);
     }
 }
 

t/cobrand/bromley.t

@@ -946,7 +946,7 @@ subtest 'redirecting of reports between backends' => sub {
             is $report->state, 'fixed - council', 'A state change';
             is $report->get_extra_metadata('external_status_code'), 67;
             my $comment = FixMyStreet::DB->resultset("Comment")->search(undef, { order_by => { -desc => 'id' } })->first;
-            is $comment->text, 'Template text';
+            is $comment->text, "Template text\n\nOutgoing notes from Echo";
         };
 
         subtest "Echo then redirect it back to Confirm" => sub {