wco_models 3.1.0.276 → 3.1.0.278

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d2d2fd07a9f97269d04402ecbe29c6e258f33d07a5e68c3cf4fc3e11066f146
-  data.tar.gz: 445ab09e9ac094715bcedcc994f3d70f97b3afdf4460513e1471912e6b960de9
+  metadata.gz: acb9e2da69be5556f764520c42c4485129d89e9e9ef24a3db673a6bca94853f2
+  data.tar.gz: 40ae6eb798c0c1c4d20a6ffb849f6b8f831702e062539eea0b9b1eeaa9d28c2a
 SHA512:
-  metadata.gz: b90e415933235fbc0a12e406da6ec7bc113b1e2119da06085812c50bcad796b956aca162ca518ec5592f3da90c62a85794d131f8331599760ee427b7bdb71c72
-  data.tar.gz: d67a830c270ac218edffaee49100c7ac94da66db961bd3957bf60acae2b6990338f0ace9cb0e3889a35d34876834b586b37cac13e48e04d0db51382afb29b909
+  metadata.gz: 90326310bae152ab2f7966cd0bf957c7ce0b3cef882d2a3179510585cb26f859aab6b45e7c6222066be611cfdc2b94722922369f671d552667976dfb07294aaf
+  data.tar.gz: 1911fcd3025f363251ab78864b31ebe1ab262d0231629665c3ef1e3dcb8d7bd8cd498d8f51de3a2968c65d08659cbb8eeaefe874fe014212470d735d3b773afa

data/app/models/wco_email/email_filter.rb

@@ -5,22 +5,10 @@ class WcoEmail::EmailFilter
   include Mongoid::Paranoia
   store_in collection: 'office_email_filters' ## 'wco_email_email_filters'
 
-  field :descr, type: :string
+  field :slug, type: :string
 
   PAGE_PARAM_NAME = :filters_page
 
-  ## @deprecated, use email_filter_conditions
-  field :from_regex
-  field :from_exact
-  field :subject_regex
-  field :subject_exact
-  field :body_regex
-  field :body_exact
-  field :tag_id_exact
-
-  field :skip_from_regex
-  field :skip_to_exact
-
   STATUS_ACTIVE   = 'active'
   STATUS_INACTIVE = 'inactive'
   field :status, type: :string, default: STATUS_ACTIVE
@@ -35,58 +23,27 @@ class WcoEmail::EmailFilter
     end
   end
 
-  ## 'and' - all conditions must match, for filter to match
   has_many :conditions,      class_name: '::WcoEmail::EmailFilterCondition', inverse_of: :email_filter
   accepts_nested_attributes_for :conditions, allow_destroy: true, reject_if: :all_blank
-
-  ## '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, reject_if: :all_blank
-
-  # validate :validate_conditions
+  validate :validate_conditions
   def validate_conditions
-    if conditions.length + skip_conditions.length == 0
-      errors.add(:conditions, 'Either conditions or skip conditions must be present.')
+    if conditions.length == 0
+      errors.add(:condition, 'must be present')
     end
   end
 
-  has_and_belongs_to_many :leadsets,     class_name: '::Wco::Leadset'
-
-  ## @deprecated 2026-04-02
-  KIND_AUTORESPOND_TMPL = 'autorespond-template'
-  KIND_AUTORESPOND_EACT = 'autorespond-email-action'
-  KIND_REMOVE_TAG       = 'remove-tag'
-  KIND_ADD_TAG          = 'add-tag'
-  KIND_DESTROY_SCHS     = 'destroy-schs'
-  KIND_OAT              = 'office-action'
-
-  ## @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_OAT, KIND_AUTORESPOND_TMPL, KIND_AUTORESPOND_EACT, KIND_ADD_TAG, KIND_REMOVE_TAG, KIND_DESTROY_SCHS ]
-  field :kind ## @deprecated, use filter.action.aject.kind 2026-04-02
-
+  has_many :skip_conditions, class_name: '::WcoEmail::EmailFilterCondition', inverse_of: :email_skip_filter
+  accepts_nested_attributes_for :skip_conditions, allow_destroy: true, reject_if: :all_blank
 
-  belongs_to :email_template,         class_name: '::WcoEmail::EmailTemplate',        optional: true
-  belongs_to :email_action_template,  class_name: '::WcoEmail::EmailActionTemplate',  optional: true
+  has_and_belongs_to_many :leadsets,     class_name: '::Wco::Leadset'
+  has_and_belongs_to_many :conversations, class_name: '::WcoEmail::Conversation'
 
