11065: Merge branch 'master' into 11065-optional-audit-logging

[arvados.git] / services / api / app / models / container_request.rb

diff --git a/services/api/app/models/container_request.rb b/services/api/app/models/container_request.rb
index 470388a7c7f6786662b4661a454686d9d48e0d15..f430ae918546ed53fe7eb1ef482fefea5d46a9c7 100644 (file)
--- a/services/api/app/models/container_request.rb
+++ b/services/api/app/models/container_request.rb
@@ -361,11 +361,7 @@ class ContainerRequest < ArvadosModel
       self.requesting_container_uuid = c.uuid
       # Determine the priority of container request for the requesting
       # container.
-      self.priority = ContainerRequest.
-            where('container_uuid=? and priority>0', self.requesting_container_uuid).
-            map do |cr|
-        cr.priority
-      end.max || 0
+      self.priority = ContainerRequest.where(container_uuid: self.requesting_container_uuid).maximum("priority") || 0
     end
   end