Cache Problem->bodies and prefetch the body areas.

2 files changed, 15 insertions, 7 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index a410c2d91..c617f5733 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -441,6 +441,7 @@ sub inspect : Private {
             # This problem might no longer be visible on the current cobrand,
             # if its body has changed (e.g. by virtue of the category changing)
             # so redirect to a cobrand where it can be seen if necessary
+            $problem->discard_changes;
             my $redirect_uri;
             if ( $c->cobrand->is_council && !$c->cobrand->owns_problem($problem) ) {
                 $redirect_uri = $c->cobrand->base_url_for_report( $problem ) . $problem->url;
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 720e8cc93..19e76f6ed 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -502,13 +502,20 @@ Returns a hashref of bodies to which a report was sent.
 
 =cut
 
-sub bodies($) {
-    my $self = shift;
-    return {} unless $self->bodies_str;
-    my $bodies = $self->bodies_str_ids;
-    my @bodies = $self->result_source->schema->resultset('Body')->search({ id => $bodies })->all;
-    return { map { $_->id => $_ } @bodies };
-}
+has bodies => (
+    is => 'ro',
+    lazy => 1,
+    default => sub {
+        my $self = shift;
+        return {} unless $self->bodies_str;
+        my $bodies = $self->bodies_str_ids;
+        my @bodies = $self->result_source->schema->resultset('Body')->search(
+            { id => $bodies },
+            { prefetch => 'body_areas' },
+        )->all;
+        return { map { $_->id => $_ } @bodies };
+    },
+);
 
 sub body_names($) {
     my $self = shift;