decidim-cleaner 0.1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1e9caaddab424c8f9e7f90ae9b768821eb59a2c4084920087b753d23113bb78
-  data.tar.gz: 357866aea4f46dbc6cce35b2a2824f2ace75f9488704ae982e1a9855132c1a87
+  metadata.gz: c9fd35840bd986218c10726232aa523b811331ec05cb78d6ae52b0352e434862
+  data.tar.gz: 2edf1e583c38516e4d7eefd51f4116cb883e4f823643c605df4f40ae4718684f
 SHA512:
-  metadata.gz: b19b452a1070f8d826a5dd71989cad8eee27cfac1c90c58bced93c916e10553d5a5694c24728291d00f0c1017e049db0227cfc2168ac7e6f56b319c41342f0ee
-  data.tar.gz: 717d7ad9eed4605e7700bdf7e4175042c01812296f2bc1ff2ad3ab95cdc204e85cec95ac0a23eceb8db60bc86c93847aa71e90f3499db2771d696a26e3da48e1
+  metadata.gz: e0c59579a5fe21080c697d6553b2983b21f242d62687c7fb7e700e86c5a01617762cdd8019a0b9258719d1534f5be29a00faa0580208ae92c31dc6fedb6d536f
+  data.tar.gz: aca024679460c2a7fd0896e426c3b2de5f6aee923595b572bdfae1f2cb419090ae5a5dba6d898d4e38a744b67a0caff17b2ed2eb583bd883156cad4c063df912

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,26 +9,32 @@ 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)
                                     .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)
+                                                  .where("last_sign_in_at < ?", Time.zone.now - (organization.delete_inactive_users_after || 390).days))
         end
       end
 
       def send_warning(users)
-        users.each do |user|
+        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
       end
 
       def delete_user_and_send_email(users)
-        users.each do |user|
+        users.find_each do |user|
+          next if user.deleted?
+
           InactiveUsersMailer.warning_deletion(user).deliver_now
           Rails.logger.info "Deletion warning sent to #{user.email}"
-          user.delete
-          Rails.logger.info "User #{user.email} deleted"
+
+          Decidim::DestroyAccount.call(user, Decidim::DeleteAccountForm.from_params({ delete_reason: I18n.t("decidim.cleaner.delete_reason") }))
+          Rails.logger.info "User with id #{user.id} destroyed"
         end
       end
     end

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/config/i18n-tasks.yml

@@ -1,10 +1,15 @@
 ---
 
 base_locale: en
-locales: [en]
+locales: [en, fr]
 
 ignore_unused:
-  - "decidim.components.cleaner.name"
+  - activemodel.attributes.organization.delete_admin_logs
+  - activemodel.attributes.organization.delete_admin_logs_after
+  - activemodel.attributes.organization.delete_inactive_users
+  - activemodel.attributes.organization.delete_inactive_users_after
+  - activemodel.attributes.organization.delete_inactive_users_email_after
+  - decidim.admin.menu.clean
 
 ignore_missing:
-  - decidim.participatory_processes.scopes.global
+

data/config/locales/en.yml

@@ -7,11 +7,16 @@ en:
         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_email_after: Send email to inactive users before deletion (days, default 365)
+        delete_inactive_users_email_after: Send email to inactive users before deletion
+          (days, default 365)
   decidim:
     admin:
       menu:
         clean: Data cleaner
+      organization:
+        update:
+          error: There was a problem updating this organization.
+          success: Organization updated successfully.
     cleaner:
       admin:
         organization_cleaner:
@@ -20,19 +25,19 @@ en:
           form:
             admin_log_cleaner_title: Admin log
             inactive_users_cleaner_title: Inactive users
+      delete_reason: User deleted because of inactivity
       inactive_users_mailer:
         warning_deletion:
-          body_1: You are inactive since %{days} days on <a href="%{organization_url}"> %{organization_name} </a>.
+          body_1: You are inactive since %{days} days on <a href="%{organization_url}">
+            %{organization_name} </a>.
           body_2: As a result, your account has been deleted.
           greetings: Greetings,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
           hello: Hello
           subject: Your account has been deleted
         warning_inactive:
           body_1: You are inactive since %{days} days on %{organization_name}.
-          body_2: <a href="%{organization_url}">If no reaction within %{remaining_days} days </a>, your account will be deleted.
+          body_2: <a href="%{organization_url}">If no reaction within %{remaining_days}
+            days </a>, your account will be deleted.
           greetings: Greetings,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
           hello: Hello
           subject: Your account is inactive
-    components:
-      cleaner:
-        name: Cleaner

data/config/locales/fr.yml

@@ -4,14 +4,21 @@ fr:
     attributes:
       organization:
         delete_admin_logs: Activer la suppression de l'historique d'administration
