decidim-cleaner 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac1fce1219b0b742c8b61a04692d5347c52143dbfdf68ad79bc7c482828327b9
-  data.tar.gz: 6d2f34f4cefa57d317ac26b025ddf74a86de35f59d0cd036c825644ffc7bdad7
+  metadata.gz: 830980abcb24e1bc570b0294106219460a24215e190908c8536e31dcb88d96bd
+  data.tar.gz: e097f9c47364750b09db17e3227d988b56f9b98a1ed0ff1eae059849c52b0832
 SHA512:
-  metadata.gz: ea06df0a3a5e974bb1d2ed5ddc9ec871a123b1bbedf7a1e096b4d5f18339c90123c0b6ded17e5320687277d711215c01d7db4cd488e86bd8956b4c1b1685c412
-  data.tar.gz: 6d286d5dae2c41de0a6f7e8d12c031c3b45c6a00bc25907e27c60e294b3dc23a32c4e29f24eab57dfb339f9ad667d856b444b6ecfafac008c59ed4177ef26547
+  metadata.gz: 544a4b8ba6f11c41247f6e0fcba99488d84dfdfef55808aa05d3e4d17511d573b51a9490d530156a2f51cdcaeb4427e5cfa90d4c5f59aee496f2b5417918e6ea
+  data.tar.gz: 1ae59307e31ed3124049984fba4da46f95f47abc61facfec08a7942eb0af83e5c9540a06eb7a9605b5662d37ea4cf2ac864e0d8edf5a544756a96110e8325220

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)
 

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:)
-                            .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,31 @@ module Decidim
           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))
-
+                                    .where("last_sign_in_at < ?", email_inactive_before_date(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))
+                                                  .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.last_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 +44,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[6.1]
+  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
-      "4.0.0"
+      "4.1.0"
     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: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Quentinchampenois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-04-19 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