diff --git a/app/models/order_cycle.rb b/app/models/order_cycle.rb index 060f75e4f0..3fa6448944 100644 --- a/app/models/order_cycle.rb +++ b/app/models/order_cycle.rb @@ -154,9 +154,8 @@ class OrderCycle < ApplicationRecord joins(:order_cycle). merge(OrderCycle.active). group('exchanges.receiver_id'). - select("exchanges.receiver_id AS receiver_id, - MIN(order_cycles.orders_close_at) AS earliest_close_at"). - map { |ex| [ex.receiver_id, ex.earliest_close_at.to_time] } + pluck(Arel.sql("exchanges.receiver_id AS receiver_id"), + Arel.sql("MIN(order_cycles.orders_close_at) AS earliest_close_at")) ] end diff --git a/app/serializers/api/uncached_enterprise_serializer.rb b/app/serializers/api/uncached_enterprise_serializer.rb index d92db46d28..c1d620facd 100644 --- a/app/serializers/api/uncached_enterprise_serializer.rb +++ b/app/serializers/api/uncached_enterprise_serializer.rb @@ -7,7 +7,7 @@ module Api attributes :orders_close_at, :active def orders_close_at - options[:data].earliest_closing_times[object.id] + options[:data].earliest_closing_times[object.id]&.to_time end def active