Factor anonymize function to User model.

2 files changed, 20 insertions, 14 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 8f8d7cc47..0d897e71e 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -1911,20 +1911,7 @@ sub user_hide_everywhere : Private {
 sub user_remove_account : Private {
     my ( $self, $c, $user ) = @_;
     $c->forward('user_logout_everywhere', [ $user ]);
-    $user->problems->update({ anonymous => 1, name => '', send_questionnaire => 0 });
-    $user->comments->update({ anonymous => 1, name => '' });
-    $user->alerts->update({ whendisabled => \'current_timestamp' });
-    $user->password('', 1);
-    $user->update({
-        email => 'removed-' . $user->id . '@' . FixMyStreet->config('EMAIL_DOMAIN'),
-        email_verified => 0,
-        name => '',
-        phone => '',
-        phone_verified => 0,
-        title => undef,
-        twitter_id => undef,
-        facebook_id => undef,
-    });
+    $user->anonymize_account;
     $c->stash->{status_message} = _('That user’s personal details have been removed.');
 }
 
diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm
index c624a2efe..3ec6ae92c 100644
--- a/perllib/FixMyStreet/DB/Result/User.pm
+++ b/perllib/FixMyStreet/DB/Result/User.pm
@@ -456,6 +456,25 @@ sub adopt {
     $other->delete;
 }
 
+sub anonymize_account {
+    my $self = shift;
+
+    $self->problems->update({ anonymous => 1, name => '', send_questionnaire => 0 });
+    $self->comments->update({ anonymous => 1, name => '' });
+    $self->alerts->update({ whendisabled => \'current_timestamp' });
+    $self->password('', 1);
+    $self->update({
+        email => 'removed-' . $self->id . '@' . FixMyStreet->config('EMAIL_DOMAIN'),
+        email_verified => 0,
+        name => '',
+        phone => '',
+        phone_verified => 0,
+        title => undef,
+        twitter_id => undef,
+        facebook_id => undef,
+    });
+}
+
 # Planned reports / shortlist
 
 # Override the default auto-created function as we only want one live entry so