Do not error in export if report has bad category.

If category groups are enabled, the CSV export includes a subcategory, but it was only fetching a valid groups value if the row's contact was found.
mysociety · Aug 4, 2020 · 994093c · 994093c
1 parent 361bf0b
commit 994093c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -493,7 +493,7 @@ sub generate_csv : Private {
         }
 
         if ($asked_for{subcategory}) {
-            my $group = $obj->contact && $obj->contact->groups;
+            my $group = $obj->contact ? $obj->contact->groups : [];
             $group = join(',', @$group);
             if ($group) {
                 $hashref->{subcategory} = $obj->category;

diff --git a/t/app/controller/dashboard.t b/t/app/controller/dashboard.t
@@ -83,6 +83,7 @@ my $categories = scraper {
 
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => 'no2fa',
+    COBRAND_FEATURES => { category_groups => { no2fa => 1 } },
     MAPIT_URL => 'http://mapit.uk/',
 }, sub {
 
@@ -174,13 +175,14 @@ FixMyStreet::override_config {
     subtest 'export as csv' => sub {
         $mech->create_problems_for_body(1, $body->id, 'Title', {
             detail => "this report\nis split across\nseveral lines",
+            category => 'Problem one',
             areas => ",$alt_area_id,2651,",
         });
         $mech->get_ok('/dashboard?export=1');
         my @rows = $mech->content_as_csv;
         is scalar @rows, 19, '1 (header) + 18 (reports) = 19 lines';
 
-        is scalar @{$rows[0]}, 20, '20 columns present';
+        is scalar @{$rows[0]}, 21, '21 columns present';
 
         is_deeply $rows[0],
             [
@@ -189,6 +191,7 @@ FixMyStreet::override_config {
                 'Detail',
                 'User Name',
                 'Category',
+                'Subcategory',
                 'Created',
                 'Confirmed',
                 'Acknowledged',
@@ -207,9 +210,9 @@ FixMyStreet::override_config {
             ],
             'Column headers look correct';
 
-        is $rows[5]->[14], 'Trowbridge', 'Ward column is name not ID';
-        is $rows[5]->[15], '529025', 'Correct Easting conversion';
-        is $rows[5]->[16], '179716', 'Correct Northing conversion';
+        is $rows[5]->[15], 'Trowbridge', 'Ward column is name not ID';
+        is $rows[5]->[16], '529025', 'Correct Easting conversion';
+        is $rows[5]->[17], '179716', 'Correct Northing conversion';
     };
 
     subtest 'export updates as csv' => sub {