wco_models 3.1.0.189 → 3.1.0.191

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d7aa099d022824fbef4b0fae04c43b89a70ab7e232e70fce561f268c8733084
-  data.tar.gz: 4b7b8bb274105b8ab5dd52c5705e5cab7e2f16a1d4e43d59434c62ddaa87fa0d
+  metadata.gz: 9bff74466afd78d598eeb38f3b23283337a17e0b5a8b92b0e26f845f0bb8911a
+  data.tar.gz: e4f9e670080defcc68b180349aff8fd16b5de911bfc2951a97032f57a5a3400e
 SHA512:
-  metadata.gz: 856d7b8285233d1a98b6874c493e6b015da8c8723da597576fb28d0716f190a1a41ea673c18920cca10e12791cb1e08d7f3d4fcb0b3b352dd3562838c406ab5c
-  data.tar.gz: 65badfb5507f336f56d25fe963a5eb8a743186d410cfa4910bdc8fd952c25fa9bcea54df61bfa63511dd63c94715b5846c311dcc4e19b3462be0ae1f8d603596
+  metadata.gz: 2aa5e46bf8e08e735d816278ecc948d47e99cd70e7c85e8d17bf7a7f196310c6096f12a14fd9d03158f426025580cec2648995c4325ff21bfe0940193f35ce73
+  data.tar.gz: d59c6bd87089bbb5a3ac0092a365696cf0d0fde26c2eb2573f00a1b6bc304ba53b2ef96a45ffa8212ef43b17ac7a0c13fa8d9d4c0c464454ccc42c18f2bc2cc4

data/app/controllers/wco/api/tags_controller.rb

@@ -0,0 +1,9 @@
+
+class Wco::Api::TagsController < Wco::ApiController
+
+  def index
+    authorize! :index, Wco::Tag
+    @tags = Wco::Tag.all()
+  end
+
+end

data/app/controllers/wco/api_controller.rb

@@ -10,7 +10,6 @@ class Wco::ApiController < ActionController::Base
   private
 
   def decode_jwt
-    byebug
     out = JWT.decode params[:jwt_token], nil, false
     email = out[0]['email']
     user = User.find_by({ email: email })

data/app/models/wco/tag.rb

@@ -30,16 +30,21 @@ class Wco::Tag
     find_or_create_by({ slug: INBOX })
   end
 
-  TRASH = 'trash'
-  def self.trash
-    find_or_create_by({ slug: TRASH })
-  end
-
   SPAM = 'spam'
   def self.spam
     find_or_create_by({ slug: SPAM })
   end
 
+  NOT_SPAM = 'not-spam'
+  def self.not_spam
+    find_or_create_by({ slug: NOT_SPAM })
+  end
+
+  TRASH = 'trash'
+  def self.trash
+    find_or_create_by({ slug: TRASH })
+  end
+
   def to_s
     slug
   end

data/app/models/wco_email/email_filter.rb

@@ -1,4 +1,5 @@
 
+
 ##
 ## 2023-03-04 _vp_ When I receive one.
 ##
@@ -10,9 +11,6 @@ class WcoEmail::EmailFilter
 
   PAGE_PARAM_NAME = :filters_page
 
-  FIELD_OPTS     = [ :subject, :from, :to, :to_and_cc, :body, ]
-  MATCHTYPE_OPTS = [ :regex, :exact_insensitive, ]
-
   field :from_regex
   field :from_exact
   field :subject_regex
@@ -23,13 +21,33 @@ class WcoEmail::EmailFilter
   field :skip_from_regex
   field :skip_to_exact
 
