CR comments

pull/13941/head
Alex Martín 6 years ago
parent 786ae19bd8
commit 4b94613cfe

@ -115,11 +115,9 @@ module Carto
end
def export_named_maps(user)
re = /tpl_(?<viz_id>.+)/
named_maps_key = "map_tpl|#{user.username}"
named_maps_keys = $tables_metadata_secondary.hkeys(named_maps_key).reject do |named_map|
match = re.match(named_map)
match && visualization_exists?(id: match[:viz_id].tr('_', '-'), user_id: user.id)
matches_user_visualization?(named_map, user)
end
named_maps_hash = named_maps_keys.reduce({}) do |m, named_map|
m.merge(named_map => Base64.encode64($tables_metadata_secondary.hget(named_maps_key, named_map)))
@ -128,6 +126,12 @@ module Carto
{ named_maps_key => named_maps_hash }
end
def matches_user_visualization?(named_map, user)
re = /tpl_(?<viz_id>.+)/
match = re.match(named_map)
match && visualization_exists?(id: match[:viz_id].tr('_', '-'), user_id: user.id)
end
def visualization_exists?(criteria)
Carto::Visualization.where(criteria).exists?
rescue

@ -55,7 +55,7 @@ describe Carto::RedisExportService do
def check_named_maps(export, visualization)
expect(export[:redis][:tables_metadata]["map_tpl|#{visualization.user.username}"].keys).to eq(['custom_named'])
expect(export[:redis][:tables_metadata]["map_tpl|#{visualization.user.username}"]['custom_named']).to eq("ezpjPT4iY3VzdG9tIn0=\n")
expect(export[:redis][:tables_metadata]["map_tpl|#{visualization.user.username}"]['custom_named']).to eq(Base64.encode64("{:c=>\"custom\"}"))
end
def check_redis(prefix)

Loading…
Cancel
Save