From 2009b9715f9290a6787e626623a46b55ffe08126 Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Sat, 31 May 2014 08:47:26 +0000 Subject: [PATCH 1/2] VRFS-736 removed html from title in text-based emails --- .../views/jam_ruby/progress_mailer/client_dl_notrun.text.erb | 2 +- .../app/views/jam_ruby/progress_mailer/client_notdl.text.erb | 2 +- .../views/jam_ruby/progress_mailer/client_run_notgear.text.erb | 2 +- .../app/views/jam_ruby/progress_mailer/gear_notsess.text.erb | 2 +- .../app/views/jam_ruby/progress_mailer/reg_notconnect.text.erb | 2 +- .../app/views/jam_ruby/progress_mailer/reg_notinvite.text.erb | 2 +- .../app/views/jam_ruby/progress_mailer/reg_notlike.text.erb | 2 +- .../app/views/jam_ruby/progress_mailer/sess_notgood.text.erb | 2 +- .../app/views/jam_ruby/progress_mailer/sess_notrecord.text.erb | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_dl_notrun.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_dl_notrun.text.erb index 110ddcfac..c447c34fb 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_dl_notrun.text.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_dl_notrun.text.erb @@ -1,4 +1,4 @@ -<% provide(:title, @title) %> +<%= @title %> Hello <%= EmailBatchProgression::VAR_FIRST_NAME %> -- diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_notdl.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_notdl.text.erb index cb5d3dbaa..4ec636c7b 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_notdl.text.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_notdl.text.erb @@ -1,4 +1,4 @@ -<% provide(:title, @title) %> +<%= @title %> Hello <%= EmailBatchProgression::VAR_FIRST_NAME %> -- diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_run_notgear.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_run_notgear.text.erb index 190ae73ae..b635ede90 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_run_notgear.text.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/client_run_notgear.text.erb @@ -1,4 +1,4 @@ -<% provide(:title, @title) %> +<%= @title %> Hello <%= EmailBatchProgression::VAR_FIRST_NAME %> -- diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/gear_notsess.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/gear_notsess.text.erb index 74978f1e3..d027cf178 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/gear_notsess.text.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/gear_notsess.text.erb @@ -1,4 +1,4 @@ -<% provide(:title, @title) %> +<%= @title %> Hello <%= EmailBatchProgression::VAR_FIRST_NAME %> -- diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notconnect.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notconnect.text.erb index 24f5360b3..370823a10 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notconnect.text.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notconnect.text.erb @@ -1,4 +1,4 @@ -<% provide(:title, @title) %> +<%= @title %> Hello <%= EmailBatchProgression::VAR_FIRST_NAME %> -- diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notinvite.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notinvite.text.erb index 05d50f493..372ab08da 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notinvite.text.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notinvite.text.erb @@ -1,4 +1,4 @@ -<% provide(:title, @title) %> +<%= @title %> Hello <%= EmailBatchProgression::VAR_FIRST_NAME %> -- diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notlike.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notlike.text.erb index 86ea83312..9dddb6ca6 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notlike.text.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/reg_notlike.text.erb @@ -1,4 +1,4 @@ -<% provide(:title, @title) %> +<%= @title %> Hello <%= EmailBatchProgression::VAR_FIRST_NAME %> -- diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/sess_notgood.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/sess_notgood.text.erb index a0519e8f3..28030d0dd 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/sess_notgood.text.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/sess_notgood.text.erb @@ -1,4 +1,4 @@ -<% provide(:title, @title) %> +<%= @title %> Hello <%= EmailBatchProgression::VAR_FIRST_NAME %> -- diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/sess_notrecord.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/sess_notrecord.text.erb index 614cd98fc..301bef449 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/sess_notrecord.text.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/progress_mailer/sess_notrecord.text.erb @@ -1,4 +1,4 @@ -<% provide(:title, @title) %> +<%= @title %> Hello <%= EmailBatchProgression::VAR_FIRST_NAME %> -- From 30037bc967babe52a4012745cecc22a8ef750d74 Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Sat, 31 May 2014 09:03:18 +0000 Subject: [PATCH 2/2] VRFS-1698 removed sendgrid email error handling --- admin/app/admin/email_error_batch.rb | 29 ------- ruby/lib/jam_ruby.rb | 1 - ruby/lib/jam_ruby/models/email_error.rb | 80 ------------------- .../resque/scheduled/email_error_collector.rb | 15 ---- web/config/scheduler.yml | 5 -- 5 files changed, 130 deletions(-) delete mode 100644 admin/app/admin/email_error_batch.rb delete mode 100644 ruby/lib/jam_ruby/models/email_error.rb delete mode 100644 ruby/lib/jam_ruby/resque/scheduled/email_error_collector.rb diff --git a/admin/app/admin/email_error_batch.rb b/admin/app/admin/email_error_batch.rb deleted file mode 100644 index 9c4ce9280..000000000 --- a/admin/app/admin/email_error_batch.rb +++ /dev/null @@ -1,29 +0,0 @@ -ActiveAdmin.register JamRuby::EmailError, :as => 'Email Errors' do - - menu :label => 'Email Errors', :parent => 'Email' - - config.batch_actions = false - config.filters = false - config.clear_action_items! - - index do - column 'User' do |eerr| - eerr.user ? link_to(eerr.user.name, admin_user_path(eerr.user_id)) : 'N/A' - end - column 'Error Type' do |eerr| eerr.error_type end - column 'Email Address' do |eerr| eerr.email_address end - column 'Status' do |eerr| eerr.status end - column 'Reason' do |eerr| eerr.reason end - column 'Email Date' do |eerr| eerr.email_date end - end - - controller do - - def scoped_collection - @eerrors ||= end_of_association_chain - .includes([:user]) - .order('email_date DESC') - end - end - -end diff --git a/ruby/lib/jam_ruby.rb b/ruby/lib/jam_ruby.rb index 39686c778..dec2cde7a 100755 --- a/ruby/lib/jam_ruby.rb +++ b/ruby/lib/jam_ruby.rb @@ -145,7 +145,6 @@ require "jam_ruby/models/email_batch_periodic" require "jam_ruby/models/email_batch_new_musician" require "jam_ruby/models/email_batch_progression" require "jam_ruby/models/email_batch_set" -require "jam_ruby/models/email_error" require "jam_ruby/app/mailers/async_mailer" require "jam_ruby/app/mailers/batch_mailer" require "jam_ruby/app/mailers/progress_mailer" diff --git a/ruby/lib/jam_ruby/models/email_error.rb b/ruby/lib/jam_ruby/models/email_error.rb deleted file mode 100644 index fe693b849..000000000 --- a/ruby/lib/jam_ruby/models/email_error.rb +++ /dev/null @@ -1,80 +0,0 @@ -module JamRuby - class EmailError < ActiveRecord::Base - self.table_name = "email_errors" - - belongs_to :user, :class_name => 'JamRuby::User' - - default_scope :order => 'email_date DESC' - - ERR_BOUNCE = :bounce - ERR_INVALID = :invalid - - SENDGRID_UNAME = 'jamkazam' - SENDGRID_PASSWD = 'jamjamblueberryjam' - - def self.sendgrid_url(resource, action='get', params='') - start_date, end_date = self.date_range - "https://api.sendgrid.com/api/#{resource}.#{action}.json?api_user=#{EmailError::SENDGRID_UNAME}&api_key=#{EmailError::SENDGRID_PASSWD}&date=1&start_date=#{start_date.strftime('%Y-%m-%d')}&end_date=#{end_date.strftime('%Y-%m-%d')}&#{params}" - end - - def self.date_range - tt = Time.now - if eerr = self.first - return [eerr.email_date, tt] - end - [tt - 1.year, tt] - end - - def self.did_capture?(email_addy) - self.where(:email_address => email_addy).limit(1).first.present? - end - - def self.bounce_errors - uu = self.sendgrid_url('bounces') - response = RestClient.get(uu) - if 200 == response.code - return JSON.parse(response.body).collect do |jj| - next if self.did_capture?(jj['email']) - - ee = EmailError.new - ee.error_type = 'bounces' - ee.email_address = jj['email'] - ee.user_id = User.where(:email => ee.email_address).pluck(:id).first - ee.status = jj['status'] - ee.email_date = jj['created'] - ee.reason = jj['reason'] - ee.save! - # RestClient.delete(self.sendgrid_url('bounces', 'delete', "email=#{ee.email_address}")) - ee - end - end - end - - def self.invalid_errors - uu = self.sendgrid_url('invalidemails') - response = RestClient.get(uu) - if 200 == response.code - return JSON.parse(response.body).collect do |jj| - next if self.did_capture?(jj['email']) - - ee = EmailError.new - ee.error_type = 'invalidemails' - ee.email_address = jj['email'] - ee.user_id = User.where(:email => ee.email_address).pluck(:id).first - ee.email_date = jj['created'] - ee.reason = jj['reason'] - ee.save! - uu = - # RestClient.delete(self.sendgrid_url('invalidemails', 'delete', "email=#{ee.email_address}")) - ee - end - end - end - - def self.capture_errors - EmailError.bounce_errors - EmailError.invalid_errors - end - - end -end diff --git a/ruby/lib/jam_ruby/resque/scheduled/email_error_collector.rb b/ruby/lib/jam_ruby/resque/scheduled/email_error_collector.rb deleted file mode 100644 index 0c6fc9397..000000000 --- a/ruby/lib/jam_ruby/resque/scheduled/email_error_collector.rb +++ /dev/null @@ -1,15 +0,0 @@ -module JamRuby - class EmailErrorCollector - extend Resque::Plugins::LonelyJob - - @queue = :email_error_collector - @@log = Logging.logger[EmailErrorCollector] - - def self.perform - @@log.debug("waking up") - EmailError.capture_errors - @@log.debug("done") - end - - end -end diff --git a/web/config/scheduler.yml b/web/config/scheduler.yml index 71472c3bc..a138cb1de 100644 --- a/web/config/scheduler.yml +++ b/web/config/scheduler.yml @@ -19,11 +19,6 @@ CleanupFacebookSignup: class: "JamRuby::CleanupFacebookSignup" description: "Deletes facebook_signups that are old" -EmailErrorCollector: - cron: "0 14 * * *" - class: "JamRuby::EmailErrorCollector" - description: "Collects sendgrid email errors" - UserProgressEmailer: cron: "30 21 * * *" class: "JamRuby::UserProgressEmailer"