Remove unused (except by tests) send_reports() fn.

7 files changed, 21 insertions, 22 deletions

diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
index ae45351c4..3f083c073 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
@@ -232,12 +232,6 @@ sub categories_summary {
     return \%categories;
 }
 
-sub send_reports {
-    my ( $rs, $site_override ) = @_;
-    require FixMyStreet::Script::Reports;
-    return FixMyStreet::Script::Reports::send($site_override);
-}
-
 sub include_comment_counts {
     my $rs = shift;
     my $order_by = $rs->{attrs}{order_by};
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index efc9057da..27f6aed66 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -2,6 +2,7 @@ use FixMyStreet::TestMech;
 use FixMyStreet;
 use FixMyStreet::App;
 use FixMyStreet::DB;
+use FixMyStreet::Script::Reports;
 use Sub::Override;
 
 my $problem_rs = FixMyStreet::DB->resultset('Problem');
@@ -541,7 +542,7 @@ foreach my $test ( {
         } );
 
         FixMyStreet::override_config $override, sub {
-            $problem_rs->send_reports();
+            FixMyStreet::Script::Reports::send();
         };
 
         $mech->email_count_is( $test->{ email_count } );
@@ -619,7 +620,7 @@ subtest 'check can set mutiple emails as a single contact' => sub {
     } );
 
     FixMyStreet::override_config $override, sub {
-        $problem_rs->send_reports();
+        FixMyStreet::Script::Reports::send();
     };
 
     $mech->email_count_is(1);
@@ -652,7 +653,7 @@ subtest 'check can turn on report sent email alerts' => sub {
         send_fail_count => 0,
     } );
 
-    $problem_rs->send_reports();
+    FixMyStreet::Script::Reports::send();
 
     $mech->email_count_is( 2 );
     my @emails = $mech->get_email;
@@ -698,7 +699,7 @@ subtest 'check iOS app store test reports not sent' => sub {
         send_fail_count => 0,
     } );
 
-    $problem_rs->send_reports();
+    FixMyStreet::Script::Reports::send();
 
     $mech->email_count_is( 0 );
 
@@ -727,7 +728,7 @@ subtest 'check reports from abuser not sent' => sub {
         send_fail_count => 0,
     } );
 
-    $problem_rs->send_reports();
+    FixMyStreet::Script::Reports::send();
 
     $mech->email_count_is( 1 );
 