-        delete_admin_logs_after: Supprimer l'historique d'administration après (jours, par défaut 365)
+        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_email_after: Envoyer un courriel aux utilisateurs inactifs avant la suppression (jours, par défaut 365)
+        delete_inactive_users_after: Supprimer les utilisateurs inactifs après (jours,
+          par défaut 390)
+        delete_inactive_users_email_after: Envoyer un courriel aux utilisateurs inactifs
+          avant la suppression (jours, par défaut 365)
   decidim:
     admin:
       menu:
         clean: Nettoyeur de données
+      organization:
+        update:
+          error: Une erreur est survenue lors de la mise à jour de l'organisation
+          success: L'organisation a été mise à jour avec succès
     cleaner:
       admin:
         organization_cleaner:
@@ -20,19 +27,19 @@ fr:
           form:
             admin_log_cleaner_title: Historique d'administration
             inactive_users_cleaner_title: Utilisateurs inactifs
+      delete_reason: Utilisateur supprimé pour inactivité
       inactive_users_mailer:
         warning_deletion:
-          body_1: Vous êtes inactif depuis %{days} jours sur <a href="%{organization_url}"> %{organization_name} </a>.
+          body_1: Vous êtes inactif depuis %{days} jours sur <a href="%{organization_url}">
+            %{organization_name} </a>.
           body_2: Par conséquent, votre compte a été supprimé.
           greetings: Cordialement,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
           hello: Bonjour
           subject: Votre compte a été supprimé
         warning_inactive:
           body_1: Vous êtes inactif depuis %{days} jours sur %{organization_name}.
-          body_2: <a href="%{organization_url}">Si aucune réaction dans les %{remaining_days} jours</a>, votre compte sera supprimé.
+          body_2: <a href="%{organization_url}">Si aucune réaction dans les %{remaining_days}
+            jours</a>, votre compte sera supprimé.
           greetings: Cordialement,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
           hello: Bonjour
           subject: Votre compte est inactif
-    components:
-      cleaner:
-        name: Nettoyeur

data/lib/decidim/cleaner/admin_engine.rb

@@ -9,6 +9,10 @@ module Decidim
       paths["db/migrate"] = nil
       paths["lib/tasks"] = nil
 
+      def load_seed
+        nil
+      end
+
       initializer "decidim_admin.admin_settings_menu" do
         Decidim.menu :admin_settings_menu do |menu|
           menu.add_item :clean_organization,
@@ -19,10 +23,6 @@ module Decidim
                         active: is_active_link?(decidim_admin.edit_organization_cleaner_path)
         end
       end
-
-      def load_seed
-        nil
-      end
     end
   end
 end

data/lib/decidim/cleaner/engine.rb

@@ -8,10 +8,6 @@ module Decidim
     # This is the engine that runs on the public interface of cleaner.
     class Engine < ::Rails::Engine
       isolate_namespace Decidim::Cleaner
-
-      initializer "Cleaner.webpacker.assets_path" do
-        Decidim.register_assets_path File.expand_path("app/packs", root)
-      end
     end
   end
 end

data/lib/decidim/cleaner/version.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
+# :nocov:
 module Decidim
   # This holds the decidim-meetings version.
   module Cleaner
     def self.version
-      "0.1.0"
+      "1.0.1"
     end
 
     def self.decidim_version
-      "0.28.0.dev"
+      "0.26"
     end
   end
 end
+# :nocov:

data/lib/decidim/cleaner.rb

@@ -3,7 +3,6 @@
 require "decidim/cleaner/admin"
 require "decidim/cleaner/engine"
 require "decidim/cleaner/admin_engine"
-require "decidim/cleaner/component"
 
 module Decidim
   # This namespace holds the logic of the `Cleaner` module.

data/lib/tasks/decidim_cleaner_tasks.rake

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# :nocov:
 namespace :decidim_cleaner do
   desc "Warns and deletes inactive users"
   task clean_inactive_users: :environment do
@@ -11,3 +12,4 @@ namespace :decidim_cleaner do
     Decidim::Cleaner::CleanAdminLogsJob.perform_now
   end
 end
+# :nocov:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-cleaner
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Quentinchampenois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-03-09 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.28.0.dev
+        version: '0.26'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.0.dev
+        version: '0.26'
 description: Clean outdated data in Decidim's database.
 email:
 - 26109239+Quentinchampenois@users.noreply.github.com
@@ -37,22 +37,15 @@ files:
 - app/commands/decidim/cleaner/admin/update_organization_cleaner.rb
 - app/controllers/decidim/cleaner/admin/application_controller.rb
 - app/controllers/decidim/cleaner/admin/organization_cleaner_controller.rb
