decidim-cleaner 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f54787d174b568ded865927e72ec935eda6e9133b7f0852bc9e00e7aa1a3d7ca
-  data.tar.gz: 948c3bf4816c2ce34ce80d3d57196a5712c8fb286343662bfec2bfd3b4e3729a
+  metadata.gz: a54a64e4729007defe0803975b74c3e2d5d6fbcc66d30fc33c4534f79a496205
+  data.tar.gz: b3c8baca2de78e8536509be9d5ea87a96521c8b9376da7f1dd6cef97f211c240
 SHA512:
-  metadata.gz: a6eac33bbda665f50c8e2e0ac84e7b5c7ee143e6adce9c624a31e9cb89ab9d2c31cb57c92cad167ee84420bf176ccf236a6a055bc288556cdfcc76cda940dcf5
-  data.tar.gz: bac945ce0b0830278a2536242d0397e6bf8f78d448de866bf4ff23ebb047726c7c3d74cacd43e35b570ed469d39dcf189a6f025efc1dc36770c242d3bbd4a116
+  metadata.gz: 9c69c28fcc394795f6fbef9fd340cc35e4068e25983ba321d262416f8406c1b1b0769fc469fd9ab404203f963b10c8da8c8367f266c535fda771087575a2cddd
+  data.tar.gz: 2d7e6f95b56b232137ae8586d4562e59689f54b301360e3a899c5c25e3de237357c5562b442b96f09c018120d52ec47a717ec36b12aa61f51f713f78da1c3c3f

data/README.md

