Rake Task and UI changes

- Add rake task to check and update user status to Subscribe and Unsubscribed
- UI fix the navigation bar, paignation and button alignments
- Fix the rake task for Blocked users and web subscription status

Author: Ashish944

app/assets/stylesheets/light/home.css

@@ -2,3 +2,25 @@
   Place all the styles related to the matching controller here.
   They will automatically be included in application.css.
 */
+
+.badge-users-count {
+  margin-top: 10px;
+}
+
+.btn-mail {
+  margin-top: 5px;
+}
+
+#users_per_page {
+  width: 50px;
+  height: 30px;
+}
+
+#searchbox {
+  height: 30px;
+}
+
+.brand {
+  font-weight: bold !important;
+  margin-top: 5px !important;
+}

app/controllers/light/users_controller.rb

@@ -111,19 +111,16 @@ def auto_opt_in
     def opt_in
       @user = Light::User.where(email_id: params[:email]).first
       if @user.present?
-        if @user.is_subscribed.eql?(false)
-          Light::UserMailer.auto_opt_in(@user.email_id, @user.slug, @user.token).deliver
-          #send email
-        end
+        @user.update_attributes(is_subscribed: true,
+                                sidekiq_status: 'Subscribed',
+                                subscribed_at: DateTime.now)
       else
         u_name = params[:username].blank? ? params[:email] : params[:username]
-        @user= Light::User.new(username: u_name, 
-                               email_id: params[:email],
-                               source: 'web subscription request',
-                               sidekiq_status: 'new user')
-        if @user.save
-          Light::UserMailer.auto_opt_in(@user.email_id, @user.slug, @user.token).deliver
-        end
+        @user = Light::User.new(username: u_name, 
+                                email_id: params[:email],
+                                source: 'web subscription request',
+                                subscribed_at: DateTime.now,
+                                sidekiq_status: 'Subscribed')
       end
       respond_to do |format| 
         format.json { head :no_content }

app/models/light/user.rb

@@ -39,8 +39,8 @@ class User
       end
     end
 
-    scope :subscribed_users, -> { where is_subscribed: true }
-    scope :unsubscribed_users, -> { where is_subscribed: false }
+    scope :subscribed_users, -> { where(is_subscribed: true, sidekiq_status: 'Subscribed') }
+    scope :unsubscribed_users, -> { where(is_subscribed: false, sidekiq_status: 'Unsubscribed') }
     scope :new_users, -> { where(is_subscribed: false, sidekiq_status: NEW_USER) }
     scope :blocked_users, -> { where(is_subscribed: false, sidekiq_status: 'Block') }
     scope :bounced_users, -> { where(is_subscribed: false, sidekiq_status: 'Bounced') }

app/views/light/newsletters/_top_navbar.html.haml

@@ -1,4 +1,4 @@
-= nav_bar :brand => "Newsletters", :responsive => true, :static => :top, :fluid => :true do
+= nav_bar :brand => 'Newsletters', :responsive => true, :static => :top, :fluid => :true do
   = menu_group do
     = menu_item "Add Newsletter", new_newsletter_path
     = menu_item "Opt in letters", opt_in_newsletters_path
@@ -10,6 +10,7 @@
 
     = menu_item "Show Users", users_path, ({:method => 'get'} if params[:controller] == 'light/users' && params[:action].in?(['new', 'create']))
   = menu_group :pull => :right do
-    = content_tag :a, "Send Mail", :href => sendmailer_path, :class => 'btn btn-danger', :data => { :confirm => 'Are you sure ?'}
-    = content_tag :a, "Test Mail", :href => testmail_path, :class => "btn btn-success"
+    .btn-mail
+      = content_tag :a, "Send Mail", :href => sendmailer_path, :class => 'btn btn-danger', :data => { :confirm => 'Are you sure ?'}
+      = content_tag :a, "Test Mail", :href => testmail_path, :class => 'btn btn-success'
 %br

app/views/light/users/index.html.haml

@@ -24,10 +24,10 @@
           %option{:value => 'Opt in mail sent'} Opt in Mail Sent: #{Light::User.opt_in_users.count}
 
     %ul.nav.navbar-nav.pull-right
-      %li
-        %h5= raw ("Subscribers: #{badge(Light::User.subscribed_users.count)}")
+      %li.badge-users-count
+        %h5= raw ("Subscribed users: #{badge(Light::User.subscribed_users.count)}")
 
