include responsible account is slack messages. datacite/datacite#918

app/controllers/clients_controller.rb

@@ -110,6 +110,7 @@ def create
     authorize! :create, @client
 
     if @client.save
+      @client.send_welcome_email(responsible_id: current_user.uid) unless Rails.env.test?
       options = {}
       options[:is_collection] = false
       options[:params] = { current_ability: current_ability }
@@ -143,7 +144,7 @@ def destroy
       Rails.logger.warn message
       render json: { errors: [{ status: status.to_s, title: message }] }.to_json, status: status
     elsif @client.update(is_active: nil, deleted_at: Time.zone.now)
-      @client.send_delete_email unless Rails.env.test?
+      @client.send_delete_email(responsible_id: current_user.uid) unless Rails.env.test?
       head :no_content
     else
       Rails.logger.error @client.errors.inspect

app/controllers/providers_controller.rb

@@ -171,6 +171,7 @@ def create
     authorize! :create, @provider
 
     if @provider.save
+      @provider.send_welcome_email(responsible_id: current_user.uid) unless Rails.env.test?
       options = {}
       options[:include] = @include
       options[:is_collection] = false
@@ -206,7 +207,7 @@ def destroy
       Rails.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.send_delete_email unless Rails.env.test?
+      @provider.send_delete_email(responsible_id: current_user.uid) unless Rails.env.test?
       head :no_content
     else
       Rails.logger.error @provider.errors.inspect

app/models/client.rb

@@ -63,8 +63,6 @@ class Client < ActiveRecord::Base
   before_create { self.created = Time.zone.now.utc.iso8601 }
   before_save { self.updated = Time.zone.now.utc.iso8601 }
 
-  after_create :send_welcome_email, unless: Proc.new { Rails.env.test? }
-
   attr_accessor :target_id
 
   # use different index for testing

app/models/concerns/mailable.rb

@@ -6,7 +6,7 @@ module Mailable
   require 'slack-notifier'
 
   included do
-    def send_welcome_email
+    def send_welcome_email(responsible_id: nil)
       if self.class.name == "Provider"
         client_id = nil
         provider_id = symbol.downcase
@@ -29,6 +29,7 @@ def send_welcome_email
       title = Rails.env.stage? ? "DataCite Fabrica Test" : "DataCite Fabrica"
       subject = "#{title}: New Account"
       account_type = self.class.name == "Provider" ? member_type.humanize : client_type.humanize
+      responsible_id ||= "ADMIN"
       text = User.format_message_text(template: "users/welcome.text.erb", title: title, contact_name: name, name: symbol, url: url, reset_url: reset_url)
       html = User.format_message_html(template: "users/welcome.html.erb", title: title, contact_name: name, name: symbol, url: url, reset_url: reset_url)
 
@@ -38,17 +39,19 @@ def send_welcome_email
         { title: "Account ID", value: symbol, short: true },
         { title: "Account type", value: account_type, short: true },
         { title: "Account name", value: name, short: true },
-        { title: "System email", value: system_email, short: true }
+        { title: "System email", value: system_email, short: true },
+        { title: "Responsible Account ID", value: responsible_id }
       ]
       User.send_notification_to_slack(nil, title: subject, level: "good", fields: fields)
 
       response
     end
 
-    def send_delete_email
+    def send_delete_email(responsible_id: nil)
       title = Rails.env.stage? ? "DataCite Fabrica Test" : "DataCite Fabrica"
       subject = "#{title}: Account Deleted"
       account_type = self.class.name == "Provider" ? member_type.humanize : client_type.humanize
+      responsible_id ||= "ADMIN"
       text = User.format_message_text(template: "users/delete.text.erb", title: title, contact_name: name, name: symbol)
       html = User.format_message_html(template: "users/delete.html.erb", title: title, contact_name: name, name: symbol)
 
@@ -58,7 +61,8 @@ def send_delete_email
         { title: "Account ID", value: symbol, short: true },
         { title: "Account type", value: account_type, short: true },
         { title: "Account name", value: name, short: true },
-        { title: "System email", value: system_email, short: true }
+        { title: "System email", value: system_email, short: true },
+        { title: "Responsible Account ID", value: responsible_id }
       ]
       User.send_notification_to_slack(nil, title: subject, level: "warning", fields: fields)
 

app/models/provider.rb

@@ -79,8 +79,6 @@ class Provider < ActiveRecord::Base
   before_create { self.created = Time.zone.now.utc.iso8601 }
   before_save { self.updated = Time.zone.now.utc.iso8601 }
 
-  after_create :send_welcome_email, unless: Proc.new { Rails.env.test? }
-
   accepts_nested_attributes_for :prefixes
 
   # use different index for testing

app/models/user.rb

@@ -115,13 +115,15 @@ def self.reset(username)
     reset_url = ENV['BRACCO_URL'] + "/reset"
     title = Rails.env.stage? ? "DataCite Fabrica Test" : "DataCite Fabrica"
     subject = "#{title}: Password Reset Request"
+    account_type = user.class.name == "Provider" ? user.member_type.humanize : user.client_type.humanize  
     text = User.format_message_text(template: "users/reset.text.erb", title: title, contact_name: user.name, name: user.symbol, url: url, reset_url: reset_url)
     html = User.format_message_html(template: "users/reset.html.erb", title: title, contact_name: user.name, name: user.symbol, url: url, reset_url: reset_url)
     response = self.send_message(name: user.name, email: user.system_email, subject: subject, text: text, html: html)
 
     fields = [
-      { title: "Account ID", value: uid.upcase},
-      { title: "Name", value: user.name, short: true },
+      { title: "Account ID", value: uid.upcase, short: true },
+      { title: "Account type", value: account_type, short: true },
+      { title: "Account name", value: user.name, short: true },
       { title: "System email", value: user.system_email, short: true }
     ]
     slack_title = subject + (response[:status] == 200 ? " Sent" : " Failed")

lib/tasks/client.rake

@@ -130,7 +130,7 @@ namespace :client do
     end
 
     if client.update_attributes(is_active: nil, deleted_at: Time.zone.now)
-      client.send_delete_email unless Rails.env.test?
+      client.send_delete_email(responsible_id: "admin") unless Rails.env.test?
       puts "Client with client ID #{ENV['CLIENT_ID']} deleted."
     else
       puts client.errors.inspect

spec/concerns/mailable_spec.rb

@@ -7,7 +7,13 @@
   let(:title) { "DataCite Fabrica" }
 
   it "send_welcome_email" do
-    response = client.send_welcome_email
+    response = client.send_welcome_email(responsible_id: provider.symbol)
+    expect(response[:status]).to eq(200)
+    expect(response[:message]).to eq("Queued. Thank you.")
+  end
+
+  it "send_delete_email" do
+    response = client.send_delete_email(responsible_id: provider.symbol)
     expect(response[:status]).to eq(200)
     expect(response[:message]).to eq("Queued. Thank you.")
   end