wco_models 3.1.0.249 → 3.1.0.250

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 811515dc851478aafef1a023f1d86f80eada380cbb8552d58aa7c4216e01a37f
-  data.tar.gz: f0f5b2627f42b50f6b43cad2206eaf2808aa8cf1cf875abad63b238f1a14d898
+  metadata.gz: e5d5d8a2f6c49b59221969a2316d3d67b5ae66c1e05583557ae37dd699154678
+  data.tar.gz: 7118d503e0ebbdc81ab6c43530982fc25577adc45f99a24fcf64b086ffba4d3a
 SHA512:
-  metadata.gz: 97ed822fabc86f2ca940e1bdbcd35242a7fdeffa80f94e79903e82bd781f275f78c2a9d141c54104841988b2d1347e4bae32f211a736a62f8faa30a2fe4b66c7
-  data.tar.gz: 8c85be7260093d502de15b57f2d9ccb8886e32a34dd8e122fae0cd2324b5ea92b988e4de58eb4dc8224472a8e0eaadc8afa9a74efb00ad32c79036a8cfebdd83
+  metadata.gz: 844d93fa80db62810740823375f8f7aa7212867b0e06b48e61a2b40c486183ee0f8b991423019f93e5c3b374f04a607625b426f541bdcd718736ca0500926c92
+  data.tar.gz: 07fdc6450dc423173adfe7649978c3129abfb7dba440818f656c1625900f235add1a7fce531b5129d41beda7aa91d7dba182265e3c03293f7845e2738e1cfab7

data/app/assets/stylesheets/wco/main.scss

