ish_models 0.0.33.235 → 0.0.33.237

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8002a35421fc69935dc8771ead9c2c766d4506d1d1117bd3bd9890060c3c081b
-  data.tar.gz: 60c9c0e509691481bc9cf385549d74434d407a278fea83944f1c4f867a488ffa
+  metadata.gz: ecce740f5d2efcbf23bae3ac90345798790279b39de3559a1f400911b11107df
+  data.tar.gz: 8f5a2146fe4099ff9ee7a3869507e98450f57a024b133b8b4706ad4aab384839
 SHA512:
-  metadata.gz: e3d523e5af0f2bef36d7fdaf20dc28d7698298be5f8a6f380011bbfb8ec5d5d625ffb4d447b75c7fb91384bda78f6580945fe0c4f307b0656176f6fe74bc0a6e
-  data.tar.gz: 02e270850e4dfa21c2e23a6d033cc80650b9cc4bd20d6cc5f6b4e2df19a7d1c748746275cc7876c9e94068845161cd576b1980d8a9e9b37aff00c6b40b048cab
+  metadata.gz: e04996ef74d595649d87c22b6f6e828c713f8bc4638f2da49ed85548481467c22e66a3c00b3435afb9337bc863a42eb6c69613598e0889a93124f07bd2b44c3d
+  data.tar.gz: 491b70c769dd230079e463bc8b2387e7fbf91ae72a0872782b68de4ae0046ad1ffd8d5aa0ad8e68269a659613f03b39e7d565cdc6d498b5d25742348c15e99f5

data/lib/ish/email_campaign.rb

@@ -1,9 +1,8 @@
 
-#
-# Sends a campaign.
-# _vp_ 2023-02-02
-#
-
+##
+## Sends a campaign.
+## _vp_ 2023-02-02
+##
 class Ish::EmailCampaign
   include Mongoid::Document
   include Mongoid::Timestamps
@@ -14,11 +13,11 @@ class Ish::EmailCampaign
 
   PAGE_PARAM_NAME = 'email_contexts_page'
 
+  field :from_email
+  validates_presence_of :from_email
   FROM_EMAILS = %w|    hello@infiniteshelter.com no-reply@infiniteshelter.com
     piousbox@gmail.com hello@piousbox.com        no-reply@piousbox.com        victor@piousbox.com
     admin@wasya.co     hello@wasya.co            no-reply@wasya.co            victor@wasya.co |
-  field :from_email
-  validates_presence_of :from_email
   def self.from_email_list
     [ [nil, nil] ] + FROM_EMAILS.map { |i| [i, i] }
   end
@@ -40,23 +39,21 @@ class Ish::EmailCampaign
     campaign_leads&.map { |p| p.lead }
   end
 
-
-  # ##
-  # ## For templating:
-  # ##
-  # ## commonly: name, companyName
-  # field :tmpl, type: Hash, default: {}
-  # def body_templated
-  #   out = email_template.body
-  #   tmpl.each do |k, v|
-  #     out.gsub!("{#{k}}", v)
-  #   end
-  #   out
-  # end
-
-  #
-  # For tracking
-  #
+  ##
+  ## For tracking
+  ##
   attr_reader :tid
 
+  def do_send
+    leads.each do |lead|
+      ctx = Ctx.create!({
+        email_template: tmpl,
+        from_email:     tmpl.from_email,
+        lead_id:        lead.id,
+        send_at:        Time.now,
+        subject:        tmpl.subject,
+      })
+    end
+  end
+
 end

data/lib/ish/email_context.rb

@@ -33,7 +33,9 @@ class ::Ish::EmailContext
   # validates_presence_of :from_email
 
   field :subject
-  # validates_presence_of :subject
+  def subject
+    self[:subject].presence || tmpl.subject
+  end
 
   belongs_to :email_template
   def tmpl; email_template; end

data/lib/ish/email_template.rb

@@ -12,7 +12,7 @@ class ::Ish::EmailTemplate
   field :layout, type: :string, default: 'plain'
   LAYOUTS = %w| plain
     m20221201react m20221222merryxmas
-    marketing_react_1
+    marketing_react_1 marketing_react_2
     marketing_ror_1 marketing_ror_2
     marketing_wordpres_1 marketing_wordpress_2
     piousbox_roundborders

data/lib/ish_models.rb

@@ -64,6 +64,8 @@ require 'photo'
 require 'report'
 require 'video'
 
+require 'office/action'
+require 'office/action_tie'
 require 'office/email_action'
 require 'office/email_action_tie'
 require 'office/email_conversation'
@@ -75,4 +77,3 @@ require 'office/scheduled_email_action'
 
 
 
-

data/lib/office/action.rb

