Reverted opt in change

joshsoftware · Aug 31, 2018 · b490542 · b490542
1 parent 5833593
commit b490542
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/app/workers/light/enqueue.rb b/app/workers/light/enqueue.rb
@@ -5,7 +5,7 @@ class Enqueue
 
     def perform(email)
       date = Date.today.strftime("%Y%m")
-      news = Light::Newsletter.where(newsletter_type: Light::Newsletter::VALID_NEWSLETTER_TYPES[:OPT_IN]).
+      news = Light::Newsletter.where(newsletter_type: Light::Newsletter::VALID_NEWSLETTER_TYPES[:MONTHLY]).
         order_by([:sent_on, :desc]).first
       Light::UserMailer.welcome_message(email, news, 'test_user_dummy_id').deliver if news
     end

diff --git a/app/workers/light/user_worker.rb b/app/workers/light/user_worker.rb
@@ -5,20 +5,20 @@ class UserWorker
 
     def perform
       date = Date.today.strftime("%Y%m")
-      #number_of_subscribed_users = Light::User.where(is_subscribed: true, :sent_on.nin => [date]).count
-      number_of_subscribed_users = Light::User.users_for_opt_in_mail.count
+      number_of_subscribed_users = Light::User.where(is_subscribed: true, :sent_on.nin => [date],  is_blocked: {"$ne" => true}).count
+      #number_of_subscribed_users = Light::User.users_for_opt_in_mail.count
       number_of_subscribed_users_count = number_of_subscribed_users
       current_batch = 0
       users_in_batch = 250
-      #newsletter = Light::Newsletter.where(newsletter_type: Light::Newsletter::VALID_NEWSLETTER_TYPES[:MONTHLY]).
-      #  order_by([:sent_on, :desc]).first
-
-      newsletter = Light::Newsletter.where(newsletter_type: Light::Newsletter::VALID_NEWSLETTER_TYPES[:OPT_IN]).
+      newsletter = Light::Newsletter.where(newsletter_type: Light::Newsletter::VALID_NEWSLETTER_TYPES[:MONTHLY]).
         order_by([:sent_on, :desc]).first
+
+      #newsletter = Light::Newsletter.where(newsletter_type: Light::Newsletter::VALID_NEWSLETTER_TYPES[:OPT_IN]).
+      #  order_by([:sent_on, :desc]).first
       if newsletter
         while number_of_subscribed_users > 0
-          #user_ids = Light::User.where(is_subscribed: true, :sent_on.nin => [date], is_blocked: [nil, false]).order_by([:email_id, :asc]).limit(users_in_batch).skip(users_in_batch*current_batch).collect { |user| user.id.to_s }
-          user_ids  = Light::User.users_for_opt_in_mail.order_by([:email_id, :asc]).limit(users_in_batch).skip(users_in_batch*current_batch).collect { |user| user.id.to_s }
+          user_ids = Light::User.where(is_subscribed: true, :sent_on.nin => [date], , is_blocked: {"$ne" => true}).order_by([:email_id, :asc]).limit(users_in_batch).skip(users_in_batch*current_batch).collect { |user| user.id.to_s }
+          #user_ids  = Light::User.users_for_opt_in_mail.order_by([:email_id, :asc]).limit(users_in_batch).skip(users_in_batch*current_batch).collect { |user| user.id.to_s }
           current_batch += 1
           number_of_subscribed_users -= users_in_batch
           Light::HardWorker.perform_async(user_ids, newsletter.id.to_s, date)