wco_models 3.1.0.192 → 3.1.0.194

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbba6285ae64aa8c8bd1dbebcf4316b2ecb2e7d81f2143220d6e2d00e2b8833b
-  data.tar.gz: 7fe94b7db4a4f1147c0634bfdbb772cb07295870a1bdec024c855eca46e7996f
+  metadata.gz: 7b3538da96d43d2b858d411c19ebc17ec895fc80775ab8fae866c6ba5eef66b4
+  data.tar.gz: f62962e74f94fa28d1252d72502470fd3b7dce833d875e2a86648138b613ec67
 SHA512:
-  metadata.gz: 194d52d31e7fc74009341a9d64008515b4510d0f804542308cb28d11617c41765ee536d683149a9dc412d26770ba17a805ca5feb89b509a59053565e617c599e
-  data.tar.gz: 12e385987d60859fc429da32d697d7bd7dcd2c0e8fe37855b389e3b3bcafd6903e57816efe42accad974e8f6edd0b25a6709b0a14a6282d2661ce8ec5fc68d33
+  metadata.gz: aeed39e89ebbc919a75fa436a36a7b69c154839f17825aa72007766f728c99ae30cd9b22792c1b058d9745e3bbc6ec2f2ebece2cb69d2568bb841d5e8c2eee6d
+  data.tar.gz: cc252f6b9a5799cc4aa1835d4b74163ed981cd14c268f529dce89e321fb8466d28d39864e2fd57a804708c3549353a8f4bd42ba703f488f33362a6c90ef01139

data/README.txt

@@ -9,3 +9,12 @@ Login to the localstack container, then:
     --key 00nn652jk1395ujdr3l11ib06jam0oevjqv2o4g1 \
     --body /opt/tmp/00nn652jk1395ujdr3l11ib06jam0oevjqv2o4g1
 
+In ruby console:
+
+  stub = WcoEmail::MessageStub.create({
+    object_key: '00nn652jk1395ujdr3l11ib06jam0oevjqv2o4g1',
+    bucket: 'wco-email-ses-development',
+    config: { process_images: false }.to_json,
+  })
+  stub.do_process
+

data/app/models/wco/office_action_template.rb

@@ -39,3 +39,21 @@ class Wco::OfficeActionTemplate
   end
 end
 # OAT ||= Wco::OfficeActionTemplate
+
+## mark-leadsets-as-spam
+=begin
+
+@conversations.each do |c|
+  c.tags.delete( Wco::Tag.inbox )
+  c.save
+  c.leadsets.each do |leadset|
+    leadset.tags.delete( Wco::Tag.not_spam )
+    leadset.tags.push( Wco::Tag.spam )
+    leadset.save
+  end
+  # print('.')
+end
+
+=end
+
+

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

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

@@ -26,6 +26,10 @@
   -#   %label Stripe customer_id
   -#   = f.text_field :customer_id
 
+  .field
+    %label tags
+    = f.select :tag_ids, options_for_select(@tags_list, selected: leadset.tag_ids), {}, { multiple: true }
+
   .actions
     = f.submit
 

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

@@ -33,9 +33,7 @@
             = link_to leadset.company_url, leadset_path(leadset)
 
           %td.tags
-            - leadset.tags.each_with_index do |tag, idx2|
-              .chip
-                = tag.name
+            = render '/wco/tags/index_chips', tags: leadset.tags
 
           %td.leads
             = leadset.leads.length

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

@@ -81,7 +81,10 @@
   %hr
 
   .row
-    .col-12
+    .col-6
       %h5.collapse-expand#leads Leads
       = render '/wco/leads/index', leads: @leads
+    .col-6
+      Tags:
+      = render '/wco/tags/index_chips', tags: @leadset.tags
 

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

@@ -9,6 +9,8 @@
       %label Slug
       = f.text_field :slug, class: 'w-100'
 
+    .descr
+      available vars: @conversations , @oat ,
     .field
       %label action_exe
       = f.text_area :action_exe, class: :monospace

data/lib/tasks/db_tasks.rake

@@ -8,6 +8,15 @@ namespace :db do
     leadset.persisted?
     lead    = Wco::Lead.find_or_create_by({ email: 'poxlovi@gmail.com', leadset: leadset })
     lead.persisted?
+
+    blank_email_template = WcoEmail::EmailTemplate.find_or_create_by({ slug: 'blank' })
+    blank_email_template.persisted?
+
+    Wco::Tag.inbox
+    Wco::Tag.trash
+    Wco::Tag.spam
+    Wco::Tag.not_spam
+
   end
 
 end

metadata

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