From d40eef284d41d1a8609b5ca3cd51b934fca113c0 Mon Sep 17 00:00:00 2001 From: Simon Lehericey Date: Wed, 2 Aug 2017 19:15:53 +0200 Subject: [PATCH] Dossier: fixup n+1 champ query --- app/models/dossier.rb | 2 +- spec/models/dossier_spec.rb | 41 ++++++------------------------------- 2 files changed, 7 insertions(+), 36 deletions(-) diff --git a/app/models/dossier.rb b/app/models/dossier.rb index 4dd402919..653a7d718 100644 --- a/app/models/dossier.rb +++ b/app/models/dossier.rb @@ -117,7 +117,7 @@ class Dossier < ActiveRecord::Base end def ordered_champs - champs.joins(', types_de_champ').where("champs.type_de_champ_id = types_de_champ.id AND types_de_champ.procedure_id = #{procedure.id}").order('order_place') + champs.includes(:type_de_champ).order('types_de_champ.order_place') end def ordered_champs_private diff --git a/spec/models/dossier_spec.rb b/spec/models/dossier_spec.rb index 5127b16ae..08a8ddd72 100644 --- a/spec/models/dossier_spec.rb +++ b/spec/models/dossier_spec.rb @@ -598,45 +598,16 @@ describe Dossier do end describe '#ordered_champs' do - let!(:procedure_1) { create :procedure } - let!(:procedure_2) { create :procedure } - - let(:dossier_1) { Dossier.new(id: 0, procedure: procedure_1) } - let(:dossier_2) { Dossier.new(id: 0, procedure: procedure_2) } + let(:procedure) { create(:procedure) } + let(:dossier) { Dossier.create(user: create(:user), procedure: procedure) } before do - create :type_de_champ_public, libelle: 'type_1_1', order_place: 1, procedure: dossier_1.procedure - create :type_de_champ_public, libelle: 'type_1_2', order_place: 2, procedure: dossier_1.procedure - - create :type_de_champ_public, libelle: 'type_2_1', order_place: 1, procedure: dossier_2.procedure - create :type_de_champ_public, libelle: 'type_2_2', order_place: 2, procedure: dossier_2.procedure - create :type_de_champ_public, libelle: 'type_2_3', order_place: 3, procedure: dossier_2.procedure - - dossier_1.build_default_champs - dossier_2.build_default_champs + create(:type_de_champ_public, libelle: 'l1', order_place: 1, procedure: procedure) + create(:type_de_champ_public, libelle: 'l3', order_place: 3, procedure: procedure) + create(:type_de_champ_public, libelle: 'l2', order_place: 2, procedure: procedure) end - subject { dossier.ordered_champs } - - it { expect(ChampPublic.where(dossier_id: 0).size).to eq 5 } - - describe 'for dossier 1' do - let(:dossier) { dossier_1 } - - it { expect(subject.size).to eq 2 } - it { expect(subject.first.type_de_champ.libelle).to eq 'type_1_1' } - it { expect(subject.last.type_de_champ.libelle).to eq 'type_1_2' } - end - - describe 'for dossier 2' do - let(:dossier) { dossier_2 } - - it { expect(subject.size).to eq 3 } - - it { expect(subject.first.type_de_champ.libelle).to eq 'type_2_1' } - it { expect(subject.second.type_de_champ.libelle).to eq 'type_2_2' } - it { expect(subject.last.type_de_champ.libelle).to eq 'type_2_3' } - end + it { expect(dossier.ordered_champs.pluck(:libelle)).to match(%w(l1 l2 l3)) } end describe '#ordered_champs_private' do