@@ -22,6 +22,19 @@ bundle exec rails decidim_cleaner:install:migrations
 bundle exec rails db:migrate
 ```
 
+You can then modify the default values of the cleaner in your .ENV with the following variables:
+
+```bash
+# Delay until a user is considered inactive and receive a warning email (in days)
+DECIDIM_CLEANER_INACTIVE_USERS_MAIL=
+
+# Delay until a user is deleted after receiving an email (in days)
+DECIDIM_CLEANER_DELETE_INACTIVE_USERS=
+
+# Delay until an admin log is deleted (in days)
+DECIDIM_CLEANER_DELETE_ADMIN_LOGS=
+```
+
 ### Sidekiq Scheduler
 [Further documentation](https://github.com/sidekiq-scheduler/sidekiq-scheduler)
 
@@ -53,7 +66,7 @@ You can then add to your 'config/sidekiq.yml' file:
 ## Available tasks
 
 - [ ] **Delete inactive users**
-  - Cron task that checks for user accounts where `last_sign_in_at` is superior to environment variable `CLEANER_USER_INACTIVITY_LIMIT`. If true, deletes inactive user from the database.
+  - Cron task that checks for user accounts where `current_sign_in_at` is superior to environment variable `CLEANER_USER_INACTIVITY_LIMIT`. If true, deletes inactive user from the database.
 
 - [ ] **Delete old admin logs**
   - Cron task that checks for admin logs where `created_at` is anterior to the time you configured in the back office. If true, deletes old admin logs from the database.

data/app/helpers/decidim/cleaner/delays_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Cleaner
+    module DelaysHelper
+      def email_inactive_after(organization)
+        organization.delete_inactive_users_email_after || Decidim::Cleaner.delete_inactive_users_email_after
+      end
+
+      def delete_inactive_after(organization)
+        organization.delete_inactive_users_after || Decidim::Cleaner.delete_inactive_users_after
+      end
+    end
+  end
+end

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

@@ -10,10 +10,16 @@ module Decidim
           next unless organization.delete_admin_logs?
 
           Decidim::ActionLog.where(organization: organization)
-                            .where("created_at < ?", Time.zone.now - (organization.delete_admin_logs_after || 365).days)
+                            .where("created_at < ?", delete_admin_logs_before_date(organization))
                             .delete_all
         end
       end
+
+      private
+
+      def delete_admin_logs_before_date(organization)
+        Time.zone.now - (organization.delete_admin_logs_after || Decidim::Cleaner.delete_admin_logs_after).days
+      end
     end
   end
 end

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

@@ -12,25 +12,32 @@ module Decidim
           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))
+                                    .where("current_sign_in_at < ?", email_inactive_before_date(organization)))
 
           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))
+                                                  .where("warning_date < ?", delete_inactive_before_date(organization)))
         end
       end
 
       def send_warning(users)
         users.find_each do |user|
-          InactiveUsersMailer.warning_inactive(user).deliver_now
+          next if user.warning_date.present?
+
+          user.update!(warning_date: Time.zone.now) if InactiveUsersMailer.warning_inactive(user).deliver_now
           Rails.logger.info "Inactive warning sent to #{user.email}"
         end
       end
 
       def delete_user_and_send_email(users)
         users.find_each do |user|
+          if user.current_sign_in_at > user.warning_date
+            user.update!(warning_date: nil)
+            Rails.logger.info "User with id #{user.id} has logged in again, warning date reset"
+            next
+          end
+
           InactiveUsersMailer.warning_deletion(user).deliver_now
           Rails.logger.info "Deletion warning sent to #{user.email}"
 
@@ -38,6 +45,16 @@ module Decidim
           Rails.logger.info "User with id #{user.id} destroyed"
         end
       end
+
+      private
+
+      def email_inactive_before_date(organization)
+        Time.zone.now - (organization.delete_inactive_users_email_after || Decidim::Cleaner.delete_inactive_users_email_after).days
+      end
+
+      def delete_inactive_before_date(organization)
+        Time.zone.now - (organization.delete_inactive_users_after || Decidim::Cleaner.delete_inactive_users_after).days
+      end
     end
   end
 end

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

@@ -5,6 +5,7 @@ module Decidim
     # A custom mailer for Decidim so we can notify users
     # when their account was blocked
     class InactiveUsersMailer < Decidim::ApplicationMailer
+      helper Decidim::Cleaner::DelaysHelper
       def warning_inactive(user)
         with_user(user) do
           @user = user

data/app/views/decidim/cleaner/inactive_users_mailer/warning_deletion.html.erb

@@ -1,6 +1,6 @@
 <p class="email-greeting"><%= t ".hello" %></p>
 
-<p class="email-instructions"><%= t(".body_1", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host), days: @organization.delete_inactive_users_after||390).html_safe %></p>
+<p class="email-instructions"><%= t(".body_1", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host), days: email_inactive_after(@organization) + delete_inactive_after(@organization)).html_safe %></p>
 
 <p class="email-instructions"><%= t ".body_2" %></p>
 

data/app/views/decidim/cleaner/inactive_users_mailer/warning_inactive.html.erb

@@ -1,7 +1,7 @@
 <p class="email-greeting"><%= t ".hello" %></p>
 
-<p class="email-instructions"><%= t ".body_1", organization_name: h(@organization.name), days: @organization.delete_inactive_users_email_after %></p>
+<p class="email-instructions"><%= t ".body_1", organization_name: h(@organization.name), days: email_inactive_after(@organization) %></p>
 
-<p class="email-instructions"><%= t(".body_2", remaining_days: (@organization.delete_inactive_users_after||390) - (@organization.delete_inactive_users_email_after||365), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>
+<p class="email-instructions"><%= t(".body_2", remaining_days: delete_inactive_after(@organization), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>
 
 <p class="email-closing"><%= t(".greetings", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>

data/config/locales/en.yml

@@ -6,7 +6,8 @@ en:
         delete_admin_logs: Enable admin logs deletion
         delete_admin_logs_after: Delete admin logs after (days, default 365)
         delete_inactive_users: Enable inactive users deletion
-        delete_inactive_users_after: Delete inactive users after (days, default 390)
+        delete_inactive_users_after: Delete inactive users x days after the mail(days,
+          default 30)
         delete_inactive_users_email_after: Send email to inactive users before deletion
           (days, default 365)
   decidim:

data/config/locales/fr.yml

@@ -7,8 +7,8 @@ fr:
         delete_admin_logs_after: Supprimer l'historique d'administration après (jours,
           par défaut 365)
         delete_inactive_users: Activer la suppression des utilisateurs inactifs
-        delete_inactive_users_after: Supprimer les utilisateurs inactifs après (jours,
-          par défaut 390)
+        delete_inactive_users_after: Supprimer les utilisateurs inactifs au bout de
+          x jours après le courriel (jours, par défaut 30)
         delete_inactive_users_email_after: Envoyer un courriel aux utilisateurs inactifs
           avant la suppression (jours, par défaut 365)
   decidim:

data/db/migrate/20230328094652_add_warning_date_to_users.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddWarningDateToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_users, :warning_date, :datetime
+  end
+end

data/lib/decidim/cleaner/version.rb

@@ -5,7 +5,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Cleaner
     def self.version
-      "2.0.0"
+      "2.1.1"
     end
 
     def self.compatible_decidim_version

data/lib/decidim/cleaner.rb

@@ -7,5 +7,18 @@ require "decidim/cleaner/admin_engine"
 module Decidim
   # This namespace holds the logic of the `Cleaner` module.
   module Cleaner
+    include ActiveSupport::Configurable
+
+    config_accessor :delete_admin_logs_after do
+      ENV.fetch("DECIDIM_CLEANER_DELETE_ADMIN_LOGS", "365").to_i
+    end
+
+    config_accessor :delete_inactive_users_after do
+      ENV.fetch("DECIDIM_CLEANER_DELETE_INACTIVE_USERS", "30").to_i
+    end
+
+    config_accessor :delete_inactive_users_email_after do
+      ENV.fetch("DECIDIM_CLEANER_INACTIVE_USERS_MAIL", "365").to_i
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-cleaner
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Quentinchampenois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -38,6 +38,7 @@ files:
 - app/controllers/decidim/cleaner/admin/application_controller.rb
 - app/controllers/decidim/cleaner/admin/organization_cleaner_controller.rb
 - app/forms/decidim/cleaner/admin/organization_cleaner_form.rb
+- app/helpers/decidim/cleaner/delays_helper.rb
 - app/jobs/decidim/cleaner/clean_admin_logs_job.rb
 - app/jobs/decidim/cleaner/clean_inactive_users_job.rb
 - app/mailers/decidim/cleaner/inactive_users_mailer.rb
@@ -52,6 +53,7 @@ files:
 - config/routes.rb
 - db/migrate/20230106105014_add_delete_admin_logs_to_organization.rb
 - db/migrate/20230110150032_add_delete_inactive_users_to_organization.rb
+- db/migrate/20230328094652_add_warning_date_to_users.rb
 - lib/decidim/cleaner.rb
 - lib/decidim/cleaner/admin.rb
 - lib/decidim/cleaner/admin_engine.rb