Add the publiees scope on Procedure

app/controllers/admin/procedures_controller.rb

@@ -6,7 +6,7 @@ class Admin::ProceduresController < AdminController
 
   def index
     @procedures = smart_listing_create :procedures,
-      current_administrateur.procedures.published.not_archived.order(created_at: :desc),
+      current_administrateur.procedures.publiees.order(created_at: :desc),
       partial: "admin/procedures/list",
       array: true
 

app/controllers/demo_controller.rb

@@ -6,7 +6,7 @@ class DemoController < ApplicationController
     return redirect_to root_path if Rails.env.production?
 
     smart_listing_create :procedures,
-      Procedure.published.not_archived.order("id DESC"),
+      Procedure.publiees.order("id DESC"),
       partial: "demo/list",
       array: true
   end

app/controllers/users/dossiers_controller.rb

@@ -60,7 +60,7 @@ class Users::DossiersController < UsersController
   end
 
   def new
-    procedure = Procedure.not_archived.published.find(params[:procedure_id])
+    procedure = Procedure.publiees.find(params[:procedure_id])
 
     dossier = Dossier.create(procedure: procedure, user: current_user, state: 'draft')
     siret = params[:siret] || current_user.siret

app/models/gestionnaire.rb

@@ -108,7 +108,7 @@ class Gestionnaire < ActiveRecord::Base
     start_date = DateTime.now.beginning_of_week
 
     active_procedure_overviews = procedures
-                            .published
+                            .publiees
                             .map { |procedure| procedure.procedure_overview(start_date) }
                             .select(&:had_some_activities?)
 

app/models/procedure.rb

@@ -32,6 +32,7 @@ class Procedure < ActiveRecord::Base
   mount_uploader :logo, ProcedureLogoUploader
 
   default_scope { where(hidden_at: nil) }
+  scope :publiees, -> { where.not(published_at: nil).where(archived_at: nil) }
   scope :publiee_ou_archivee, -> { where.not(published_at: nil) }
   scope :not_published, -> { where(published_at: nil) }
   scope :archived, -> { where.not(archived_at: nil) }
@@ -64,7 +65,7 @@ class Procedure < ActiveRecord::Base
   end
 
   def self.active id
-    not_archived.published.find(id)
+    publiees.find(id)
   end
 
   def switch_types_de_champ index_of_first_element

app/views/administrations/_list.html.haml

@@ -18,7 +18,7 @@
               = admin.last_sign_in_at.localtime.strftime('%d/%m/%Y')
               )
           %td
-            = admin.procedures.published.count
+            = admin.procedures.publiees.count
           %td
             - total_dossier = 0
             - admin.procedures.each do |procedure| total_dossier += procedure.dossiers.state_not_brouillon.count end

app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml

@@ -19,7 +19,7 @@
       .procedure-list-element{ class: @active_class }
         Actives
         .badge.progress-bar-success
-          = current_administrateur.procedures.published.not_archived.count
+          = current_administrateur.procedures.publiees.count
 
     %a#archived-procedures{ :href => "#{url_for :admin_procedures_archived}" }
       .procedure-list-element{ class: @archived_class }

app/workers/auto_archive_procedure_worker.rb

@@ -2,7 +2,7 @@ class AutoArchiveProcedureWorker
   include Sidekiq::Worker
 
   def perform(*args)
-    Procedure.not_archived.where("auto_archive_on <= ?", Date.today).each do |procedure|
+    Procedure.publiees.where("auto_archive_on <= ?", Date.today).each do |procedure|
       procedure.dossiers.state_en_construction.each do |dossier|
         dossier.received!
       end

spec/workers/auto_archive_procedure_worker_spec.rb

@@ -1,10 +1,10 @@
 require 'rails_helper'
 
 RSpec.describe AutoArchiveProcedureWorker, type: :worker do
-  let!(:procedure) { create(:procedure, archived_at: nil, auto_archive_on: nil )}
+  let!(:procedure) { create(:procedure, published_at: Time.now, archived_at: nil, auto_archive_on: nil )}
-  let!(:procedure_hier) { create(:procedure, archived_at: nil, auto_archive_on: 1.day.ago )}
+  let!(:procedure_hier) { create(:procedure, published_at: Time.now, archived_at: nil, auto_archive_on: 1.day.ago )}
-  let!(:procedure_aujourdhui) { create(:procedure, archived_at: nil, auto_archive_on: Date.today )}
+  let!(:procedure_aujourdhui) { create(:procedure, published_at: Time.now, archived_at: nil, auto_archive_on: Date.today )}
-  let!(:procedure_demain) { create(:procedure, archived_at: nil, auto_archive_on: 1.day.from_now )}
+  let!(:procedure_demain) { create(:procedure, published_at: Time.now, archived_at: nil, auto_archive_on: 1.day.from_now )}
 
   subject { AutoArchiveProcedureWorker.new.perform }