@@ -0,0 +1,29 @@
+
+class Office::Action
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  store_in collection: 'office_actions'
+
+  field :slug, type: :string
+  validates :slug, uniqueness: true, allow_nil: true
+
+  field :descr, type: :string ## optional
+
+
+  STATE_ACTIVE   = 'active'
+  STATE_INACTIVE = 'inactive'
+  STATES         = [ STATE_ACTIVE, STATE_INACTIVE ]
+  field :state, type: :string
+  scope :active, ->{ where( state: STATE_ACTIVE ) }
+
+
+  has_many :ties,      class_name: '::Office::ActionTie', inverse_of: :office_action
+  has_many :prev_ties, class_name: '::Office::ActionTie', inverse_of: :next_office_action
+  accepts_nested_attributes_for :ties
+
+  field :action_exe, type: :string
+
+  field :perform_at, type: :time
+
+end
+OAct = Office::Action

data/lib/office/action_tie.rb

@@ -0,0 +1,16 @@
+
+class Office::ActionTie
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  store_in collection: 'office_action_ties'
+
+  attr_accessor :to_delete
+
+  belongs_to :office_action,      class_name: '::Office::Action', inverse_of: :ties
+  belongs_to :next_office_action, class_name: '::Office::Action', inverse_of: :prev_ties
+
+  field :next_at_exe,     type: :string
+  validates :next_at_exe, presence: true
+
+end
+OActie = Office::ActionTie

data/lib/office/email_action.rb

@@ -7,10 +7,6 @@ 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
 
@@ -19,10 +15,6 @@ class Office::EmailAction
   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
 
@@ -31,4 +23,4 @@ class Office::EmailAction
   accepts_nested_attributes_for :ties
 
 end
-Act = Office::EmailAction
+EAct = Office::EmailAction

data/lib/office/email_action_tie.rb

@@ -11,27 +11,8 @@ class Office::EmailActionTie
   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
+EActie = Office::EmailActionTie

data/lib/office/email_conversation.rb

@@ -17,8 +17,6 @@ class Office::EmailConversation
     Lead.find( lead_ids )
   end
 
-
-
   has_many :email_messages
   def email_messages
     Office::EmailMessage.where( email_conversation_id: self.id )
@@ -85,5 +83,4 @@ class Office::EmailConversation
   end
 
 end
-# EmailConversation = Office::EmailConversation
 Conv = Office::EmailConversation

data/lib/office/email_message_stub.rb

@@ -15,7 +15,6 @@ class Office::EmailMessageStub
   validates_presence_of :object_key
 
   field :object_path, type: :string ## A routable s3 url ## @TODO: remove this field. _vp_ 2023-03-07
-  # validates_presence_of :object_path ## only need object_key == message_id
 
   field :wp_term_ids, type: :array, default: []
 

data/lib/office/scheduled_email_action.rb

@@ -6,6 +6,7 @@ class Office::ScheduledEmailAction
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::Paranoia
+  store_in collection: 'office_scheduled_email_actions'
 
   field :lead_id, type: :integer
   def lead
@@ -19,9 +20,9 @@ class Office::ScheduledEmailAction
   scope :active, ->{ where( state: STATE_ACTIVE ) }
 
   belongs_to :email_action, class_name: '::Office::EmailAction'
-  def act; email_action; end
+  validates  :email_action, uniqueness: { scope: :lead_id }
+  def act;    email_action;    end
   def act= a; email_action= a; end
-  validates :email_action, uniqueness: { scope: :lead_id }
 
   has_many :email_contexts, class_name: '::Ish::EmailContext'
   def ctxs; email_contexts; end
@@ -59,23 +60,3 @@ class Office::ScheduledEmailAction
 end
 ::Sch = Office::ScheduledEmailAction
 
-## @TODO: herehere 2023-03-04 _vp_ Currently Working on this
-=begin
-::Sch.active.where( :perform_at.lte => Time.now ) do |sch|
-  next_a = sch.next_email_action
-
-  if sch.next_actions.present?
-    sch.next_actions.each do |next_a|
-      next_sch_a = ::Office::ScheduledEmailAction.new({
-        email_action: next_a
-
-      next_time = Time.now + eval( sch.next_in_days )
-      next_time.time = eval( sch.next_at_time )
-      sch.update_attribute( :perform_at, next_time )
-    end
-  else
-    sch.update_attribute( state: STATE_INACTIVE )
-  end
-=end
-
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.235
+  version: 0.0.33.237
 platform: ruby
 authors:
 - piousbox
@@ -158,6 +158,8 @@ files:
 - lib/mongoid/votable.rb
 - lib/mongoid/voter.rb
 - lib/newsitem.rb
+- lib/office/action.rb
+- lib/office/action_tie.rb
 - lib/office/email_action.rb
 - lib/office/email_action_tie.rb
 - lib/office/email_conversation.rb