Merge pull request #13341 from demarche-numerique/drop_dead_attribute_procedure_expires_when_termine_enabled

Tech: supprime l'attribut transitoire procedure_expires_when_termine_enabled

Author: mfo

app/components/instructeurs/procedure_counters_component/procedure_counters_component.html.erb

@@ -14,10 +14,8 @@
   <%= dossier_count %>
 <% end %>
 
-<% if procedure.procedure_expires_when_termine_enabled? %>
-  <%= turbo_stream.update "procedure-#{procedure.id}-expirant-count" do %>
-    (<%= expirant_count %>)
-  <% end %>
+<%= turbo_stream.update "procedure-#{procedure.id}-expirant-count" do %>
+  (<%= expirant_count %>)
 <% end %>
 
 <%= turbo_stream.update "procedure-#{procedure.id}-archives-count" do %>

app/components/instructeurs/procedure_summary_component/procedure_summary_component.html.erb

@@ -228,21 +228,19 @@
       <% end %>
     </li>
 
-    <% if p.procedure_expires_when_termine_enabled %>
-      <li class="fr-btn fr-btn--tertiary-no-outline flex justify-center fr-my-1w">
-        <%= link_to(instructeur_procedure_path(p, statut: 'expirant'), class: 'center') do %>
-          <span class="fr-icon-timer-line fr-icon--sm fr-text--bold"></span>
-
-          <div class="fr-text--sm">
-            <%= t('instructeurs.dossiers.labels.close_to_expiration') %>
-
-            <span id="procedure-<%= p.id %>-expirant-count">
-              <%= placeholder_span %>
-            </span>
-          </div>
-        <% end %>
-      </li>
-    <% end %>
+    <li class="fr-btn fr-btn--tertiary-no-outline flex justify-center fr-my-1w">
+      <%= link_to(instructeur_procedure_path(p, statut: 'expirant'), class: 'center') do %>
+        <span class="fr-icon-timer-line fr-icon--sm fr-text--bold"></span>
+
+        <div class="fr-text--sm">
+          <%= t('instructeurs.dossiers.labels.close_to_expiration') %>
+
+          <span id="procedure-<%= p.id %>-expirant-count">
+            <%= placeholder_span %>
+          </span>
+        </div>
+      <% end %>
+    </li>
 
     <li class="fr-btn fr-btn--tertiary-no-outline flex justify-center fr-my-1w">
       <%= link_to(instructeur_procedure_path(p, statut: 'archives'), class: 'center') do %>

app/controllers/administrateurs/procedures_controller.rb

@@ -630,7 +630,6 @@ def procedure_params
         :duree_conservation_dossiers_dans_ds,
         :lien_dpo,
         :opendata,
-        :procedure_expires_when_termine_enabled,
         :rdv_enabled,
         :pro_connect_restriction,
         :robots_indexable,

app/controllers/manager/outdated_procedures_controller.rb

@@ -46,7 +46,6 @@ class ProcedureDashboard < Administrate::BaseDashboard
     repasser_en_instruction_email_template: MailTemplateField,
     attestation_acceptation_template: AttestationTemplateField,
     attestation_refus_template: AttestationTemplateField,
-    procedure_expires_when_termine_enabled: Field::Boolean,
     duree_conservation_dossiers_dans_ds: Field::Number,
     max_duree_conservation_dossiers_dans_ds: Field::Number,
     estimated_duration_visible: Field::Boolean,
@@ -124,7 +123,6 @@ class ProcedureDashboard < Administrate::BaseDashboard
     :repasser_en_instruction_email_template,
     :attestation_acceptation_template,
     :attestation_refus_template,
-    :procedure_expires_when_termine_enabled,
     :duree_conservation_dossiers_dans_ds,
     :max_duree_conservation_dossiers_dans_ds,
     :estimated_duration_visible,
@@ -141,7 +139,6 @@ class ProcedureDashboard < Administrate::BaseDashboard
   # an array of attributes that will be displayed
   # on the model's form (`new` and `edit`) pages.
   FORM_ATTRIBUTES = [
-    :procedure_expires_when_termine_enabled,
     :duree_conservation_dossiers_dans_ds,
     :max_duree_conservation_dossiers_dans_ds,
     :estimated_duration_visible,

app/dashboards/outdated_procedure_dashboard.rb

@@ -17,15 +17,6 @@ def activate_before_expiration(user, reset_password_token)
       reply_to: CONTACT_EMAIL)
   end
 
-  def notify_procedure_expires_when_termine_forced(user_email, procedure)
-    @procedure = procedure
-    @subject = "La suppression automatique des dossiers a été activée sur la démarche #{procedure.libelle}"
-
-    mail(to: user_email,
-      subject: @subject,
-      reply_to: CONTACT_EMAIL)
-  end
-
   def notify_service_without_siret(user_email)
     @subject = "Siret manquant sur un de vos services"
 

app/dashboards/procedure_dashboard.rb

@@ -46,7 +46,6 @@ module ProcedureCloneConcern
     'experts_require_administrateur_invitation',
     'routing_enabled',
     'instructeurs_self_management_enabled',
-    'procedure_expires_when_termine_enabled',
     'zone_id',
     'lien_dpo',
     'replaced_by_procedure_id',

app/jobs/cron/enable_procedure_expires_when_termine_enabled_job.rb

@@ -339,16 +339,12 @@ def classer_sans_suite(motivation: nil, instructeur: nil, processed_at: Time.zon
   scope :termine_close_to_expiration, -> do
     state_termine
       .visible_by_user_or_administration
-      .joins(:procedure)
-      .where(procedures: { procedure_expires_when_termine_enabled: true })
       .where(expired_at: ..(Time.zone.now + Expired::REMAINING_WEEKS_BEFORE_EXPIRATION.weeks))
   end
 
   scope :close_to_expiration, -> do
-    joins(:procedure).scoping do
-      brouillon_close_to_expiration
-        .or(termine_close_to_expiration)
-    end
+    brouillon_close_to_expiration
+      .or(termine_close_to_expiration)
   end
 
   scope :never_touched_brouillon_expired, -> { visible_by_user.brouillon.where.missing(:etablissement, :individual).where(last_champ_updated_at: nil, identity_updated_at: nil, parent_dossier: nil, last_commentaire_updated_at: nil).where(created_at: ..2.weeks.ago) }
@@ -633,10 +629,7 @@ def messagerie_available?
   end
 
   def expirable?
-    [
-      brouillon?,
-      termine? && procedure.procedure_expires_when_termine_enabled,
-    ].any?
+    brouillon? || termine?
   end
 
   def close_to_expiration?