[Zurich] Set report's public response before sending email to user

The 'public response' to a problem was being omitted from the email sent to the
user when the problem is closed, because the email was sent before the report's
'extra' field was updated with the response body text.

This commit sets the public response on the problem before sending the email.

2 files changed, 41 insertions, 7 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index 80874e3f5..6cc6bdcdb 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -606,6 +606,11 @@ sub admin_report_edit {
 
         my $old_closure_state = $problem->get_extra_metadata('closure_status');
 
+        # update the public update from DM
+        if (my $update = $c->req->param('status_update')) {
+            $problem->set_extra_metadata(public_response => $update);
+        }
+
         if (
             ($state eq 'confirmed') 
             && $new_cat
@@ -728,11 +733,6 @@ sub admin_report_edit {
         $problem->latitude( $c->get_param('latitude') );
         $problem->longitude( $c->get_param('longitude') );
 
-        # update the public update from DM
-        if (my $update = $c->req->param('status_update')) {
-            $problem->set_extra_metadata(public_response => $update);
-        }
-
         # send external_message if provided and state is *now* Wish|Extern
         # e.g. was already, or was set in the Rueckmeldung ausstehend clause above.
         if ( my $external_message = $c->req->params->{external_message}
diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index 4429a94ca..721ee547c 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -632,6 +632,40 @@ subtest "external report triggers email" => sub {
         like $email->body, qr/test\@example.com/, 'body contains email address';
         $mech->clear_emails_ok;
     };
+
+    subtest "Closure email includes public response" => sub {
+        my $PUBLIC_RESPONSE = "This is the public response to your report. Freundliche Gruesse.";
+        FixMyStreet::override_config {
+            ALLOWED_COBRANDS => [ 'zurich' ],
+            MAP_TYPE => 'Zurich,OSM',
+        }, sub {
+            # set as extern
+            reset_report_state($report);
+            $report->state('planned');
+            $report->set_extra_metadata('closure_status' => 'closed');
+            $report->set_extra_metadata('email_confirmed' => 1);
+            $report->unset_extra_metadata('public_response');
+            $report->update;
+            is ($report->state, 'planned', 'Sanity check') or die;
+
+            $mech->get_ok( '/admin/report_edit/' . $report->id );
+
+            $mech->form_with_fields( 'publish_response' );
+            $mech->submit_form_ok( {
+                button => 'publish_response',
+                with_fields => {
+                    body_external => $external_body->id,
+                    external_message => $EXTERNAL_MESSAGE,
+                    status_update => $PUBLIC_RESPONSE,
+                } });
+        };
+        $email = $mech->get_email;
+        my $report_id = $report->id;
+        like $email->header('Subject'), qr/Meldung #$report_id/, 'subject looks okay';
+        like $email->header('To'), qr/test\@example.com/, 'to line looks correct';
+        like $email->body, qr/$PUBLIC_RESPONSE/, 'public_response was passed on' or die $email->body;
+        $mech->clear_emails_ok;
+    };
     $report->comments->delete; # delete the comments, as they confuse later tests
 };
 
@@ -821,8 +855,8 @@ subtest "test admin_log" => sub {
 
     # XXX: following is dependent on all of test up till now, rewrite to explicitly
     # test which things need to be logged!
-    is scalar @entries, 3, 'State changes logged'; 
-    is $entries[-1]->action, 'state change to investigating', 'State change logged as expected';
+    is scalar @entries, 4, 'State changes logged';
+    is $entries[-1]->action, 'state change to closed', 'State change logged as expected';
 };
 
 subtest 'email images to external partners' => sub {