kuroko2 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7faaf6688a807693ea34cc14fbbe75da627fef56
-  data.tar.gz: 425c499e7bea2f5a410a07ea5f79adf3931b0b57
+  metadata.gz: 8a5bff372d20c911ae85f7b7888b500a503be73b
+  data.tar.gz: 2b797f992710cbd06e44015a0291024955b53c45
 SHA512:
-  metadata.gz: f6556c97853e85ab23416591bb234751ad86f5f422df9c6062bb2c9982ac522ce225f2014e6b98e6fec90487ae687e2a827c6b42af7f388bf85969cfc316800f
-  data.tar.gz: 9f28a7dbc3409c2027fd9928bdc672b926989c4320f71f9fa64e69c8cb776ae35a127b9a29a2d816e804f6a9f85cc69decf99e41b4eede8fcc4a09fe31619d60
+  metadata.gz: e969eff950e524f52bb05b040afb3294f2ab86cc36e7c6e107cc948249dee2b6c8bfb70705878da9762c4906536ecbc9ec648131b85ec65f90aadd0febc97df2
+  data.tar.gz: e14270c72ed561cd0feb9a0993926772b3a1b5bc79bcdd67c8b9ec9826fefc469d84bf99b93df5caf562418315f9ce61fad639af38eb7f2aeb8a78c1339e8a83

data/app/models/kuroko2/job_definition.rb

@@ -25,13 +25,7 @@ class Kuroko2::JobDefinition < Kuroko2::ApplicationRecord
 
   has_many :admin_assignments, dependent: :destroy
   has_many :admins, -> { active }, through: :admin_assignments, source: :user
-  has_many :job_instances, -> { order(:id).reverse_order } do
-    def any_token?
-      self.any? do |instance|
-        instance.tokens.present?
-      end
-    end
-  end
+  has_many :job_instances, -> { order(:id).reverse_order }
   has_many :job_schedules, dependent: :delete_all
   has_many :job_suspend_schedules, dependent: :delete_all
   has_many :job_definition_tags
@@ -107,7 +101,7 @@ class Kuroko2::JobDefinition < Kuroko2::ApplicationRecord
   private
 
   def confirm_active_instances
-    if job_instances.any_token?
+    if Kuroko2::Token.joins(:job_instance).merge(job_instances).exists?
       errors.add(:base, I18n.t('model.job_definition.confirm_active_instances'))
       throw :abort
     end

data/lib/kuroko2/version.rb

@@ -1,3 +1,3 @@
 module Kuroko2
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end