wco_models 3.1.0.61 → 3.1.0.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 486108c2ea569d03ce5ae9aa5356b34fc93a95595cb22b2ef5ad1954aa4120d0
-  data.tar.gz: 42869ee9a142532a6710a3fc33a43b26d5c37c1bc6f07f13a625d2c137992a38
+  metadata.gz: ef2b8e4bef23e27158ed837b1aea47e139f21d1e5465a94f850acb62d843765b
+  data.tar.gz: 7209dcbe82884748e25f90ec28e3e99ac002838086c492a7a6c4de025d087ca3
 SHA512:
-  metadata.gz: 28cdd389154518d44da11512d2f0f0ccbcc2bbf9c6e44c7889bacf1f9abd15887375bf6541fb4ea85a2df7d60c3cd9ccb3cc3d677c3a41c2fe1f17c63eec1abc
-  data.tar.gz: 91e297e8dfe0772ebbe554a93d55c2264cedcb891a68846e1cca4eb899574f7aa9390359bb8d475c493ffcf81562c4ed5a45664961694c6ad70e476535bd434c
+  metadata.gz: 5d26f9a04b158184b51a29af4192185657af21b0911dcb7a839396178b07b17d10ed4513a56aec82e1cfbac1ae27cee017e942ab66ee3a592ba3b846959e9ceb
+  data.tar.gz: 69d0d4188dc22faa92e30f95434388aeacf261ce6bfd4db23ac047b340b1c0d187cca33b3114b8ddda832c0e76d18185b08adbc61ec4102ed21367f5781e43fa

data/app/assets/stylesheets/wco/utils.scss