-  has_many :email_filter_conditions
-  has_many :email_filter_skip_conditions, class_name: 'WcoEmail::EmailFilterCondition'
-
-  has_and_belongs_to_many :action_tmpls, class_name: 'Wco::OfficeActionTemplate'
-  has_and_belongs_to_many :leadsets,     class_name: 'Wco::Leadset'
-
-  belongs_to :tag, class_name: 'Wco::Tag', inverse_of: :email_filters, optional: true
+  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
+  accepts_nested_attributes_for :conditions, allow_destroy: true
+
+  ## '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'
+
+  belongs_to :tag, class_name: '::Wco::Tag', inverse_of: :email_filters, optional: true
 
   KIND_AUTORESPOND_TMPL = 'autorespond-template'
   KIND_AUTORESPOND_EACT = 'autorespond-email-action'
@@ -46,10 +64,45 @@ class WcoEmail::EmailFilter
   field :kind
 
 
-  belongs_to :email_template,        class_name: 'WcoEmail::EmailTemplate',         optional: true
-  belongs_to :email_action_template, class_name: 'WcoEmail::EmailActionTemplate',   optional: true
+  belongs_to :email_template,        class_name: '::WcoEmail::EmailTemplate',         optional: true
+  belongs_to :email_action_template, class_name: '::WcoEmail::EmailActionTemplate',   optional: true
+
+  ## @TODO: change to has_and_belongs_to_many, test-driven.
+  has_many :conversations, class_name: '::WcoEmail::Conversation', inverse_of: :filter
+
+  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?
+    out =<<-AOL
+<EmailFilter #{from_regex} #{from_exact}>
+#{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>"
+AOL
+    while out.match(/\n\n/) do
+      out = out.gsub(/\n\n/, "\n")
+    end
+    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
 
-  has_many :conversations, class_name: 'WcoEmail::Conversation', inverse_of: :filter
 
-end
 
+end
+::EF = WcoEmail::EmailFilter

data/app/models/wco_email/email_filter_action.rb

@@ -0,0 +1,47 @@
+
+class WcoEmail::EmailFilterAction
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  store_in collection: 'email_filter_actions'
+
+  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'
+  field :kind
+  validates :kind, inclusion: ::WcoEmail::ACTIONS
+
+  field :value # the id of a tag, or email template, or email action
+
+
+  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"
+  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 }<EmailFilterAction #{kind} `#{_value}` />\n"
+  end
+end

data/app/models/wco_email/email_filter_condition.rb

@@ -5,13 +5,28 @@ class WcoEmail::EmailFilterCondition
   include Mongoid::Paranoia
   store_in collection: 'office_email_filter_conditions'
 
-  belongs_to :email_filter,      inverse_of: :email_filter_conditions
-  belongs_to :email_filter_skip, inverse_of: :email_filter_skip_conditions
+  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 :field
-  field :matchtype
-  field :value
+  validates :field, presence: true
+
+  field :operator, type: String
+  validates :operator, presence: true, inclusion: ::WcoEmail::OPERATORS
 
+  field :value
+  validates :value, presence: true
 
+  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 )
+      _value = Wco::Tag.find( value )
+    end
+    "#{" " * indent }<EmailFilterCondition #{field} #{operator} `#{_value}` />\n"
+  end
 end
 

data/app/models/wco_email/message.rb

@@ -124,7 +124,27 @@ class WcoEmail::Message
       })
 
     else
-      raise "unknown filter kind: #{filter.kind}"
+      if filter.actions.present?
+        filter.actions.each do |act|
+          case act.kind
+          when ::WcoEmail::ACTION_REMOVE_TAG
+            this_tag = Wco::Tag.find( act.value )
+            conv.tags -= [ this_tag ]
+          when ::WcoEmail::ACTION_ADD_TAG
+            this_tag = Wco::Tag.find( act.value )
+            conv.tags += [ this_tag ]
+          when ::WcoEmail::ACTION_AUTORESPOND
+            this_template = WcoEmail::EmailTemplate.find( act.value )
+            WcoEmail::Context.create!({
+              email_template: this_template,
+              lead_id:        lead.id,
+              send_at:        Time.now,
+            })
+          end
+        end
+      else
+        raise "unknown filter kind: #{filter.kind}"
+      end
     end
 
     conv.save!

