send questionnaires for all open states

3 files changed, 123 insertions, 1 deletions

diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index daedf5577..47dac1e8e 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -305,6 +305,22 @@ sub is_open {
     return exists $open_states{ $self->state } ? 1 : 0;
 }
 
+=head2
+
+    @states = FixMyStreet::DB::Problem::visible_states();
+
+Returns a list of states that should be displayed on the site.
+
+=cut
+
+sub visible_states {
+    return (
+        'confirmed',    'planned', 'investigating',
+        'in progress',  'fixed',   'fixed - council',
+        'fixed - user', 'will not fix',
+    );
+}
+
 =head2 meta_line
 
 Returns a string to be used on a problem report page, describing some of the
diff --git a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
index e490c77a6..665e0e3e0 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
@@ -19,7 +19,7 @@ sub send_questionnaires_period {
 
     # Select all problems that need a questionnaire email sending
     my $q_params = {
-        state => [ 'confirmed', 'fixed' ],
+        state => [ FixMyStreet::DB::Result::Problem::visible_states() ],
         whensent => [
             '-and',
             { '!=', undef },
diff --git a/t/app/model/questionnaire.t b/t/app/model/questionnaire.t
new file mode 100644
index 000000000..2bc8f9b2c
--- /dev/null
+++ b/t/app/model/questionnaire.t
@@ -0,0 +1,106 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+
+use FixMyStreet;
+use FixMyStreet::TestMech;
+
+my $user = FixMyStreet::App->model('DB::User')->find_or_create( { email => 'test@example.com' } );
+
+my $problem = FixMyStreet::App->model('DB::Problem')->create(
+    {
+        postcode     => 'EH99 1SP',
+        latitude     => 1,
+        longitude    => 1,
+        areas        => 1,
+        title        => 'to be sent',
+        detail       => 'detail',
+        used_map     => 1,
+        user_id      => 1,
+        name         => 'A Name',
+        state        => 'confirmed',
+        service      => '',
+        cobrand      => 'default',
+        cobrand_data => '',
+        confirmed    => \"ms_current_timestamp() - '5 weeks'::interval",
+        whensent     => \"ms_current_timestamp() - '5 weeks'::interval",
+        user         => $user,
+        anonymous    => 0,
+    }
+);
+
+diag $problem->id;
+
+my $mech = FixMyStreet::TestMech->new;
+
+for my $test ( 
+    {
+        state => 'unconfirmed',
+        send_email => 0,
+    },
+    {
+        state => 'partial',
+        send_email => 0,
+    },
+    {
+        state => 'hidden',
+        send_email => 0,
+    },
+    {
+        state => 'confirmed',
+        send_email => 1,
+    },
+    {
+        state => 'investigating',
+        send_email => 1,
+    },
+    {
+        state => 'planned',
+        send_email => 1,
+    },
+    {
+        state => 'in progress',
+        send_email => 1,
+    },
+    {
+        state => 'fixed',
+        send_email => 1,
+    },
+    {
+        state => 'fixed - council',
+        send_email => 1,
+    },
+    {
+        state => 'fixed - user',
+        send_email => 1,
+    },
+    {
+        state => 'will not fix',
+        send_email => 1,
+    },
+) {
+    subtest "correct questionnaire behviour for state $test->{state}" => sub {
+        $problem->discard_changes;
+        $problem->state( $test->{state} );
+        $problem->send_questionnaire( 1 );
+        $problem->update;
+
+        $problem->questionnaires->delete;
+
+        $mech->email_count_is(0);
+
+        FixMyStreet::App->model('DB::Questionnaire')
+          ->send_questionnaires( { site => 'fixmystreet' } );
+
+        $mech->email_count_is( $test->{send_email} );
+
+        $mech->clear_emails_ok();
+    }
+}
+
+$mech->delete_user( $user );
+
+done_testing();