ish_models 0.0.33.282 → 0.0.33.284

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5f09926e50bdfd5eb47e0d54068d1e489da436ac66a04cbcbbdf512c54bd08d
-  data.tar.gz: '060097f0e62e56a7b6a531d59688818156395c197fddd4e6f99ec9e2a61d2372'
+  metadata.gz: 4a4d957982b07fa1d853042019a04a184a7f29b72714c6cdf7a1004f280eb40f
+  data.tar.gz: 7e146b62cb7fc0f4a355a411ae4179da424df030c13a3c51c3290f4a7a5b829c
 SHA512:
-  metadata.gz: 218fbb19117f7f2fd8cfb16b3bd42a926842c01935d533d38a0032f04161128a670cb618e38b3335e6f0e69b927f6b318923734f9f09195f353b1bfb182269c6
-  data.tar.gz: 8bbc63978210f3b2e2d33887aa89ae65ad89f70c15be228eafa22604dec316727cda6bbfcc1c0af9f58fb34be468ebbbcd8bab23674476e11f0a95d97c565a91
+  metadata.gz: d17aebb57121789518229f7a1c2dbaf5779a7fe0ea9814cceb11f8a6d4434e0ec71564678a3b5f15c6d15870cb77b9301a2b23f6d7743507482da553a79ae96b
+  data.tar.gz: 9aeb3776194c1bbac334a18c493a14b85ed3eed5fa46c0456b6f7ecb6db063b7ef98ee3d8fb00bbbef69cd75f2007f804bc80bd5d365f3fc535139e475283f04

data/lib/ish/email_template.rb

@@ -5,7 +5,7 @@ class ::Ish::EmailTemplate
 
   field :slug
   validates_uniqueness_of :slug
-  validates_presence_of :slug
+  validates_presence_of   :slug
 
   field :preview_str, type: :string
 
@@ -26,7 +26,7 @@ class ::Ish::EmailTemplate
   field :subject
   field :body
   field :can_unsubscribe, type: :boolean, default: true
-  field :config_exe,                      default: ""      ## used a lot.
+  field :config_exe,                      default: ""      ## unused! _vp_ 2023-09-24
   field :config_json,     type: Object,   default: '{}'
 
   FROM_EMAILS = [
@@ -95,5 +95,9 @@ class ::Ish::EmailTemplate
   end
   def self.blank; self.blank_template; end
 
+  def to_s
+    "Tmpl:#{slug}"
+  end
+
 end
 ::Tmpl = ::Ish::EmailTemplate

data/lib/office/email_conversation.rb

@@ -73,47 +73,6 @@ class Office::EmailConversation
   end
 
 
-  def apply_filter filter
-    case filter.kind
-
-    when ::Office::EmailFilter::KIND_DESTROY_SCHS
-      add_tag    ::WpTag::TRASH
-      remove_tag ::WpTag::INBOX
-      tmp_lead = ::Lead.where( email: self.part_txt.split("\n")[1] ).first
-      if tmp_lead
-        tmp_lead.schs.each do |sch|
-          sch.update_attributes({ state: ::Sch::STATE_TRASH })
-        end
-      end
-
-    when ::Office::EmailFilter::KIND_ADD_TAG
-      add_tag filter.wp_term_id
-      if ::WpTag::TRASH == ::WpTag.find( filter.wp_term_id ).slug
-        remove_tag ::WpTag::INBOX
-      end
-
-    when ::Office::EmailFilter::KIND_REMOVE_TAG
-      remove_tag filter.wp_term_id
-
-    when ::Office::EmailFilter::KIND_AUTORESPOND_TMPL
-      Ish::EmailContext.create({
-        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
-  end
 
 
 

data/lib/office/email_message.rb

@@ -58,6 +58,47 @@ class Office::EmailMessage
     body
   end
 
+
+  def apply_filter filter
+    case filter.kind
+
+    when ::Office::EmailFilter::KIND_DESTROY_SCHS
+      conv.add_tag    ::WpTag::TRASH
+      conv.remove_tag ::WpTag::INBOX
+      lead.schs.each do |sch|
+        sch.update_attributes({ state: ::Sch::STATE_TRASH })
+      end
+
+    when ::Office::EmailFilter::KIND_ADD_TAG
+      conv.add_tag filter.wp_term_id
+      if ::WpTag::TRASH == ::WpTag.find( filter.wp_term_id ).slug
+        conv.remove_tag ::WpTag::INBOX
+      end
+
+    when ::Office::EmailFilter::KIND_REMOVE_TAG
+      conv.remove_tag filter.wp_term_id
+
+    when ::Office::EmailFilter::KIND_AUTORESPOND_TMPL
+      Ish::EmailContext.create({
+        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
+  end
+
+
 end
 ::Msg = Office::EmailMessage
 

data/lib/office/lead_action.rb

@@ -7,6 +7,9 @@ class Office::LeadAction
   include Mongoid::Timestamps
 
   belongs_to :lead_action_template, class_name: '::Office::LeadActionTemplate', inverse_of: :lead_actions, foreign_key: :tmpl_id
+  def tmpl
+    lead_action_template
+  end
 
   field     :lead_id, type: :integer
   validates :lead_id, presence: true
@@ -14,7 +17,7 @@ class Office::LeadAction
     Lead.find( lead_id )
   end
 
-  field :params, type: Object
+  field :params, type: Object, default: '{}'
 
 
 end

data/lib/office/lead_action_template.rb

@@ -20,6 +20,9 @@ class Office::LeadActionTemplate
   KIND_UNSUBSCRIBE_CAMPAIGN = 'kind-unsubscribe-campaign'
   KINDS                     = [ KIND_UNSUBSCRIBE_TEMPLATE, KIND_UNSUBSCRIBE_CAMPAIGN ]
 
+  def to_s
+    "OLAT:#{slug}"
+  end
 
   def unsubscribe_from_campaign
   end
@@ -35,6 +38,10 @@ class Office::LeadActionTemplate
     })
   end
 
+  def self.list
+    [ [nil,nil] ] + all.map { |i| [ i.slug, i.id.to_s ] }
+  end
+
 
 end
-
+OLAT = Office::LeadActionTemplate

metadata

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