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

fix create_tdc after_stable_id

Browse source
This commit is contained in:
simon lehericey 2022-07-08 09:52:23 +02:00 committed by Paul Chavard
parent 4a198a4c09
commit 64d82798a6
1 changed files with 13 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/models/procedure_revision.rb
View file

@ -44,26 +44,22 @@ class ProcedureRevision < ApplicationRecord
def add_type_de_champ(params) def add_type_de_champ(params)
parent_stable_id = params.delete(:parent_stable_id) parent_stable_id = params.delete(:parent_stable_id)
after_stable_id = params.delete(:after_stable_id)
coordinate = {}
if parent_stable_id.present?
parent_coordinate, _ = coordinate_and_tdc(parent_stable_id) parent_coordinate, _ = coordinate_and_tdc(parent_stable_id)
parent_id = parent_coordinate&.id
coordinate[:parent_id] = parent_coordinate.id after_stable_id = params.delete(:after_stable_id)
coordinate[:position] = last_position(parent_coordinate.revision_types_de_champ, after_stable_id) after_coordinate, _ = coordinate_and_tdc(after_stable_id)
elsif params[:private]
coordinate[:position] = last_position(revision_types_de_champ_private, after_stable_id) # the collection is orderd by (position, id), so we can use after_coordinate.position
else # if not present, a big number is used to ensure the element is at the tail
coordinate[:position] = last_position(revision_types_de_champ_public, after_stable_id) position = (after_coordinate&.position) || 100_000
end
tdc = TypeDeChamp.new(params) tdc = TypeDeChamp.new(params)
if tdc.save if tdc.save
coordinate[:type_de_champ] = tdc h = { type_de_champ: tdc, parent_id: parent_id, position: position }
coordinate = revision_types_de_champ.create!(coordinate) coordinate = revision_types_de_champ.create!(h)
reorder(coordinate.siblings)
reorder(coordinate.reload.siblings)
end end
# they are not aware of the addition # they are not aware of the addition
@ -219,6 +215,8 @@ class ProcedureRevision < ApplicationRecord
end end
def coordinate_and_tdc(stable_id) def coordinate_and_tdc(stable_id)
return [nil, nil] if stable_id.blank?
coordinate = revision_types_de_champ coordinate = revision_types_de_champ
.joins(:type_de_champ) .joins(:type_de_champ)
.find_by(type_de_champ: { stable_id: stable_id }) .find_by(type_de_champ: { stable_id: stable_id })
@ -478,18 +476,6 @@ class ProcedureRevision < ApplicationRecord
cloned_type_de_champ cloned_type_de_champ
end end
def last_position(siblings, after_stable_id = nil)
if after_stable_id.present?
siblings
.joins(:type_de_champ)
.find_by(types_de_champ: { stable_id: after_stable_id })
.position + 1
else
last = siblings.last
last.present? ? last.position + 1 : 0
end
end
def conditions_are_valid? def conditions_are_valid?
stable_ids = types_de_champ_public.map(&:stable_id) stable_ids = types_de_champ_public.map(&:stable_id)