@@ -743,7 +744,7 @@ subtest 'check reports from abuser not sent' => sub {
     my $abuse = FixMyStreet::DB->resultset('Abuse')->create( { email => $problem->user->email } );
 
     $mech->clear_emails_ok;
-    $problem_rs->send_reports();
+    FixMyStreet::Script::Reports::send();
 
     $mech->email_count_is( 0 );
 
diff --git a/t/app/sendreport/inspection_required.t b/t/app/sendreport/inspection_required.t
index c8cb30592..03c7ff944 100644
--- a/t/app/sendreport/inspection_required.t
+++ b/t/app/sendreport/inspection_required.t
@@ -1,7 +1,7 @@
 use FixMyStreet;
 use FixMyStreet::DB;
 use FixMyStreet::TestMech;
-use FixMyStreet::SendReport::Email;
+use FixMyStreet::Script::Reports;
 
 ok( my $mech = FixMyStreet::TestMech->new, 'Created mech object' );
 
@@ -31,7 +31,7 @@ my $report = $reports[0];
 subtest "Report isn't sent if uninspected" => sub {
     $mech->clear_emails_ok;
 
-    FixMyStreet::DB->resultset('Problem')->send_reports();
+    FixMyStreet::Script::Reports::send();
 
     $mech->email_count_is( 0 );
     is $report->whensent, undef, "Report hasn't been sent";
@@ -42,7 +42,7 @@ subtest 'Report is sent when inspected' => sub {
     $report->set_extra_metadata(inspected => 1);
     $report->update;
 
-    FixMyStreet::DB->resultset('Problem')->send_reports();
+    FixMyStreet::Script::Reports::send();
 
     $report->discard_changes;
     $mech->email_count_is( 1 );
@@ -61,7 +61,7 @@ subtest 'Uninspected report is sent when made by trusted user' => sub {
     });
     ok  $user->has_permission_to('trusted', $report->bodies_str_ids), 'User can make trusted reports';
 
-    FixMyStreet::DB->resultset('Problem')->send_reports();
+    FixMyStreet::Script::Reports::send();
 
     $report->discard_changes;
     $mech->email_count_is( 1 );
@@ -81,7 +81,7 @@ subtest "Uninspected report isn't sent when user rep is too low" => sub {
     $contact->set_extra_metadata(reputation_threshold => 20);
     $contact->update;
 
-    FixMyStreet::DB->resultset('Problem')->send_reports();
+    FixMyStreet::Script::Reports::send();
 
     $report->discard_changes;
     $mech->email_count_is( 0 );
@@ -92,7 +92,7 @@ subtest 'Uninspected report is sent when user rep is high enough' => sub {
     $user->set_extra_metadata(reputation => 21);
     $user->update;
 
-    FixMyStreet::DB->resultset('Problem')->send_reports();
+    FixMyStreet::Script::Reports::send();
 
     $report->discard_changes;
     $mech->email_count_is( 1 );
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index a64337085..a3a807bb1 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -1,5 +1,6 @@
 use CGI::Simple;
 use FixMyStreet::TestMech;
+use FixMyStreet::Script::Reports;
 my $mech = FixMyStreet::TestMech->new;
 
 # Create test data
@@ -54,7 +55,7 @@ subtest 'testing special Open311 behaviour', sub {
         STAGING_FLAGS => { send_reports => 1 },
         ALLOWED_COBRANDS => [ 'fixmystreet', 'bromley' ],
     }, sub {
-        $test_data = FixMyStreet::DB->resultset('Problem')->send_reports();
+        $test_data = FixMyStreet::Script::Reports::send();
     };
     $report->discard_changes;
     ok $report->whensent, 'Report marked as sent';
diff --git a/t/cobrand/fixamingata.t b/t/cobrand/fixamingata.t
index 133a8c950..0aa264660 100644
--- a/t/cobrand/fixamingata.t
+++ b/t/cobrand/fixamingata.t
@@ -1,5 +1,6 @@
 use mySociety::Locale;
 
+use FixMyStreet::Script::Reports;
 use FixMyStreet::TestMech;
 my $mech = FixMyStreet::TestMech->new;
 
@@ -35,7 +36,7 @@ $mech->email_count_is(0);
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => [ 'fixamingata' ],
 }, sub {
-    FixMyStreet::DB->resultset('Problem')->send_reports();
+    FixMyStreet::Script::Reports::send();
 };
 my $email = $mech->get_email;
 my $plain = $mech->get_text_body_from_email($email, 1);
diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index e0671db2a..8c2c70c2f 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -7,6 +7,7 @@ use LWP::Protocol::PSGI;
 use Test::LongString;
 use Path::Tiny;
 use t::Mock::MapItZurich;
+use FixMyStreet::Script::Reports;
 use FixMyStreet::TestMech;
 my $mech = FixMyStreet::TestMech->new;
 
@@ -36,7 +37,7 @@ sub send_reports_for_zurich {
         ALLOWED_COBRANDS => ['zurich']
     }, sub {
         # Actually send the report
-        FixMyStreet::DB->resultset('Problem')->send_reports('zurich');
+        FixMyStreet::Script::Reports::send('zurich');
     };
 }
 sub reset_report_state {
diff --git a/t/sendreport/open311.t b/t/sendreport/open311.t
index 52b1952f4..1eb5535aa 100644
--- a/t/sendreport/open311.t
+++ b/t/sendreport/open311.t
@@ -1,4 +1,5 @@
 use CGI::Simple;
+use FixMyStreet::Script::Reports;
 use FixMyStreet::TestMech;
 my $mech = FixMyStreet::TestMech->new;
 
@@ -25,7 +26,7 @@ subtest 'testing Open311 behaviour', sub {
         STAGING_FLAGS => { send_reports => 1 },
         ALLOWED_COBRANDS => [ 'fixmystreet' ],
     }, sub {
-        $test_data = FixMyStreet::DB->resultset('Problem')->send_reports();
+        $test_data = FixMyStreet::Script::Reports::send();
     };
     $report->discard_changes;
     ok $report->whensent, 'Report marked as sent';