Exclude update alerts from summary alert counts.

There might be the odd update alert we are interested in (those not
auto-signed up for as part of report or update creation), but they
will be rare.

2 files changed, 9 insertions, 1 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 686d23aa1..693612b9c 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -91,7 +91,7 @@ sub index : Path : Args(0) {
 
     $c->stash->{comments} = \%comment_counts;
 
-    my $alerts = $c->model('DB::Alert')->summary_count( $c->cobrand->restriction );
+    my $alerts = $c->model('DB::Alert')->summary_report_alerts( $c->cobrand->restriction );
 
     my %alert_counts =
       map { $_->confirmed => $_->get_column('confirmed_count') } $alerts->all;
diff --git a/perllib/FixMyStreet/DB/ResultSet/Alert.pm b/perllib/FixMyStreet/DB/ResultSet/Alert.pm
index 1866e9b06..c61053fff 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Alert.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Alert.pm
@@ -35,6 +35,13 @@ sub timeline_disabled {
     );
 }
 
+# Return summary for alerts on reports (so excluding alerts on updates)
+sub summary_report_alerts {
+    my ( $rs, $restriction ) = @_;
+    $rs = $rs->search({ alert_type => { '!=', 'new_updates' } });
+    return $rs->summary_count($restriction);
+}
+
 sub summary_count {
     my ( $rs, $restriction ) = @_;
 
@@ -47,4 +54,5 @@ sub summary_count {
         }
     );
 }
+
 1;