@@ -138,4 +138,6 @@ h5.title {
 
 .padded {
   margin: 0.5em;
+  width: 100%;
 }
+

data/app/models/wco_email/context.rb

@@ -54,8 +54,8 @@ class WcoEmail::Context
   belongs_to :email_template, class_name: 'WcoEmail::EmailTemplate'
   def tmpl; email_template; end
 
-  belongs_to :scheduled_email_action, class_name: 'WcoEmail::ScheduledEmailAction', optional: true
-  def sch; scheduled_email_action; end
+  belongs_to :email_action, class_name: 'WcoEmail::EmailAction', optional: true
+  def sch; email_action; end
 
   belongs_to :email_campaign, class_name: 'WcoEmail::EmailCampaign', optional: true
 
@@ -66,17 +66,14 @@ class WcoEmail::Context
   field :unsubscribed_at, type: DateTime
 
 
-  def notsent
-    WcoEmail::EmailContext.where( sent_at: nil, unsubscribed_at: nil )
+  def self.notsent
+    where( sent_at: nil, unsubscribed_at: nil )
   end
-  def self.notsent; new.notsent; end
 
 
-  def scheduled
-    # or({ :send_at.lte => Time.now }, { :send_at => nil }) ## This won't work b/c I need draft state!
-    WcoEmail::EmailContext.where({ :send_at.lte => Time.now  })
+  def self.scheduled
+    where( :send_at.lte => Time.now  )
   end
-  def self.scheduled; new.scheduled; end
 
 
   belongs_to :lead,      class_name: 'Wco::Lead'

data/app/models/wco_email/email_action.rb

@@ -16,7 +16,7 @@ class WcoEmail::EmailAction
   STATUS_INACTIVE     = 'inactive'
   STATUS_TRASH        = 'trash'
   STATUS_UNSUBSCRIBED = 'unsubscribed'
-  STATUSS             = [ STATUS_ACTIVE, STATUS_INACTIVE, STATUS_UNSUBSCRIBED, STATUS_TRASH ]
+  STATUSES            = [ nil, STATUS_ACTIVE, STATUS_INACTIVE, STATUS_UNSUBSCRIBED, STATUS_TRASH ]
   field :status, type: :string
   scope :active, ->{ where( status: STATUS_ACTIVE ) }
 
@@ -25,7 +25,6 @@ class WcoEmail::EmailAction
   belongs_to :email_action_template, class_name: 'WcoEmail::EmailActionTemplate'
   validates  :email_action_template, uniqueness: { scope: :lead }
   def tmpl; email_action_template; end
-  def tmpl= k; email_action_template = k; end
 
   has_many :email_contexts, class_name: 'WcoEmail::Context'
   def ctxs; email_contexts; end
@@ -38,20 +37,20 @@ class WcoEmail::EmailAction
     sch.update({ status: STATUS_INACTIVE })
 
     # send now
-    ctx = Ctx.create!({
-      email_template_id:         sch.act.tmpl.id,
-      from_email:                sch.act.tmpl.from_email,
-      lead_id:                   sch.lead.id,
-      scheduled_email_action_id: sch.act.id,
-      send_at:                   Time.now,
-      subject:                   sch.act.tmpl.subject,
+    ctx = WcoEmail::Context.create!({
+      email_action:   sch,
+      email_template: sch.tmpl.email_template,
+      from_email:     sch.tmpl.email_template.from_email,
+      lead:           sch.lead,
+      send_at:        Time.now,
+      subject:        sch.tmpl.email_template.subject,
     })
 
     # schedule next actions & update the action
-    sch.act.ties.each do |tie|
-      next_sch = Sch.find_or_initialize_by({
-        lead_id:         sch.lead_id,
-        email_action_id: tie.next_email_action.id,
+    sch.tmpl.ties.each do |tie|
+      next_sch = self.class.find_or_initialize_by({
+        lead_id:                  sch.lead_id,
+        email_action_template_id: tie.next_tmpl.id,
       })
       next_sch.perform_at = eval(tie.next_at_exe)
       next_sch.status     = STATUS_ACTIVE
@@ -59,10 +58,9 @@ class WcoEmail::EmailAction
     end
   end
 
+
   def self.list
     [[nil,nil]] + all.map { |p| [ "#{p.lead&.email} :: #{p.tmpl&.slug}", p.id ] }
   end
-
-
 end
 

data/app/models/wco_email/email_action_template.rb

@@ -13,23 +13,23 @@ class WcoEmail::EmailActionTemplate
   validates :slug, uniqueness: true, allow_nil: true
   index({ slug: 1 }, { unique: true, name: "slug_idx" })
 
-  belongs_to :email_template, class_name: 'WcoEmail::EmailTemplate'
-  def tmpl; email_template; end
+  # field :from_email ## this is in email_template
 
-  has_many :scheduled_email_actions, class_name: 'WcoEmail::ScheduledEmailAction'
-  def schs; scheduled_email_actions; end
+  belongs_to :email_template, class_name: 'EmailTemplate'
 
-  has_many :ties,      class_name: 'WcoEmail::EmailActionTie', inverse_of: :email_action
-  has_many :prev_ties, class_name: 'WcoEmail::EmailActionTie', inverse_of: :next_email_action
+  has_many :email_actions, class_name: 'EmailAction'
+
+  has_many :ties,      class_name: '::WcoEmail::EmailActionTemplateTie', inverse_of: :tmpl
+  has_many :prev_ties, class_name: '::WcoEmail::EmailActionTemplateTie', inverse_of: :next_tmpl
   accepts_nested_attributes_for :ties
 
-  has_many :email_filters, class_name: 'WcoEmail::EmailFilter', inverse_of: :email_action
+  has_many :email_filters, class_name: 'EmailFilter', inverse_of: :email_action
 
-  ## @TODO: change this right now.
-  field :deleted_at, default: nil, type: :time
+  def to_s
+    slug
+  end
 
   def self.list
     [[nil,nil]] + all.map { |a| [ a.slug, a.id ] }
   end
-
 end

data/app/models/wco_email/email_action_template_tie.rb

@@ -0,0 +1,15 @@
+
+class WcoEmail::EmailActionTemplateTie
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  store_in collection: 'office_email_action_template_tie'
+
+  attr_accessor :to_delete
+
+  belongs_to :tmpl,      class_name: 'EmailActionTemplate', inverse_of: :ties
+  belongs_to :next_tmpl, class_name: 'EmailActionTemplate', inverse_of: :prev_ties
+
+  field     :next_at_exe, type: :string
+  validates :next_at_exe, presence: true
+
+end

data/app/models/wco_email/email_template.rb

@@ -89,6 +89,7 @@ class WcoEmail::EmailTemplate
     'Wasya Co Mailer <wasyacomailer@gmail.com>',
   ];
   FROM_EMAILS_2 = [
+    [ nil, nil ],
 
     [ 'Victor Pudeyev <piousbox@gmail.com>',    'piousbox@gmail.com' ],
     [ 'Victor Pudeyev <victor@piousbox.com>',   'victor@piousbox.com' ],
@@ -115,7 +116,7 @@ class WcoEmail::EmailTemplate
 
   ## 2023-03-04 _vp_ This works!
   def get_binding
-    @lead = Lead.where( email: 'stub@wasya.co' ).first
+    # @lead = Lead.where( email: 'stub@wasya.co' ).first
     binding()
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.61
+  version: 3.1.0.62
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2024-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -413,6 +413,7 @@ files:
 - app/models/wco_email/conversation.rb
 - app/models/wco_email/email_action.rb
 - app/models/wco_email/email_action_template.rb
+- app/models/wco_email/email_action_template_tie.rb
 - app/models/wco_email/email_filter.rb
 - app/models/wco_email/email_template.rb
 - app/models/wco_email/message.rb