DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

refactor(attestation_template): move to procedure

Browse source
This commit is contained in:
Paul Chavard 2022-11-09 11:09:24 +00:00
parent 55c5de2c2c
commit cafda4f6f0
20 changed files with 170 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/models/dossier.rb
View file

@ -135,8 +135,8 @@ class Dossier < ApplicationRecord
has_one :france_connect_information, through: :user
has_one :attestation_template, through: :revision
has_one :procedure, through: :revision
has_one :attestation_template, through: :procedure
has_many :types_de_champ, through: :revision, source: :types_de_champ_public
has_many :types_de_champ_private, through: :revision
@ -375,7 +375,7 @@ class Dossier < ApplicationRecord
.where.not(user: users_who_submitted)
end
scope :for_api_v2, -> { includes(revision: [:attestation_template, procedure: [:administrateurs]], etablissement: [], individual: [], traitement: []) }
scope :for_api_v2, -> { includes(:attestation_template, revision: [procedure: [:administrateurs]], etablissement: [], individual: [], traitement: []) }
scope :with_notifications, -> do
joins(:follows)
@ -748,17 +748,21 @@ class Dossier < ApplicationRecord
{ lon: lon, lat: lat, zoom: zoom }
end
def active_attestation_template
attestation_template || revision.attestation_template
end
def unspecified_attestation_champs
if attestation_template&.activated?
attestation_template.unspecified_champs_for_dossier(self)
if active_attestation_template&.activated?
active_attestation_template.unspecified_champs_for_dossier(self)
else
[]
end
end
def build_attestation
if attestation_template&.activated?
attestation_template.attestation_for(self)
if active_attestation_template&.activated?
active_attestation_template.attestation_for(self)
end
end
@ -819,10 +823,6 @@ class Dossier < ApplicationRecord
end
end
def attestation_activated?
termine? && attestation_template&.activated?
end
def after_passer_en_construction
self.conservation_extension = 0.days
self.depose_at = self.en_construction_at = self.traitements