Fix cobrand restriction of My/Nearby.

5c79337 simplified a bit too far, as after then a particular cobrand
could in Nearby and My only filter reports to a particular body, not
any other criteria. To fix this, introduce more generic functions in
the default cobrand to allow more flexibility.

Make sure a few tests delete their bodies fully so that new tests
pass when run as part of the suite.

Fixes #1289.

1 files changed, 4 insertions, 2 deletions

diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
index f82f0135c..488030928 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
@@ -16,13 +16,15 @@ sub set_restriction {
 }
 
 sub to_body {
-    my ($rs, $bodies) = @_;
+    my ($rs, $bodies, $join) = @_;
     return $rs unless $bodies;
     unless (ref $bodies eq 'ARRAY') {
         $bodies = [ map { ref $_ ? $_->id : $_ } $bodies ];
     }
+    $join = { join => 'problem' } if $join;
     $rs = $rs->search(
-        \[ "regexp_split_to_array(bodies_str, ',') && ?", [ {} => $bodies ] ]
+        \[ "regexp_split_to_array(bodies_str, ',') && ?", [ {} => $bodies ] ],
+        $join
     );
     return $rs;
 }