@@ -199,7 +199,8 @@ input[type=file] {
 /* M */
 
 .maxwidth {
-  max-width: 1000px; /* @TODO: this would be responsive by-breakpoint _vp_ 2024-04-23 */
+  width: 1200px;
+  max-width: 1200px; /* @TODO: this would be responsive by-breakpoint _vp_ 2024-04-23 */
   margin: auto;
 }
 
@@ -229,6 +230,13 @@ input[type=file] {
   margin: 15px; // bootstrap has 15px gutters
 }
 
+table pre {
+  max-width: 50vw;
+  max-height: 50vh;
+  border: 1px solid #ccc;
+  padding: 1em;
+}
+
 /* R */
 
 .red {

data/app/mailers/wco_email/application_mailer.rb

@@ -14,6 +14,17 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
           subject: "POX::#{@msg.subject}" )
   end
 
+  def notify_self params
+    subject = params[:subject] || 'default subject'
+    body = params[:body] || 'default body'
+    mail( from: DEFAULT_FROM,
+      to:       DEFAULT_RECIPIENT,
+      subject:  subject,
+      body:     body,
+      content_type: "text/text",
+    );
+  end
+
   def option_alert option
     @option = option
     mail({
@@ -53,10 +64,10 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
 
     profile = Wco::Profile.find_by email: @ctx.from_email
     delivery_options = {
+      address:   profile.smtp_host,
+      password:  profile.smtp_password,
+      port:      profile.smtp_port,
       user_name: profile.smtp_username,
-      password: profile.smtp_password,
-      address: profile.smtp_host,
-      post: profile.smtp_port,
     };
 
     mail( from:    @ctx.from_email,

data/app/models/wco/lead.rb

@@ -14,7 +14,8 @@ class Wco::Lead
   field :name
   field :phone
   field :address
-  field :comment
+  field :comment ## _TODO: replace with log?
+  field :memory, type: Hash, default: {}
 
   belongs_to :leadset, class_name: 'Wco::Leadset'
   before_validation :set_leadset, on: :create
@@ -81,7 +82,8 @@ class Wco::Lead
   end
 
   def to_s
-    "#{name} <#{email}>"
+    # "`#{name}` <#{email}>"
+    email
   end
   def self.list
     [[nil,nil]] + all.map { |p| [ p.email, p.id ] }

data/app/models/wco/office_action.rb

@@ -20,31 +20,33 @@ class Wco::OfficeAction
   STATUSS         = [ STATUS_ACTIVE, STATUS_INACTIVE ]
   field :status, type: :string
   scope :active, ->{ where( status: STATUS_ACTIVE ) }
+  attr_accessor :deactivate
 
   field :perform_at, type: :time
 
   def do_run
-    sch = self
-    sch.update!({ status: STATUS_INACTIVE })
+    @oa = self
+    @oa.update!({ status: STATUS_INACTIVE })
 
     begin
-      eval( sch.tmpl.action_exe )
+      eval( @oa.tmpl.action_exe )
     rescue => err
       puts! err, "Wco::OfficeAction#do_run"
-      ::ExceptionNotifier.notify_exception(
-        err,
-        data: { office_action: self }
-      )
+      ::ExceptionNotifier.notify_exception( err, data: { office_action: self } )
     end
 
-    # schedule next actions & update the action
-    sch.tmpl.ties.each do |tie|
-      next_sch = self.class.find_or_initialize_by({
-        office_action_template_id: tie.next_tmpl.id,
-      })
-      next_sch.perform_at = eval(tie.next_at_exe)
-      next_sch.status     = STATUS_ACTIVE
-      next_sch.save!
+    if @oa.deactivate
+      ; # nothing
+    else
+      # schedule next actions & update the action
+      @oa.tmpl.ties.each do |tie|
+        next_oa = self.class.find_or_initialize_by({
+          office_action_template_id: tie.next_tmpl.id,
+        })
+        next_oa.perform_at = eval(tie.next_at_exe)
+        next_oa.status     = STATUS_ACTIVE
+        next_oa.save!
+      end
     end
   end
 

data/app/models/wco/office_action_template.rb

@@ -33,6 +33,8 @@ class Wco::OfficeActionTemplate
   # has_and_belongs_to_many :email_filters, class_name: WcoEmail::EmailFilter
   has_many :email_filters, class_name: '::WcoEmail::EmailFilter', inverse_of: :office_action_template
 
+  has_many :ajects, inverse_of: :aject ## email action object
+
   def to_s
     "#{slug}"
   end

data/app/models/wco/tag.rb

@@ -15,13 +15,13 @@ class Wco::Tag
   belongs_to :site,          class_name: '::Wco::Site', optional: true
   has_many :email_filters,   class_name: '::WcoEmail::EmailFilter',   inverse_of: :tag
   has_many :email_templates, class_name: '::WcoEmail::EmailTemplate', inverse_of: :tag
+  has_many :ajects,         class_name: '::WcoEmail::EmailFilterAction', inverse_of: :aject
 
   has_and_belongs_to_many :conversations, class_name: '::WcoEmail::Conversation', index: true
   has_and_belongs_to_many :galleries,     class_name: '::Wco::Gallery'
-  has_and_belongs_to_many :headlines # ,     class_name: 'Headline'
   has_and_belongs_to_many :leads,         class_name: '::Wco::Lead',    index: true
   has_and_belongs_to_many :leadsets,      class_name: '::Wco::Leadset'
-  has_and_belongs_to_many :logs
+  has_many :logs, inverse_of: :obj
   has_and_belongs_to_many :message_stubs, class_name: '::WcoEmail::MessageStub'
   has_and_belongs_to_many :newsvideos, class_name: '::Wco::Newsvideo'
   has_and_belongs_to_many :reports,    class_name: '::Wco::Report'

data/app/models/wco_email/conversation.rb

@@ -35,6 +35,10 @@ class WcoEmail::Conversation
 
   belongs_to :filter, class_name: 'WcoEmail::EmailFilter', inverse_of: :conversations, optional: true
 
+=begin
+  current_profile = OpenStruct.new per_page: 25
+  params = { tagname: 'inbox' }
+=end
   def self.load_conversations_messages_tag_by_params_and_profile params, current_profile
     @conversations = WcoEmail::Conversation.all
 

data/app/models/wco_email/email_action_template.rb

@@ -15,6 +15,8 @@ class WcoEmail::EmailActionTemplate
 
   belongs_to :email_template, class_name: 'EmailTemplate'
 
+  has_many :ajects, inverse_of: :aject ## email action object
+
   has_many :email_actions, class_name: 'EmailAction'
 
   has_many :ties,      class_name: '::WcoEmail::EmailActionTemplateTie', inverse_of: :tmpl

data/app/models/wco_email/email_filter.rb

@@ -5,12 +5,11 @@ class WcoEmail::EmailFilter
   include Mongoid::Paranoia
   store_in collection: 'office_email_filters' ## 'wco_email_email_filters'
 
-  PAGE_PARAM_NAME = :filters_page
-
-  FIELD_OPTS     = [ 'subject', 'from', 'to', 'to_and_cc', 'body', ] ## 'lead_tag_id'
-  MATCHTYPE_OPTS = [ 'regex', 'exact_insensitive' ]
+  field :descr, type: :string
 
+  PAGE_PARAM_NAME = :filters_page
 
+  ## @deprecated, use email_filter_conditions
   field :from_regex
   field :from_exact
   field :subject_regex
@@ -22,8 +21,13 @@ class WcoEmail::EmailFilter
   field :skip_from_regex
   field :skip_to_exact
 
+  STATUS_ACTIVE   = 'active'
+  STATUS_INACTIVE = 'inactive'
+  field :status, type: :string, default: STATUS_ACTIVE
+  def self.active; where( :status.in => [ nil, STATUS_ACTIVE ] ); end
+
   has_many :actions, class_name: '::WcoEmail::EmailFilterAction', inverse_of: :email_filter
-  accepts_nested_attributes_for :actions, allow_destroy: true
+  accepts_nested_attributes_for :actions, allow_destroy: true, reject_if: :all_blank
   # validate :validate_actions
   def validate_actions
     if actions.length == 0
@@ -33,11 +37,11 @@ class WcoEmail::EmailFilter
 
   ## '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
+  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
+  accepts_nested_attributes_for :skip_conditions, allow_destroy: true, reject_if: :all_blank
 
   # validate :validate_conditions
   def validate_conditions
@@ -48,7 +52,7 @@ class WcoEmail::EmailFilter
 
   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'
@@ -61,8 +65,8 @@ class WcoEmail::EmailFilter
   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
+  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
 
 
   belongs_to :email_template,         class_name: '::WcoEmail::EmailTemplate',        optional: true
@@ -71,7 +75,7 @@ class WcoEmail::EmailFilter
   ## 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
+  belongs_to :tag,                    class_name: '::Wco::Tag',                  optional: true, inverse_of: :email_filters
 
   ## @TODO: change to has_and_belongs_to_many, test-driven.
   has_many :conversations, class_name: '::WcoEmail::Conversation', inverse_of: :filter
@@ -84,11 +88,11 @@ class WcoEmail::EmailFilter
     # 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?
     out =<<-AOL
-<EmailFilter #{from_regex} #{from_exact}>
+<EmailFilter >
 #{conditions.map { |c| c.to_s_full( indent: 2) }.join }
 #{skip_conditions.map { |c| c.to_s_full( indent: 2) }.join }
 #{actions.map { |c| c.to_s_full( indent: 2) }.join }
-</EmailFilter>"
+</EmailFilter>
 AOL
     while out.match(/\n\n/) do
       out = out.gsub(/\n\n/, "\n")

data/app/models/wco_email/email_filter_action.rb

@@ -6,42 +6,43 @@ class WcoEmail::EmailFilterAction
 
   belongs_to :email_filter
 
-  KIND_EXE         = 'exe'
-  KIND_REMOVE_TAG  = ::WcoEmail::ACTION_REMOVE_TAG
-  KIND_ADD_TAG     = ::WcoEmail::ACTION_ADD_TAG
-  KIND_AUTORESPOND = ::WcoEmail::ACTION_AUTORESPOND
-  KIND_SCHEDULE_EMAIL_ACTION = 'autorespond-email-action'
-  KIND_REMOVE_EMAIL_ACTION   = 'remove-email-action'
+  KIND_AUTORESPOND = 'autorespond-template'
+  # KIND_EXE_RB      = 'exe-rb'
+  KIND_ADD_TAG     = 'add-tag'
+  KIND_RM_TAG      = 'remove-tag'
+  KIND_EAT         = 'autorespond-email-action'
+  KIND_RM_EAT      = 'rm-email-action'
+  KIND_OAT         = 'office-action-template'
+  KIND_RM_OAT      = 'rm-office-action-template'
+  KINDS = [ KIND_ADD_TAG, KIND_RM_TAG, KIND_AUTORESPOND, KIND_OAT, KIND_EAT, KIND_RM_EAT ]
   field :kind
-  validates :kind, inclusion: ::WcoEmail::ACTIONS
+  validates :kind, inclusion: KINDS
 
-  field :value # the id of a tag, or email template, or email action
+  ## for exe_rb only. otherwise, use aject
+  field :value
 
+  belongs_to :aject, polymorphic: true # , optional: true # eg tag, EAT, OAT
+  # validates :aject_id, presence: true
 
-  before_validation :check_value
-  def check_value
-    case kind
-    when KIND_AUTORESPOND
-      existing = WcoEmail::EmailTemplate.where({ id: value }).first
-      if !existing
-        errors.add( :base, 'missing EmailTemplate id when creating an EmailFilterAction' )
-        throw :abort
-      end
-    end
-  end
+  ## 2026-04-02 not anymore.
+  # before_validation :check_value
+  # def check_value
+  #   case kind
+  #   when KIND_AUTORESPOND
+  #     existing = WcoEmail::EmailTemplate.where({ id: value }).first
+  #     if !existing
+  #       errors.add( :base, 'missing EmailTemplate id when creating an EmailFilterAction' )
+  #       throw :abort
+  #     end
+  #   end
+  # end
 
 
   def to_s
-    "<EFA #{kind} #{value} />\n"
+    "<EFAction #{kind} #{aject} />\n"
   end
   def to_s_full indent: 0
-    _value = value
-    if [ KIND_ADD_TAG, KIND_REMOVE_TAG ].include?( kind )
-      _value = Wco::Tag.find( value )
-    end
-    if [ KIND_AUTORESPOND ].include?( kind )
-      _value = WcoEmail::EmailTemplate.find( value )
-    end
-    "#{" " * indent }<EFAction #{kind} `#{_value}` />\n"
+    "#{" " * indent }<EFAction #{kind} `#{aject}` />\n"
   end
+
 end

data/app/models/wco_email/email_filter_condition.rb

@@ -8,18 +8,33 @@ class WcoEmail::EmailFilterCondition
   belongs_to :email_filter,      class_name: '::WcoEmail::EmailFilter', inverse_of: :conditions,      optional: true
   belongs_to :email_skip_filter, class_name: '::WcoEmail::EmailFilter', inverse_of: :skip_conditions, optional: true
 
-  ## see WcoEmail::FIELD_*
+  FIELD_BODY    = 'body'
+  FIELD_FROM    = 'from'
+  FIELD_TAGGED  = 'leadset-tagged'
+  FIELD_NOT_TAGGED  = 'leadset-not-tagged'
+  FIELD_SUBJECT  = 'subject'
+  # FIELD_TO       = 'to'
+  FIELD_TO_OR_CC = 'to-or-cc'
+  FIELD_OPTS     = [ FIELD_SUBJECT, FIELD_FROM, FIELD_TO_OR_CC, FIELD_TAGGED, FIELD_NOT_TAGGED, FIELD_BODY ]
   field :field
-  validates :field, presence: true
+  validates :field, presence: true, inclusion: FIELD_OPTS
 
-  field :matchtype, type: String
-  validates :matchtype, presence: true, inclusion: WcoEmail::EmailFilter::MATCHTYPE_OPTS
-  def operator;    matchtype;     end
-  def operator= a; matchtype = a; end
+  OPERATOR_EQUALS      = 'eq-i'
+  # OPERATOR_HAS_TAG     = 'has-tag'
+  # OPERATOR_NOT_HAS_TAG = 'not-has-tag'
+  OPERATOR_REGEX = 'regex'
+  OPERATOR_MATCH = 'match-i'
+  OPERATOR__ID = '_id'
+  OPERATOR_SLUG = 'slug'
+  OPERATOR_OPTS = [ OPERATOR_REGEX, OPERATOR_MATCH, OPERATOR__ID, OPERATOR_SLUG ]
+  field :operator
+  validates :operator, presence: true, inclusion: OPERATOR_OPTS
 
   field :value
   validates :value, presence: true
 
+  index({ email_filter_id: 1, field: 1, operator: 1, value: 1 }, unique: true )
+
   def apply leadset:, message:
     cond = self
     reason = nil
@@ -43,14 +58,11 @@ class WcoEmail::EmailFilterCondition
 
 
   def to_s
-    "<EFC #{field} #{matchtype} #{value} />"
+    "<EF#{email_skip_filter ? 'Skip' : ''}Condition #{field} #{operator} `#{value}` />"
   end
   def to_s_full indent: 0
-    _value = value
-    if [ ::WcoEmail::OPERATOR_HAS_TAG, ::WcoEmail::OPERATOR_NOT_HAS_TAG ].include?( matchtype )
-      _value = Wco::Tag.find( value )
-    end
-    "#{" " * indent }<EF#{email_skip_filter ? 'Skip' : ''}Condition #{field} #{matchtype} `#{_value}` />\n"
+    "#{" " * indent }<EF#{email_skip_filter ? 'Skip' : ''}Condition #{field} #{operator} `#{value}` />\n"
   end
+
 end
 

data/app/models/wco_email/email_template.rb

@@ -11,7 +11,7 @@ class WcoEmail::EmailTemplate
   validates :slug, presence: true, uniqueness: true
   index({ slug: 1 }, { unique: true, name: "slug_idx" })
   def to_s
-    "Tmpl:#{slug}"
+    "#{slug}"
   end
 
   field :preview_str, type: :string
@@ -127,6 +127,7 @@ class WcoEmail::EmailTemplate
   has_many :email_contexts, class_name: '::WcoEmail::Context'
   has_many :email_filters,  class_name: '::WcoEmail::EmailFilter'
   has_many :unsubscribes,   class_name: '::WcoEmail::Unsubscribe'
+  has_many :ajects, inverse_of: :aject ## email action object
 
   belongs_to :tag, class_name: '::Wco::Tag', inverse_of: :email_templates, optional: true
 

data/app/models/wco_email/message_stub.rb

@@ -117,7 +117,7 @@ class WcoEmail::MessageStub
 
     @conv.update_attributes({
       status:      WcoEmail::Conversation::STATUS_UNREAD,
-      latest_at:   json['date'].to_s || Time.now.to_datetime,
+      latest_at:   json['date'].to_time.to_s || Time.now.to_datetime,
       from_emails: ( @conv.from_emails + [ from ]).uniq,
       preview:     @message.preview_str,
     })

data/app/views/wco/leads/_list.haml

@@ -0,0 +1,8 @@
+
+-#
+-# much lighter than _index
+-#
+.leads
+  %ul
+    - leads.each do |ls|
+      %li= link_to ls, wco.lead_path(ls)

data/app/views/wco/leads/show.haml

@@ -24,6 +24,10 @@
           %li
             Comment:
             %pre.descr #{raw @lead.comment}
+        %li
+          memory:
+          = @lead.memory
+
 
     .col-md-6
       - if @lead.photo

data/app/views/wco/office_action_templates/_form.haml

@@ -13,7 +13,7 @@
       %label action_type
       = f.select :action_type, options_for_select( [ nil, 'js', 'rb', 'sh' ], selected: oat.action_type )
     .descr
-      rb available vars: @conversations , @oat ,
+      rb available vars: @conversations , @oat , @oa ,
     .field
       %label action_exe
       = f.text_area :action_exe, class: :monospace

data/app/views/wco/office_action_templates/index.haml

@@ -3,20 +3,21 @@
   .header
     %h5.title Office Action Templates
 
-  %ul
+  .a
     - @oats.each do |oat|
-      %li
-        .d-flex
-          = link_to '[~]', edit_office_action_template_path(oat)
-           
-          = button_to 'x', office_action_template_path(oat), method: :delete, data: { confirm: 'Are you sure?' }
-           
-          = link_to oat.slug, office_action_template_path(oat)
-           
-          = button_to 'Run w/convos', oat_perform_with_conversations_path(oat), data: { confirm: 'Are you sure?' }
-
-        = render '/wco/office_action_templates/ties', ties: oat.ties, oat: oat
-        -# = oat.inspect
+      .Oat.descr
+        .row
+          .col-6
+            .d-flex
+              = link_to '[~]', edit_office_action_template_path(oat)
+               
+              = button_to 'x', office_action_template_path(oat), method: :delete, data: { confirm: 'Are you sure?' }
+               
+              = link_to oat.slug, office_action_template_path(oat)
+               
+              = button_to 'Run w/convos', oat_perform_with_conversations_path(oat), data: { confirm: 'Are you sure?' }
+          .col-6
+            = render '/wco/office_action_templates/ties', ties: oat.ties, oat: oat
 
   %hr
   = render 'form', oat: @new_oat

data/app/views/wco/tags/_index_table.haml

@@ -6,7 +6,7 @@
       %th N Conv
       %th N Stubs
 
-      %th N Headlines
+      -# %th N Headlines
 
       %th N Galleries
       %th N Reports
@@ -24,7 +24,7 @@
           = link_to tag.slug, tag_path(tag)
         %td= tag.conversations.length
         %td= tag.message_stubs.length
-        %td= tag.headlines.length
+        -# %td= tag.headlines.length
         %td= tag.galleries.length
         %td= tag.reports.length
         %td= tag.videos.length

data/lib/20260402_tmp.rb

@@ -0,0 +1,125 @@
+
+##
+## skip: careers@wasya.co
+## skip: mishellduvrazka2023|wasteplacellc|smttest42|robincroom|acelec|rleer24|statusunknown03|claricefth|abogadooctavioarango|claudenicefh|email4gregory|morishitaarata|314658|alisa406|dawnmeverly|faizana1298|jandrews555|midwestksp|mj8712|msohaibhere|piousbox|poxlovi|snehagophane99|stephenkim79
+##
+## exceptions: finradrnm@finra.org
+##
+
+filter = nil
+WcoEmail::EmailFilter.active.each do |_filter|
+  filter = _filter
+  case filter.kind
+  when WcoEmail::EmailFilter::KIND_ADD_TAG,
+       WcoEmail::EmailFilter::KIND_REMOVE_TAG,
+       WcoEmail::EmailFilter::KIND_AUTORESPOND_TMPL,
+       WcoEmail::EmailFilter::KIND_AUTORESPOND_EACT
+
+    aject_id = case filter.kind
+      when WcoEmail::EmailFilter::KIND_ADD_TAG,
+           WcoEmail::EmailFilter::KIND_REMOVE_TAG
+        filter.tag_id
+      when WcoEmail::EmailFilter::KIND_AUTORESPOND_TMPL
+        filter.email_template_id
+      when WcoEmail::EmailFilter::KIND_AUTORESPOND_EACT
+        filter.email_action_template_id
+      end
+    # puts! aject_id, 'aject_id'
+
+    aject_type = case filter.kind
+      when WcoEmail::EmailFilter::KIND_ADD_TAG,
+           WcoEmail::EmailFilter::KIND_REMOVE_TAG
+        'Wco::Tag'
+      when WcoEmail::EmailFilter::KIND_AUTORESPOND_TMPL
+        'WcoEmail::EmailTemplate'
+      when WcoEmail::EmailFilter::KIND_AUTORESPOND_EACT
+        'WcoEmail::EmailActionTemplate'
+      end
+    # puts! aject_type, 'aject_type'
+
+    aject_kind = filter.kind
+    # aject_kind = case filter.kind
+    #   when WcoEmail::EmailFilter::KIND_AUTORESPOND_EACT
+    #     filter.kind
+    #   else
+    #     filter.kind
+    #   end
+    # puts! aject_kind, 'aject_kind'
+
+
+    action_ids = WcoEmail::EmailFilterAction.where({
+      kind: filter.kind,
+      aject_id: aject_id,
+    }).distinct(:email_filter_id)
+    new_filter = WcoEmail::EmailFilter.where( :id.in => action_ids ).first
+
+    if new_filter
+      puts "+++ filter exists"
+    else
+      new_filter = WcoEmail::EmailFilter.new({
+        actions_attributes: [{
+          kind: aject_kind,
+          aject_type: aject_type,
+          aject_id: aject_id,
+        }] })
+
+      new_filter.save!
+      puts "+++ created new filter #{new_filter.id}"
+    end
+
+    cond_field = WcoEmail::EmailFilterCondition::FIELD_FROM
+    cond_op = WcoEmail::EmailFilterCondition::OPERATOR_MATCH
+    cond_value = filter.from_exact
+    if cond_value.blank?
+      cond_field = WcoEmail::EmailFilterCondition::FIELD_SUBJECT
+      cond_value = filter.subject_exact
+    end
+    if cond_value.blank?
+      cond_field = WcoEmail::EmailFilterCondition::FIELD_FROM
+      cond_op = WcoEmail::EmailFilterCondition::OPERATOR_REGEX
+      cond_value = filter.from_regex
+    end
+    if cond_value.blank?
+      cond_field = WcoEmail::EmailFilterCondition::FIELD_SUBJECT
+      cond_op = WcoEmail::EmailFilterCondition::OPERATOR_REGEX
+      cond_value = filter.subject_regex
+    end
+    if cond_value.blank?
+      cond_field = WcoEmail::EmailFilterCondition::FIELD_BODY
+      cond_op = WcoEmail::EmailFilterCondition::OPERATOR_MATCH
+      cond_value = filter.body_exact
+    end
+    if cond_value.blank?
+      throw '+++ cond_value cannot be blank'
+    end
+    # puts! cond_field, 'cond_field'
+    # puts! cond_value, 'cond_value'
+
+    new_condition = WcoEmail::EmailFilterCondition.where({
+      email_filter_id: new_filter.id,
+      field: cond_field,
+      operator: cond_op,
+      value: cond_value,
+    }).first
+    if new_condition
+      puts "+++ condition exists"
+    else
+      new_condition = WcoEmail::EmailFilterCondition.new({
+        email_filter_id: new_filter.id,
+        field: cond_field,
+        operator: cond_op,
+        value: cond_value,
+      })
+      new_condition.save!
+      puts "+++ created new condition #{new_condition.id}"
+    end
+
+    filter.conversations.update_all( filter_id: new_filter.id )
+    filter.update( status: 'inactive' )
+
+  end
+
+end
+
+
+

data/lib/tasks/office_tasks.rake

@@ -7,7 +7,7 @@ namespace :wco do
 
   desc 'run office actions'
   task run_office_actions: :environment do
-    puts! "Starting wco_email:run_office_actions..."
+    puts! "Starting wco_email:run_office_actions in #{Rails.env}..."
     while true do
 
       schs = Wco::OfficeAction.active.where({ :perform_at.lte => Time.now })

data/lib/wco_models.rb

@@ -34,29 +34,7 @@ module Iro; end
 module Tda; end
 module Wco; end
 
-module WcoEmail
-  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'
-  FIELD_FROM    = 'from'
-  FIELD_LEADSET = 'leadset_id'
-  FIELD_SUBJECT = 'subject'
-  FIELD_TO      = 'to'
-
-  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 WcoEmail; end
 module WcoHosting; end
 
 class Wco::HTTParty

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.249
+  version: 3.1.0.250
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-01 00:00:00.000000000 Z
+date: 2026-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ahoy_matey
@@ -591,6 +591,7 @@ files:
 - app/views/wco/leads/_header.haml
 - app/views/wco/leads/_index.haml
 - app/views/wco/leads/_index_chips.haml
+- app/views/wco/leads/_list.haml
 - app/views/wco/leads/_table.haml
 - app/views/wco/leads/edit.haml
 - app/views/wco/leads/index.haml
@@ -767,6 +768,7 @@ files:
 - config/initializers/ahoy.rb
 - config/initializers/assets.rb
 - config/routes.rb
+- lib/20260402_tmp.rb
 - lib/shortcuts.rb
 - lib/tasks/db_tasks.rake
 - lib/tasks/migrate_tasks.rake