Added guard to help prevent double sending emails and restored the ability to display featured jobs in the Popular Protip mailer

just3ws · just3ws · commit 204adaf47880 · 2014-09-03T21:14:57.000-05:00
diff --git a/app/mailers/mail_preview.rb b/app/mailers/mail_preview.rb
@@ -5,6 +5,7 @@ def popular_protips
     from = 60.days.ago
     to = 0.days.ago
     user = User.with_username(USERNAME)
+    REDIS.srem(ProtipMailer::CAMPAIGN_ID, user.id.to_s)
     protips = ProtipMailer::Queries.popular_protips(from, to)
     ProtipMailer.popular_protips(user, protips, from, to).deliver
   end
diff --git a/app/mailers/notifier_mailer.rb b/app/mailers/notifier_mailer.rb
@@ -26,8 +26,6 @@ class NothingToSendException < Exception
   NEW_APPLICANT_EVENT = 'new_applicant'
   INVOICE_EVENT = 'invoice'
 
-  ACTIVITY_SUBJECT_PREFIX = "[Coderwall]"
-
   def welcome_email(username)
     headers['X-Mailgun-Variables'] = {email_type: WELCOME_EVENT}.to_json
 
diff --git a/app/mailers/protip_mailer.rb b/app/mailers/protip_mailer.rb
@@ -17,15 +17,19 @@ class ProtipMailer < ActionMailer::Base
     protips_count: 'protips'
   }
   ACTIVITY_SUBJECT_PREFIX = '[Coderwall]'
+  CAMPAIGN_ID = 'protip_mailer-popular_protips'
 
   #################################################################################
   def popular_protips(user, protips, from, to)
-    fail 'Protips are required.' if protips.nil? || protips.empty?
     fail 'User is required.' unless user
+    # Skip if this user has already been sent and email for this campaign id.
+    fail "Already sent email to #{user.id} please check Redis SET #{CAMPAIGN_ID}." unless REDIS.sadd(CAMPAIGN_ID, user.id.to_s)
+
+    fail 'Protips are required.' if protips.nil? || protips.empty?
     fail 'From date is required.' unless from
     fail 'To date is required.' unless to
 
-    headers['X-Mailgun-Campaign-Id'] = 'protip_mailer-popular_protips'
+    headers['X-Mailgun-Campaign-Id'] = CAMPAIGN_ID
 
     @user = user
     @protips = protips
@@ -44,7 +48,7 @@ def popular_protips(user, protips, from, to)
     end.first
     @most = nil if @most && (@most[@star_stat] <= 0)
 
-    mail(to: @user.email, subject: "#{ACTIVITY_SUBJECT_PREFIX} protips just for you, algorithmically picked w/:heart:")
+    mail(to: @user.email, subject: "protips just for you, algorithmically picked w/:heart:")
   rescue Exception => ex
     abort_delivery(ex)
   end
diff --git a/app/views/protip_mailer/popular_protips.html.haml b/app/views/protip_mailer/popular_protips.html.haml
@@ -33,7 +33,9 @@
                                   Coderwall is Open Source!
                                 %h3{style: "#{nopad} #{sans_serif} font-size: 16px; line-height: 22px; color: #48494E; font-weight: normal;"}
                                   Coderwall is an open product on Assembly. Every software product on Assembly is a collaborative effort including the vision, development, design, and marketing. Each month a product's revenue is collected & split amongst all involved. Want to help make Coderwall better?
-                                  %a{href: 'https://assembly.com/coderwall', style: "#{nopad} color: #3d8dcc;"} Jump in and get started!
+                                  %a{href: 'http://hackernoons.com/all-our-coderwall-are-belong-to-you', style: "#{nopad} color: #3d8dcc;"} Read the announcement
+                                  or
+                                  %a{href: 'https://assembly.com/coderwall', style: "#{nopad} color: #3d8dcc;"} jump in and get started!
 
 
               %table.outside{border: 0, cellpadding: 0, cellspacing: 0, style: "margin: 0 auto; padding: 0 40px 20px 40px; width: 600px; background: #fff;", width: 600}
