ish_models 0.0.33.247 → 0.0.33.248

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 823be62d6f3e6bf6817ef43ebbcefda4c12049f01aedafb95b9fd01a624c6453
-  data.tar.gz: 9b1db16ef558002d83c109426fb41757a4b4892acc3f81a38dbaf130759b23dd
+  metadata.gz: 2def700aeaad8af0e705ff8942ad3644d42e9bd1ac93360dda132e81eac94c3a
+  data.tar.gz: 0efc6da855db6c6087405a8a86a32c1c5ec331fa6605f5c73bf6ba50cd3ab788
 SHA512:
-  metadata.gz: 2238d1a7cd112636cc58aba0eaaea3534a9cd8bb504b901ebe0b3b2298bb8aba90cba6abd4b5063234063c8d0348290a94e7d8979308c204996929797e991cb3
-  data.tar.gz: b2788efc4ae0447ff65d56aa829164a44ae1e42fa12538a63bcd6802c957568da23763d254cc8b79033eb5d25f358b28c4abf2e485dfe1709f274cb721fdc106
+  metadata.gz: 980d5d0b40716c183f460e92dceb012e0999a04f6449b9b5a637d45c1109f504949d6fd45cb598ef3263fb96f90dfac4609c9bfe10e280a2f1af1dbcae526515
+  data.tar.gz: e2629dfb10d8554ac7da8f8c5541f38da1f02333e5259ac0f2bedd7fd2d68d3b5ad5e7ca1532b31ca769f918a253f97d8feeed1fcca66fe78766c77e0f5ad7f0

data/lib/ish/email_template.rb

@@ -45,8 +45,9 @@ class ::Ish::EmailTemplate
     binding()
   end
 
-  has_many :email_actions, class_name: '::Office::EmailAction'
+  has_many :email_actions,  class_name: '::Office::EmailAction'
   has_many :email_contexts, class_name: '::Ish::EmailContext'
+  has_many :email_filters,  class_name: '::Office::EmailFilter', inverse_of: :email_template
 
   SLUG_BLANK = 'blank'
   def self.blank_template

data/lib/office/email_action.rb

@@ -22,5 +22,7 @@ class Office::EmailAction
   has_many :prev_ties, class_name: '::Office::EmailActionTie', inverse_of: :next_email_action
   accepts_nested_attributes_for :ties
 
+  has_many :email_filters, class_name: 'Office::EmailFilter', inverse_of: :email_action
+
 end
 EAct = Office::EmailAction

data/lib/office/email_conversation.rb

@@ -32,12 +32,14 @@ class Office::EmailConversation
   ## Tested manually ok, does not pass the spec. @TODO: hire to make pass spec? _vp_ 2023-03-07
   def add_tag tag
     case tag.class.name
+    when 'Integer'
+      tag = WpTag.find( tag )
     when 'WpTag'
-      ;
+      ; # tag is WpTag
     when 'String'
       tag = WpTag.emailtag(tag)
     else
-      throw "#add_tag expects a WpTag or string (eg WpTag::INBOX) as the only parameter."
+      throw "#add_tag expects a WpTag or string (eg WpTag::INBOX) or id as the only parameter."
     end
     self[:wp_term_ids] = ( [ tag.id ] + self[:wp_term_ids] ).uniq
     self.save!
@@ -45,12 +47,14 @@ class Office::EmailConversation
 
   def remove_tag tag
     case tag.class.name
-    when 'WpTag'
-      ;
+    when 'Integer'
+      tag = WpTag.find( tag )
     when 'String'
-      tag = WpTag.emailtag(tag)
+      tag = WpTag.emailtag( tag )
+    when 'WpTag'
+      ; # tag is WpTag
     else
-      throw "#remove_tag expects a WpTag or string (eg WpTag::INBOX) as the only parameter."
+      throw "#remove_tag expects a WpTag or string (eg WpTag::INBOX) or id as the only parameter."
     end
     self[:wp_term_ids] = self[:wp_term_ids] - [ tag.id ]
     out = self.save!

data/lib/office/email_filter.rb

@@ -7,19 +7,36 @@ class Office::EmailFilter
   include Mongoid::Timestamps
 
   field :from_regex
+  field :from_exact
   field :subject_regex
+  field :subject_exact
   field :body_regex
+  field :body_exact
 
-  KIND_SKIP_INBOX = 'skip-inbox'
-  KIND_AUTORESPOND = 'autorespond'
-  KINDS = [ nil, KIND_SKIP_INBOX, KIND_AUTORESPOND ]
+  KIND_AUTORESPOND      = 'autorespond' # @deprecated, DO NOT USE!
+  KIND_AUTORESPOND_TMPL = 'autorespond-template'
+  KIND_AUTORESPOND_EACT = 'autorespond-email-action'
+  KIND_REMOVE_TAG  = 'remove-tag'
+  KIND_ADD_TAG     = 'add-tag'
+  KIND_DELETE      = 'delete' # @obsolete, use add-tag
+  KIND_SKIP_INBOX  = 'skip-inbox' # @obsolete, use remove-tag
+
+  KINDS = [ nil, KIND_AUTORESPOND_TMPL, KIND_AUTORESPOND_EACT, KIND_SKIP_INBOX, KIND_ADD_TAG, KIND_REMOVE_TAG]
   field :kind
 
-  STATE_ACTIVE = 'active'
+  STATE_ACTIVE   = 'active'
   STATE_INACTIVE = 'inactive'
   STATES = [ STATE_ACTIVE, STATE_INACTIVE ]
   field :state, type: :string, default: STATE_ACTIVE
   scope :active, ->{ where( state: STATE_ACTIVE ) }
 
+  belongs_to :email_template, class_name: 'Ish::EmailTemplate', optional: true
+  belongs_to :email_action,   class_name: 'Office::EmailAction', optional: true
+
+  field :wp_term_id, type: :integer
+  def category
+    self.wp_term_id && WpTag.find( self.wp_term_id )
+  end
+
 end
 

data/lib/office/email_message.rb

@@ -93,14 +93,33 @@ class Office::EmailMessage
   ## @TODO: move to email_conversation _vp_ 2023-03-24
   def apply_filter filter
     case filter.kind
+
+    ## @deprecated, use KIND_REMOVE_TAG
     when ::Office::EmailFilter::KIND_SKIP_INBOX
       # self.remove_tag( WpTag::INBOX )
       self.conv.remove_tag( WpTag::INBOX )
-    when ::Office::EmailFilter::KIND_AUTORESPOND
+
+    when ::Office::EmailFilter::KIND_ADD_TAG
+      self.conv.add_tag( filter.wp_term_id )
+
+    when ::Office::EmailFilter::KIND_REMOVE_TAG
+      self.conv.remove_tag( filter.wp_term_id )
+
+    when ::Office::EmailFilter::KIND_AUTORESPOND_TMPL
       Ish::EmailContext.create({
-        email_template: ::Tmpl.find_by_slug( filter.email_template_slug ),
-        lead: lead,
+        email_template: filter.email_template,
+        lead_id: lead.id,
+        send_at: Time.now + 22.minutes,
       })
+
+    when ::Office::EmailFilter::KIND_AUTORESPOND_EACT
+      ::Sch.create({
+        email_action: filter.email_action,
+        state: ::Sch::STATE_ACTIVE,
+        lead_id: lead.id,
+        perform_at: Time.now + 22.minutes,
+      })
+
     else
       raise "unknown filter kind: #{filter.kind}"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.247
+  version: 0.0.33.248
 platform: ruby
 authors:
 - piousbox