-      %li      
+      %li.badge-users-count
         %h5= raw ("New users: #{badge(Light::User.new_users.count)}")
 
 .row
@@ -55,13 +55,13 @@
 
                 %a{ :href => "/newsletter/users/{{_id.$oid}}", data:{ :confirm => 'Are you sure?', method: 'delete'}, :class => 'btn btn-sm btn-danger' } Delete
 
-      .col-lg-12.padding_none.text-center
+      .col-lg-12.padding_none.pull-right
         #user_pagination.col-lg-12
         .col-lg-6.content
 
 :javascript
   var users_data = #{@users.to_json}
   var total_count = #{@users.count}
-  $('#searchbox').css('height',30)
-  $('.per-page').css('width',90)
   initialize_filterjs_table('#users tbody', users_data, '#user-template', '', [], '#user_pagination', '#users_per_page')
+  $('.per-page').css('width',90)
+  $('.per-page').css('height',30)

lib/tasks/update_user_status.rake

@@ -0,0 +1,67 @@
+namespace :light do
+  desc 'Checking and updating the User status (Subscribed and Unsubscribed)'
+  task :update_user_status => :environment do
+
+    print "\n\n Update the flag is_subscribed for status: "
+    ['Bounced', 'Spam', 'Opt in mail sent', 'Invalid'].each do |status|
+      print "\n #{status} : "
+      print Light::User.where(sidekiq_status: status)
+                   .update_all(is_subscribed: false)[:n]
+      # Keeping is_blocked as is, because we have code sit in there depending on it.
+    end
+
+    print "\n\n Fix the data for Blocked Users : "
+    print "\n Update flags for Block user : "
+    print Light::User.where(sidekiq_status: 'Block')
+                 .update_all(is_subscribed: false, is_blocked: true)[:n]
+
+    print "\n Update status for new_users who are blocked : "
+    print Light::User.where(is_subscribed: false, sidekiq_status: 'new user', is_blocked: true)
+                 .update_all(sidekiq_status: 'Block')[:n]
+
+
+    print "\n\n Update one who dones't have sidekiq_status : "
+    print "\n Unsubscribed : "
+    print Light::User.where(is_subscribed: false, sidekiq_status: nil, :is_blocked.in => [false, nil])
+                 .update_all(sidekiq_status: 'Unsubscribed', unsubscribed_at: DateTime.now)[:n]
+
+    print "\n Block (is_subscribed: false) : "
+    print Light::User.where(is_subscribed: false, is_blocked: true, sidekiq_status: nil)
+                 .update_all(sidekiq_status: 'Block')[:n]
+
+    print "\n Block (is_subscribed: true) : "
+    print Light::User.where(is_subscribed: true, is_blocked: true, sidekiq_status: nil)
+                 .update_all(is_subscribed: false, sidekiq_status: 'Block')[:n]
+
+    print "\n Subscribed : "
+    print Light::User.where(is_subscribed: true, sidekiq_status: nil)
+                 .update_all(sidekiq_status: 'Subscribed')[:n]
+
+    print "\n\n Updated flag value for is_blocked: nil to flase : "
+    print Light::User.where(is_blocked: nil)
+                 .update_all(is_blocked: false)[:n]
+
+    print "\n\n Updated Status for Web Subscription Request : "
+    print Light::User.where(sidekiq_status: 'web subscription request')
+                    .update_all(source: 'web subscription request',
+                                is_subscribed: false,
+                                sidekiq_status: 'Unsubscribed',
+                                unsubscribed_at: DateTime.now)[:n]
+
+    def check_status(status)
+      Light::User.where(sidekiq_status: status).count
+    end
+
+    # Status wise count of User
+    print "\n\n Total no of User Status : " +
+         "\n Subscribed : #{check_status('Subscribed')}" +
+         "\n Unsubscribed : #{check_status('Unsubscribed')}" +
+         "\n New User : #{check_status('new user')}" +
+         "\n Invalid : #{check_status('Invalid')}" +
+         "\n Spam : #{check_status('Spam')}" +
+         "\n Blocked : #{check_status('Block')}" +
+         "\n Bounced : #{check_status('Bounced')}" +
+         "\n Opt in User: #{check_status('Opt in mail sent')} \n\n"
+ end
+end
+