Merge pull request #103 from sul-dlss/user-notification-changes

setup auto puring of inactive/unconfirmed users via cron; update text…
sul-dlss-deprecated · Dec 21, 2017 · faf0d2c · faf0d2c
2 parents 868c506 + ec8ccb4
commit faf0d2c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -37,7 +37,7 @@ class User < ActiveRecord::Base
   before_save :trim_names
   after_create :signup_for_mailing_list, :if=>lambda{subscribe_to_mailing_list=='1'}
   after_create :create_default_favorites_list # create the default favorites list when accounts are created
-  after_create :inactivate_account, :if=>lambda{Revs::Application.config.require_manual_account_activation == true}
+  after_create :inactivate_account, :if=>lambda{Revs::Application.config.require_manual_account_activation == true && !sunet_user?}
   after_save :create_default_favorites_list # create the default favorites list if it doesn't exist when a user logs in
 
   validate :check_role_name

diff --git a/app/views/revs_mailer/new_users_notification.erb b/app/views/revs_mailer/new_users_notification.erb
@@ -4,5 +4,5 @@
     <meta charset="utf-8" />
   </head>
   <body>
-<p><%=@num_users%> users have registered on the Automobility Archive and require activation.</p>
+<p><%=@num_users%> users have registered on the Automobility Archive and require activation.  Visit <a href="https://automobility.stanford.edu/admin/users?filter_status=inactive_new">the admin interface</a> to approve.</p>
 </body></html>
diff --git a/config/schedule.rb b/config/schedule.rb
@@ -2,14 +2,23 @@
 
 if ['production','staging'].include? @environment
 
-  every 5.days, :at => '1:00 am' do
+  every 5.days, :at => '12:00 am' do
     rake "blacklight:delete_old_searches[5]"
   end
 
   every 1.days, :at => '1:00 am' do
     rake "revs:notify_new_registrations"
   end
 
+  every 1.days, :at => '2:00 am' do
+    rake "users:purge_unconfirmed_users"
+  end
+
+  every 1.days, :at => '3:00 am' do
+    rake "users:purge_inactive_users"
+  end
+
+
 end
 
 if ['production'].include? @environment
@@ -18,4 +27,4 @@
     rake "-s sitemap:refresh"
   end
 
-end
+end