In category setup, eagerly fetch translations.

mysociety · Oct 24, 2024 · 148ebde · 148ebde
1 parent 884bb0d
commit 148ebde
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -767,7 +767,7 @@ sub setup_categories_and_bodies : Private {
 
     my $all_areas = $c->stash->{all_areas};
 
-    my @bodies = $c->model('DB::Body')->active->for_areas(keys %$all_areas)->all;
+    my @bodies = $c->model('DB::Body')->active->for_areas(keys %$all_areas)->translated->all;
     my %bodies = map { $_->id => $_ } @bodies;
 
     $c->cobrand->call_hook(munge_report_new_bodies => \%bodies);

diff --git a/perllib/FixMyStreet/DB/ResultSet/Contact.pm b/perllib/FixMyStreet/DB/ResultSet/Contact.pm
@@ -52,17 +52,33 @@ sub for_new_reports {
         $params->{$rs->me('state')} = [ 'unconfirmed', 'confirmed' ];
     }
 
-    $rs->search($params, { prefetch => 'body' });
+    $rs = $rs->search($params, { prefetch => 'body' });
+    my $schema = $rs->result_source->schema;
+    $rs = $rs->search(undef, {
+        '+columns' => {
+            'body.msgstr' => \"COALESCE(translations.msgstr, body.name)",
+            'msgstr' => \"COALESCE(translations_2.msgstr, me.category)"
+        },
+        join => [ 'translations', 'translations' ],
+        bind => [
+            'name', $schema->lang, 'body',
+            'category', $schema->lang, 'contact',
+        ],
+    });
+    return $rs;
 }
 
 sub translated {
     my $rs = shift;
     my $schema = $rs->result_source->schema;
-    $rs->search(undef, {
-        '+columns' => { 'msgstr' => \"COALESCE(translations.msgstr, me.category)" },
-        join => 'translations',
-        bind => [ 'category', $schema->lang, 'contact' ],
-    });
+    if (!$rs->{attrs}{'+columns'}[0]{msgstr}) {
+        $rs = $rs->search(undef, {
+            '+columns' => { 'msgstr' => \"COALESCE(translations.msgstr, me.category)" },
+            join => 'translations',
+            bind => [ 'category', $schema->lang, 'contact' ],
+        });
+    }
+    return $rs;
 }
 
 sub all_sorted {