fix superfluous query when user is nil

keygen-sh · May 10, 2024 · 1a57eaa · 1a57eaa
1 parent 7abc4ae
commit 1a57eaa
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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]),