Pass columns CSV needs into Problem->as_hashref.

Then it can skip working out some things as they are not needed.

2 files changed, 16 insertions, 21 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
index 7cdf150aa..866deb98e 100644
--- a/perllib/FixMyStreet/App/Controller/Dashboard.pm
+++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -360,21 +360,16 @@ sub generate_csv : Private {
     my $fixed_states = FixMyStreet::DB::Result::Problem->fixed_states;
     my $closed_states = FixMyStreet::DB::Result::Problem->closed_states;
 
-    my $wards = 0;
-    my $comments = 0;
-    foreach (@{$c->stash->{csv}->{columns}}) {
-        $wards = 1 if $_ eq 'wards';
-        $comments = 1 if $_ eq 'acknowledged';
-    }
+    my %asked_for = map { $_ => 1 } @{$c->stash->{csv}->{columns}};
 
     my $problems = $c->stash->{csv}->{problems};
     while ( my $report = $problems->next ) {
-        my $hashref = $report->as_hashref($c);
+        my $hashref = $report->as_hashref($c, \%asked_for);
 
         $hashref->{user_name_display} = $report->anonymous
             ? '(anonymous)' : $report->user->name;
 
-        if ($comments) {
+        if ($asked_for{acknowledged}) {
             for my $comment ($report->comments) {
                 my $problem_state = $comment->problem_state or next;
                 next unless $comment->state eq 'confirmed';
@@ -389,7 +384,7 @@ sub generate_csv : Private {
             }
         }
 
-        if ($wards) {
+        if ($asked_for{wards}) {
             $hashref->{wards} = join ', ',
               map { $c->stash->{children}->{$_}->{name} }
               grep {$c->stash->{children}->{$_} }
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 2deeb3084..9feb98c76 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -918,12 +918,11 @@ sub add_send_method {
 }
 
 sub as_hashref {
-    my $self = shift;
-    my $c    = shift;
+    my ($self, $c, $cols) = @_;
 
     my $state_t = FixMyStreet::DB->resultset("State")->display($self->state);
 
-    return {
+    my $out = {
         id        => $self->id,
         title     => $self->title,
         category  => $self->category,
@@ -935,16 +934,17 @@ sub as_hashref {
         state     => $self->state,
         state_t   => $state_t,
         used_map  => $self->used_map,
-        is_fixed  => $self->fixed_states->{ $self->state } ? 1 : 0,
-        photos    => [ map { $_->{url} } @{$self->photos} ],
-        meta      => $self->confirmed ? $self->meta_line( $c ) : '',
-        ($self->confirmed ? (
-            confirmed => $self->confirmed,
-            confirmed_pp => $c->cobrand->prettify_dt( $self->confirmed ),
-        ) : ()),
-        created => $self->created,
-        created_pp => $c->cobrand->prettify_dt( $self->created ),
+        created   => $self->created,
     };
+    $out->{is_fixed} = $self->fixed_states->{ $self->state } ? 1 : 0 if !$cols || $cols->{is_fixed};
+    $out->{photos} = [ map { $_->{url} } @{$self->photos} ] if !$cols || $cols->{photos};
+    $out->{meta} = $self->confirmed ? $self->meta_line( $c ) : '' if !$cols || $cols->{meta};
+    $out->{created_pp} = $c->cobrand->prettify_dt( $self->created ) if !$cols || $cols->{created_pp};
+    if ($self->confirmed) {
+        $out->{confirmed} = $self->confirmed if !$cols || $cols->{confirmed};
+        $out->{confirmed_pp} = $c->cobrand->prettify_dt( $self->confirmed ) if !$cols || $cols->{confirmed_pp};
+    }
+    return $out;
 }
 
 =head2 latest_moderation_log_entry