Merge branch 'main' into sentry/3267070633

This commit is contained in:
mfo 2022-05-12 16:41:33 +02:00 committed by GitHub
commit c6ef17341b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 64 additions and 9 deletions

View file

@ -732,6 +732,13 @@ class Procedure < ApplicationRecord
new_draft.revision_types_de_champ.reload
# Some revisions do not have links to children types de champ
new_draft
.types_de_champ
.filter(&:repetition?)
.flat_map(&:types_de_champ)
.each(&:migrate_parent!)
new_draft
end

View file

@ -381,13 +381,12 @@ class ProcedureRevision < ApplicationRecord
end
def revise_type_de_champ(type_de_champ)
types_de_champ_association = type_de_champ.private? ? :revision_types_de_champ_private : :revision_types_de_champ_public
association = send(types_de_champ_association).find_by!(type_de_champ: type_de_champ)
revision_type_de_champ = revision_types_de_champ.find_by!(type_de_champ: type_de_champ)
cloned_type_de_champ = type_de_champ.deep_clone(include: [:types_de_champ]) do |original, kopy|
PiecesJustificativesService.clone_attachments(original, kopy)
end
cloned_type_de_champ.revision = self
association.update!(type_de_champ: cloned_type_de_champ)
revision_type_de_champ.update!(type_de_champ: cloned_type_de_champ)
cloned_type_de_champ.types_de_champ.each(&:migrate_parent!)
cloned_type_de_champ
end

View file

@ -18,6 +18,8 @@
# stable_id :bigint
#
class TypeDeChamp < ApplicationRecord
self.ignored_columns = [:migrated_parent]
enum type_champs: {
text: 'text',
textarea: 'textarea',
@ -394,12 +396,13 @@ class TypeDeChamp < ApplicationRecord
end
def migrate_parent!
if parent_id.present? && migrated_parent.nil?
ProcedureRevisionTypeDeChamp.create(parent: parent.revision_type_de_champ,
type_de_champ: self,
revision_id: parent.revision_type_de_champ.revision_id,
position: order_place)
update_column(:migrated_parent, true)
if parent_id.present? && revision_types_de_champ.empty?
parent.revision_types_de_champ.each do |revision_type_de_champ|
ProcedureRevisionTypeDeChamp.create(parent: revision_type_de_champ,
type_de_champ: self,
revision_id: revision_type_de_champ.revision_id,
position: order_place)
end
end
self
end

View file

@ -0,0 +1,46 @@
namespace :after_party do
desc 'Deployment task: fix_child_types_de_champ'
task fix_child_types_de_champ: :environment do
puts "Running deploy task 'fix_child_types_de_champ'"
children = TypeDeChamp.where.not(parent_id: nil).where.missing(:revision_types_de_champ).includes(parent: :revision_types_de_champ)
progress = ProgressReport.new(children.count)
children.find_each do |type_de_champ|
type_de_champ.parent.revision_types_de_champ.each do |revision_type_de_champ|
ProcedureRevisionTypeDeChamp.create(parent: revision_type_de_champ,
type_de_champ: type_de_champ,
revision_id: revision_type_de_champ.revision_id,
position: type_de_champ.order_place)
end
progress.inc
end
progress.finish
children = TypeDeChamp.where.not(parent_id: nil).includes(:revision_types_de_champ, parent: :revision_types_de_champ)
progress = ProgressReport.new(children.count)
children.find_each do |type_de_champ|
prtdcs = type_de_champ.parent.revision_types_de_champ
rtdcs = type_de_champ.revision_types_de_champ
if prtdcs.size > rtdcs.size
missing_rtdcs = prtdcs.filter { |prtdc| !prtdc.revision_id.in?(rtdcs.map(&:revision_id)) }
missing_rtdcs.each do |revision_type_de_champ|
ProcedureRevisionTypeDeChamp.create(parent: revision_type_de_champ,
type_de_champ: type_de_champ,
revision_id: revision_type_de_champ.revision_id,
position: type_de_champ.order_place)
end
end
progress.inc
end
progress.finish
# Update task as completed. If you remove the line below, the task will
# run with every deploy (or every time you call after_party:run).
AfterParty::TaskRecord
.create version: AfterParty::TaskRecorder.new(__FILE__).timestamp
end
end