4 files changed, 108 insertions, 3 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm
index 2f1d88d08..88b53494b 100644
--- a/perllib/FixMyStreet/App/Controller/Report/Update.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm
@@ -56,7 +56,7 @@ sub update_problem : Private {
     my $problem = $c->stash->{problem} || $update->problem;
 
     if ( $update->mark_fixed ) {
-        $problem->state('fixed');
+        $problem->state('fixed - user');
 
         if ( $update->user->id == $problem->user->id ) {
             $problem->send_questionnaire(0);
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 47bee1e0a..c23d5d1fc 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -835,7 +835,7 @@ sub generate_problem_banner {
         $banner->{id} = 'unknown';
         $banner->{text} = _('This problem is old and of unknown status.');
     }
-    if ($problem->state eq 'fixed') {
+    if ($problem->is_fixed) {
         $banner->{id} = 'fixed';
         $banner->{text} = _('This problem has been fixed') . '.';
     }
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 366024c7c..65a2268b6 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -119,6 +119,74 @@ use Utils;
 
 with 'FixMyStreet::Roles::Abuser';
 
+=head2
+
+    @states = FixMyStreet::DB::Problem::open_states();
+
+Get a list or states that are regarded as open. If called in
+array context then returns an array of names, otherwise returns a
+HASHREF.
+
+=cut
+
+sub open_states {
+    my $states = {
+        'unconfirmed'   => 1,
+        'confirmed'     => 1,
+        'investigating' => 1,
+        'planned'       => 1,
+        'in progress'   => 1,
+    };
+
+    return wantarray ? keys %{$states} : $states;
+}
+
+=head2
+
+    @states = FixMyStreet::DB::Problem::fixed_states();
+
+Get a list or states that should be regarded as fixed. If called in
+array context then returns an array of names, otherwise returns a
+HASHREF.
+
+=cut
+
+sub fixed_states {
+    my $states = {
+        'fixed'           => 1,
+        'fixed - user'    => 1,
+        'fixed - council' => 1,
+    };
+
+    return wantarray ? keys %{ $states } : $states;
+}
+
+=head2
+
+    @states = FixMyStreet::DB::Problem::visible_states();
+
+Get a list or states that should be visible on the site. If called in
+array context then returns an array of names, otherwise returns a
+HASHREF.
+
+=cut
+
+sub visible_states {
+    my $states = {
+        'confirmed'       => 1,
+        'planned'         => 1,
+        'investigating'   => 1,
+        'in progress'     => 1,
+        'fixed'           => 1,
+        'fixed - council' => 1,
+        'fixed - user'    => 1,
+        'closed'          => 1,
+    };
+
+    return wantarray ? keys %{$states} : $states;
+}
+
+
 my $tz = DateTime::TimeZone->new( name => "local" );
 
 sub confirmed_local {
@@ -284,6 +352,43 @@ sub get_photo_params {
     return $photo;
 }
 
+=head2 is_open
+
+Returns 1 if the problem is in a open state otherwise 0.
+
+=cut
+
+sub is_open {
+    my $self = shift;
+
+    return exists $self->open_states->{ $self->state } ? 1 : 0;
+}
+
+
+=head2 is_fixed
+
+Returns 1 if the problem is in a fixed state otherwise 0.
+
+=cut
+
+sub is_fixed {
+    my $self = shift;
+
+    return exists $self->fixed_states->{ $self->state } ? 1 : 0;
+}
+
+=head2 is_visible
+
+Returns 1 if the problem should be displayed on the site otherwise 0.
+
+=cut
+
+sub is_visible {
+    my $self = shift;
+
+    return exists $self->visible_states->{ $self->state } ? 1 : 0;
+}
+
 =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 },