-  ## no habtm please
-  # has_and_belongs_to_many :action_tmpls, class_name: '::Wco::OfficeActionTemplate'
-  belongs_to :office_action_template, class_name: '::Wco::OfficeActionTemplate', optional: true
   belongs_to :tag,                    class_name: '::Wco::Tag',                  optional: true, inverse_of: :email_filters
 
-  has_and_belongs_to_many :conversations, class_name: '::WcoEmail::Conversation'
-
   def to_s
     "EmailFilter: #{from_regex} #{from_exact} #{conditions.map { |c| c.to_s }.join }"
   end
   def to_s_full
-    # inn = ""
-    # inn = "#{inn}#{conditions.map { |c| c.to_s_full }.join }" if conditions.present?
-    # inn = "#{inn}#{skip_conditions.map { |c| c.to_s_full }.join }" if skip_conditions.present?
-
     attrs = ''
     if from_regex || from_exact
       attrs = "#{attrs} from=#{from_regex}#{from_exact}"
@@ -105,19 +62,60 @@ AOL
     out
   end
 
-  def to_xml
-    attrs = ''
-    children = ''
-    if from_regex || from_exact
-      attrs = "#{attrs} from=#{from_regex}#{from_exact}"
-    end
-    if conditions.present?
-      children = "#{children}#{conditions.map { |c| c.to_s }.join('') }"
-    end
-    return "<EF #{attrs}>#{children}</EF>\n"
-  end
 
 
 
+
+
+  ##
+  ## deprecated
+  ##
+
+  ## @deprecated, use email_filter_conditions
+  field :from_regex
+  field :from_exact
+  field :subject_regex
+  field :subject_exact
+  field :body_regex
+  field :body_exact
+  field :tag_id_exact
+
+  field :skip_from_regex
+  field :skip_to_exact
+
+  ## @deprecated 2026-04-02, use email_filter_action::<KIND>
+  KIND_AUTORESPOND_TMPL = 'autorespond-template'
+  KIND_AUTORESPOND_EACT = 'autorespond-email-action'
+  KIND_REMOVE_TAG       = 'remove-tag'
+  KIND_ADD_TAG          = 'add-tag'
+  KIND_DESTROY_SCHS     = 'destroy-schs'
+  KIND_OAT              = 'office-action'
+
+  ## @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_OAT, KIND_AUTORESPOND_TMPL, KIND_AUTORESPOND_EACT, KIND_ADD_TAG, KIND_REMOVE_TAG, KIND_DESTROY_SCHS ]
+  field :kind ## @deprecated, use filter.action.aject.kind 2026-04-02
+
+  ## @deprecated, use email_filter.email_action.aject
+  belongs_to :email_template,         class_name: '::WcoEmail::EmailTemplate',        optional: true
+  belongs_to :email_action_template,  class_name: '::WcoEmail::EmailActionTemplate',  optional: true
+  belongs_to :office_action_template, class_name: '::Wco::OfficeActionTemplate', optional: true
+
+  ## use to_s_full
+  # def to_xml
+  #   attrs = ''
+  #   children = ''
+  #   if from_regex || from_exact
+  #     attrs = "#{attrs} from=#{from_regex}#{from_exact}"
+  #   end
+  #   if conditions.present?
+  #     children = "#{children}#{conditions.map { |c| c.to_s }.join('') }"
+  #   end
+  #   return "<EF #{attrs}>#{children}</EF>\n"
+  # end
+
 end
 ::EF = WcoEmail::EmailFilter

data/app/models/wco_email/message.rb

@@ -118,7 +118,7 @@ class WcoEmail::Message
 
   def apply_filter filter
     puts! filter, 'WcoEmail::Message#apply_filter' if DEBUG
-    conv.filter = filter
+    conv.filters << filter
 
     case filter.kind
 

data/app/models/wco_email/message_stub.rb

@@ -128,7 +128,7 @@ class WcoEmail::MessageStub
 
 
     ## Actions & Filters
-    email_filters = WcoEmail::EmailFilter.all
+    email_filters = WcoEmail::EmailFilter.all.active
     email_filters.each do |filter|
       reason = nil
       if filter.from_regex.present? && @message.from.downcase.match( filter.from_regex )
@@ -315,7 +315,7 @@ class WcoEmail::MessageStub
 
 
     ## Actions & Filters
-    email_filters = WcoEmail::EmailFilter.all
+    email_filters = WcoEmail::EmailFilter.all.active
     email_filters.each do |filter|
       reason = nil
       if filter.from_regex.present? && @message.from.downcase.match( filter.from_regex )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.276
+  version: 3.1.0.278
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-01 00:00:00.000000000 Z
+date: 2026-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3