decidim-cleaner 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d719f430907247b84a0cc288639ab222c6120d27e6dc407d6b04f5547fe82a2e
-  data.tar.gz: f176026b4e7218680433e383c266587ce6fa47ea360ac42972452bc4e4446b73
+  metadata.gz: f54787d174b568ded865927e72ec935eda6e9133b7f0852bc9e00e7aa1a3d7ca
+  data.tar.gz: 948c3bf4816c2ce34ce80d3d57196a5712c8fb286343662bfec2bfd3b4e3729a
 SHA512:
-  metadata.gz: 148df6e0913bb0965c4660449f332a647bac902d1ce35c902880ac7e11b4ce07515bef36b7b92d238e2259ba6dc9f4a4d9f956e24e070bcd4ddb4205f8146048
-  data.tar.gz: '073996a639f9961296aea2a95329e400441524e5a088f04fcfa6bf130d81be7658fc29ed4a66d3e5fbbf4b34c38e77f067c48eb0ad03782df06c9eab1bc42823'
+  metadata.gz: a6eac33bbda665f50c8e2e0ac84e7b5c7ee143e6adce9c624a31e9cb89ab9d2c31cb57c92cad167ee84420bf176ccf236a6a055bc288556cdfcc76cda940dcf5
+  data.tar.gz: bac945ce0b0830278a2536242d0397e6bf8f78d448de866bf4ff23ebb047726c7c3d74cacd43e35b570ed469d39dcf189a6f025efc1dc36770c242d3bbd4a116

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/commands/decidim/cleaner/admin/update_organization_cleaner.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic for updating the current
       # organization cleaner.
-      class UpdateOrganizationCleaner < Decidim::Command
+      class UpdateOrganizationCleaner < Rectify::Command
         # Public: Initializes the command.
         #
         # organization - The Organization that will be updated.

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

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

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

@@ -9,17 +9,21 @@ module Decidim
         Decidim::Organization.find_each do |organization|
           next unless organization.delete_inactive_users?
 
-          send_warning(Decidim::User.where(organization:)
+          send_warning(Decidim::User.where(organization: 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:).where("last_sign_in_at < ?", Time.zone.now - (organization.delete_inactive_users_after || 390).days))
+
+          delete_user_and_send_email(Decidim::User.where(organization: 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
@@ -27,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:)
+          mail(to: user.email, subject: 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:)
+          mail(to: user.email, subject: subject)
         end
       end
     end

data/db/migrate/20230106105014_add_delete_admin_logs_to_organization.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddDeleteAdminLogsToOrganization < ActiveRecord::Migration[6.1]
+class AddDeleteAdminLogsToOrganization < ActiveRecord::Migration[5.2]
   def change
     add_column :decidim_organizations, :delete_admin_logs, :boolean, default: false, null: false
     add_column :decidim_organizations, :delete_admin_logs_after, :integer

data/db/migrate/20230110150032_add_delete_inactive_users_to_organization.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddDeleteInactiveUsersToOrganization < ActiveRecord::Migration[6.1]
+class AddDeleteInactiveUsersToOrganization < ActiveRecord::Migration[5.2]
   def change
     add_column :decidim_organizations, :delete_inactive_users, :boolean, default: false, null: false
     add_column :decidim_organizations, :delete_inactive_users_email_after, :integer

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.0"
+      "2.0.0"
     end
 
-    def self.decidim_version
-      "0.26"
+    def self.compatible_decidim_version
+      "0.26.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-cleaner
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Quentinchampenois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-03 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.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.26'
+        version: 0.26.0
 description: Clean outdated data in Decidim's database.
 email:
 - 26109239+Quentinchampenois@users.noreply.github.com
@@ -76,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: 2.7.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="