[Fix #503] Dossier: remove updated

app/controllers/users/carte_controller.rb

@@ -56,7 +56,7 @@ class Users::CarteController < UsersController
 
   def self.route_authorization
     {
-        states: [:draft, :initiated, :updated],
+        states: [:draft, :initiated],
         api_carto: true
     }
   end

app/controllers/users/description_controller.rb

@@ -93,7 +93,7 @@ class Users::DescriptionController < UsersController
 
   def self.route_authorization
     {
-        states: [:draft, :initiated, :updated]
+        states: [:draft, :initiated]
     }
   end
 

app/controllers/users/recapitulatif_controller.rb

@@ -18,7 +18,7 @@ class Users::RecapitulatifController < UsersController
 
   def self.route_authorization
     {
-        states: [:initiated, :updated, :received, :without_continuation, :closed, :refused]
+        states: [:initiated, :received, :without_continuation, :closed, :refused]
     }
   end
 

app/models/dossier.rb

@@ -2,7 +2,6 @@ class Dossier < ActiveRecord::Base
   enum state: {
     draft:                'draft',
     initiated:            'initiated',
-    updated:              'updated',              # etude par l'administration en cours
     received:             'received',
     closed:               'closed',
     refused:              'refused',
@@ -11,7 +10,7 @@ class Dossier < ActiveRecord::Base
 
   BROUILLON = %w(draft)
   NOUVEAUX = %w(initiated)
-  EN_CONSTRUCTION = %w(initiated updated)
+  EN_CONSTRUCTION = %w(initiated)
   EN_INSTRUCTION = %w(received)
   EN_CONSTRUCTION_OU_INSTRUCTION = EN_CONSTRUCTION + EN_INSTRUCTION
   A_INSTRUIRE = %w(received)
@@ -163,16 +162,6 @@ class Dossier < ActiveRecord::Base
       end
     when 'gestionnaire'
       case action
-      when 'comment'
-        if updated?
-          initiated!
-        elsif initiated?
-          initiated!
-        end
-      when 'follow'
-        if initiated?
-          updated!
-        end
       when 'close'
         if received?
           self.attestation = build_attestation

app/views/dossiers/_dossier_show.html.haml

@@ -13,7 +13,7 @@
         .col-xs-8.title-no-expanse
           .carret-right
           INFORMATIONS DU DEMANDEUR
-        - if !@current_gestionnaire && ["draft", "updated", "initiated"].include?(@facade.dossier.state)
+        - if !@current_gestionnaire && ["draft", "initiated"].include?(@facade.dossier.state)
           %a#add_siret.action{ href: users_dossier_add_siret_path(dossier_id: @facade.dossier.id) }
             .col-lg-4.col-md-4.col-sm-4.col-xs-4.action
               Renseigner un SIRET

config/locales/models/dossier/fr.yml

@@ -10,7 +10,6 @@ fr:
         state:
           draft: "Brouillon"
           initiated: "En construction"
-          updated: "En construction"
           received: "En instruction"
           closed: "Accepté"
           refused: "Refusé"

doc/apipie_examples.json

@@ -45,7 +45,7 @@
           "updated_at": "2008-09-01T08:05:00.000Z",
           "archived": false,
           "mandataire_social": false,
-          "state": "updated",
+          "state": "initiated",
           "simplified_state": "En construction",
           "initiated_at": "2017-04-11T12:00:12.000Z",
           "received_at": null,

spec/controllers/backoffice/commentaires_controller_spec.rb

@@ -113,19 +113,15 @@ describe Backoffice::CommentairesController, type: :controller do
 
       describe 'change dossier state after post a comment' do
         context 'gestionnaire is connected' do
-          context 'when dossier is at state updated' do
+          context 'when dossier is at state initiated' do
             before do
               sign_in gestionnaire
-              dossier.updated!
+              dossier.initiated!
 
               post :create, params: {dossier_id: dossier_id, texte_commentaire: texte_commentaire}
               dossier.reload
             end
 
-            subject { dossier.state }
-
-            it { is_expected.to eq('initiated') }
-
             it 'Notification email is send' do
               expect(NotificationMailer).to receive(:new_answer).and_return(NotificationMailer)
               expect(NotificationMailer).to receive(:deliver_now!)

spec/controllers/new_gestionnaire/procedures_controller_spec.rb

@@ -142,7 +142,7 @@ describe NewGestionnaire::ProceduresController, type: :controller do
             create(:dossier, procedure: procedure, state: "without_continuation", archived: true)
 
             gestionnaire.procedures << procedure2
-            create(:dossier, :followed, procedure: procedure2, state: "updated")
+            create(:dossier, :followed, procedure: procedure2, state: "initiated")
             create(:dossier, procedure: procedure2, state: "closed")
             gestionnaire.followed_dossiers << create(:dossier, procedure: procedure2, state: "received")
 

spec/decorators/dossier_decorator_spec.rb

@@ -27,11 +27,6 @@ describe DossierDecorator do
       expect(subject).to eq('En construction')
     end
 
-    it 'updated is mis à jour' do
-      dossier.updated!
-      expect(subject).to eq('En construction')
-    end
-
     it 'closed is traité' do
       dossier.closed!
       expect(subject).to eq('Accepté')
@@ -74,7 +69,7 @@ describe DossierDecorator do
 
       context "when the dossier is not in brouillon state" do
         before do
-          dossier.state = 'updated'
+          dossier.state = 'initiated'
           dossier.save
         end
 

spec/facades/admin_procedures_show_facades_spec.rb

@@ -7,7 +7,6 @@ describe AdminProceduresShowFacades do
   let!(:dossier_1) { create(:dossier,  procedure: procedure, state: 'initiated') }
   let!(:dossier_2) { create(:dossier,  procedure: procedure, state: 'initiated') }
   let!(:dossier_6) { create(:dossier,  procedure: procedure, archived: true, state: 'initiated') }
-  let!(:dossier_7) { create(:dossier,  procedure: procedure, state: 'updated') }
 
   subject { AdminProceduresShowFacades.new procedure }
 
@@ -20,13 +19,13 @@ describe AdminProceduresShowFacades do
   describe '.dossiers' do
     subject { super().dossiers }
 
-    it { expect(subject.size).to eq(4) }
+    it { expect(subject.size).to eq(3) }
   end
 
   describe '.dossiers_for_pie_highchart' do
     subject { super().dossiers_for_pie_highchart }
 
-    it { expect(subject).to eq({ 'En construction' => 3 }) }
+    it { expect(subject).to eq({ 'En construction' => 2 }) }
   end
 
   describe '.dossiers_archived_by_state_total' do
@@ -47,7 +46,7 @@ describe AdminProceduresShowFacades do
   describe 'dossiers_total' do
     subject { super().dossiers_total }
 
-    it { is_expected.to eq(4) }
+    it { is_expected.to eq(3) }
   end
 
   describe 'dossiers_termine_total' do

spec/features/backoffice/add_commentaire_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 feature 'add commentaire on backoffice' do
   let(:procedure) { create(:procedure, :published) }
-  let(:dossier) { create(:dossier, :with_entreprise, procedure: procedure, state: 'updated') }
+  let(:dossier) { create(:dossier, :with_entreprise, procedure: procedure, state: 'initiated') }
   let(:dossier_id) { dossier.id }
   let!(:commentaire) { create(:commentaire, dossier: dossier, email: 'toto@toto.com') }
   let(:email_commentaire) { 'test@test.com' }

spec/features/backoffice/flux_de_commentaires_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 feature 'backoffice: flux de commentaires' do
   let(:procedure) { create(:procedure, :published) }
   let(:gestionnaire) { create(:gestionnaire) }
-  let(:dossier) { create(:dossier, :with_entreprise, procedure: procedure, state: 'updated') }
+  let(:dossier) { create(:dossier, :with_entreprise, procedure: procedure, state: 'initiated') }
   let(:dossier_id) { dossier.id }
 
   let(:champ1) { create(:champ, dossier: dossier, type_de_champ: create(:type_de_champ_public, libelle: "subtitle1")) }

spec/features/backoffice/lateral_page_pref_list_dossier_backoffice_spec.rb

@@ -6,7 +6,7 @@ feature 'usage of pref list dossier lateral panel', js: true do
   let(:procedure) { create(:procedure, :published, administrateur: administrateur) }
 
   before do
-    create(:dossier, :with_entreprise, procedure: procedure, state: 'updated')
+    create(:dossier, :with_entreprise, procedure: procedure, state: 'initiated')
     create :assign_to, procedure: procedure, gestionnaire: gestionnaire
 
     login_as gestionnaire, scope: :gestionnaire

spec/features/backoffice/lateral_page_pref_list_dossier_by_procedure_backoffice_spec.rb

@@ -6,7 +6,7 @@ feature 'usage of pref list dossier lateral panel by procedure', js: true do
   let(:procedure) { create(:procedure, :published, :with_type_de_champ, administrateur: administrateur) }
 
   before do
-    create(:dossier, :with_entreprise, procedure: procedure, state: 'updated')
+    create(:dossier, :with_entreprise, procedure: procedure, state: 'initiated')
     create :assign_to, procedure: procedure, gestionnaire: gestionnaire
 
     login_as gestionnaire, scope: :gestionnaire

spec/features/backoffice/navigate_to_dossier_spec.rb

@@ -6,8 +6,8 @@ feature 'on backoffice page', js: true do
   let(:procedure) { create(:procedure, :published, administrateur: administrateur) }
   let(:procedure_individual) { create :procedure, :published, libelle: 'procedure individual', administrateur: administrateur, for_individual: true }
 
-  let!(:dossier) { create(:dossier, :with_entreprise, procedure: procedure, state: 'updated') }
+  let!(:dossier) { create(:dossier, :with_entreprise, procedure: procedure, state: 'initiated') }
-  let!(:dossier_individual) { create :dossier, procedure: procedure_individual, state: 'updated' }
+  let!(:dossier_individual) { create :dossier, procedure: procedure_individual, state: 'initiated' }
 
   before do
     create :assign_to, gestionnaire: gestionnaire, procedure: procedure
@@ -34,7 +34,7 @@ feature 'on backoffice page', js: true do
     end
 
     context "and goes to the page of a dossier he hasn't access to" do
-      let!(:unauthorized_dossier) { create(:dossier, :with_entreprise, state: 'updated') }
+      let!(:unauthorized_dossier) { create(:dossier, :with_entreprise, state: 'initiated') }
 
       before do
         visit backoffice_dossier_path(unauthorized_dossier)

spec/features/users/onglets_link_spec.rb

@@ -7,7 +7,6 @@ feature 'on click on tabs button' do
 
   before do
     create(:dossier, :with_entreprise, user: user, state: 'initiated')
-    create(:dossier, :with_entreprise, user: user, state: 'updated')
     create(:dossier, :with_entreprise, user: user, state: 'received')
     create(:dossier, :with_entreprise, user: user, state: 'closed')
     create(:dossier, :with_entreprise, user: user, state: 'refused')
@@ -22,7 +21,7 @@ feature 'on click on tabs button' do
     context 'when he click on tabs en construction' do
       before do
         visit users_dossiers_url(liste: :a_traiter)
-        page.click_on 'En construction 2'
+        page.click_on 'En construction 1'
       end
 
       scenario 'it redirect to users dossier termine' do

spec/models/dossier_spec.rb

@@ -188,39 +188,7 @@ describe Dossier do
           context 'when is follow' do
             let(:action) { 'follow' }
 
-            it { is_expected.to eq 'updated' }
+            it { is_expected.to eq 'initiated' }
-          end
-        end
-      end
-
-      context 'when dossier is at state updated' do
-        before do
-          dossier.updated!
-        end
-
-        context 'when user is connect' do
-          let(:role) { 'user' }
-
-          context 'when is post a comment' do
-            let(:action) { 'comment' }
-
-            it { is_expected.to eq('updated') }
-          end
-
-          context 'when is updated dossier informations' do
-            let(:action) { 'update' }
-
-            it { is_expected.to eq('updated') }
-          end
-        end
-
-        context 'when gestionnaire is connect' do
-          let(:role) { 'gestionnaire' }
-
-          context 'when is post a comment' do
-            let(:action) { 'comment' }
-
-            it { is_expected.to eq('initiated') }
           end
         end
       end

spec/services/user_routes_authorization_service_spec.rb

@@ -23,11 +23,6 @@ describe UserRoutesAuthorizationService do
         it { is_expected.to be_falsey }
       end
 
-      describe 'updated' do
-        let(:state) { 'updated' }
-        it { is_expected.to be_falsey }
-      end
-
       describe 'closed' do
         let(:state) { 'closed' }
         it { is_expected.to be_falsey }
@@ -48,11 +43,6 @@ describe UserRoutesAuthorizationService do
           it { is_expected.to be_falsey }
         end
 
-        describe 'updated' do
-          let(:state) { 'updated' }
-          it { is_expected.to be_falsey }
-        end
-
         describe 'closed' do
           let(:state) { 'closed' }
           it { is_expected.to be_falsey }
@@ -72,11 +62,6 @@ describe UserRoutesAuthorizationService do
           it { is_expected.to be_truthy }
         end
 
-        describe 'updated' do
-          let(:state) { 'updated' }
-          it { is_expected.to be_truthy }
-        end
-
         describe 'closed' do
           let(:state) { 'closed' }
           it { is_expected.to be_falsey }
@@ -97,11 +82,6 @@ describe UserRoutesAuthorizationService do
         it { is_expected.to be_truthy }
       end
 
-      describe 'updated' do
-        let(:state) { 'updated' }
-        it { is_expected.to be_truthy }
-      end
-
       describe 'closed' do
         let(:state) { 'closed' }
         it { is_expected.to be_falsey }
@@ -121,11 +101,6 @@ describe UserRoutesAuthorizationService do
         it { is_expected.to be_truthy }
       end
 
-      describe 'updated' do
-        let(:state) { 'updated' }
-        it { is_expected.to be_truthy }
-      end
-
       describe 'closed' do
         let(:state) { 'closed' }
         it { is_expected.to be_truthy }

spec/views/backoffice/dossiers/index_html.haml_spec.rb

@@ -7,7 +7,6 @@ describe 'backoffice/dossiers/index.html.haml', type: :view do
   let!(:procedure) { create(:procedure, :published, administrateur: administrateur) }
 
   let!(:decorate_dossier_initiated) { create(:dossier, :with_entreprise, procedure: procedure, state: 'initiated').decorate }
-  let!(:decorate_dossier_updated) { create(:dossier, :with_entreprise, procedure: procedure, state: 'updated').decorate }
   let!(:decorate_dossier_received) { create(:dossier, :with_entreprise, procedure: procedure, state: 'received').decorate }
   let!(:decorate_dossier_closed) { create(:dossier, :with_entreprise, procedure: procedure, state: 'closed').decorate }
   let!(:decorate_dossier_refused) { create(:dossier, :with_entreprise, procedure: procedure, state: 'refused').decorate }
@@ -20,7 +19,6 @@ describe 'backoffice/dossiers/index.html.haml', type: :view do
   let(:all_state_dossiers_list) { dossiers_list_facade.service.all_state }
 
   before do
-    decorate_dossier_updated.entreprise.update_column(:raison_sociale, 'plep')
     decorate_dossier_received.entreprise.update_column(:raison_sociale, 'plup')
     decorate_dossier_closed.entreprise.update_column(:raison_sociale, 'plyp')
     decorate_dossier_refused.entreprise.update_column(:raison_sociale, 'plzp')
@@ -77,14 +75,13 @@ describe 'backoffice/dossiers/index.html.haml', type: :view do
 
   it { is_expected.to have_content('Nouveaux dossiers 1 dossier') }
   it { is_expected.to have_content('Dossiers suivis 0 dossiers') }
-  it { is_expected.to have_content('Tous les dossiers 6 dossiers') }
+  it { is_expected.to have_content('Tous les dossiers 5 dossiers') }
 
   it { is_expected.to have_content('État') }
   it { is_expected.to have_content('Libellé procédure') }
   it { is_expected.to have_content('Raison sociale') }
   it { is_expected.to have_content('Mise à jour le') }
 
-  it { is_expected.to have_content('plep') }
   it { is_expected.to have_content('plup') }
   it { is_expected.to have_content('plyp') }
 end

spec/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show_spec.rb

@@ -40,18 +40,6 @@ describe 'layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.htm
       include_examples 'button Passer en instruction is present'
     end
 
-    context 'when dossier have state update' do
-      let(:state) { 'updated' }
-
-      before do
-        render
-      end
-
-      it { expect(rendered).to have_content('En construction') }
-
-      include_examples 'button Passer en instruction is present'
-    end
-
     context 'when dossier have state received' do
       let(:state) { 'received' }
 

spec/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show_spec.rb

@@ -20,16 +20,6 @@ describe 'layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.htm
       it { expect(rendered).to have_content('En construction') }
     end
 
-    context 'when dossier state is updated' do
-      let(:state) { 'updated' }
-
-      before do
-        render
-      end
-
-      it { expect(rendered).to have_content('En construction') }
-    end
-
     context 'when dossier state is closed' do
       let(:state) { 'closed' }
 

spec/views/users/dossiers/index_html.haml_spec.rb

@@ -4,7 +4,6 @@ describe 'users/dossiers/index.html.haml', type: :view do
   let(:user) { create(:user) }
 
   let!(:decorate_dossier_initiated) { create(:dossier, :with_entreprise, user: user, state: 'initiated').decorate }
-  let!(:decorate_dossier_updated) { create(:dossier, :with_entreprise, user: user, state: 'updated').decorate }
   let!(:decorate_dossier_received) { create(:dossier, :with_entreprise, user: user, state: 'received').decorate }
   let!(:decorate_dossier_closed) { create(:dossier, :with_entreprise, user: user, state: 'closed').decorate }
   let!(:decorate_dossier_refused) { create(:dossier, :with_entreprise, user: user, state: 'refused').decorate }
@@ -40,7 +39,7 @@ describe 'users/dossiers/index.html.haml', type: :view do
   end
 
   describe 'on tab en construction' do
-    let(:total_dossiers) { 2 }
+    let(:total_dossiers) { 1 }
     let(:active_class) { '.active .text-danger' }
     let(:dossiers_to_display) { user.dossiers.state_en_construction }
     let(:liste) { 'a_traiter' }
@@ -48,10 +47,6 @@ describe 'users/dossiers/index.html.haml', type: :view do
     it_behaves_like 'check_tab_content' do
       let(:decorate_dossier_at_check) { decorate_dossier_initiated }
     end
-
-    it_behaves_like 'check_tab_content' do
-      let(:decorate_dossier_at_check) { decorate_dossier_updated }
-    end
   end
 
   describe 'on tab etude en examen' do

spec/workers/auto_archive_procedure_worker_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe AutoArchiveProcedureWorker, type: :worker do
     let!(:dossier1) { create(:dossier, procedure: procedure_hier, state: 'draft', archived: false)}
     let!(:dossier2) { create(:dossier, procedure: procedure_hier, state: 'initiated', archived: false)}
     let!(:dossier3) { create(:dossier, procedure: procedure_hier, state: 'initiated', archived: false)}
-    let!(:dossier4) { create(:dossier, procedure: procedure_hier, state: 'updated', archived: false)}
+    let!(:dossier4) { create(:dossier, procedure: procedure_hier, state: 'initiated', archived: false)}
     let!(:dossier5) { create(:dossier, procedure: procedure_hier, state: 'received', archived: false)}
     let!(:dossier6) { create(:dossier, procedure: procedure_hier, state: 'closed', archived: false)}
     let!(:dossier7) { create(:dossier, procedure: procedure_hier, state: 'refused', archived: false)}