1 files changed, 63 insertions, 1 deletions

diff --git a/perllib/FixMyStreet/DB/ResultSet/Contact.pm b/perllib/FixMyStreet/DB/ResultSet/Contact.pm
index 8ef6d1ac5..801d20cc0 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Contact.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Contact.pm
@@ -3,6 +3,7 @@ use base 'DBIx::Class::ResultSet';
 
 use strict;
 use warnings;
+use POSIX qw(strcoll);
 
 sub me { join('.', shift->current_source_alias, shift || q{})  }
 
@@ -16,7 +17,12 @@ Filter down to not deleted contacts (so active or inactive).
 
 sub not_deleted {
     my $rs = shift;
-    return $rs->search( { $rs->me('state') => { '!=' => 'deleted' } } );
+    return $rs->search( { $rs->me('state') => { -not_in => [ 'deleted', 'staff' ] } } );
+}
+
+sub not_deleted_admin {
+    my $rs = shift;
+    return $rs->search( { $rs->me('state') => { -not_in => [ 'deleted' ] } } );
 }
 
 sub active {
@@ -24,6 +30,53 @@ sub active {
     $rs->search( { $rs->me('state') => [ 'unconfirmed', 'confirmed' ] } );
 }
 
+sub for_new_reports {
+    my ($rs, $c, $bodies) = @_;
+    my $params = {
+        $rs->me('body_id') => [ keys %$bodies ],
+    };
+
+    if ($c->user_exists && $c->user->is_superuser) {
+        # Everything normal OR any staff states
+        $params->{$rs->me('state')} = [ 'unconfirmed', 'confirmed', 'staff' ];
+    } elsif ($c->user_exists && $c->user->from_body) {
+        # Everything normal OR staff state in the user body
+        $params->{'-or'} = [
+            $rs->me('state') => [ 'unconfirmed', 'confirmed' ],
+            {
+                $rs->me('body_id') => $c->user->from_body->id,
+                $rs->me('state') => 'staff',
+            },
+        ];
+    } else {
+        $params->{$rs->me('state')} = [ 'unconfirmed', 'confirmed' ];
+    }
+
+    $rs->search($params, { prefetch => 'body' });
+}
+
+sub translated {
+    my $rs = shift;
+    my $schema = $rs->result_source->schema;
+    $rs->search(undef, {
+        '+columns' => { 'msgstr' => 'translations.msgstr' },
+        join => 'translations',
+        bind => [ 'category', $schema->lang, 'contact' ],
+    });
+}
+
+sub all_sorted {
+    my $rs = shift;
+
+    my @contacts = $rs->translated->all;
+    @contacts = sort {
+        my $a_name = $a->get_extra_metadata('display_name') || $a->get_column('msgstr') || $a->category;
+        my $b_name = $b->get_extra_metadata('display_name') || $b->get_column('msgstr') || $b->category;
+        strcoll($a_name, $b_name)
+    } @contacts;
+    return @contacts;
+}
+
 sub summary_count {
     my ( $rs, $restriction ) = @_;
 
@@ -37,4 +90,13 @@ sub summary_count {
     );
 }
 
+sub group_lookup {
+    my $rs = shift;
+    map {
+        my $group = $_->get_extra_metadata('group') || '';
+        $group = join(',', ref $group ? @$group : $group);
+        $_->category => $group
+    } $rs->all;
+}
+
 1;