models: add a Procedure#with_hidden scope, and remove unscoped usages

This avoids the broad use of `unscoped` to remove the `hidden_at`
clause.

app/controllers/manager/procedures_controller.rb

@@ -12,7 +12,7 @@ module Manager
         Procedure
       else
         # … but allow them to be searched and displayed.
-        Procedure.unscope(:where)
+        Procedure.with_hidden
       end
     end
 

app/models/procedure.rb

@@ -45,6 +45,8 @@ class Procedure < ApplicationRecord
   accepts_nested_attributes_for :types_de_champ_private, reject_if: proc { |attributes| attributes['libelle'].blank? }, allow_destroy: true
 
   default_scope { where(hidden_at: nil) }
+  scope :hidden,                -> { unscope(where: :hidden_at).where.not(hidden_at: nil) }
+  scope :with_hidden,           -> { unscope(where: :hidden_at) }
   scope :brouillons,            -> { where(aasm_state: :brouillon) }
   scope :publiees,              -> { where(aasm_state: :publiee) }
   scope :closes,                -> { where(aasm_state: [:close, :depubliee]) }

lib/tasks/2017_10_18_regenerate_attestation.rake

@@ -12,7 +12,7 @@ namespace :'2017_10_18_regenerate_attestation' do
   end
 
   def regenerate_attestations(attestation)
-    Procedure.unscoped do
+    Procedure.with_hidden do
       Dossier.unscoped do
         dossier = attestation.dossier
         procedure = dossier.procedure

lib/tasks/2018_05_15_add_aasm_state_to_procedure.rake

@@ -3,6 +3,6 @@ namespace :'2018_05_15_add_aasm_state_to_procedure' do
     Procedure.archivees.update_all(aasm_state: :archivee)
     Procedure.publiees.update_all(aasm_state: :publiee)
     Procedure.brouillons.update_all(aasm_state: :brouillon)
-    Procedure.unscoped.where.not(hidden_at: nil).update_all(aasm_state: :hidden)
+    Procedure.rewhere(hidden_at: nil).update_all(aasm_state: :hidden)
   end
 end

lib/tasks/deployment/20190704133852_create_dummy_paths_for_archived_and_hidden_procedures.rake

@@ -3,11 +3,11 @@ namespace :after_party do
   task create_dummy_paths_for_archived_and_hidden_procedures: :environment do
     rake_puts "Running deploy task 'create_dummy_paths_for_archived_procedures'"
 
-    Procedure.unscoped.archivees.where(path: nil).each do |p|
+    Procedure.with_hidden.archivees.where(path: nil).each do |p|
       p.update_column(:path, SecureRandom.uuid)
     end
 
-    Procedure.unscoped.hidden.where(path: nil).each do |p|
+    Procedure.hidden.where(path: nil).each do |p|
       p.update_column(:path, SecureRandom.uuid)
     end
 

lib/tasks/deployment/20190819142551_create_default_groupe_instructeur.rake

@@ -2,7 +2,7 @@ namespace :after_party do
   desc 'Deployment task: create_default_groupe_instructeur'
   task create_default_groupe_instructeur: :environment do
     Procedure
-      .unscoped
+      .with_hidden
       .left_outer_joins(:groupe_instructeurs)
       .where('groupe_instructeurs.id is null')
       .find_each do |procedure|

spec/models/procedure_spec.rb

@@ -151,6 +151,26 @@ describe Procedure do
     end
   end
 
+  describe 'scopes' do
+    let!(:procedure) { create(:procedure) }
+    let!(:hidden_procedure) { create(:procedure, :hidden) }
+
+    describe 'default_scope' do
+      subject { Procedure.all }
+      it { is_expected.to match_array([procedure]) }
+    end
+
+    describe '.hidden' do
+      subject { Procedure.all.hidden }
+      it { is_expected.to match_array([hidden_procedure]) }
+    end
+
+    describe '.with_hidden' do
+      subject { Procedure.all.with_hidden }
+      it { is_expected.to match_array([procedure, hidden_procedure]) }
+    end
+  end
+
   describe 'validation' do
     context 'libelle' do
       it { is_expected.not_to allow_value(nil).for(:libelle) }