ish_models 0.0.33.281 → 0.0.33.283

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 309331625ed639a9bd1ddfb2142225aede62f631849763c8b3fabd8ce0d02b17
-  data.tar.gz: ee3439e19b8c30a296978750e572cbbe187a10f66f02ea35eec7a17526cc1d40
+  metadata.gz: f08684b167a8a9dd2f48caf9441d0c328ce9fef962a3964feeb0fb067a74db6c
+  data.tar.gz: d006ee0f98934aa7b7146fbd434faa81e696a48e8f391381ed9dd78d4b70be7f
 SHA512:
-  metadata.gz: 30e65133826f586e41a9ad12ec57aa48e9bc26c1ba7d214811233e5eb084a73bf8a2e9ca1c866124ca49f8e187035c17ad1960e7154ef15a1db4b7ccc6d9458e
-  data.tar.gz: 490e745619d555e1c30fc9aab472c75508af4753da93341fe6f869cc5f86d9d2194ab67f93643b76c175d0f02348f8ba2a091a9b7d645bd2b192df32d89036c0
+  metadata.gz: 04a4903ee82b65803e0cadd5b2235935ce9041f6c442defd558c3d81e14a522a47d6510aaf69e32b71d0bd5c16a9f8590acd7fa7506417ab17789e34fd59f88a
+  data.tar.gz: 5bae3c73bc973fb0b240b9cfba54cc42e2de35c6257226dc386d130bc0f272a3a2bb770e0d42144f127a2bf3b782b0ce3b6cc9aa8032aa181e1438f0bbc5cf95

data/lib/ish/email_context.rb

@@ -53,12 +53,13 @@ class ::Ish::EmailContext
 
   field :rendered_str
 
-  field :sent_at, type: DateTime
-  field :send_at, type: DateTime
+  field :sent_at,         type: DateTime
+  field :send_at,         type: DateTime
+  field :unsubscribed_at, type: DateTime
 
 
   def notsent
-    Ish::EmailContext.where( sent_at: nil )
+    Ish::EmailContext.where( sent_at: nil, unsubscribed_at: nil )
   end
   def self.notsent; new.notsent; end
 

data/lib/ish/email_template.rb

@@ -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 = [

data/lib/ish/email_unsubscribe.rb

@@ -7,12 +7,12 @@ class Ish::EmailUnsubscribe
   # validates_presence_of :email
   # validates_uniqueness_of :email
 
-  field :lead_id
+  field :lead_id, type: :integer
   field :reason
   field :unsubscribed_at
 
-  belongs_to :campaign, class_name: '::Ish::EmailCampaign', inverse_of: :unsubscribes
-  belongs_to :template, class_name: '::Ish::EmailTemplate', inverse_of: :unsubscribes
+  belongs_to :campaign, class_name: '::Ish::EmailCampaign', inverse_of: :unsubscribes, optional: true
+  belongs_to :template, class_name: '::Ish::EmailTemplate', inverse_of: :unsubscribes, optional: true
 
 
 end

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
 

metadata

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