Back : Save TypeDePJ for a procedure

app/controllers/admin/procedures_controller.rb

@@ -32,6 +32,7 @@ class Admin::ProceduresController < ApplicationController
     end
 
     save_types_de_champs_params
+    save_types_de_piece_justificative_params
 
     flash.notice = 'Procédure enregistrée'
 
@@ -47,6 +48,7 @@ class Admin::ProceduresController < ApplicationController
     end
 
     save_types_de_champs_params
+    save_types_de_piece_justificative_params
 
     flash.notice = 'Préocédure modifiée'
     redirect_to admin_procedures_path
@@ -79,6 +81,25 @@ class Admin::ProceduresController < ApplicationController
     end
   end
 
+  def save_types_de_piece_justificative_params
+    unless params[:type_de_piece_justificative].nil? || params[:type_de_piece_justificative].size == 0
+      params[:type_de_piece_justificative].each do |index, type_de_piece_justificative|
+
+        if type_de_piece_justificative[:id_type_de_piece_justificative].nil? || type_de_piece_justificative[:id_type_de_piece_justificative] == ''
+          type_de_piece_justificative_tmp = TypeDePieceJustificative.new
+        else
+          type_de_piece_justificative_tmp = TypeDePieceJustificative.find(type_de_piece_justificative[:id_type_de_piece_justificative])
+        end
+
+        type_de_piece_justificative_tmp.libelle = type_de_piece_justificative[:libelle]
+        type_de_piece_justificative_tmp.description = type_de_piece_justificative[:description]
+        type_de_piece_justificative_tmp.procedure = @procedure
+
+        type_de_piece_justificative_tmp.save
+      end
+    end
+  end
+
   def create_params
     params.require(:procedure).permit(:libelle, :description, :organisation, :direction, :lien_demarche, :use_api_carto)
   end

app/views/admin/procedures/types_de_piece_justificative/_liste.html.haml

@@ -1,6 +1,6 @@
 #liste_piece_justificative
   -if @procedure.types_de_piece_justificative.size > 0
-    - @procedure.types_de_piece_justificative.order(:order_place).each_with_index do |type_de_piece_justificative, index|
+    - @procedure.types_de_piece_justificative.order(:libelle).each_with_index do |type_de_piece_justificative, index|
       =render partial: 'admin/procedures/types_de_piece_justificative/form', locals:{ type_de_piece_justificative: type_de_piece_justificative, index: index }
 
 #new_type_de_piece_justificative

spec/controllers/admin/procedures_controller_spec.rb

@@ -52,12 +52,32 @@ describe Admin::ProceduresController, type: :controller do
     }
   }
 
+  let(:types_de_piece_justificative_params_errors) {
+    {'0' =>
+         {libelle: '',
+          description: 'Description de test'},
+     '1' =>
+         {libelle: 'Champs de test 2',
+          description: 'Description de test 2'}
+    }
+  }
+
+  let(:types_de_piece_justificative_params) {
+    {'0' =>
+         {libelle: 'PJ de test',
+          description: 'Description de test'},
+     '1' =>
+         {libelle: 'PJ de test 2',
+          description: 'Description de test 2'}
+    }
+  }
+
   before do
     sign_in admin
   end
 
   describe 'GET #show' do
-    let(:procedure) { create(:procedure) }
+    let(:procedure) { create(:procedure, :with_type_de_champs, :with_two_type_de_piece_justificative) }
 
     subject { get :show, id: procedure_id }
 
@@ -168,10 +188,43 @@ describe Admin::ProceduresController, type: :controller do
         it { expect(subject.types_de_champs.size).to eq(1) }
       end
     end
