Add second order_by parameter, as created_at might not be unique (#3658)

Resources included by decorators are ordered by 'created_at', which only
has a resolution in seconds. This may lead to arbitrary ordering. To
ensure a consistent ordering, 'guid', which has already been utilized by
the SequelPaginator for secondary ordering, has been added to the
decorators as well.

Additional database statements aim to return the oldest or newest
entries from a selection. For those, 'id' has been added as the second
'order_by' parameter.

The specs testing the results of included resources have been improved
to ensure a specific ordering by setting a definitive creation date. In
some instances, the matcher has been changed from 'match_array' to 'eq',
enabling the tests to verify the order of elements.

Author: philippthun

app/decorators/field_service_instance_broker_decorator.rb

@@ -22,7 +22,7 @@ def decorate(hash, service_instances)
                 join(:service_instances, service_plan_id: :service_plans__id).
                 where(service_instances__id: managed_service_instances.map(&:id)).
                 distinct.
-                order_by(:service_brokers__created_at).
+                order_by(:service_brokers__created_at, :service_brokers__guid).
                 select(:service_brokers__name, :service_brokers__guid, :service_brokers__created_at).
                 all
 

app/decorators/field_service_instance_offering_decorator.rb

@@ -21,7 +21,7 @@ def decorate(hash, service_instances)
                   join(:service_instances, service_plan_id: :service_plans__id).
                   where(service_instances__id: managed_service_instances.map(&:id)).
                   distinct.
-                  order_by(:services__created_at).
+                  order_by(:services__created_at, :services__guid).
                   select(:services__label, :services__guid, :services__description, :services__tags, :services__extra, :services__service_broker_id, :services__created_at).
                   all
 

app/decorators/field_service_instance_organization_decorator.rb

@@ -17,7 +17,7 @@ def decorate(hash, resources)
       spaces = resources.map { |r| r.try(:space) || r }.uniq
       orgs = spaces.map(&:organization).uniq
 
-      hash[:included][:organizations] = orgs.sort_by(&:created_at).map do |org|
+      hash[:included][:organizations] = orgs.sort_by { |o| [o.created_at, o.guid] }.map do |org|
         org_view = {}
         org_view[:name] = org.name if @fields.include?('name')
         org_view[:guid] = org.guid if @fields.include?('guid')

app/decorators/field_service_instance_plan_decorator.rb

@@ -19,7 +19,7 @@ def decorate(hash, service_instances)
       hash[:included] ||= {}
       plans = managed_service_instances.map(&:service_plan).uniq
 
-      hash[:included][:service_plans] = plans.sort_by(&:created_at).map do |plan|
+      hash[:included][:service_plans] = plans.sort_by { |p| [p.created_at, p.guid] }.map do |plan|
         plan_view = {}
         plan_view[:guid] = plan.guid if @fields.include?('guid')
         plan_view[:name] = plan.name if @fields.include?('name')

app/decorators/field_service_instance_space_decorator.rb

@@ -17,7 +17,7 @@ def decorate(hash, resources)
 
       spaces = resources.map { |r| r.try(:space) || r }.uniq
 
-      hash[:included][:spaces] = spaces.sort_by(&:created_at).map do |space|
+      hash[:included][:spaces] = spaces.sort_by { |s| [s.created_at, s.guid] }.map do |space|
         temp = {}
         temp[:guid] = space.guid if @fields.include?('guid')
         temp[:name] = space.name if @fields.include?('name')

app/decorators/field_service_offering_service_broker_decorator.rb

@@ -15,7 +15,7 @@ def initialize(fields)
     def decorate(hash, service_offerings)
       hash[:included] ||= {}
       service_brokers = service_offerings.map(&:service_broker).uniq
-      hash[:included][:service_brokers] = service_brokers.sort_by(&:created_at).map do |broker|
+      hash[:included][:service_brokers] = service_brokers.sort_by { |sb| [sb.created_at, sb.guid] }.map do |broker|
         broker_view = {}
         broker_view[:name] = broker.name if @fields.include?('name')
         broker_view[:guid] = broker.guid if @fields.include?('guid')

app/decorators/field_service_plan_service_broker_decorator.rb

@@ -16,7 +16,7 @@ def decorate(hash, service_plans)
       hash[:included] ||= {}
       service_offerings = service_plans.map(&:service).uniq
       service_brokers = service_offerings.map(&:service_broker).uniq
-      hash[:included][:service_brokers] = service_brokers.sort_by(&:created_at).map do |broker|
+      hash[:included][:service_brokers] = service_brokers.sort_by { |sb| [sb.created_at, sb.guid] }.map do |broker|
         broker_view = {}
         broker_view[:name] = broker.name if @fields.include?('name')
         broker_view[:guid] = broker.guid if @fields.include?('guid')

app/decorators/include_binding_app_decorator.rb

@@ -19,7 +19,7 @@ def apps(bindings)
         app_guids = bindings.pluck(:app_guid).compact.uniq
         return if app_guids.empty?
 
-        AppModel.where(guid: app_guids).order(:created_at).
+        AppModel.where(guid: app_guids).order(:created_at, :guid).
           eager(Presenters::V3::AppPresenter.associated_resources).all
       end
     end

app/decorators/include_binding_route_decorator.rb

@@ -20,7 +20,7 @@ def match?(include_params)
 
         def routes(route_bindings)
           route_ids = route_bindings.map(&:route_id)
-          routes = Route.where(id: route_ids).order_by(:created_at).
+          routes = Route.where(id: route_ids).order_by(:created_at, :guid).
                    eager(Presenters::V3::RoutePresenter.associated_resources).all
           routes.map { |route| Presenters::V3::RoutePresenter.new(route).to_hash }
         end

app/decorators/include_binding_service_instance_decorator.rb

@@ -18,7 +18,7 @@ def decorate(hash, bindings)
       private
 
       def service_instances(bindings)
-        ServiceInstance.where(guid: bindings.map(&:service_instance_guid).uniq).order(:created_at).
+        ServiceInstance.where(guid: bindings.map(&:service_instance_guid).uniq).order(:created_at, :guid).
           eager(Presenters::V3::ServiceInstancePresenter.associated_resources).all
       end
     end