Merge branch 'bromley-new-statuses'

Conflicts:
	bin/send-comments
	conf/crontab.ugly
	db/schema.sql
	perllib/FixMyStreet/App/Controller/Admin.pm
	perllib/FixMyStreet/DB/Result/Open311conf.pm
	perllib/FixMyStreet/DB/ResultSet/Problem.pm
	perllib/Open311.pm
	t/app/controller/report_updates.t
	t/open311.t
	templates/web/default/report/display.html
	templates/web/default/report/updates.html
	templates/web/fixmystreet/report/display.html

1 files changed, 376 insertions, 24 deletions

diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index 82670d6cc..2204a9d99 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -477,64 +477,91 @@ for my $test (
         state => 'investigating',
     },
     {
-        desc => 'from authority user marks report as planned',
+        desc => 'from authority user marks report as in progress',
         fields => {
             name => $user->name,
             may_show_name => 1,
             add_alert => undef,
             photo => '',
-            update => 'Set state to planned',
-            state => 'planned',
+            update => 'Set state to in progress',
+            state => 'in progress',
         },
-        state => 'planned',
+        state => 'in progress',
     },
     {
-        desc => 'from authority user marks report as in progress',
+        desc => 'from authority user marks report as fixed',
         fields => {
             name => $user->name,
             may_show_name => 1,
             add_alert => undef,
             photo => '',
-            update => 'Set state to in progress',
-            state => 'in progress',
+            update => 'Set state to fixed',
+            state => 'fixed',
         },
-        state => 'in progress',
+        state => 'fixed - council',
     },
     {
-        desc => 'from authority user marks report as closed',
+        desc => 'from authority user marks report as confirmed',
         fields => {
             name => $user->name,
             may_show_name => 1,
             add_alert => undef,
             photo => '',
-            update => 'Set state to closed',
-            state => 'closed',
+            update => 'Set state to confirmed',
+            state => 'confirmed',
         },
-        state => 'closed',
+        state => 'confirmed',
+        reopened => 1,
     },
     {
-        desc => 'from authority user marks report as fixed',
+        desc => 'from authority user marks report as action scheduled',
         fields => {
             name => $user->name,
             may_show_name => 1,
             add_alert => undef,
             photo => '',
-            update => 'Set state to fixed',
-            state => 'fixed',
+            update => 'Set state to action scheduled',
+            state => 'action scheduled',
         },
-        state => 'fixed - council',
+        state => 'action scheduled',
     },
     {
-        desc => 'from authority user marks report as confirmed',
+        desc => 'from authority user marks report as unable to fix',
         fields => {
             name => $user->name,
             may_show_name => 1,
             add_alert => undef,
             photo => '',
-            update => 'Set state to confirmed',
-            state => 'confirmed',
+            update => 'Set state to unable to fix',
+            state => 'unable to fix',
         },
-        state => 'confirmed',
+        state => 'unable to fix',
+    },
+    {
+        desc => 'from authority user marks report as not responsible',
+        fields => {
+            name => $user->name,
+            may_show_name => 1,
+            add_alert => undef,
+            photo => '',
+            update => 'Set state to not responsible',
+            state => 'not responsible',
+        },
+        state => 'not responsible',
+        meta  => "not the council's responsibility"
+    },
+    {
+        desc => 'from authority user marks report as duplicate',
+        fields => {
+            name => $user->name,
+            may_show_name => 1,
+            add_alert => undef,
+            photo => '',
+            update => 'Set state to duplicate',
+            state => 'duplicate',
+        },
+        state => 'duplicate',
+        meta  => 'duplicate report',
     },
     {
         desc => 'from authority user marks report sent to two councils as fixed',
@@ -577,11 +604,11 @@ for my $test (
         is $update->problem_state, $test->{state}, 'problem state set';
 
         my $update_meta = $mech->extract_update_metas;
-        # setting it to confirmed shouldn't say anything
-        if ( $test->{fields}->{state} ne 'confirmed' ) {
-            like $update_meta->[0], qr/marked as $test->{fields}->{state}$/, 'update meta includes state change';
+        my $meta_state = $test->{meta} || $test->{fields}->{state};
+        if ( $test->{reopened} ) {
+            like $update_meta->[0], qr/reopened$/, 'update meta says reopened';
         } else {
-            like $update_meta->[0], qr/reopened$/, 'update meta includes state change';
+            like $update_meta->[0], qr/marked as $meta_state$/, 'update meta includes state change';
         }
         like $update_meta->[0], qr{Test User \(Westminster City Council\)}, 'update meta includes council name';
         $mech->content_contains( 'Test User (<strong>Westminster City Council</strong>)', 'council name in bold');
@@ -629,6 +656,105 @@ subtest 'check meta correct for comments marked confirmed but not marked open' =
     unlike $update_meta->[0], qr/reopened$/, 'update meta does not say reopened';
   };
 
+subtest "check comment with no status change has not status in meta" => sub {
+        $mech->log_in_ok( $user->email );
+        $user->from_council( 0 );
+        $user->update;
+
+        my $comment = $report->comments->first;
+        $comment->update( { mark_fixed => 1, problem_state => 'fixed - council' } );
+
+        $mech->get_ok("/report/$report_id");
+
+        $mech->submit_form_ok(
+            {
+                with_fields => {
+                    name => $user->name,
+                    may_show_name => 1,
+                    add_alert => undef,
+                    photo => '',
+                    update => 'Comment that does not change state',
+                },
+            },
+            'submit update'
+        );
+
+        $report->discard_changes;
+        my @updates = $report->comments->all;
+        is scalar @updates, 2, 'correct number of updates';
+
+        warn $updates[0]->problem_state;
+        warn $updates[1]->problem_state;
+        my $update = pop @updates;
+
+        is $report->state, 'fixed - council', 'correct report state';
+        is $update->problem_state, 'fixed - council', 'corect update state';
+        my $update_meta = $mech->extract_update_metas;
+        unlike $update_meta->[1], qr/marked as/, 'update meta does not include state change';
+
+        $user->from_council( 2504 );
+        $user->update;
+
+        $mech->get_ok("/report/$report_id");
+
+        $mech->submit_form_ok(
+            {
+                with_fields => {
+                    name => $user->name,
+                    may_show_name => 1,
+                    add_alert => undef,
+                    photo => '',
+                    update => 'Comment that sets state to investigating',
+                    state => 'investigating',
+                },
+            },
+            'submit update'
+        );
+
+        $report->discard_changes;
+        @updates = $report->comments->all;
+        is scalar @updates, 3, 'correct number of updates';
+
+        $update = pop @updates;
+
+        is $report->state, 'investigating', 'correct report state';
+        is $update->problem_state, 'investigating', 'corect update state';
+        $update_meta = $mech->extract_update_metas;
+        like $update_meta->[0], qr/marked as fixed/, 'first update meta says fixed';
+        unlike $update_meta->[1], qr/marked as/, 'second update meta does not include state change';
+        like $update_meta->[2], qr/marked as investigating/, 'third update meta says investigating';
+
+        my $dt = DateTime->now;
+        my $comment = FixMyStreet::App->model('DB::Comment')->find_or_create(
+            {
+                problem_id => $report_id,
+                user_id    => $user->id,
+                name       => 'Other User',
+                mark_fixed => 'false',
+                text       => 'This is some update text',
+                state      => 'confirmed',
+                confirmed  => $dt->ymd . ' ' . $dt->hms,
+                anonymous  => 'f',
+            }
+        );
+
+        $mech->get_ok("/report/$report_id");
+
+        $report->discard_changes;
+        @updates = $report->comments->all;
+        is scalar @updates, 4, 'correct number of updates';
+
+        $update = pop @updates;
+
+        is $report->state, 'investigating', 'correct report state';
+        is $update->problem_state, undef, 'no update state';
+        $update_meta = $mech->extract_update_metas;
+        like $update_meta->[0], qr/marked as fixed/, 'first update meta says fixed';
+        unlike $update_meta->[1], qr/marked as/, 'second update meta does not include state change';
+        like $update_meta->[2], qr/marked as investigating/, 'third update meta says investigating';
+        unlike $update_meta->[3], qr/marked as/, 'fourth update meta has no state change';
+};
+
 $user->from_council(0);
 $user->update;
 
@@ -1286,6 +1412,232 @@ for my $test (
     };
 }
 
+for my $test (
+    {
+        desc => 'update confirmed without marking as fixed leaves state unchanged',
+        initial_state => 'confirmed',
+        expected_form_fields => {
+            fixed => undef,
+        },
+        submitted_form_fields => {
+            fixed => 0,
+        },
+        end_state => 'confirmed',
+    },
+    {
+        desc => 'update investigating without marking as fixed leaves state unchanged',
+        initial_state => 'investigating',
+        expected_form_fields => {
+            fixed => undef,
+        },
+        submitted_form_fields => {
+            fixed => 0,
+        },
+        end_state => 'investigating',
+    },
+    {
+        desc => 'update in progress without marking as fixed leaves state unchanged',
+        initial_state => 'in progress',
+        expected_form_fields => {
+            fixed => undef,
+        },
+        submitted_form_fields => {
+            fixed => 0,
+        },
+        end_state => 'in progress',
+    },
+    {
+        desc => 'update action scheduled without marking as fixed leaves state unchanged',
+        initial_state => 'action scheduled',
+        expected_form_fields => {
+            fixed => undef,
+        },
+        submitted_form_fields => {
+            fixed => 0,
+        },
+        end_state => 'action scheduled',
+    },
+    {
+        desc => 'update fixed without marking as open leaves state unchanged',
+        initial_state => 'fixed',
+        expected_form_fields => {
+            reopen => undef,
+        },
+        submitted_form_fields => {
+            reopen => 0,
+        },
+        end_state => 'fixed',
+    },
+    {
+        desc => 'update unable to fix without marking as fixed leaves state unchanged',
+        initial_state => 'unable to fix',
+        expected_form_fields => {
+            fixed => undef,
+        },
+        submitted_form_fields => {
+            fixed => 0,
+        },
+        end_state => 'unable to fix',
+    },
+    {
+        desc => 'update not responsible without marking as fixed leaves state unchanged',
+        initial_state => 'not responsible',
+        expected_form_fields => {
+            fixed => undef,
+        },
+        submitted_form_fields => {
+            fixed => 0,
+        },
+        end_state => 'not responsible',
+    },
+    {
+        desc => 'update duplicate without marking as fixed leaves state unchanged',
+        initial_state => 'duplicate',
+        expected_form_fields => {
+            fixed => undef,
+        },
+        submitted_form_fields => {
+            fixed => 0,
+        },
+        end_state => 'duplicate',
+    },
+    {
+        desc => 'can mark confirmed as fixed',
+        initial_state => 'confirmed',
+        expected_form_fields => {
+            fixed => undef,
+        },
+        submitted_form_fields => {
+            fixed => 1,
+        },
+        end_state => 'fixed - user',
+    },
+    {
+        desc => 'can mark investigating as fixed',
+        initial_state => 'investigating',
+        expected_form_fields => {
+            fixed => undef,
+        },
+        submitted_form_fields => {
+            fixed => 1,
+        },
+        end_state => 'fixed - user',
+    },
+    {
+        desc => 'can mark in progress as fixed',
+        initial_state => 'in progress',
+        expected_form_fields => {
+            fixed => undef,
+        },
+        submitted_form_fields => {
+            fixed => 1,
+        },
+        end_state => 'fixed - user',
+    },
+    {
+        desc => 'can mark action scheduled as fixed',
+        initial_state => 'action scheduled',
+        expected_form_fields => {
+            fixed => undef,
+        },
+        submitted_form_fields => {
+            fixed => 1,
+        },
+        end_state => 'fixed - user',
+    },
+    {
+        desc => 'cannot mark fixed as fixed, can mark as not fixed',
+        initial_state => 'fixed',
+        expected_form_fields => {
+            reopen => undef,
+        },
+        submitted_form_fields => {
+            reopen => 1,
+        },
+        end_state => 'confirmed',
+    },
+    {
+        desc => 'can mark unable to fix as fixed, cannot mark not closed',
+        initial_state => 'unable to fix',
+        expected_form_fields => {
+            fixed => undef,
+        },
+        submitted_form_fields => {
+            fixed => 1,
+        },
+        end_state => 'fixed - user',
+    },
+    {
+        desc => 'can mark not responsible as fixed, cannot mark not closed',
+        initial_state => 'not responsible',
+        expected_form_fields => {
+            fixed => undef,
+        },
+        submitted_form_fields => {
+            fixed => 1,
+        },
+        end_state => 'fixed - user',
+    },
+    {
+        desc => 'can mark duplicate as fixed, cannot mark not closed',
+        initial_state => 'duplicate',
+        expected_form_fields => {
+            fixed => undef,
+        },
+        submitted_form_fields => {
+            fixed => 1,
+        },
+        end_state => 'fixed - user',
+    },
+) {
+    subtest $test->{desc} => sub {
+        $mech->log_in_ok( $report->user->email );
+
+        my %standard_fields = (
+            name => $report->user->name,
+            update => 'update text',
+            photo         => '',
+            may_show_name => 1,
+            add_alert => 1,
+        );
+
+        my %expected_fields = (
+            %standard_fields,
+            %{ $test->{expected_form_fields} },
+            update => '',
+        );
+
+        my %submitted_fields = (
+            %standard_fields,
+            %{ $test->{submitted_form_fields} },
+        );
+
+        # clear out comments for this problem to make
+        # checking details easier later
+        ok( $_->delete, 'deleted comment ' . $_->id ) for $report->comments;
+
+        $report->discard_changes;
+        $report->state($test->{initial_state});
+        $report->update;
+
+        $mech->get_ok("/report/$report_id");
+
+        my $values = $mech->visible_form_values('updateForm');
+        is_deeply $values, \%expected_fields, 'correct form fields present';
+
+        if ( $test->{submitted_form_fields} ) {
+            $mech->submit_form_ok( {
+                    with_fields => \%submitted_fields
+                },
+                'submit update'
+            );
+
+            $report->discard_changes;
+            is $report->state, $test->{end_state}, 'update sets correct report state';
+        }
+    };
+}
+
 subtest 'check have to be logged in for creator fixed questionnaire' => sub {
     $mech->log_out_ok();