-- app/controllers/decidim/cleaner/application_controller.rb
 - app/forms/decidim/cleaner/admin/organization_cleaner_form.rb
-- app/helpers/decidim/cleaner/application_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
-- app/models/decidim/cleaner/application_record.rb
-- app/packs/entrypoints/decidim_cleaner.js
-- app/packs/images/decidim/cleaner/icon.svg
-- app/packs/stylesheets/decidim/cleaner/cleaner.scss
 - app/permissions/decidim/cleaner/admin/permissions.rb
 - app/views/decidim/cleaner/admin/organization_cleaner/_form.html.erb
 - app/views/decidim/cleaner/admin/organization_cleaner/edit.html.erb
 - app/views/decidim/cleaner/inactive_users_mailer/warning_deletion.html.erb
 - app/views/decidim/cleaner/inactive_users_mailer/warning_inactive.html.erb
-- config/assets.rb
 - config/i18n-tasks.yml
 - config/locales/en.yml
 - config/locales/fr.yml
@@ -62,7 +55,6 @@ files:
 - lib/decidim/cleaner.rb
 - lib/decidim/cleaner/admin.rb
 - lib/decidim/cleaner/admin_engine.rb
-- lib/decidim/cleaner/component.rb
 - lib/decidim/cleaner/engine.rb
 - lib/decidim/cleaner/test/factories.rb
 - lib/decidim/cleaner/version.rb
@@ -84,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:
   - - ">="

data/app/controllers/decidim/cleaner/application_controller.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Cleaner
-    # This controller is the abstract class from which all other controllers of
-    # this engine inherit.
-    #
-    # Note that it inherits from `Decidim::Components::BaseController`, which
-    # override its layout and provide all kinds of useful methods.
-    class ApplicationController < Decidim::Components::BaseController
-    end
-  end
-end

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

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Cleaner
-    # Custom helpers, scoped to the cleaner engine.
-    #
-    module ApplicationHelper
-    end
-  end
-end

data/app/models/decidim/cleaner/application_record.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Cleaner
-    # Abstract class from which all models in this engine inherit.
-    class ApplicationRecord < ActiveRecord::Base
-      self.abstract_class = true
-    end
-  end
-end

data/app/packs/entrypoints/decidim_cleaner.js

@@ -1,2 +0,0 @@
-// Images
-require.context("../images", true)

data/app/packs/images/decidim/cleaner/icon.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 35"><path d="M17.5 35A17.5 17.5 0 1 1 35 17.5 17.52 17.52 0 0 1 17.5 35zm0-33.06A15.56 15.56 0 1 0 33.06 17.5 15.57 15.57 0 0 0 17.5 1.94zm9.5 13.7H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zm0 3.68H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zM22.26 23H8a1 1 0 0 1 0-1.94h14.26a1 1 0 0 1 0 1.94z"/></svg>

data/app/packs/stylesheets/decidim/cleaner/cleaner.scss

@@ -1 +0,0 @@
-/* css for decidim_cleaner */

data/config/assets.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-base_path = File.expand_path("..", __dir__)
-
-Decidim::Webpacker.register_path("#{base_path}/app/packs")
-Decidim::Webpacker.register_entrypoints(
-  decidim_cleaner: "#{base_path}/app/packs/entrypoints/decidim_cleaner.js"
-)
-Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/cleaner/cleaner")

data/lib/decidim/cleaner/component.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require "decidim/components/namer"
-
-Decidim.register_component(:cleaner) do |component|
-  component.engine = Decidim::Cleaner::Engine
-  component.admin_engine = Decidim::Cleaner::AdminEngine
-  component.icon = "decidim/cleaner/icon.svg"
-
-  # component.on(:before_destroy) do |instance|
-  #   # Code executed before removing the component
-  # end
-
-  # These actions permissions can be configured in the admin panel
-  # component.actions = %w()
-
-  # component.settings(:global) do |settings|
-  #   # Add your global settings
-  #   # Available types: :integer, :boolean
-  #   # settings.attribute :vote_limit, type: :integer, default: 0
-  # end
-
-  # component.settings(:step) do |settings|
-  #   # Add your settings per step
-  # end
-
-  # component.register_resource(:some_resource) do |resource|
-  #   # Register a optional resource that can be references from other resources.
-  #   resource.model_class_name = "Decidim::Cleaner::SomeResource"
-  #   resource.template = "decidim/cleaner/some_resources/linked_some_resources"
-  # end
-
-  # component.register_stat :some_stat do |context, start_at, end_at|
-  #   # Register some stat number to the application
-  # end
-
-  # component.seeds do |participatory_space|
-  #   # Add some seeds for this component
-  # end
-end