Merge tag 'v1.7' into fiksgatami-dev

1 files changed, 20 insertions, 14 deletions

diff --git a/perllib/FixMyStreet/DB/ResultSet/Comment.pm b/perllib/FixMyStreet/DB/ResultSet/Comment.pm
index 70f8027aa..1b6afb819 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Comment.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Comment.pm
@@ -4,19 +4,24 @@ use base 'DBIx::Class::ResultSet';
 use strict;
 use warnings;
 
+sub to_body {
+    my ($rs, $body_restriction) = @_;
+    return FixMyStreet::DB::ResultSet::Problem::to_body($rs, $body_restriction);
+}
+
+
 sub timeline {
-    my ( $rs, $restriction ) = @_;
+    my ( $rs, $body_restriction ) = @_;
 
     my $prefetch = 
         FixMyStreet::App->model('DB')->schema->storage->sql_maker->quote_char ?
         [ qw/user/ ] :
         [];
 
-    return $rs->search(
+    return $rs->to_body($body_restriction)->search(
         {
             state => 'confirmed',
-            created => { '>=', \"ms_current_timestamp()-'7 days'::interval" },
-            %{ $restriction },
+            created => { '>=', \"current_timestamp-'7 days'::interval" },
         },
         {
             prefetch => $prefetch,
@@ -25,17 +30,18 @@ sub timeline {
 }
 
 sub summary_count {
-    my ( $rs, $restriction ) = @_;
+    my ( $rs, $body_restriction ) = @_;
 
-    return $rs->search(
-            $restriction,
-        {
-            group_by => ['me.state'],
-            select   => [ 'me.state', { count => 'me.id' } ],
-            as       => [qw/state state_count/],
-            join     => 'problem'
-        }
-    );
+    my $params = {
+        group_by => ['me.state'],
+        select   => [ 'me.state', { count => 'me.id' } ],
+        as       => [qw/state state_count/],
+    };
+    if ($body_restriction) {
+        $rs = $rs->to_body($body_restriction);
+        $params->{join} = 'problem';
+    }
+    return $rs->search(undef, $params);
 }
 
 1;