kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Simplify implementation of environments serializer

This commit is contained in:
Grzegorz Bizon 2017-02-07 13:11:15 +01:00
parent 14bf5c1009
commit e4cb073bc0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/serializers/environment_serializer.rb
View File

@ -1,5 +1,5 @@
class EnvironmentSerializer < BaseSerializer class EnvironmentSerializer < BaseSerializer
Struct.new('Item', :name, :size, :id, :latest) Item = Struct.new(:name, :size, :latest)
entity EnvironmentEntity entity EnvironmentEntity
@ -41,11 +41,10 @@ class EnvironmentSerializer < BaseSerializer
'COUNT(*) AS environments_count', 'COUNT(*) AS environments_count',
'MAX(id) AS last_environment_id') 'MAX(id) AS last_environment_id')
environments = resource.where(id: items.map(&:last)) environments = resource.where(id: items.map(&:last)).index_by(&:id)
.order('COALESCE(environment_type, name) ASC')
items.zip(environments).map do |item| items.map do |name, size, id|
Struct::Item.new(*item.flatten) Item.new(name, size, environments[id])
end end
end end
end end