wco_models 3.1.0.59 → 3.1.0.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b11007f01745aba3d77e2ba586b7989ec42ac5554aa9f53684098cd6f0fd4a1
-  data.tar.gz: 835baafdae5711debc5e503730f4fda22e342ecec976e3543fbd9d4ab0cc8a62
+  metadata.gz: cb93491d155b30b81d71bb16ad9929b3fce38bd0bda3a915e1b716feb9ec195d
+  data.tar.gz: 859abb66b1c27fba4d80dfc54ecf4ca63efdbe1b310f88a65838372a82b839d1
 SHA512:
-  metadata.gz: 1432d0dbfe12b637baee8916c5b1d38f5ebd187678ea3d83ce06527ed304b623051b404602868383feff6897861e15821178199a24f0271d27fbd145075705ed
-  data.tar.gz: f43b68d4282382af6bacd3ec26ee511e8d29b1c49e02df4648daa65e8ce0d3df02d412ee9e4a9ec461770c5402c69936a8be4961296322a6690bf2534bee1a16
+  metadata.gz: f1eab179dda685dd1f22d188c9216c7dab65dfe67d00689e7dadac911d50ebfca8933dd5f93b6145d9a147da168822148ae79345eafa8991e518d04117f16356
+  data.tar.gz: 50412046c73aa10b4437fdba003ed0ab467b27c60abdee510d51be3b9a6137173789e3ad27843c64a0146502a3e36d40be792e80f670e5acd0ba5c0df7edb527

data/app/models/wco/tag.rb

@@ -11,6 +11,8 @@ class Wco::Tag
 
   # parent-child
 
+  has_many :email_filters, class_name: 'WcoEmail::EmailFilter', inverse_of: :tag
+
   has_and_belongs_to_many :conversations, class_name: 'WcoEmail::Conversation'
   has_and_belongs_to_many :message_stubs, class_name: 'WcoEmail::MessageStub'
   has_and_belongs_to_many :headlines # ,     class_name: 'Headline'

data/app/models/wco_email/email_filter.rb

@@ -17,6 +17,7 @@ class WcoEmail::EmailFilter
   field :body_regex
   field :body_exact
 
+  belongs_to :tag, class_name: 'Wco::Tag', inverse_of: :email_filters, optional: true
 
   KIND_AUTORESPOND_TMPL = 'autorespond-template'
   KIND_AUTORESPOND_EACT = 'autorespond-email-action'
@@ -24,9 +25,10 @@ class WcoEmail::EmailFilter
   KIND_ADD_TAG          = 'add-tag'
   KIND_DESTROY_SCHS     = 'destroy-schs'
 
-  KIND_AUTORESPOND = 'autorespond' # @deprecated, DO NOT USE!
-  KIND_DELETE      = 'delete'      # @deprecated, use add-tag
-  KIND_SKIP_INBOX  = 'skip-inbox'  # @deprecated, use remove-tag
+  ## @deprecated
+  KIND_AUTORESPOND = 'autorespond' ## @deprecated, DO NOT USE!
+  KIND_DELETE      = 'delete'      ## @deprecated, use add-tag
+  KIND_SKIP_INBOX  = 'skip-inbox'  ## @deprecated, use remove-tag
 
   KINDS = [ nil, KIND_AUTORESPOND_TMPL, KIND_AUTORESPOND_EACT, KIND_ADD_TAG, KIND_REMOVE_TAG, KIND_DESTROY_SCHS]
   field :kind

data/app/models/wco_email/email_template.rb

@@ -131,7 +131,7 @@ class WcoEmail::EmailTemplate
   def self.blank; self.blank_template; end
 
   def self.list
-    all.map { |p| [ p.slug, p.id ] }
+    [[nil,nil]] + all.map { |p| [ p.slug, p.id ] }
   end
 
 end

data/app/models/wco_email/message.rb

@@ -71,8 +71,8 @@ class WcoEmail::Message
 
   belongs_to :stub, class_name: 'WcoEmail::MessageStub'
 
-  has_many :assets, class_name: '::Wco::Asset'
-  has_many :photos, class_name: '::Wco::Photo'
+  has_many :assets,  class_name: '::Wco::Asset'
+  has_many :photos,  class_name: '::Wco::Photo'
   has_many :replies, class_name: '::WcoEmail::Context', inverse_of: :reply_to_message
 
   def apply_filter filter
@@ -81,23 +81,23 @@ class WcoEmail::Message
     case filter.kind
 
     when WcoEmail::EmailFilter::KIND_DESTROY_SCHS
-      conv.add_tag    ::WpTag::TRASH
-      conv.remove_tag ::WpTag::INBOX
+      conv.tags.push   Wco::Tag.trash
+      conv.tags -= [ Wco::Tag.inbox ]
       lead.schs.each do |sch|
         sch.update_attributes({ state: ::Sch::STATE_TRASH })
       end
 
     when WcoEmail::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
+      conv.tags.push filter.tag
+      if filter.tag == Wco::Tag.trash
+        conv.tags.remove Wco::Tag.inbox
       end
 
     when WcoEmail::EmailFilter::KIND_REMOVE_TAG
-      conv.remove_tag filter.wp_term_id
+      conv.tags -= [ filter.tag ]
 
     when WcoEmail::EmailFilter::KIND_AUTORESPOND_TMPL
-      Ish::EmailContext.create({
+      WcoEmail::Context.create({
         email_template: filter.email_template,
         lead_id:        lead.id,
         send_at:        Time.now + 22.minutes,
@@ -114,6 +114,8 @@ class WcoEmail::Message
     else
       raise "unknown filter kind: #{filter.kind}"
     end
+
+    conv.save
   end
 
   ## From: https://stackoverflow.com/questions/24672834/how-do-i-remove-emoji-from-string/24673322

data/app/models/wco_email/message_stub.rb

@@ -171,8 +171,7 @@ class WcoEmail::MessageStub
     ##
     ## Tags
     ##
-    inbox_tag = Wco::Tag.inbox
-    conv.tags.push inbox_tag
+    conv.tags.push Wco::Tag.inbox
     conv.tags.push stub.tags
     conv.save
 
@@ -211,7 +210,7 @@ class WcoEmail::MessageStub
       ;
     else
       conv = WcoEmail::Conversation.find( conv.id )
-      if conv.tags.include? inbox_tag
+      if conv.tags.include? Wco::Tag.inbox
         out = WcoEmail::ApplicationMailer.forwarder_notify( @message.id.to_s )
         Rails.env.production? ? out.deliver_later : out.deliver_now
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.59
+  version: 3.1.0.60
 platform: ruby
 authors:
 - Victor Pudeyev