data/app/models/wco_email/message_stub.rb

@@ -57,7 +57,7 @@ class WcoEmail::MessageStub
     raw      = @client.get_object( bucket: stub.bucket, key: stub.object_key ).body.read
     raw      = raw.encode('utf-8', invalid: :replace, undef: :replace, replace: '_' )
     the_mail = Mail.new( raw )
-    puts! the_mail, 'the_mail'
+    # puts! the_mail, 'the_mail'
 
     message_id         = the_mail.header['message-id']&.decoded
     message_id       ||= "#{the_mail.date&.iso8601}::#{the_mail.from}"
@@ -199,6 +199,24 @@ 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
+      end
+
       if reason
         puts! "Applying filter #{filter} to conv #{@message.conversation} for matching #{reason}" if DEBUG
 

data/app/models/wco_hosting/appliance_tmpl.rb

@@ -30,6 +30,8 @@ class WcoHosting::ApplianceTmpl
   #   file.close
   # end
 
+  field :docker_compose_erb, type: :string
+
   field :stdout, type: :string, default: ''
   field :stderr, type: :string, default: ''
 

data/app/views/wco/api/tags/index.json.jbuilder

@@ -0,0 +1,7 @@
+
+json.tags do
+  json.array! @tags do |tag|
+    json.label tag.to_s
+    json.value tag.id.to_s
+  end
+end

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

@@ -16,7 +16,7 @@
       %label schwab_refresh_token
       = f.text_field :schwab_refresh_token
     .field
-      %label schwab_access_token
+      %label schwab_id_token
       = f.text_field :schwab_id_token
 
     .actions

data/config/routes.rb

@@ -7,6 +7,8 @@ Wco::Engine.routes.draw do
 
     get 'obf',              to: 'obfuscated_redirects#show' ## testing only.
     get 'obf/:id',          to: 'obfuscared_redirects#show'
+
+    get 'tags', to: 'tags#index'
   end
 
   get 'application/tinymce', to: 'application#tinymce'

data/lib/wco_models.rb

@@ -31,7 +31,30 @@ INACTIVE = 'inactive'
 STATUSES = [ nil, ACTIVE, INACTIVE ]
 
 module Wco; end
-module WcoEmail; 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'
+  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 WcoHosting; end
 
 class Wco::HTTParty
@@ -40,4 +63,3 @@ class Wco::HTTParty
 end
 
 ActiveSupport.escape_html_entities_in_json = true
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.189
+  version: 3.1.0.191
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-30 00:00:00.000000000 Z
+date: 2025-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ahoy_matey
@@ -429,6 +429,7 @@ files:
 - app/assets/stylesheets/wco/videos.scss
 - app/controllers/wco/api/leads_controller.rb
 - app/controllers/wco/api/obfuscated_redirects_controller.rb
+- app/controllers/wco/api/tags_controller.rb
 - app/controllers/wco/api_controller.rb
 - app/controllers/wco/application_controller.rb
 - app/controllers/wco/galleries_controller.rb
@@ -499,6 +500,7 @@ files:
 - app/models/wco_email/email_action_template.rb
 - app/models/wco_email/email_action_template_tie.rb
 - app/models/wco_email/email_filter.rb
+- app/models/wco_email/email_filter_action.rb
 - app/models/wco_email/email_filter_condition.rb
 - app/models/wco_email/email_template.rb
 - app/models/wco_email/message.rb
@@ -525,6 +527,7 @@ files:
 - app/views/wco/_search.haml
 - app/views/wco/_select_all.haml
 - app/views/wco/api/leads/index_hash.jbuilder
+- app/views/wco/api/tags/index.json.jbuilder
 - app/views/wco/application/_alerts_notices.haml
 - app/views/wco/application/_auth_widget.haml
 - app/views/wco/application/_debug.haml