wco_models 3.1.0.255 → 3.1.0.256

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdb22f97e5a94b451b8aed68269f75aef631073ede0da10aebabc51f54d2c757
-  data.tar.gz: 10b0e793a7f2de9064b4e22fc8bb157e4c54cd852abb0b879280f3ab091b0c8b
+  metadata.gz: df997a022614f9d91328ec9895d6751031d95757c3bd440a8d901e3b9ec05039
+  data.tar.gz: 0d5b4f8ae88b862dd789bd222d07f8a1d22830b2fc002fe443e9df3fe888fced
 SHA512:
-  metadata.gz: a25efefb7f7465c1de0c1b75012e7d16722ea7aeecc95719845753ee4c25c08ffc91ea463d040ffe7a1b656532505efd5936413e2dd727db8212936c779bbd2b
-  data.tar.gz: 31d72730e8af98a78a02376a7c6fb5e907b8fb3436d2aa3fae7dfc95e95b418a704af9951360677bfa77162abbe1536300c02ffdd0a4cd637982f5986767a418
+  metadata.gz: eeb94f1ebc9fe0c9e8f889e91131fca6d3f497f641e2ab08edb2e762aeedc2716079a0e71ff33f5b3a00070161e8b13e015dc5a52a90fa3174dcf5c157271339
+  data.tar.gz: 6da49cff643a536dc13c169de9b37d0d82cf0ecfaf5cd1ef2bc3c1dc9cdca6c6a566e4d9b7de646698a94cc40124d73ef0a06c42f28c2a2f56e3d599493a806b

data/app/models/wco/office_action.rb

@@ -23,10 +23,12 @@ class Wco::OfficeAction
   attr_accessor :deactivate
 
   field :perform_at, type: :time
+  field :config, type: Hash, default: {}
 
   def do_run
     @oa = self
     @oa.update!({ status: STATUS_INACTIVE })
+    @oat = @oa.office_action_template
 
     begin
       eval( @oa.tmpl.action_exe )

data/app/models/wco_email/email_filter_condition.rb

@@ -9,13 +9,14 @@ class WcoEmail::EmailFilterCondition
   belongs_to :email_skip_filter, class_name: '::WcoEmail::EmailFilter', inverse_of: :skip_conditions, optional: true
 
   FIELD_BODY    = 'body'
+  FIELD_BODY_PLAIN = 'body-plain'
   FIELD_FROM    = 'from'
   FIELD_TAGGED  = 'leadset-tagged'
   FIELD_NOT_TAGGED  = 'leadset-not-tagged'
   FIELD_SUBJECT  = 'subject'
   # FIELD_TO       = 'to'
   FIELD_TO_OR_CC = 'to-or-cc'
-  FIELD_OPTS     = [ FIELD_SUBJECT, FIELD_FROM, FIELD_TO_OR_CC, FIELD_TAGGED, FIELD_NOT_TAGGED, FIELD_BODY ]
+  FIELD_OPTS     = [ FIELD_SUBJECT, FIELD_FROM, FIELD_TO_OR_CC, FIELD_TAGGED, FIELD_NOT_TAGGED, FIELD_BODY, FIELD_BODY_PLAIN ]
   field :field
   validates :field, presence: true, inclusion: FIELD_OPTS
 

data/app/models/wco_email/message.rb

@@ -83,6 +83,29 @@ class WcoEmail::Message
   has_many :photos,  class_name: '::Wco::Photo'
   has_many :replies, class_name: '::WcoEmail::Context', inverse_of: :reply_to_message
 
+  def apply2_filter filter
+    conv.filter = filter
+    filter.actions each do |action|
+      case action.kind
+      when WcoEmail::EmailFilterAction::KIND_OAT
+
+        config = {
+          'email_message_id' => self.id,
+          'lead_id' => lead_id,
+          'message_id' => self.id,
+          'stub_id' => stub_id,
+        }
+        oa = Wco::OfficeAction.create!({
+          office_action_template: filter.aject,
+          status:                 'active',
+          perform_at:             Time.now,
+          config:                 config,
+        })
+
+      end
+    end
+  end
+
   def apply_filter filter
     puts! filter, 'WcoEmail::Message#apply_filter' if DEBUG
     conv.filter = filter

data/app/models/wco_email/message_stub.rb

@@ -95,13 +95,9 @@ class WcoEmail::MessageStub
       subject: subject,
       date:    json['date'].to_s,
 
-      from:  from,
-
-      to:  json['to'],
-      tos: [ json['to'] ],
-
-      cc:  json['cc'],
-      ccs: [ json['cc'] ],
+      from: from,
+      to:   json['to'],
+      cc:   json['cc'],
 
       part_html: json['html_body'],
       part_txt:  json['plain_body'],
@@ -155,7 +151,7 @@ class WcoEmail::MessageStub
       end
 
       if reason
-        puts! "Applying filter #{filter} to conv #{@message.conversation} for matching #{reason}" if DEBUG
+        puts! "Applying2 filter #{filter} to conv #{@message.conversation} for matching #{reason}" if DEBUG
 
         ## skip
         skip_reason = nil
@@ -173,7 +169,7 @@ class WcoEmail::MessageStub
         if skip_reason
           puts! "NOT Applying filter #{filter} to conv #{@message.conversation} for matching #{skip_reason}" if DEBUG
         else
-          @message.apply_filter( filter )
+          @message.apply2_filter( filter )
         end
       end
     end

metadata

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