ish_models 0.0.33.210 → 0.0.33.212

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46e7967e2f0d884e8c5ff8a5a6e6d54aed2cc64b605a286ed40f3e2b9417fcdd
-  data.tar.gz: bd0fb0ca21faef2ed8f2d42068756087fa80b5199fd887552a2989411b187145
+  metadata.gz: 2c44b73e125b69cd7cfe86af7801f5b0192c19b4d4fcf8a080879342ff8da0c7
+  data.tar.gz: 907323dd21684b8b4b73a23a5d4891bf06ec2126eecdde8e7e14073a7aa0dec1
 SHA512:
-  metadata.gz: ab02dca3ecf3add944f5f35bb1ed4977996acd81dd7fc33570307a7826d120a2fce295785d8d4fde754c3e516f1b73d0dcb9cdee28b40698188a5ee771211e4a
-  data.tar.gz: d41c6bb9bd15965fec727922217d2095b386770f9f6511bb6de0c1610fe156194da3656e6245574a258a0cc02c7c5db9a4312da2fc6cd96b6f38fba57c23bf3b
+  metadata.gz: eb26137627d7577a249ff8c3e07cb6643c1d89509bfa92c32ed423ff41c269fc5a377eff14268f97b4937aa87472bb030a2636fc777c7d28be0f5ccbf67bde05
+  data.tar.gz: bf9475b51920b917d3ebcaff3db5101df7c8ff10ea8f6d48bf3364a1969151b03b562626353d8b6562ce07598d39084c40d0492bf231a9a240dc869d38b4fcdf

data/lib/ish/email_context.rb

@@ -49,6 +49,9 @@ class ::Ish::EmailContext
     Ish::EmailContext.where({ :send_at.lte => Time.now  })
   end
 
+  def self.from_email_list
+    Ish::EmailCampaign.from_email_list
+  end
 
   field :lead_id, type: :integer
   def lead; Lead.find( lead_id ); end

data/lib/ish_models.rb

@@ -67,6 +67,7 @@ require 'report'
 require 'video'
 
 require 'office/email_action'
+require 'office/email_action_tie'
 require 'office/email_conversation'
 require 'office/email_filter'
 require 'office/email_message'

data/lib/office/email_action.rb

@@ -7,23 +7,28 @@ class Office::EmailAction
   include Mongoid::Document
   include Mongoid::Timestamps
 
+  # field :next_at_exe, type: :string
+  # field :next_in_days, type: :string
+  # field :next_at_time, type: :string
+
   field :slug, type: :string
   validates :slug, uniqueness: true, allow_nil: true
 
-  field :descr, type: :string
+  field :descr, type: :string ## optional, can remove
 
   belongs_to :email_template, class_name: '::Ish::EmailTemplate'
   def tmpl; email_template; end
 
-  # field :next_in_days, type: :string
-  # field :next_at_time, type: :string
-  field :next_at_exe, type: :string
-
-  belongs_to :prev_email_action, class_name: '::Office::EmailAction', optional: true, inverse_of: :next_email_actions
-  has_many :next_email_actions, class_name: '::Office::EmailAction', inverse_of: :prev_email_action
+  # belongs_to :prev_email_action, class_name: '::Office::EmailAction', optional: true, inverse_of: :next_email_actions
+  # has_many :next_email_actions, class_name: '::Office::EmailAction', inverse_of: :prev_email_action
+  # accepts_nested_attributes_for :next_email_actions
 
   has_many :scheduled_email_actions, class_name: '::Office::ScheduledEmailAction'
   def schs; scheduled_email_actions; end
 
-end
+  has_many :ties,      class_name: '::Office::EmailActionTie', inverse_of: :email_action
+  has_many :prev_ties, class_name: '::Office::EmailActionTie', inverse_of: :next_email_action
+  accepts_nested_attributes_for :ties
 
+end
+Act = Office::EmailAction

data/lib/office/email_action_tie.rb

