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

extract coordinate_and_tdc

Browse source
This commit is contained in:
simon lehericey 2022-05-17 22:04:53 +02:00
parent 0b90f4d30d
commit be33c0ce7b
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/models/procedure_revision.rb
View file

@ -45,8 +45,8 @@ class ProcedureRevision < ApplicationRecord
if parent_stable_id.present? if parent_stable_id.present?
clone_parent_to_draft_revision(parent_stable_id) clone_parent_to_draft_revision(parent_stable_id)
parent = types_de_champ.find_by(stable_id: parent_stable_id)
parent_coordinate = revision_types_de_champ.find_by(type_de_champ: parent) parent_coordinate, parent = coordinate_and_tdc(parent_stable_id)
coordinate[:parent_id] = parent_coordinate.id coordinate[:parent_id] = parent_coordinate.id
coordinate[:position] = children_of(parent).count coordinate[:position] = children_of(parent).count
@ -87,9 +87,7 @@ class ProcedureRevision < ApplicationRecord
# Ensure that if this is a child, it's parent is cloned to the new revision # Ensure that if this is a child, it's parent is cloned to the new revision
clone_parent_to_draft_revision(stable_id) clone_parent_to_draft_revision(stable_id)
coordinate = revision_types_de_champ coordinate, _ = coordinate_and_tdc(stable_id)
.joins(:type_de_champ)
.find_by(type_de_champ: { stable_id: stable_id })
siblings = coordinate.siblings.to_a siblings = coordinate.siblings.to_a
@ -102,11 +100,7 @@ class ProcedureRevision < ApplicationRecord
# Ensure that if this is a child, it's parent is cloned to the new revision # Ensure that if this is a child, it's parent is cloned to the new revision
clone_parent_to_draft_revision(stable_id) clone_parent_to_draft_revision(stable_id)
coordinate = revision_types_de_champ coordinate, tdc = coordinate_and_tdc(stable_id)
.joins(:type_de_champ)
.find_by(type_de_champ: { stable_id: stable_id })
tdc = coordinate.type_de_champ
coordinate.destroy coordinate.destroy
@ -170,6 +164,14 @@ class ProcedureRevision < ApplicationRecord
private private
def coordinate_and_tdc(stable_id)
coordinate = revision_types_de_champ
.joins(:type_de_champ)
.find_by(type_de_champ: { stable_id: stable_id })
[coordinate, coordinate.type_de_champ]
end
def reorder(siblings) def reorder(siblings)
siblings.to_a.compact.each.with_index do |sibling, position| siblings.to_a.compact.each.with_index do |sibling, position|
sibling.update(position: position) sibling.update(position: position)