diff --git a/app/controllers/instructeurs/procedures_controller.rb b/app/controllers/instructeurs/procedures_controller.rb index 7f1896659..1ff1145c4 100644 --- a/app/controllers/instructeurs/procedures_controller.rb +++ b/app/controllers/instructeurs/procedures_controller.rb @@ -108,8 +108,6 @@ module Instructeurs @dossiers = @dossiers.where(id: filtered_sorted_paginated_ids) - @dossiers = procedure_presentation.eager_load_displayed_fields(@dossiers) - @dossiers = @dossiers.sort_by { |d| filtered_sorted_paginated_ids.index(d.id) } @projected_dossiers = DossierProjectionService.project(filtered_sorted_paginated_ids, procedure_presentation.displayed_fields) diff --git a/app/models/procedure_presentation.rb b/app/models/procedure_presentation.rb index daab7a86f..d64dff58f 100644 --- a/app/models/procedure_presentation.rb +++ b/app/models/procedure_presentation.rb @@ -90,10 +90,6 @@ class ProcedurePresentation < ApplicationRecord ] end - def displayed_fields_values(dossier) - displayed_fields.map { |field| get_value(dossier, field[TABLE], field[COLUMN]) } - end - def sorted_ids(dossiers, instructeur) table, column, order = sort.values_at(TABLE, COLUMN, 'order') @@ -178,25 +174,6 @@ class ProcedurePresentation < ApplicationRecord end.reduce(:&) end - def eager_load_displayed_fields(dossiers) - relations_to_include = displayed_fields - .pluck(TABLE) - .reject { |table| table == 'self' } - .map do |table| - case table - when TYPE_DE_CHAMP - { champs: :type_de_champ } - when TYPE_DE_CHAMP_PRIVATE - { champs_private: :type_de_champ } - else - table - end - end - .uniq - - dossiers.includes(relations_to_include) - end - def human_value_for_filter(filter) case filter[TABLE] when TYPE_DE_CHAMP, TYPE_DE_CHAMP_PRIVATE @@ -314,23 +291,6 @@ class ProcedurePresentation < ApplicationRecord end end - def get_value(dossier, table, column) - case table - when 'self' - dossier.send(column)&.strftime('%d/%m/%Y') - when 'user', 'individual', 'etablissement' - dossier.send(table)&.send(column) - when 'followers_instructeurs' - dossier.send(table)&.map { |g| g.send(column) }&.join(', ') - when TYPE_DE_CHAMP - dossier.champs.find { |c| c.stable_id == column.to_i }.to_s - when TYPE_DE_CHAMP_PRIVATE - dossier.champs_private.find { |c| c.stable_id == column.to_i }.to_s - when 'groupe_instructeur' - dossier.groupe_instructeur.label - end - end - def field_hash(label, table, column) { 'label' => label, diff --git a/spec/models/procedure_presentation_spec.rb b/spec/models/procedure_presentation_spec.rb index 1949fb4b9..815096316 100644 --- a/spec/models/procedure_presentation_spec.rb +++ b/spec/models/procedure_presentation_spec.rb @@ -125,126 +125,6 @@ describe ProcedurePresentation do it { expect(subject.displayed_fields_for_select).to eq([[["label1", "table1/column1"], ["label2", "table2/column2"]], ["user/email"]]) } end - describe '#get_value' do - let(:procedure_presentation) { create(:procedure_presentation, procedure: procedure, assign_to: assign_to, displayed_fields: [{ 'table' => table, 'column' => column }]) } - - subject { procedure_presentation.displayed_fields_values(dossier).first } - - context 'for self table' do - let(:table) { 'self' } - - context 'for created_at column' do - let(:column) { 'created_at' } - let(:dossier) { Timecop.freeze(Time.zone.local(1992, 3, 22)) { create(:dossier, procedure: procedure) } } - - it { is_expected.to eq('22/03/1992') } - end - - context 'for en_construction_at column' do - let(:column) { 'en_construction_at' } - let(:dossier) { create(:dossier, :en_construction, procedure: procedure, en_construction_at: Time.zone.local(2018, 10, 17)) } - - it { is_expected.to eq('17/10/2018') } - end - - context 'for updated_at column' do - let(:column) { 'updated_at' } - let(:dossier) { create(:dossier, procedure: procedure) } - - before { dossier.touch(time: Time.zone.local(2018, 9, 25)) } - - it { is_expected.to eq('25/09/2018') } - end - end - - context 'for user table' do - let(:table) { 'user' } - let(:column) { 'email' } - - let(:dossier) { create(:dossier, procedure: procedure, user: create(:user, email: 'bla@yopmail.com')) } - - it { is_expected.to eq('bla@yopmail.com') } - end - - context 'for individual table' do - let(:table) { 'individual' } - let(:procedure) { create(:procedure, :for_individual, :with_type_de_champ, :with_type_de_champ_private) } - let(:dossier) { create(:dossier, procedure: procedure, individual: create(:individual, nom: 'Martin', prenom: 'Jacques', gender: 'M.')) } - - context 'for prenom column' do - let(:column) { 'prenom' } - - it { is_expected.to eq('Jacques') } - end - - context 'for nom column' do - let(:column) { 'nom' } - - it { is_expected.to eq('Martin') } - end - - context 'for gender column' do - let(:column) { 'gender' } - - it { is_expected.to eq('M.') } - end - end - - context 'for etablissement table' do - let(:table) { 'etablissement' } - let(:column) { 'code_postal' } # All other columns work the same, no extra test required - - let!(:dossier) { create(:dossier, procedure: procedure, etablissement: create(:etablissement, code_postal: '75008')) } - - it { is_expected.to eq('75008') } - end - - context 'for groupe_instructeur table' do - let(:table) { 'groupe_instructeur' } - let(:column) { 'label' } - - let!(:dossier) { create(:dossier, procedure: procedure) } - - it { is_expected.to eq('défaut') } - end - - context 'for followers_instructeurs table' do - let(:table) { 'followers_instructeurs' } - let(:column) { 'email' } - - let(:dossier) { create(:dossier, procedure: procedure) } - let!(:follow1) { create(:follow, dossier: dossier, instructeur: create(:instructeur, email: 'user1@host')) } - let!(:follow2) { create(:follow, dossier: dossier, instructeur: create(:instructeur, email: 'user2@host')) } - - it "return emails of followers instructeurs" do - emails_to_display = procedure_presentation.displayed_fields_values(dossier).first.split(', ').sort - expect(emails_to_display).to eq ["user1@host", "user2@host"] - end - end - - context 'for type_de_champ table' do - let(:table) { 'type_de_champ' } - let(:column) { procedure.types_de_champ.first.stable_id.to_s } - - let(:dossier) { create(:dossier, procedure: procedure) } - - before { dossier.champs.first.update(value: 'kale') } - - it { is_expected.to eq('kale') } - end - - context 'for type_de_champ_private table' do - let(:table) { 'type_de_champ_private' } - let(:column) { procedure.types_de_champ_private.first.stable_id.to_s } - - let(:dossier) { create(:dossier, procedure: procedure) } - - before { dossier.champs_private.first.update(value: 'quinoa') } - - it { is_expected.to eq('quinoa') } - end - end - describe '#sorted_ids' do let(:instructeur) { create(:instructeur) } let(:assign_to) { create(:assign_to, procedure: procedure, instructeur: instructeur) } @@ -755,136 +635,6 @@ describe ProcedurePresentation do end end - describe '#eager_load_displayed_fields' do - let(:procedure_presentation) { create(:procedure_presentation, procedure: procedure, assign_to: assign_to, displayed_fields: [{ 'table' => table, 'column' => column }]) } - let!(:dossier) { create(:dossier, :en_construction, procedure: procedure) } - let(:displayed_dossier) { procedure_presentation.eager_load_displayed_fields(procedure.dossiers).first } - - context 'for type de champ' do - let(:table) { 'type_de_champ' } - let(:column) { procedure.types_de_champ.first.stable_id.to_s } - - it 'preloads the champs relation' do - # Ideally, we would only preload the champs for the matching column - - expect(displayed_dossier.association(:champs)).to be_loaded - expect(displayed_dossier.association(:champs_private)).not_to be_loaded - expect(displayed_dossier.association(:user)).not_to be_loaded - expect(displayed_dossier.association(:individual)).not_to be_loaded - expect(displayed_dossier.association(:etablissement)).not_to be_loaded - expect(displayed_dossier.association(:followers_instructeurs)).not_to be_loaded - expect(displayed_dossier.association(:groupe_instructeur)).not_to be_loaded - end - end - - context 'for type de champ private' do - let(:table) { 'type_de_champ_private' } - let(:column) { procedure.types_de_champ_private.first.stable_id.to_s } - - it 'preloads the champs relation' do - # Ideally, we would only preload the champs for the matching column - - expect(displayed_dossier.association(:champs)).not_to be_loaded - expect(displayed_dossier.association(:champs_private)).to be_loaded - expect(displayed_dossier.association(:user)).not_to be_loaded - expect(displayed_dossier.association(:individual)).not_to be_loaded - expect(displayed_dossier.association(:etablissement)).not_to be_loaded - expect(displayed_dossier.association(:followers_instructeurs)).not_to be_loaded - expect(displayed_dossier.association(:groupe_instructeur)).not_to be_loaded - end - end - - context 'for user' do - let(:table) { 'user' } - let(:column) { 'email' } - - it 'preloads the user relation' do - expect(displayed_dossier.association(:champs)).not_to be_loaded - expect(displayed_dossier.association(:champs_private)).not_to be_loaded - expect(displayed_dossier.association(:user)).to be_loaded - expect(displayed_dossier.association(:individual)).not_to be_loaded - expect(displayed_dossier.association(:etablissement)).not_to be_loaded - expect(displayed_dossier.association(:followers_instructeurs)).not_to be_loaded - expect(displayed_dossier.association(:groupe_instructeur)).not_to be_loaded - end - end - - context 'for individual' do - let(:procedure) { create(:procedure, :for_individual, :with_type_de_champ, :with_type_de_champ_private) } - let(:table) { 'individual' } - let(:column) { 'nom' } - - it 'preloads the individual relation' do - expect(displayed_dossier.association(:champs)).not_to be_loaded - expect(displayed_dossier.association(:champs_private)).not_to be_loaded - expect(displayed_dossier.association(:user)).not_to be_loaded - expect(displayed_dossier.association(:individual)).to be_loaded - expect(displayed_dossier.association(:etablissement)).not_to be_loaded - expect(displayed_dossier.association(:followers_instructeurs)).not_to be_loaded - expect(displayed_dossier.association(:groupe_instructeur)).not_to be_loaded - end - end - - context 'for etablissement' do - let(:table) { 'etablissement' } - let(:column) { 'siret' } - - it 'preloads the etablissement relation' do - expect(displayed_dossier.association(:champs)).not_to be_loaded - expect(displayed_dossier.association(:champs_private)).not_to be_loaded - expect(displayed_dossier.association(:user)).not_to be_loaded - expect(displayed_dossier.association(:individual)).not_to be_loaded - expect(displayed_dossier.association(:etablissement)).to be_loaded - expect(displayed_dossier.association(:followers_instructeurs)).not_to be_loaded - expect(displayed_dossier.association(:groupe_instructeur)).not_to be_loaded - end - end - - context 'for followers_instructeurs' do - let(:table) { 'followers_instructeurs' } - let(:column) { 'email' } - - it 'preloads the followers_instructeurs relation' do - expect(displayed_dossier.association(:champs)).not_to be_loaded - expect(displayed_dossier.association(:champs_private)).not_to be_loaded - expect(displayed_dossier.association(:user)).not_to be_loaded - expect(displayed_dossier.association(:individual)).not_to be_loaded - expect(displayed_dossier.association(:etablissement)).not_to be_loaded - expect(displayed_dossier.association(:followers_instructeurs)).to be_loaded - expect(displayed_dossier.association(:groupe_instructeur)).not_to be_loaded - end - end - - context 'for groupe_instructeur' do - let(:table) { 'groupe_instructeur' } - let(:column) { 'label' } - - it 'preloads the groupe_instructeur relation' do - expect(displayed_dossier.association(:champs)).not_to be_loaded - expect(displayed_dossier.association(:champs_private)).not_to be_loaded - expect(displayed_dossier.association(:user)).not_to be_loaded - expect(displayed_dossier.association(:individual)).not_to be_loaded - expect(displayed_dossier.association(:etablissement)).not_to be_loaded - expect(displayed_dossier.association(:followers_instructeurs)).not_to be_loaded - expect(displayed_dossier.association(:groupe_instructeur)).to be_loaded - end - end - - context 'for self' do - let(:table) { 'self' } - let(:column) { 'created_at' } - - it 'does not preload anything' do - expect(displayed_dossier.association(:champs)).not_to be_loaded - expect(displayed_dossier.association(:champs_private)).not_to be_loaded - expect(displayed_dossier.association(:user)).not_to be_loaded - expect(displayed_dossier.association(:individual)).not_to be_loaded - expect(displayed_dossier.association(:etablissement)).not_to be_loaded - expect(displayed_dossier.association(:followers_instructeurs)).not_to be_loaded - end - end - end - describe "#human_value_for_filter" do let(:filters) { { "suivis" => [{ "label" => "label1", "table" => "type_de_champ", "column" => first_type_de_champ_id, "value" => "true" }] } }