wco_models 3.1.0.191 → 3.1.0.193

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bff74466afd78d598eeb38f3b23283337a17e0b5a8b92b0e26f845f0bb8911a
-  data.tar.gz: e4f9e670080defcc68b180349aff8fd16b5de911bfc2951a97032f57a5a3400e
+  metadata.gz: 7c53ddd403cc55954a1df11b9e56ced2f9e7c7c06d2bdd811d168fd67330ed4c
+  data.tar.gz: 6780da6d6ac23641ff9bfa637e10231df33a2e21898e0422cc4794d2f4a83777
 SHA512:
-  metadata.gz: 2aa5e46bf8e08e735d816278ecc948d47e99cd70e7c85e8d17bf7a7f196310c6096f12a14fd9d03158f426025580cec2648995c4325ff21bfe0940193f35ce73
-  data.tar.gz: d59c6bd87089bbb5a3ac0092a365696cf0d0fde26c2eb2573f00a1b6bc304ba53b2ef96a45ffa8212ef43b17ac7a0c13fa8d9d4c0c464454ccc42c18f2bc2cc4
+  metadata.gz: 3fa3ad8806434774d813e9b6af35ea966665f9ad35b7613353df99c8b5ab4028cdafee1a4c5416ea6072387326615acfb8fe4ad00a8ecd11835fd024aeb10ac0
+  data.tar.gz: eb95c14521da85dc6c051af5934996de37e3fc0edbfe90ed97c03010439d35349ae58cdef11cbbdfd32f534464df154d68a80c831d5ed248aef418b34db9da24

data/app/models/wco_email/email_filter.rb

@@ -37,6 +37,7 @@ class WcoEmail::EmailFilter
   ## 'and' - all conditions must match, for filter to match
   has_many :skip_conditions, class_name: '::WcoEmail::EmailFilterCondition', inverse_of: :email_skip_filter
   accepts_nested_attributes_for :skip_conditions, allow_destroy: true
+
   validate :validate_conditions
   def validate_conditions
     if conditions.length + skip_conditions.length == 0

data/app/models/wco_email/email_filter_action.rb

@@ -42,6 +42,6 @@ class WcoEmail::EmailFilterAction
     if [ KIND_AUTORESPOND ].include?( kind )
       _value = WcoEmail::EmailTemplate.find( value )
     end
-    "#{" " * indent }<EmailFilterAction #{kind} `#{_value}` />\n"
+    "#{" " * indent }<EFAction #{kind} `#{_value}` />\n"
   end
 end

data/app/models/wco_email/email_filter_condition.rb

@@ -18,15 +18,37 @@ class WcoEmail::EmailFilterCondition
   field :value
   validates :value, presence: true
 
+  def apply leadset:, message:
+    cond = self
+    reason = nil
+    case cond.field
+    when WcoEmail::FIELD_LEADSET
+      if cond.operator == WcoEmail::OPERATOR_NOT_HAS_TAG
+        this_tag = Wco::Tag.find cond.value
+        if leadset.tags.include?( this_tag )
+          ;
+        else
+          reason = "{email_skip_filter ? 'skip_' : ''}condition leadset not-has-tag #{this_tag} NOT met"
+        end
+      end
+    when WcoEmail::FIELD_TO
+      if message.to == cond.value
+        reason = "{email_skip_filter ? 'skip_' : ''}condition to = #{cond.value}"
+      end
+    end
+    return reason
+  end
+
+
   def to_s
     "<EFC #{field} #{operator} #{value} />"
   end
   def to_s_full indent: 0
     _value = value
-    if [ OPERATOR_HAS_TAG, OPERATOR_NOT_HAS_TAG ].include?( operator )
+    if [ ::WcoEmail::OPERATOR_HAS_TAG, ::WcoEmail::OPERATOR_NOT_HAS_TAG ].include?( operator )
       _value = Wco::Tag.find( value )
     end
-    "#{" " * indent }<EmailFilterCondition #{field} #{operator} `#{_value}` />\n"
+    "#{" " * indent }<EF#{email_skip_filter ? 'Skip' : ''}Condition #{field} #{operator} `#{_value}` />\n"
   end
 end
 

data/app/models/wco_email/message_stub.rb

@@ -199,22 +199,8 @@ class WcoEmail::MessageStub
         reason = 'subject_exact'
       end
 
-      filter.conditions.each do |cond|
-        case cond.field
-        when WcoEmail::FIELD_LEADSET
-          if cond.operator == WcoEmail::OPERATOR_NOT_HAS_TAG
-            this_tag = Wco::Tag.find cond.value
-            if leadset.tags.include?( this_tag )
-              ;
-            else
-              reason = "condition leadset not-has-tag #{this_tag} NOT met"
-            end
-          end
-        when WcoEmail::FIELD_TO
-          if @message.to == cond.value
-            reason = "condition to = #{cond.value}"
-          end
-        end
+      filter.conditions.each do |scond|
+        reason ||= scond.apply(leadset: leadset, message: @message )
       end
 
       if reason
@@ -229,6 +215,10 @@ class WcoEmail::MessageStub
           skip_reason = 'skip_from_regex'
         end
 
+        filter.skip_conditions.each do |scond|
+          skip_reason ||= scond.apply(leadset: leadset, message: @message )
+        end
+
         if skip_reason
           puts! "NOT Applying filter #{filter} to conv #{@message.conversation} for matching #{skip_reason}" if DEBUG
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.191
+  version: 3.1.0.193
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-21 00:00:00.000000000 Z
+date: 2025-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ahoy_matey