From bc1e038f02d7b8e171a48fca68382f37b0dc6bb9 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 30 Nov 2022 13:49:53 +0000 Subject: [PATCH] CLDC-1688 Review markups Co-authored-by: James Rose Update app/controllers/schemes_controller.rb Co-authored-by: James Rose Update app/controllers/locations_controller.rb Co-authored-by: James Rose --- app/controllers/locations_controller.rb | 2 +- app/controllers/schemes_controller.rb | 2 +- app/mailers/location_or_scheme_deactivation_mailer.rb | 10 ++-------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/controllers/locations_controller.rb b/app/controllers/locations_controller.rb index a2148d59e..b11b5246d 100644 --- a/app/controllers/locations_controller.rb +++ b/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, diff --git a/app/controllers/schemes_controller.rb b/app/controllers/schemes_controller.rb index 691e2f861..c982ae906 100644 --- a/app/controllers/schemes_controller.rb +++ b/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, ) diff --git a/app/mailers/location_or_scheme_deactivation_mailer.rb b/app/mailers/location_or_scheme_deactivation_mailer.rb index 58996b4e4..9bbc58cc3 100644 --- a/app/mailers/location_or_scheme_deactivation_mailer.rb +++ b/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"