@@ -0,0 +1,37 @@
+
+##
+## act = Act.new ; tie = Actie.new; act.ties.push( tie )
+##
+class Office::EmailActionTie
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  attr_accessor :to_delete
+
+  belongs_to :email_action,      class_name: '::Office::EmailAction', inverse_of: :ties
+  belongs_to :next_email_action, class_name: '::Office::EmailAction', inverse_of: :prev_ties
+
+
+  field :next_at_exe, type: :string
+  validates :next_at_exe, presence: true
+
+  # field :next_in_days, type: :string
+  # field :next_at_time, type: :string
+
+  # field :slug, type: :string
+  # validates :slug, uniqueness: true, allow_nil: true
+
+  # field :descr, type: :string ## optional, can remove
+
+  # belongs_to :email_template, class_name: '::Ish::EmailTemplate'
+  # def tmpl; email_template; end
+
+  # belongs_to :prev_email_action, class_name: '::Office::EmailAction', optional: true, inverse_of: :next_email_actions
+  # has_many :next_email_actions, class_name: '::Office::EmailAction', inverse_of: :prev_email_action
+  # accepts_nested_attributes_for :next_email_actions
+
+  # has_many :scheduled_email_actions, class_name: '::Office::ScheduledEmailAction'
+  # def schs; scheduled_email_actions; end
+
+end
+Actie = Office::EmailActionTie

data/lib/office/email_message.rb

@@ -41,23 +41,34 @@ class Office::EmailMessage
 
   ## Copied to email_conversation
   field :wp_term_ids, type: Array, default: []
+
   ## Tested manually ok, does not pass the spec. @TODO: hire to make pass spec? _vp_ 2023-03-07
   def add_tag tag
-    if WpTag == tag.class
-      self[:wp_term_ids] = self[:wp_term_ids].push(tag.id).uniq
-      self.save!
+    case tag.class.name
+    when 'WpTag'
+      ;
+    when 'String'
+      tag = WpTag.emailtag(tag)
     else
-      throw "#add_tag expects a WpTag as the only parameter."
+      throw "#add_tag2 expects a WpTag or string (eg WpTag::INBOX) as the only parameter."
     end
+    self[:wp_term_ids] = ( [ tag.id ] + self[:wp_term_ids] ).uniq
+    self.save!
   end
   def remove_tag tag
-    if WpTag == tag.class
-      self[:wp_term_ids].delete( tag.id )
-      self.save!
+    case tag.class.name
+    when 'WpTag'
+      ;
+    when 'String'
+      tag = WpTag.emailtag(tag)
     else
-      throw "#remove_tag expects a WpTag as the only parameter."
+      throw "#remove_tag2 expects a WpTag or string (eg WpTag::INBOX) as the only parameter."
     end
+    self[:wp_term_ids] = self[:wp_term_ids] - [ tag.id ]
+    out = self.save!
+    out
   end
+  def rmtag tag; remove_tag tag; end
 
   belongs_to :email_conversation
   def conv
@@ -74,10 +85,12 @@ class Office::EmailMessage
     from[0].split('@')[1]
   end
 
+  ## @TODO: move to email_conversation _vp_ 2023-03-24
   def apply_filter filter
     case filter.kind
     when ::Office::EmailFilter::KIND_SKIP_INBOX
       self.remove_tag( WpTag::INBOX )
+      self.conv.remove_tag( WpTag::INBOX )
     when ::Office::EmailFilter::KIND_AUTORESPOND
       Ish::EmailContext.create({
         email_template: ::Tmpl.find_by_slug( filter.email_template_slug ),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.210
+  version: 0.0.33.212
 platform: ruby
 authors:
 - piousbox
@@ -144,6 +144,7 @@ files:
 - lib/mongoid/voter.rb
 - lib/newsitem.rb
 - lib/office/email_action.rb
+- lib/office/email_action_tie.rb
 - lib/office/email_conversation.rb
 - lib/office/email_filter.rb
 - lib/office/email_message.rb