Browse Source

CLDC-1688 Review markups

Co-authored-by: James Rose <james@jbpr.net>

Update app/controllers/schemes_controller.rb

Co-authored-by: James Rose <james@jbpr.net>

Update app/controllers/locations_controller.rb

Co-authored-by: James Rose <james@jbpr.net>
pull/1040/head
Sam 4 years ago committed by Kat
parent
commit
bc1e038f02
  1. 2
      app/controllers/locations_controller.rb
  2. 2
      app/controllers/schemes_controller.rb
  3. 10
      app/mailers/location_or_scheme_deactivation_mailer.rb

2
app/controllers/locations_controller.rb

@ -53,7 +53,7 @@ class LocationsController < ApplicationController
flash[:notice] = deactivate_success_notice
LocationOrSchemeDeactivationMailer.new.send_deactivation_mails(
logs.to_a,
logs,
url_for(controller: "lettings_logs", action: "update_logs"),
@location.scheme.service_name,
@location.postcode,

2
app/controllers/schemes_controller.rb

@ -54,7 +54,7 @@ class SchemesController < ApplicationController
flash[:notice] = deactivate_success_notice
LocationOrSchemeDeactivationMailer.new.send_deactivation_mails(
logs.to_a,
logs,
url_for(controller: "lettings_logs", action: "update_logs"),
@scheme.service_name,
)

10
app/mailers/location_or_scheme_deactivation_mailer.rb

@ -15,19 +15,13 @@ class LocationOrSchemeDeactivationMailer < NotifyMailer
end
def send_deactivation_mails(logs, update_logs_url, scheme_name, postcode = nil)
counts_by_user(logs).each do |user, count|
send_deactivation_mail(user, count, update_logs_url, scheme_name, postcode) if user
logs.group_by(&:created_by).transform_values(&:count).compact.each do |user, count|
send_deactivation_mail(user, count, update_logs_url, scheme_name, postcode)
end
end
private
def counts_by_user(logs)
logs.each_with_object(Hash.new(0)) do |log, counts|
counts[log.created_by] += 1
end
end
def description(scheme_name, postcode)
if postcode
"the #{postcode} location from the #{scheme_name} scheme"

Loading…
Cancel
Save