From a863be8831efbb815bfd9ecdba01b8334552f0a3 Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 22 Dec 2021 11:32:33 +0000
Subject: [PATCH] Rename User#delete to User#destroy

"delete" is generally used for immediate SQL deletion without running
any callbacks or other ruby code, whereas "destroy" will trigger callbacks.

Although we don't currently use any callbacks, let's rename this method to
align better with the convention.
---
 app/controllers/users_controller.rb        | 4 ++--
 app/models/user.rb                         | 4 ++--
 test/controllers/browse_controller_test.rb | 2 +-
 test/models/user_test.rb                   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4f05ece74..f7a82c08c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -208,9 +208,9 @@ class UsersController < ApplicationController
   end
 
   ##
-  # delete a user, marking them as deleted and removing personal data
+  # destroy a user, marking them as deleted and removing personal data
   def destroy
-    @user.delete
+    @user.destroy
     redirect_to user_path(:display_name => params[:display_name])
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 8b8f31676..177a29984 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -241,8 +241,8 @@ class User < ApplicationRecord
   end
 
   ##
-  # delete a user - leave the account but purge most personal data
-  def delete
+  # destroy a user - leave the account but purge most personal data
+  def destroy
     avatar.purge_later
 
     self.display_name = "user_#{id}"
diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb
index 135e49d3f..d9f4401bf 100644
--- a/test/controllers/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -161,7 +161,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest
     assert_select "div.note-comments ul li", :count => 2
     assert_select "div.details", /Resolved by #{user.display_name}/
 
-    user.delete
+    user.destroy
 
     reset!
 
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index c34b4b81f..76f520091 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -256,9 +256,9 @@ class UserTest < ActiveSupport::TestCase
     assert create(:moderator_user).has_role?("moderator")
   end
 
-  def test_delete
+  def test_destroy
     user = create(:user, :with_home_location, :description => "foo")
-    user.delete
+    user.destroy
     assert_equal "user_#{user.id}", user.display_name
     assert user.description.blank?
     assert_nil user.home_lat
-- 
2.45.1