REFACTOR: Change dossier state 'SubmitValidated' To 'Submitted'

app/controllers/users/recapitulatif_controller.rb

@@ -25,10 +25,10 @@ class Users::RecapitulatifController < UsersController
     render 'show'
   end
 
-  def submit_validate
+  def submit
     show
 
-    @dossier.next_step! 'user', 'submit_validate'
+    @dossier.next_step! 'user', 'submit'
     flash.notice = 'Dossier déposé avec succès.'
 
     render 'show'

app/decorators/dossier_decorator.rb

@@ -23,7 +23,7 @@ class DossierDecorator < Draper::Decorator
         'Mis à jour'
       when 'validated'
         'Validé'
-      when 'submit_validated'
+      when 'submitted'
         'Déposé'
       when 'closed'
         'Traité'

app/models/dossier.rb

@@ -1,10 +1,10 @@
 class Dossier < ActiveRecord::Base
   enum state: {draft: 'draft',
-               initiated: 'initiated', #-submitted
+               initiated: 'initiated',
                replied: 'replied',
                updated: 'updated',
                validated: 'validated',
-               submit_validated: 'submit_validated', #initiated
+               submitted: 'submitted', #-submit_validated
                closed: 'closed'} #-processed
 
   has_one :etablissement, dependent: :destroy
@@ -49,7 +49,7 @@ class Dossier < ActiveRecord::Base
   end
 
   def next_step! role, action
-    unless %w(initiate replied update comment valid submit_validate close).include?(action)
+    unless %w(initiate update comment valid submit close).include?(action)
       fail 'action is not valid'
     end
 
@@ -63,9 +63,9 @@ class Dossier < ActiveRecord::Base
           if draft?
             initiated!
           end
-        when 'submit_validate'
+        when 'submit'
           if validated?
-            submit_validated!
+            submitted!
           end
         when 'update'
           if replied?
@@ -93,7 +93,7 @@ class Dossier < ActiveRecord::Base
             validated!
           end
         when 'close'
-          if submit_validated?
+          if submitted?
             closed!
           end
       end
@@ -102,7 +102,7 @@ class Dossier < ActiveRecord::Base
   end
 
   def self.a_traiter
-    Dossier.where("state='initiated' OR state='updated' OR state='submit_validated'").order('updated_at ASC')
+    Dossier.where("state='initiated' OR state='updated' OR state='submitted'").order('updated_at ASC')
   end
 
   def self.en_attente

app/views/dossiers/_infos_dossier.html.haml

@@ -39,16 +39,16 @@
 
   %div.row{style: 'text-align:right'}
     -unless gestionnaire_signed_in?
-      -if !@dossier.validated? && !@dossier.submit_validated? && !@dossier.closed?
+      -if !@dossier.validated? && !@dossier.submitted? && !@dossier.closed?
         %a#maj_infos.btn.btn-info{href: "/users/dossiers/#{@dossier.id}/description?back_url=recapitulatif"}
           = 'Editer mon dossier'
 
     -unless user_signed_in?
-      -if !@dossier.validated? && !@dossier.submit_validated? && !@dossier.closed?
+      -if !@dossier.validated? && !@dossier.submitted? && !@dossier.closed?
         = form_tag(url_for({controller: 'backoffice/dossiers', action: :valid, dossier_id: @dossier.id}), class: 'form-inline', method: 'POST') do
           %button#action_button.btn.btn-success
             = 'Valider le dossier'
-      -elsif @dossier.submit_validated?
+      -elsif @dossier.submitted?
         = form_tag(url_for({controller: 'backoffice/dossiers', action: :close, dossier_id: @dossier.id}), class: 'form-inline', method: 'POST') do
           %button#action_button.btn.btn-success
             = 'Traiter le dossier'

app/views/users/recapitulatif/show.html.haml

@@ -15,7 +15,7 @@
           %button#action_button.btn.btn-success
             = 'Soumettre mon dossier'
       -elsif @dossier.validated?
-        = form_tag(url_for({controller: :recapitulatif, action: :submit_validate, dossier_id: @dossier.id}), class: 'form-inline', method: 'POST') do
+        = form_tag(url_for({controller: :recapitulatif, action: :submit, dossier_id: @dossier.id}), class: 'form-inline', method: 'POST') do
           %button#action_button.btn.btn-success
             = 'Déposer mon dossier'
       -else

config/routes.rb

@@ -27,7 +27,7 @@ Rails.application.routes.draw do
       post 'description' => 'description#create'
       get '/recapitulatif' => 'recapitulatif#show'
       post '/recapitulatif/initiate' => 'recapitulatif#initiate'
