correctly trigger delete confirmation emails. #138

datacite · Nov 15, 2018 · 3cdef3d · 3cdef3d
1 parent c3d77e1
commit 3cdef3d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/app/controllers/clients_controller.rb b/app/controllers/clients_controller.rb
@@ -116,7 +116,7 @@ def destroy
       logger.warn message
       render json: { errors: [{ status: status.to_s, title: message }] }.to_json, status: status
     elsif @client.update_attributes(is_active: nil, deleted_at: Time.zone.now)
-      @client.remove_users(id: "client_id", jwt: current_user.jwt) unless Rails.env.test?
+      @client.send_delete_email unless Rails.env.test?
       head :no_content
     else
       logger.warn @client.errors.inspect

diff --git a/app/controllers/providers_controller.rb b/app/controllers/providers_controller.rb
@@ -130,7 +130,7 @@ def destroy
       logger.warn message
       render json: { errors: [{ status: status.to_s, title: message }] }.to_json, status: status
     elsif @provider.update_attributes(is_active: nil, deleted_at: Time.zone.now)
-      @provider.remove_users(id: "provider_id", jwt: current_user.jwt) unless Rails.env.test?
+      @provider.send_delete_email unless Rails.env.test?
       head :no_content
     else
       logger.warn @provider.errors.inspect

diff --git a/app/models/client.rb b/app/models/client.rb
@@ -51,7 +51,6 @@ class Client < ActiveRecord::Base
   before_save { self.updated = Time.zone.now.utc.iso8601 }
 
   after_create :send_welcome_email, unless: Proc.new { Rails.env.test? }
-  before_destroy :send_delete_email, unless: Proc.new { Rails.env.test? }
 
   attr_accessor :target_id
 

diff --git a/app/models/provider.rb b/app/models/provider.rb
@@ -54,7 +54,6 @@ class Provider < ActiveRecord::Base
   before_save { self.updated = Time.zone.now.utc.iso8601 }
 
   after_create :send_welcome_email, unless: Proc.new { Rails.env.test? }
-  before_destroy :send_delete_email, unless: Proc.new { Rails.env.test? }
 
   accepts_nested_attributes_for :prefixes