2 files changed, 32 insertions, 4 deletions
diff --git a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
index a7e6d9736..bf085e32a 100644
--- a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
@@ -27,7 +27,8 @@ sub email_alerts ($) {
             alert.cobrand_data as alert_cobrand_data, alert.parameter as alert_parameter, alert.parameter2 as alert_parameter2, ';
         if ($head_table) {
             $query .= "
-                   $item_table.id as item_id, $item_table.name as item_name, $item_table.text as item_text,
+                   $item_table.id as item_id, $item_table.text as item_text,
+                   $item_table.name as item_name, $item_table.anonymous as item_anonymous,
                    $head_table.*
             from alert
                 inner join $item_table on alert.parameter::integer = $item_table.${head_table}_id
@@ -85,7 +86,7 @@ sub email_alerts ($) {
             my $url = $cobrand->base_url_for_emails( $row->{alert_cobrand_data} );
             if ($row->{item_text}) {
                 $data{problem_url} = $url . "/report/" . $row->{id};
-                $data{data} .= $row->{item_name} . ' : ' if $row->{item_name};
+                $data{data} .= $row->{item_name} . ' : ' if $row->{item_name} && !$row->{item_anonymous};
                 $data{data} .= $row->{item_text} . "\n\n------\n\n";
             } else {
                 $data{data} .= $url . "/report/" . $row->{id} . " - $row->{title}\n\n";
diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
index 4de8f2e5f..89f17fa60 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
@@ -161,10 +161,10 @@ sub timeline {
 }
 
 sub summary_count {
-    my ( $rs, $restriction ) = @_;
+    my ( $rs ) = @_;
 
     return $rs->search(
-        $restriction,
+        undef,
         {
             group_by => ['state'],
             select   => [ 'state', { count => 'id' } ],
@@ -173,4 +173,31 @@ sub summary_count {
     );
 }
 
+sub unique_users {
+    my ( $rs ) = @_;
+
+    return $rs->search( {
+        state => [ 'confirmed', 'fixed' ],
+    }, {
+        select => [ { count => { distinct => 'user_id' } } ],
+        as     => [ 'count' ]
+    } )->first->get_column('count');
+}
+
+sub categories_summary {
+    my ( $rs ) = @_;
+
+    my $categories = $rs->search( {
+        state    => [ 'confirmed', 'fixed' ],
+        whensent => { '<' => \"NOW() - INTERVAL '4 weeks'" },
+    }, {
+        select   => [ 'category', { count => 'id' }, { count => \"case when state='fixed' then 1 else null end" } ],
+        as       => [ 'category', 'c', 'fixed' ],
+        group_by => [ 'category' ],
+        result_class => 'DBIx::Class::ResultClass::HashRefInflator'
+    } );
+    my %categories = map { $_->{category} => { total => $_->{c}, fixed => $_->{fixed} } } $categories->all;
+    return \%categories;
+}
+
 1;