1 files changed, 39 insertions, 11 deletions

diff --git a/perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm b/perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm
index 5d1d45379..03bc511a0 100644
--- a/perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm
+++ b/perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm
@@ -14,10 +14,6 @@ use FixMyStreet::Email;
 
 my $opts = {
     commit => 0,
-    body => '2237',
-    cobrand => 'oxfordshire',
-    closure_cutoff => "2015-01-01 00:00:00",
-    email_cutoff => "2016-01-01 00:00:00",
 };
 
 sub query {
@@ -84,11 +80,7 @@ sub archive {
     });
 
     printf("Closing %d old reports, without sending emails: ", $problems_to_close->count);
-
-    if ( $opts->{commit} ) {
-        $problems_to_close->update({ state => 'closed', send_questionnaire => 0 });
-    }
-
+    close_problems($problems_to_close);
     printf("done.\n")
 }
 
@@ -132,10 +124,46 @@ sub send_email_and_close {
 
     unless ( $email_error ) {
         printf("done.\n    Closing reports: ");
-
-        $problems->update({ state => 'closed', send_questionnaire => 0 });
+        close_problems($problems);
         printf("done.\n");
     } else {
         printf("error! Not closing reports for this user.\n")
     }
 }
+
+sub close_problems {
+    return unless $opts->{commit};
+
+    my $problems = shift;
+    while (my $problem = $problems->next) {
+        my $timestamp = \'current_timestamp';
+        my $comment = $problem->add_to_comments( {
+            text => '',
+            created => $timestamp,
+            confirmed => $timestamp,
+            user_id => $opts->{user},
+            name => _('an administrator'),
+            mark_fixed => 0,
+            anonymous => 0,
+            state => 'confirmed',
+            problem_state => 'closed',
+            extra => { is_superuser => 1 },
+        } );
+        $problem->update({ state => 'closed', send_questionnaire => 0 });
+
+        # Stop any alerts being sent out about this closure.
+        my @alerts = FixMyStreet::DB->resultset('Alert')->search( {
+            alert_type => 'new_updates',
+            parameter  => $problem->id,
+            confirmed  => 1,
+        } );
+
+        for my $alert (@alerts) {
+            my $alerts_sent = FixMyStreet::DB->resultset('AlertSent')->find_or_create( {
+                alert_id  => $alert->id,
+                parameter => $comment->id,
+            } );
+        }
+
+    }
+}