From 3c22f4ea487d309efd837828f8a9dd6b034a6e3e Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 19 Feb 2024 16:08:47 +0100 Subject: [PATCH] fix(attestation): always return v1 template when exists, otherwise it's a v2 --- app/models/procedure.rb | 2 +- spec/models/procedure_spec.rb | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/app/models/procedure.rb b/app/models/procedure.rb index 88106acfa..f8059a9d7 100644 --- a/app/models/procedure.rb +++ b/app/models/procedure.rb @@ -51,7 +51,7 @@ class Procedure < ApplicationRecord has_one :attestation_template_v1, -> { AttestationTemplate.v1 }, dependent: :destroy, class_name: "AttestationTemplate", inverse_of: :procedure has_one :attestation_template_v2, -> { AttestationTemplate.v2 }, dependent: :destroy, class_name: "AttestationTemplate", inverse_of: :procedure - has_one :attestation_template, -> { AttestationTemplate.v1.or(AttestationTemplate.v2) }, dependent: :destroy, inverse_of: :procedure + has_one :attestation_template, -> { order(Arel.sql("CASE WHEN version = '1' THEN 0 ELSE 1 END")) }, dependent: :destroy, inverse_of: :procedure belongs_to :parent_procedure, class_name: 'Procedure', optional: true belongs_to :canonical_procedure, class_name: 'Procedure', optional: true diff --git a/spec/models/procedure_spec.rb b/spec/models/procedure_spec.rb index 9a7899c8d..e0fcc9984 100644 --- a/spec/models/procedure_spec.rb +++ b/spec/models/procedure_spec.rb @@ -1761,6 +1761,36 @@ describe Procedure do end end + describe "#attestation_template" do + let(:procedure) { create(:procedure) } + + context "when there is a v2 created after v1" do + before do + create(:attestation_template, procedure: procedure) + create(:attestation_template, :v2, procedure: procedure) + end + + it { expect(procedure.attestation_template.version).to eq(1) } + end + + context "when there is a v2 created before v1" do + before do + create(:attestation_template, :v2, procedure: procedure) + create(:attestation_template, procedure: procedure, activated: true) + end + + it { expect(procedure.attestation_template.version).to eq(1) } + end + + context "when there is only a v2" do + before do + create(:attestation_template, :v2, procedure: procedure) + end + + it { expect(procedure.attestation_template.version).to eq(2) } + end + end + private def create_dossier_with_pj_of_size(size, procedure)