Merge remote-tracking branches 'origin/fetch-tweaks' and 'origin/skip…

…-wait-mark-failure'

CHANGELOG.md

@@ -11,6 +11,9 @@
     - Development improvements:
         - Default make_css to `web/cobrands` rather than `web`.
         - Ability to pass custom arguments (eg: SSL config) to server when running via Docker
+        - Allow bin/fetch start/end times to be fractional.
+    - Open311 improvements:
+        - Increase default timeout.
 
 * v4.0 (3rd December 2021)
     - Front end improvements:

bin/fetch

@@ -26,8 +26,8 @@ my ($opts, $usage) = describe_options(
     '%c %o',
     ['reports', 'fetch reports'],
     ['updates', 'fetch updates'],
-    ['start|s:i', 'start time to use (hours before now), defaults to one (reports) or two (updates)' ],
-    ['end|e:i', 'end time to use (hours before now), defaults to zero' ],
+    ['start|s:f', 'start time to use (hours before now), defaults to one (reports) or two (updates)' ],
+    ['end|e:f', 'end time to use (hours before now), defaults to zero' ],
     ['body|b:s', 'body name to only fetch this body' ],
     ['verbose|v', 'more verbose output'],
     ['help|h', "print usage message and exit" ],

perllib/FixMyStreet/DB/Result/Comment.pm

@@ -254,6 +254,17 @@ sub moderation_filter {
     { problem_id => $self->problem_id };
 }
 
+sub update_send_failed {
+    my $self = shift;
+    my $msg  = shift;
+
+    $self->update( {
+        send_fail_count => $self->send_fail_count + 1,
+        send_fail_timestamp => \'current_timestamp',
+        send_fail_reason => $msg
+    } );
+}
+
 =head2 meta_line
 
 Returns a string to be used on a report update, describing some of the metadata

perllib/Open311.pm

@@ -578,7 +578,7 @@ sub _request {
 
 sub _make_request {
     my ($self, $req) = @_;
-    my $ua = LWP::UserAgent->new;
+    my $ua = LWP::UserAgent->new( timeout => 300 );
     my $res = $ua->request( $req );
     return $res;
 }

perllib/Open311/PostServiceRequestUpdates.pm

@@ -114,7 +114,10 @@ sub process_update {
     # Some cobrands (e.g. Buckinghamshire) don't want to receive updates
     # from anyone except the original problem reporter.
     if (my $skip = $cobrand->call_hook(should_skip_sending_update => $comment)) {
-        if ($skip ne 'WAIT' && !defined $comment->get_extra_metadata('cobrand_skipped_sending')) {
+        if ($skip eq 'WAIT') {
+            # Mark this as a failure, so that it is not constantly retried
+            $comment->update_send_failed("Skipping posting due to wait");
+        } elsif (!defined $comment->get_extra_metadata('cobrand_skipped_sending')) {
             $comment->set_extra_metadata(cobrand_skipped_sending => 1);
             $comment->update;
         }
@@ -137,11 +140,7 @@ sub process_update {
         } );
         $self->log($comment, 'Send successful');
     } else {
-        $comment->update( {
-            send_fail_count => $comment->send_fail_count + 1,
-            send_fail_timestamp => \'current_timestamp',
-            send_fail_reason => "Failed to post over Open311\n\n" . $o->error,
-        } );
+        $comment->update_send_failed("Failed to post over Open311\n\n" . $o->error);
         $self->log($comment, 'Send failed');
     }
 }

t/open311/post-service-request-updates.t

@@ -92,7 +92,8 @@ subtest 'Send comments' => sub {
     $c1->discard_changes;
     is $c1->extra->{title}, "MRS", 'Title set on Bromley update';
     $c2->discard_changes;
-    is $c2->send_fail_count, 0, 'Oxfordshire update skipped entirely';
+    is $c2->send_fail_count, 1, 'Oxfordshire update skipped entirely, still logs as failure';
+    $c2->update({ send_fail_count => 0 });
 
     Open311->_inject_response('/servicerequestupdates.xml', "", 500);
     $oxon_other->update({ email => 'Alloy-OTHER' });