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

refactor(champs): cleanup champ_for_update

Browse source
This commit is contained in:
Paul Chavard 2024-12-05 15:38:46 +01:00
parent 56b0b156bf
commit 3556fcc11e
No known key found for this signature in database
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/models/concerns/dossier_champs_concern.rb
View file

@ -114,8 +114,8 @@ module DossierChampsConcern
end end
def champ_for_update(type_de_champ, row_id, updated_by:) def champ_for_update(type_de_champ, row_id, updated_by:)
champ, attributes = champ_with_attributes_for_update(type_de_champ, row_id, updated_by:) champ = champ_upsert_by!(type_de_champ, row_id)
champ.assign_attributes(attributes) champ.updated_by = updated_by
champ champ
end end
@ -203,33 +203,33 @@ module DossierChampsConcern
def champ_attributes_by_public_id(public_id, attributes, scope, updated_by:) def champ_attributes_by_public_id(public_id, attributes, scope, updated_by:)
stable_id, row_id = public_id.split('-') stable_id, row_id = public_id.split('-')
type_de_champ = find_type_de_champ_by_stable_id(stable_id, scope) type_de_champ = find_type_de_champ_by_stable_id(stable_id, scope)
champ_with_attributes_for_update(type_de_champ, row_id, updated_by:).last.merge(attributes) champ = champ_upsert_by!(type_de_champ, row_id)
attributes.merge(id: champ.id, updated_by:)
end end
def champ_with_attributes_for_update(type_de_champ, row_id, updated_by:) def champ_upsert_by!(type_de_champ, row_id)
check_valid_row_id_on_write?(type_de_champ, row_id) check_valid_row_id_on_write?(type_de_champ, row_id)
attributes = type_de_champ.params_for_champ champ_attributes = type_de_champ.params_for_champ
# TODO: Once we have the right index in place, we should change this to use `create_or_find_by` instead of `find_or_create_by` # TODO: Once we have the right index in place, we should change this to use `create_or_find_by` instead of `find_or_create_by`
champ = champs champ = champs
.create_with(**attributes) .create_with(**champ_attributes)
.find_or_create_by!(stable_id: type_de_champ.stable_id, row_id:) .find_or_create_by!(stable_id: type_de_champ.stable_id, row_id:)
attributes[:id] = champ.id
attributes[:updated_by] = updated_by
# Needed when a revision change the champ type in this case, we reset the champ data # Needed when a revision change the champ type in this case, we reset the champ data
if champ.type != attributes[:type] if champ.type != champ_attributes[:type]
attributes[:value] = nil champ_attributes[:value] = nil
attributes[:value_json] = nil champ_attributes[:value_json] = nil
attributes[:external_id] = nil champ_attributes[:external_id] = nil
attributes[:data] = nil champ_attributes[:data] = nil
champ = champ.becomes!(attributes[:type].constantize) champ = champ.becomes!(champ_attributes[:type].constantize)
champ.save!
end end
champ.assign_attributes(champ_attributes)
champ.save!
reset_champ_cache(champ) reset_champ_cache(champ)
[champ, attributes] champ
end end
def check_valid_row_id_on_write?(type_de_champ, row_id) def check_valid_row_id_on_write?(type_de_champ, row_id)