github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 15:16:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Refactor save_custom_fields methods (#24495)

Browse Source 
Operate a key at a time, to make it clearer what's going on.

This also fixes a bug where array integer fields would get re-written
even when there wasn't a change.
This commit is contained in:
Daniel Waterworth 2023-11-21 12:40:15 -06:00 committed by GitHub
parent 447d9b2105
commit 0059e6807c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
app/models/concerns/has_custom_fields.rb
View File

@ -21,6 +21,20 @@ module HasCustomFields
types[key]
end
def self.serialize(value, type)
if value.is_a?(Hash) || type == :json
value.to_json
elsif TrueClass === value
"t"
elsif FalseClass === value
"f"
elsif Integer === value
value.to_s
else
value
end
end
def self.cast_custom_field(key, value, types, return_array = true)
return value unless type = get_custom_field_type(types, key)
@ -100,7 +114,7 @@ module HasCustomFields
def get_custom_field_type(name)
@custom_field_types ||= {}
@custom_field_types[name]
@custom_field_types[name] || :string
end
def preload_custom_fields(objects, fields)
@ -236,54 +250,40 @@ module HasCustomFields
def save_custom_fields(force = false)
if force || !custom_fields_clean?
dup = @custom_fields.dup.with_indifferent_access
array_fields = {}
ActiveRecord::Base.transaction do
_custom_fields.reload.each do |f|
if dup[f.name].is_a?(Array)
# we need to collect Arrays fully before we can compare them
if !array_fields.has_key?(f.name)
array_fields[f.name] = [f]
else
array_fields[f.name] << f
end
elsif dup[f.name].is_a?(Hash)
if dup[f.name].to_json != f.value
f.destroy!
else
dup.delete(f.name)
dup = @custom_fields.dup.with_indifferent_access
fields_by_key = _custom_fields.reload.group_by(&:name)
(dup.keys.to_set + fields_by_key.keys.to_set).each do |key|
fields = fields_by_key[key] || []
value = dup[key]
field_type = self.class.get_custom_field_type(key)
if Array === field_type || (field_type != :json && Array === value)
value = value || []
value.compact!
sub_type = field_type[0]
value.map! { |v| HasCustomFields::Helpers.serialize(v, sub_type) }
unless value == fields.map(&:value)
fields.each(&:destroy!)
value.each { |subv| _custom_fields.create!(name: key, value: subv) }
end
else
t = {}
self.class.append_custom_field(t, f.name, f.value)
if dup.has_key?(f.name) && dup[f.name] == t[f.name]
dup.delete(f.name)
if value.nil?
fields.each(&:destroy!)
else
f.destroy!
value = HasCustomFields::Helpers.serialize(value, field_type)
field = fields.find { |f| f.value == value }
fields.select { |f| f != field }.each(&:destroy!)
create_singular(key, value) if !field
end
end
end
# let's iterate through our arrays and compare them
array_fields.each do |field_name, fields|
if fields.length == dup[field_name].length && fields.map(&:value) == dup[field_name]
dup.delete(field_name)
else
fields.each(&:destroy!)
end
end
dup.each do |k, v|
field_type = self.class.get_custom_field_type(k)
if v.is_a?(Array) && field_type != :json
v.each { |subv| _custom_fields.create!(name: k, value: subv) }
else
create_singular(k, v, field_type)
end
end
end
on_custom_fields_change