wco_models 3.1.0.83 → 3.1.0.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 136fd63ec2289135d50625c8ee250e34de0ba12757cec2a0d535264d8b3af9b4
-  data.tar.gz: f696b308e67bd35b454f11880fbf876d378c603983ae941396605ba0ca8e5a4a
+  metadata.gz: e35d2da6576585f442b86b8ab7589e6338a8c621659f1cb3fbc9f83135c9803e
+  data.tar.gz: 2640b0995ab53af533155910cd90d607188754e87e6d58898eed2a1a3c98354e
 SHA512:
-  metadata.gz: 125155b3a50dc0c7ae25c9dcb0f642ef3127bf13a3fa11040c91240deab4ef7bfd787d0ec73065b6c31f25a111c524637822d45bc0c6739ab8676833e826cd9d
-  data.tar.gz: e8c8f58699d02a209e9be4bfa177a987e40d67daa22db0535ade103f55dc4874ef8fb45c412ab1da49b5723996b4c734ce5cec1f48172bb6a41a22b5b73c2bae
+  metadata.gz: 0f55ff4f412e168ba9a2e715afd3e90abd8e44f5d209f544beec59e0d1e9125be0fe1e25763b62e14b131e9c986fb633594d974cedda643ceb8601c74f4b2c18
+  data.tar.gz: ee4b6abe4d93e40dabd416046b23fce7fea9a2596283fdcce523419eb33941c83855799b8201b32be22c21c554aed0212a50033ee45be56d91da197c8685c8aa

data/app/models/wco/headline.rb

@@ -12,7 +12,8 @@ class Wco::Headline
   field :name
   validates :name, presence: true, uniqueness: true
 
-  belongs_to :site, class_name: 'Wco::Site'
+  ## @TODO: remove this entirely. 2024-01-16
+  belongs_to :site, class_name: 'Wco::Site', optional: true
 
   has_and_belongs_to_many :tags, class_name: 'Wco::Tag'
 

data/app/models/wco/office_action.rb

@@ -23,9 +23,25 @@ class Wco::OfficeAction
 
   field :perform_at, type: :time
 
+  def do_run
+    sch = self
+    sch.update!({ status: STATUS_INACTIVE })
+
+    eval( sch.tmpl.action_exe )
+
+    # schedule next actions & update the action
+    sch.tmpl.ties.each do |tie|
+      next_sch = self.class.find_or_initialize_by({
+        office_action_template_id: tie.next_tmpl.id,
+      })
+      next_sch.perform_at = eval(tie.next_at_exe)
+      next_sch.status     = STATUS_ACTIVE
+      next_sch.save!
+    end
+  end
+
   def to_s
     slug
   end
-
 end
 

data/app/models/wco/office_action_template_tie.rb

@@ -7,10 +7,10 @@ class Wco::OfficeActionTemplateTie
   attr_accessor :to_delete
 
   belongs_to :office_action_template,      class_name: 'OfficeActionTemplate', inverse_of: :ties
-  def oat; office_action_template; end
+  def tmpl; office_action_template; end
 
   belongs_to :next_office_action_template, class_name: 'OfficeActionTemplate', inverse_of: :prev_ties
-  def next_oat; next_office_action_template; end
+  def next_tmpl; next_office_action_template; end
   # def tmpl;     next_office_action_template; end
 
 

data/app/views/wco/office_action_templates/_ties.haml

@@ -1,5 +1,5 @@
 
-- oat ||= nil
+- tmpl ||= nil
 - depth ||= 5
 - depth = depth - 1
 
@@ -10,9 +10,9 @@
       %li
         = tie.next_at_exe
         %br
-        = link_to '[~]', edit_office_action_template_path(tie.next_oat)
-        = link_to tie.next_oat, office_action_template_path(tie.next_oat)
-        - if tie.next_oat == oat
+        = link_to '[~]', edit_office_action_template_path(tie.next_tmpl)
+        = link_to tie.next_tmpl, office_action_template_path(tie.next_tmpl)
+        - if tie.next_tmpl == tmpl
           <b>[Same]</b>
-        - elsif tie.next_oat.ties.present?
-          = render '/wco/office_action_templates/ties', ties: tie.next_oat.ties, depth: depth, oat: tie.next_oat
+        - elsif tie.next_tmpl.ties.present?
+          = render '/wco/office_action_templates/ties', ties: tie.next_tmpl.ties, depth: depth, tmpl: tie.next_tmpl

data/app/views/wco/office_actions/_index.haml

@@ -7,6 +7,8 @@
        
       = link_to oa.slug, office_action_path(oa)
       %ul
+        %li
+          .gray.mini= oa.id
         %li <b>status:</b> #{oa.status}
         %li
           <b>tmpl:</b>

data/lib/tasks/office_tasks.rake

@@ -2,34 +2,26 @@
 require 'business_time'
 require 'httparty'
 
-namespace :office do
+namespace :wco do
 
-  desc 'run_office_actions'
+
+  desc 'run office actions'
   task run_office_actions: :environment do
+    puts! "Starting wco_email:run_office_actions..."
     while true do
 
-      OA  = Wco::OfficeAction
-      OAT = Wco::OfficeActionTemplate
-
-      OA.active.where( :perform_at.lte => Time.now ).each do |oa|
-        puts "+++ +++ Office Action: #{oa}"
+      schs = Wco::OfficeAction.active.where({ :perform_at.lte => Time.now })
+      print "[#{schs.length}]" if schs.length != 0
+      schs.each do |sch|
 
-        oa.update({ status: INACTIVE })
-        oa.tmpl.do_run
-        oa.tmpl.ties.each do |tie|
-          next_oa = OA.find_or_initialize_by({
-            office_action_template_id: tie.next_oat.id,
-          })
-          next_oa.perform_at = eval( tie.next_at_exe )
-          next_oa.status     = ACTIVE
-          next_oa.save!
-        end
+        sch.do_run
 
-        print '^'
+        print "[#{sch.id}]^"
+        sleep 15
       end
 
       print '.'
-      sleep Rails.env.production? ? 60 : 5 # seconds
+      sleep 15
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.83
+  version: 3.1.0.85
 platform: ruby
 authors:
 - Victor Pudeyev