-      post '/recapitulatif/submit_validate' => 'recapitulatif#submit_validate'
+      post '/recapitulatif/submit' => 'recapitulatif#submit'
       # get '/demande' => 'demandes#show'
       # post '/demande' => 'demandes#update'
       post '/commentaire' => 'commentaires#create'

db/migrate/20151102143908_change_state_submit_validated_to_submitted.rb

@@ -0,0 +1,5 @@
+class ChangeStateSubmitValidatedToSubmitted < ActiveRecord::Migration
+  def change
+    Dossier.where(state: 'submit_validated').update_all(state: 'submitted')
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151102142940) do
+ActiveRecord::Schema.define(version: 20151102143908) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

spec/controllers/backoffice/dossiers_controller_spec.rb

@@ -48,7 +48,7 @@ describe Backoffice::DossiersController, type: :controller do
   describe 'POST #close' do
     context 'le gestionnaire taite un dossier' do
       before do
-        dossier.submit_validated!
+        dossier.submitted!
         sign_in gestionnaire
       end
 

spec/controllers/users/recapitulatif_controller_spec.rb

@@ -40,16 +40,16 @@ describe Users::RecapitulatifController, type: :controller do
     end
   end
 
-  describe 'POST #submit_validate' do
+  describe 'POST #submit' do
     context 'when an user depose his dossier' do
       before do
         dossier.validated!
-        post :submit_validate, dossier_id: dossier.id
+        post :submit, dossier_id: dossier.id
       end
 
-      it 'dossier change his state for submit_validated' do
+      it 'dossier change his state for submitted' do
         dossier.reload
-        expect(dossier.state).to eq('submit_validated')
+        expect(dossier.state).to eq('submitted')
       end
 
       it 'a message informe user what his dossier is initiated' do

spec/decorators/dossier_decorator_spec.rb

@@ -37,8 +37,8 @@ describe DossierDecorator do
       expect(subject).to eq('Validé')
     end
 
-    it 'submit_validated is dépose' do
-      dossier.submit_validated!
+    it 'submitted is dépose' do
+      dossier.submitted!
       expect(subject).to eq('Déposé')
     end
 

spec/models/dossier_spec.rb

@@ -294,10 +294,10 @@ describe Dossier do
             it { is_expected.to eq('validated') }
           end
 
-          context 'when is submit_validated the dossier' do
-            let(:action) { 'submit_validate' }
+          context 'when is submitted the dossier' do
+            let(:action) { 'submit' }
 
-            it { is_expected.to eq('submit_validated') }
+            it { is_expected.to eq('submitted') }
           end
         end
 
@@ -312,9 +312,9 @@ describe Dossier do
         end
       end
 
-      context 'when dossier is at state submit_validated' do
+      context 'when dossier is at state submitted' do
         before do
-          dossier.submit_validated!
+          dossier.submitted!
         end
 
         context 'when user is connect' do
@@ -323,7 +323,7 @@ describe Dossier do
           context 'when is post a comment' do
             let(:action) { 'comment' }
 
-            it { is_expected.to eq('submit_validated') }
+            it { is_expected.to eq('submitted') }
           end
         end
 
@@ -333,7 +333,7 @@ describe Dossier do
           context 'when is post a comment' do
             let(:action) { 'comment' }
 
-            it {is_expected.to eq('submit_validated')}
+            it {is_expected.to eq('submitted')}
           end
 
           context 'when is closed the dossier' do
@@ -378,7 +378,7 @@ describe Dossier do
       let!(:dossier4) { create(:dossier, :with_user, :with_procedure, state: 'replied')}
       let!(:dossier5) { create(:dossier, :with_user, :with_procedure, state: 'updated')}
       let!(:dossier6) { create(:dossier, :with_user, :with_procedure, state: 'validated')}
-      let!(:dossier7) { create(:dossier, :with_user, :with_procedure, state: 'submit_validated')}
+      let!(:dossier7) { create(:dossier, :with_user, :with_procedure, state: 'submitted')}
       let!(:dossier8) { create(:dossier, :with_user, :with_procedure, state: 'closed')}
 
       describe '#a_traiter' do

spec/views/backoffice/dossiers/show.html.html_spec.rb

@@ -103,9 +103,9 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do
       end
     end
 
-    context 'when dossier have state submit_validated' do
+    context 'when dossier have state submitted' do
       before do
-        dossier.submit_validated!
+        dossier.submitted!
         render
       end
 

spec/views/users/recapitulatif/show.html.haml_spec.rb

@@ -100,9 +100,9 @@ describe 'users/recapitulatif/show.html.haml', type: :view do
         end
       end
 
-      context 'when dossier state is submit_validated' do
+      context 'when dossier state is submitted' do
         before do
-          dossier.submit_validated!
+          dossier.submitted!
           render
         end