[Bromley] hide referrral update after sending, no prefix.

perllib/FixMyStreet/Cobrand/Bromley.pm

@@ -334,26 +334,28 @@ sub _include_user_title_in_extra {
 sub open311_pre_send_updates {
     my ($self, $row) = @_;
 
-    $self->{bromley_original_update_text} = $row->text;
-
-    my $private_comments = $row->get_extra_metadata('private_comments');
-    if ($private_comments) {
-        my $text = $row->text . "\n\nPrivate comments: $private_comments";
-        $row->text($text);
-    }
-
     return $self->_include_user_title_in_extra($row);
 }
 
 sub open311_post_send_updates {
-    my ($self, $row) = @_;
+    my ($self, $comment, $external_id) = @_;
 
-    $row->text($self->{bromley_original_update_text});
+    if (($comment->problem_state || '') eq REFERRED_TO_BROMLEY) {
+        if ($external_id) {
+            $comment->state('hidden');
+        }
+    }
 }
 
 sub open311_munge_update_params {
     my ($self, $params, $comment, $body) = @_;
 
+    my $private_comments = $comment->get_extra_metadata('private_comments');
+    if ($private_comments) {
+        my $text = $params->{description} . "\n\nPrivate comments: $private_comments";
+        $params->{description} = $text;
+    }
+
     delete $params->{update_id};
     $params->{public_anonymity_required} = $comment->anonymous ? 'TRUE' : 'FALSE',
     $params->{update_id_ext} = $comment->id;
@@ -362,7 +364,7 @@ sub open311_munge_update_params {
     if (($comment->problem_state || '') eq REFERRED_TO_BROMLEY) {
         $params->{status} = 'REFERRED_TO_LBB_STREETS';
         if (my $handover_notes = $comment->problem->get_extra_metadata('handover_notes')) {
-            $params->{description} .= " | Handover notes - $handover_notes";
+            $params->{description} = $handover_notes;
         }
     }
 }

perllib/Open311/PostServiceRequestUpdates.pm

@@ -202,7 +202,7 @@ sub process_update {
 
     my $id = $o->post_service_request_update( $comment );
 
-    $cobrand->call_hook(open311_post_send_updates => $comment);
+    $cobrand->call_hook(open311_post_send_updates => $comment, $id);
 
     if ( $id ) {
         $comment->update( {

t/cobrand/bromley.t

@@ -803,6 +803,7 @@ subtest 'redirecting of reports between backends' => sub {
             $update->process_body;
             $report->discard_changes;
             is $report->comments->count, 1;
+            is_deeply [ map { $_->state } $report->comments->all ], ['hidden'];
             is $report->whensent, undef;
             is $report->get_extra_metadata('handover_notes'), 'This is a handover note';
             is $report->category, 'Referred to Veolia Streets';
@@ -817,6 +818,7 @@ subtest 'redirecting of reports between backends' => sub {
             $report->update({ external_id => 'parent-guid', whensent => DateTime->now, send_method_used => 'Open311' });
             $mech->post('/waste/echo', Content_Type => 'text/xml', Content => $in);
             is $report->comments->count, 2, 'A new update';
+            is_deeply [ map { $_->state } $report->comments->order_by('id')->all ], ['hidden', 'confirmed'];
             $report->discard_changes;
             is $report->external_id, 12345, 'ID changed back';
             is $report->state, 'in progress', 'A state change';
@@ -832,14 +834,17 @@ subtest 'redirecting of reports between backends' => sub {
             my $c = CGI::Simple->new($req->content);
             is $c->param('status'), 'REFERRED_TO_LBB_STREETS';
             is $c->param('service_code'), 'LBB_RRE_FROM_VEOLIA_STREETS';
-            is $c->param('description'), "Completed | Handover notes - Outgoing notes from Echo";
+            is $c->param('description'), "Outgoing notes from Echo";
+
+            is_deeply [ map { $_->state } $report->comments->order_by('id')->all ], ['hidden', 'hidden'];
         };
         subtest 'A report sent to Echo, redirected to Confirm' => sub {
             $report->comments->delete;
             $report->unset_extra_metadata('original_bromley_external_id');
             $report->update({ external_id => 'original-guid' });
             $mech->post('/waste/echo', Content_Type => 'text/xml', Content => $in);
             is $report->comments->count, 1, 'A new update';
+            is_deeply [ map { $_->state } $report->comments->all ], ['hidden'];
             $report->discard_changes;
             is $report->whensent, undef;
             is $report->external_id, 'original-guid', 'ID not changed';