wco_models 3.1.0.77 → 3.1.0.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75d573c20e2daa8d9ce98511e31788bef7f389ce4c67ff693e10cbd51062a704
-  data.tar.gz: aace2791f359a233c5ea2c48fb88e84e17fd6c0d0a92dd6a8e2d581f243de576
+  metadata.gz: 47c1bfd514e6256509d803414d83c9788a784d763ef4f2d0498f2838b593c097
+  data.tar.gz: 525c22eab612f690439d427d0f714f937b6f77853ecad2fd6006b8f3fd4787e8
 SHA512:
-  metadata.gz: 55b718c4db30af9bae6c6448337e1195766ab2efbf6d35df0c1a6be1380de61be33f414cbd17610dbee94882d7c7b9329d4510ffd4c4a64ee73633d7c67d38fd
-  data.tar.gz: 8aabf72c5aef2900b195c704ee3875bb31c95ec1cf814f091d09692c9480265cd507ca510e5e48b2e67009b700b83231dc31a6c1ca8778432295155424d8f2a9
+  metadata.gz: e4d06549e214c3e666b692fb01abeff916827efa2bc77e38468e624eec463b24a67290d8327c6b7667220a44c6c4c0595ede9d7abcf78f5b845fcc3b08b84d17
+  data.tar.gz: b7cdd068d8a5f9607fee162d093ae0e8671e34ee94641daab7274ed23f3dbcbe849852e9664b9668e729c545b46624e32ca19c7571b38fb2d8bf6f2971a60cc8

data/app/models/wco_email/email_action.rb

@@ -64,3 +64,5 @@ class WcoEmail::EmailAction
   end
 end
 
+Sch = WcoEmail::EmailAction
+

data/app/models/wco_email/email_filter.rb

@@ -33,12 +33,6 @@ class WcoEmail::EmailFilter
   KINDS = [ nil, KIND_AUTORESPOND_TMPL, KIND_AUTORESPOND_EACT, KIND_ADD_TAG, KIND_REMOVE_TAG, KIND_DESTROY_SCHS]
   field :kind
 
-  STATUS_ACTIVE   = 'active'
-  STATUS_INACTIVE = 'inactive'
-  STATUSES        = [ STATUS_ACTIVE, STATUS_INACTIVE ]
-  field :status, type: :string, default: STATUS_ACTIVE
-  scope :active, ->{ where( status: STATUS_ACTIVE ) }
-
   belongs_to :email_template,        class_name: 'WcoEmail::EmailTemplate',         optional: true
   belongs_to :email_action_template, class_name: 'WcoEmail::EmailActionTemplate',   optional: true
 

data/app/models/wco_email/email_template.rb

@@ -136,3 +136,4 @@ class WcoEmail::EmailTemplate
   end
 
 end
+ET = WcoEmail::EmailTemplate

data/app/models/wco_email/message.rb

@@ -98,18 +98,19 @@ class WcoEmail::Message
       conv.tags -= [ filter.tag ]
 
     when WcoEmail::EmailFilter::KIND_AUTORESPOND_TMPL
-      WcoEmail::Context.create({
+      WcoEmail::Context.create!({
         email_template: filter.email_template,
         lead_id:        lead.id,
         send_at:        Time.now,
       })
 
     when WcoEmail::EmailFilter::KIND_AUTORESPOND_EACT
-      ::Sch.create({
-        email_action: filter.email_action,
-        state:        ::Sch::STATE_ACTIVE,
-        lead_id:      lead.id,
-        perform_at:   Time.now,
+      # byebug
+      out = Sch.create!({
+        email_action_template: filter.email_action_template,
+        status:                Sch::STATUS_ACTIVE,
+        lead_id:               lead.id,
+        perform_at:            Time.now,
       })
 
     else

data/app/models/wco_email/message_stub.rb

@@ -178,9 +178,9 @@ class WcoEmail::MessageStub
 
 
     ## Actions & Filters
-    email_filters = WcoEmail::EmailFilter.active
+    email_filters = WcoEmail::EmailFilter.all
     email_filters.each do |filter|
-      reson = nil
+      reason = nil
       if filter.from_regex.present? && @message.from.downcase.match( filter.from_regex )
         reason = 'from_regex'
       end
@@ -198,7 +198,7 @@ class WcoEmail::MessageStub
       end
 
       if reason
-        puts! "Applying filter #{filter} to conv #{conv} for matching #{reason}" if DEBUG
+        puts! "Applying filter #{filter} to conv #{@message.conversation} for matching #{reason}" if DEBUG
         @message.apply_filter( filter )
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.77
+  version: 3.1.0.79
 platform: ruby
 authors:
 - Victor Pudeyev