From 1a57eaab93a76d4b8f79f9b4f529a4c5309a3177 Mon Sep 17 00:00:00 2001 From: Zeke Gabrielse Date: Thu, 9 May 2024 23:04:55 -0500 Subject: [PATCH] fix superfluous query when user is nil --- app/services/license_validation_service.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/services/license_validation_service.rb b/app/services/license_validation_service.rb index 86c99ee8c..697365101 100644 --- a/app/services/license_validation_service.rb +++ b/app/services/license_validation_service.rb @@ -282,7 +282,7 @@ def validate! machine_limit = license.max_machines || 1 machine_count = case when license.lease_per_user? - owner = if scope.present? + owner = if scope.present? && scope.key?(:user) license.users.where(id: scope[:user]) .or( license.users.where(email: scope[:user]), @@ -312,7 +312,7 @@ def validate! machine_limit = license.max_machines machine_count = case when license.lease_per_user? - owner = if scope.present? + owner = if scope.present? && scope.key?(:user) license.users.where(id: scope[:user]) .or( license.users.where(email: scope[:user]), @@ -340,7 +340,7 @@ def validate! core_limit = license.max_cores core_count = case when license.lease_per_user? - owner = if scope.present? + owner = if scope.present? && scope.key?(:user) license.users.where(id: scope[:user]) .or( license.users.where(email: scope[:user]), @@ -386,7 +386,7 @@ def validate! process_count = license.processes.count process_limit = license.max_processes when license.lease_per_user? - owner = if scope.present? + owner = if scope.present? && scope.key?(:user) license.users.where(id: scope[:user]) .or( license.users.where(email: scope[:user]),