+
+    describe 'type_de_piece_justificative processing' do
+      before do
+        post :create, procedure: procedure_params, type_de_piece_justificative: types_de_piece_justificative_params
+      end
+
+      subject { Procedure.last }
+
+      context 'when no type de piece justificative is informed' do
+        let(:types_de_piece_justificative_params) { {} }
+        it { expect(subject.types_de_piece_justificative.size).to eq(0) }
+      end
+
+      context 'when two types de piece justificative are informed' do
+        it { expect(subject.types_de_piece_justificative.size).to eq(2) }
+
+        describe ' check types de piece justificative attributs present into database' do
+          subject { TypeDePieceJustificative.all }
+
+          it { expect(subject[0].libelle).to eq(types_de_piece_justificative_params['0'][:libelle]) }
+          it { expect(subject[0].description).to eq(types_de_piece_justificative_params['0'][:description]) }
+
+          it { expect(subject[1].libelle).to eq(types_de_piece_justificative_params['1'][:libelle]) }
+          it { expect(subject[1].description).to eq(types_de_piece_justificative_params['1'][:description]) }
+        end
+      end
+
+      context 'when one of two types de piece justificative have not a libelle' do
+        let(:types_de_piece_justificative_params) { types_de_piece_justificative_params_errors }
+
+        it { expect(subject.types_de_piece_justificative.size).to eq(1) }
+      end
+    end
   end
 
   describe 'PUT #update' do
-    let!(:procedure) { create(:procedure, :with_type_de_champs) }
+    let!(:procedure) { create(:procedure, :with_type_de_champs, :with_two_type_de_piece_justificative) }
 
     context 'when administrateur is not connected' do
       before do
@@ -185,7 +238,7 @@ describe Admin::ProceduresController, type: :controller do
 
     context 'when administrateur is connected' do
       before do
-        put :update, id: procedure.id, procedure: procedure_params, type_de_champs: types_de_champs_params
+        put :update, id: procedure.id, procedure: procedure_params, type_de_champs: types_de_champs_params, type_de_piece_justificative: types_de_piece_justificative_params
         procedure.reload
       end
 
@@ -277,6 +330,56 @@ describe Admin::ProceduresController, type: :controller do
           end
         end
       end
+
+      describe 'type_de_piece_justificative processing' do
+        subject { procedure }
+
+        context 'when no type de piece justificative is informed' do
+          let(:types_de_piece_justificative_params) { {} }
+          it { expect(subject.types_de_piece_justificative.size).to eq(2) }
+        end
+
+        context 'when two types de piece justificative are informed' do
+          it { expect(subject.types_de_piece_justificative.size).to eq(4) }
+
+          describe ' check types de piece justificative attributs added into database' do
+            subject { procedure.types_de_piece_justificative }
+
+            it { expect(subject[2].libelle).to eq(types_de_piece_justificative_params['0'][:libelle]) }
+            it { expect(subject[2].description).to eq(types_de_piece_justificative_params['0'][:description]) }
+
+            it { expect(subject[3].libelle).to eq(types_de_piece_justificative_params['1'][:libelle]) }
+            it { expect(subject[3].description).to eq(types_de_piece_justificative_params['1'][:description]) }
+          end
+        end
+
+        context 'when one of two types de piece justificative have not a libelle' do
+          let(:types_de_piece_justificative_params) { types_de_piece_justificative_params_errors }
+
+          it { expect(subject.types_de_piece_justificative.size).to eq(3) }
+        end
+
+        context 'when one types de piece justificative is edit' do
+          let(:types_de_piece_justificative_params) {
+            {'0' =>
+                 {libelle: 'PJ de test editée',
+                  type: 'number',
+                  description: 'Description de test editée',
+                  order_place: 1,
+                  id_type_de_piece_justificative: procedure.types_de_piece_justificative.first.id}
+            }
+          }
+
+          it { expect(subject.types_de_piece_justificative.size).to eq(2) }
+
+          describe ' check types de piece justificative attributs updated into database' do
+            subject { procedure.types_de_piece_justificative.first }
+
+            it { expect(subject.libelle).to eq(types_de_piece_justificative_params['0'][:libelle]) }
+            it { expect(subject.description).to eq(types_de_piece_justificative_params['0'][:description]) }
+          end
+        end
+      end
     end
   end
 end