ish_models 0.0.33.211 → 0.0.33.213

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 846b485fb78f382c7d084c59e34ed913434821c725a22fd83ebc1cf13e65e7c0
-  data.tar.gz: 5f2a09a0a4671ffe36d0986ecc061de33c1a45188c8c9394fc73a04d3ae00b04
+  metadata.gz: 4f038ff1851957b2b2d8ec01c3ab51af9a21878edbfa61c4dfda2df664b126f4
+  data.tar.gz: 4c682ece15b9bfa0a02e7edea7c3916ee840da82c90049d2c5755e8323c9595a
 SHA512:
-  metadata.gz: 86344c408514561160296d4b4fc6a3647da3f85028fc3ac41cb9c03d7a7271ea2a4984c8875a9dda412d1306be1d6ffb5a960ce5f2e5a35e7b3259444c4704e6
-  data.tar.gz: aff1681e76aa26eb7d322ebe8988da180b6b20fa42c68c40b235b1ed45957b762f95a31969dfc3b00985c93eff267833415b75a92f06c849442aa7118bc44929
+  metadata.gz: 7867b58c47db3b1297144df58a51eacfd9c203f5af415028e4908223f76a480743dee435a58fbdf78963b2b595c8d01199f1140fb622cca9695a81a118d43c91
+  data.tar.gz: 9610d87986bf78a8fac233ea83d2fe428e995e2a62105f909ff22775b71808b27ae8e8e1382fd09e367e792e18eb8d67af6665588186a0b827b5747aa161811f

data/lib/ish/email_context.rb

@@ -11,7 +11,7 @@ class ::Ish::EmailContext
 
   field :preview_str, type: :string
   def preview_str
-    if self[:preview_str].presence?
+    if self[:preview_str].presence
       return self[:preview_str]
     else
       return tmpl.preview_str
@@ -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/scheduled_email_action.rb

@@ -12,9 +12,9 @@ class Office::ScheduledEmailAction
     Lead.find( lead_id )
   end
 
-  STATE_ACTIVE = 'active'
+  STATE_ACTIVE   = 'active'
   STATE_INACTIVE = 'inactive'
-  STATES = [ STATE_ACTIVE, STATE_INACTIVE ]
+  STATES         = [ STATE_ACTIVE, STATE_INACTIVE ]
   field :state, type: :string
   scope :active, ->{ where( state: STATE_ACTIVE ) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.211
+  version: 0.0.33.213
 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