X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/bb8f9b8724cc2baf6b311d8cfcc25f45f4ad2cc1..d6446b03e2f5d5079a870bdd7b963456dc12b485:/services/api/app/models/container.rb diff --git a/services/api/app/models/container.rb b/services/api/app/models/container.rb index 97f8dfa279..ee338b81ff 100644 --- a/services/api/app/models/container.rb +++ b/services/api/app/models/container.rb @@ -51,17 +51,15 @@ class Container < ArvadosModel after_save :update_cr_logs after_save :handle_completed - has_many :container_requests, { - class_name: 'ContainerRequest', - foreign_key: 'container_uuid', + has_many :container_requests, + class_name: 'ContainerRequest', + foreign_key: 'container_uuid', + primary_key: 'uuid' + belongs_to :auth, + class_name: 'ApiClientAuthorization', + foreign_key: 'auth_uuid', primary_key: 'uuid', - } - belongs_to :auth, { - class_name: 'ApiClientAuthorization', - foreign_key: 'auth_uuid', - primary_key: 'uuid', - optional: true, - } + optional: true api_accessible :user, extend: :common do |t| t.add :command @@ -321,7 +319,7 @@ class Container < ArvadosModel resolved_runtime_constraints.delete('cuda') ].uniq end - reusable_runtime_constraints = hash_product(runtime_constraint_variations) + reusable_runtime_constraints = hash_product(**runtime_constraint_variations) .map { |v| resolved_runtime_constraints.merge(v) } candidates = candidates.where_serialized(:runtime_constraints, reusable_runtime_constraints, md5: true, multivalue: true)