decidim-cleaner 1.0.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9fd35840bd986218c10726232aa523b811331ec05cb78d6ae52b0352e434862
-  data.tar.gz: 2edf1e583c38516e4d7eefd51f4116cb883e4f823643c605df4f40ae4718684f
+  metadata.gz: ac1fce1219b0b742c8b61a04692d5347c52143dbfdf68ad79bc7c482828327b9
+  data.tar.gz: 6d2f34f4cefa57d317ac26b025ddf74a86de35f59d0cd036c825644ffc7bdad7
 SHA512:
-  metadata.gz: e0c59579a5fe21080c697d6553b2983b21f242d62687c7fb7e700e86c5a01617762cdd8019a0b9258719d1534f5be29a00faa0580208ae92c31dc6fedb6d536f
-  data.tar.gz: aca024679460c2a7fd0896e426c3b2de5f6aee923595b572bdfae1f2cb419090ae5a5dba6d898d4e38a744b67a0caff17b2ed2eb583bd883156cad4c063df912
+  metadata.gz: ea06df0a3a5e974bb1d2ed5ddc9ec871a123b1bbedf7a1e096b4d5f18339c90123c0b6ded17e5320687277d711215c01d7db4cd488e86bd8956b4c1b1685c412
+  data.tar.gz: 6d286d5dae2c41de0a6f7e8d12c031c3b45c6a00bc25907e27c60e294b3dc23a32c4e29f24eab57dfb339f9ad667d856b444b6ecfafac008c59ed4177ef26547

data/README.md

@@ -22,6 +22,11 @@ bundle exec rails decidim_cleaner:install:migrations
 bundle exec rails db:migrate
 ```
 
+### Sidekiq Scheduler
+[Further documentation](https://github.com/sidekiq-scheduler/sidekiq-scheduler)
+
+**Sidekiq scheduler uses a 6 columns format**
+
 You can then add to your 'config/sidekiq.yml' file:
 
 ```yaml
@@ -36,6 +41,15 @@ You can then add to your 'config/sidekiq.yml' file:
     queue: scheduled
 ```
 
+### Cronjob
+```
+# Warns and deletes inactive users
+0 9 * * * cd /home/user/decidim_application && RAILS_ENV=production bundle exec rake decidim_cleaner:clean_inactive_users
+
+# Deletes old admin logs
+0 9 * * * cd /home/user/decidim_application && RAILS_ENV=production bundle exec rake decidim_cleaner:clean_admin_logs
+```
+
 ## Available tasks
 
 - [ ] **Delete inactive users**

data/app/jobs/decidim/cleaner/clean_admin_logs_job.rb

@@ -9,7 +9,7 @@ module Decidim
         Decidim::Organization.find_each do |organization|
           next unless organization.delete_admin_logs?
 
-          Decidim::ActionLog.where(organization: organization)
+          Decidim::ActionLog.where(organization:)
                             .where("created_at < ?", Time.zone.now - (organization.delete_admin_logs_after || 365).days)
                             .delete_all
         end

data/app/jobs/decidim/cleaner/clean_inactive_users_job.rb

@@ -9,18 +9,21 @@ module Decidim
         Decidim::Organization.find_each do |organization|
           next unless organization.delete_inactive_users?
 
-          send_warning(Decidim::User.where(organization: organization)
+          send_warning(Decidim::User.where(organization:)
+                                    .not_deleted
+                                    .where.not(email: "")
                                     .where("last_sign_in_at < ?", Time.zone.now - (organization.delete_inactive_users_email_after || 365).days)
                                     .where("last_sign_in_at > ?", Time.zone.now - (organization.delete_inactive_users_email_after || 365).days - 1.day))
-          delete_user_and_send_email(Decidim::User.where(organization: organization)
+
+          delete_user_and_send_email(Decidim::User.where(organization:)
+                                                  .not_deleted
+                                                  .where.not(email: "")
                                                   .where("last_sign_in_at < ?", Time.zone.now - (organization.delete_inactive_users_after || 390).days))
         end
       end
 
       def send_warning(users)
         users.find_each do |user|
-          next if user.deleted?
-
           InactiveUsersMailer.warning_inactive(user).deliver_now
           Rails.logger.info "Inactive warning sent to #{user.email}"
         end
@@ -28,8 +31,6 @@ module Decidim
 
       def delete_user_and_send_email(users)
         users.find_each do |user|
-          next if user.deleted?
-
           InactiveUsersMailer.warning_deletion(user).deliver_now
           Rails.logger.info "Deletion warning sent to #{user.email}"
 

data/app/mailers/decidim/cleaner/inactive_users_mailer.rb

@@ -13,7 +13,7 @@ module Decidim
             "decidim.cleaner.inactive_users_mailer.warning_inactive.subject",
             organization_name: @organization.name
           )
-          mail(to: user.email, subject: subject)
+          mail(to: user.email, subject:)
         end
       end
 
@@ -25,7 +25,7 @@ module Decidim
             "decidim.cleaner.inactive_users_mailer.warning_deletion.subject",
             organization_name: @organization.name
           )
-          mail(to: user.email, subject: subject)
+          mail(to: user.email, subject:)
         end
       end
     end

data/lib/decidim/cleaner/version.rb

@@ -5,11 +5,11 @@ module Decidim
   # This holds the decidim-meetings version.
   module Cleaner
     def self.version
-      "1.0.1"
+      "4.0.0"
     end
 
-    def self.decidim_version
-      "0.26"
+    def self.compatible_decidim_version
+      "0.28.dev"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-cleaner
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Quentinchampenois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: 0.28.dev
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: 0.28.dev
 description: Clean outdated data in Decidim's database.
 email:
 - 26109239+Quentinchampenois@users.noreply.github.com