wco_models 3.1.0.190 → 3.1.0.192

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d49f77b6a2706b11084a327dcfedb56bf887ba04bf71e23f66ecff2749abc069
-  data.tar.gz: 15bf5266b05ad0116ff87266d7f242dc840b9b773c668d37dcda649e13528a0b
+  metadata.gz: dbba6285ae64aa8c8bd1dbebcf4316b2ecb2e7d81f2143220d6e2d00e2b8833b
+  data.tar.gz: 7fe94b7db4a4f1147c0634bfdbb772cb07295870a1bdec024c855eca46e7996f
 SHA512:
-  metadata.gz: daf54c6e2d1b5c220eaadc56aa00a8b185b2f635fdb5960de233d7b8c39d788abc7b15c10eea0d7b174a0219608e64a606f1d2a44e71e79828264f093fd371d0
-  data.tar.gz: 96ab243124e389910b3d19a0e007d711d8300fcb80960411f3141b436af760a7c6d5e8c2fa3715c8b91caa0ee47ea8aace500582012f849b6b988c433ab58bd7
+  metadata.gz: 194d52d31e7fc74009341a9d64008515b4510d0f804542308cb28d11617c41765ee536d683149a9dc412d26770ba17a805ca5feb89b509a59053565e617c599e
+  data.tar.gz: 12e385987d60859fc429da32d697d7bd7dcd2c0e8fe37855b389e3b3bcafd6903e57816efe42accad974e8f6edd0b25a6709b0a14a6282d2661ce8ec5fc68d33

data/app/models/wco_email/email_filter.rb

@@ -23,6 +23,12 @@ class WcoEmail::EmailFilter
 
   has_many :actions, class_name: '::WcoEmail::EmailFilterAction', inverse_of: :email_filter
   accepts_nested_attributes_for :actions, allow_destroy: true
+  validate :validate_actions
+  def validate_actions
+    if actions.length == 0
+      errors.add(:actions, 'must be present')
+    end
+  end
 
   ## 'and' - all conditions must match, for filter to match
   has_many :conditions,      class_name: '::WcoEmail::EmailFilterCondition', inverse_of: :email_filter
@@ -31,7 +37,12 @@ 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
+      errors.add(:conditions, 'Either conditions or skip conditions must be present.')
+    end
+  end
 
   has_and_belongs_to_many :action_tmpls, class_name: '::Wco::OfficeActionTemplate'
   has_and_belongs_to_many :leadsets,     class_name: '::Wco::Leadset'

data/app/models/wco_email/email_filter_action.rb

@@ -13,6 +13,7 @@ class WcoEmail::EmailFilterAction
   KIND_SCHEDULE_EMAIL_ACTION = 'autorespond-email-action'
   KIND_REMOVE_EMAIL_ACTION   = 'remove-email-action'
   field :kind
+  validates :kind, inclusion: ::WcoEmail::ACTIONS
 
   field :value # the id of a tag, or email template, or email action
 

data/app/models/wco_email/email_filter_condition.rb

@@ -12,11 +12,8 @@ class WcoEmail::EmailFilterCondition
   field :field
   validates :field, presence: true
 
-  OPERATOR_EQUALS      = WcoEmail::OPERATOR_EQUALS
-  OPERATOR_HAS_TAG     = WcoEmail::OPERATOR_HAS_TAG
-  OPERATOR_NOT_HAS_TAG = WcoEmail::OPERATOR_NOT_HAS_TAG
   field :operator, type: String
-  validates :operator, presence: true
+  validates :operator, presence: true, inclusion: ::WcoEmail::OPERATORS
 
   field :value
   validates :value, presence: true
@@ -33,11 +30,3 @@ class WcoEmail::EmailFilterCondition
   end
 end
 
-=begin
-
-## not whitelisted
-tag = Wco::Tag.find_by({ slug: 'known-leadsets' })
-out = @company.tags.include?( tag )
-!out
-
-=end

data/app/models/wco_email/message_stub.rb

@@ -210,6 +210,10 @@ class WcoEmail::MessageStub
               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
       end
 

data/lib/wco_models.rb

@@ -33,9 +33,13 @@ STATUSES = [ nil, ACTIVE, INACTIVE ]
 module Wco; end
 
 module WcoEmail
-  ACTION_ADD_TAG    = 'add-tag'
-  ACTION_AUTORESPOND = 'autorespond-template'
-  ACTION_REMOVE_TAG = 'remove-tag'
+  ACTION_ADD_TAG               = 'add-tag'
+  ACTION_AUTORESPOND           = 'autorespond-template'
+  ACTION_EXE                   = 'exe'
+  ACTION_SCHEDULE_EMAIL_ACTION = 'autorespond-email-action'
+  ACTION_REMOVE_EMAIL_ACTION   = 'remove-email-action'
+  ACTION_REMOVE_TAG            = 'remove-tag'
+  ACTIONS = [ 'add-tag', 'autorespond-email-action', 'autorespond-template', 'exe', 'remove-email-action', 'remove-tag' ]
 
   FIELD_BODY    = 'body'
   FIELD_EXE     = 'exe'
@@ -47,6 +51,8 @@ module WcoEmail
   OPERATOR_EQUALS      = 'equals'
   OPERATOR_HAS_TAG     = 'has-tag'
   OPERATOR_NOT_HAS_TAG = 'not-has-tag'
+  OPERATOR_TEXT_INPUT  = 'text-input'
+  OPERATORS = [ 'equals', 'has-tag', 'not-has-tag', 'text-input' ]
 end
 
 module WcoHosting; end

metadata

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