wco_models 3.1.0.304 → 3.1.0.305

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87541daeb7455882c94e744cf11f35ac8a491c2a7367e59bb666cb8230473613
-  data.tar.gz: 1a421dd9461abd591b248c6b9d1eeaadb6f05e3146a9e8420f35c35504d278c4
+  metadata.gz: 9ab5f3e9735c73de3708a8b0cedec3bba5b93a1f6c693396d6f6b492c5639702
+  data.tar.gz: 94708879c3fc160e214afe8522e9bc792fdf046fa903f9c27151e237419189d3
 SHA512:
-  metadata.gz: 03f99e4c551e579c2cdc8ec4436ffb0ec66b4af7c812424bc7ed027d950b40b7fde8efbdf174bd64b9f7084bf4cefb8b97266da6bdb535ae3ef26972cdf9496f
-  data.tar.gz: df84c4aaa5f7f63c6fa5fa589cb7a4e596e70cceb661881c1900517e3ef6ca276524ea56c8d6f0f4cfe4d598534e57800ad800660b280330c0673272d495ae38
+  metadata.gz: 0d9e765a2b3b61a7641704fe779b297191fa7a8d2c167f5e7163f51d2a8fd0696839620e2864ad557bbbc0fa7b8b26366023f85c797ff0bb52c36b3bd59ec27f
+  data.tar.gz: 453ab1dd3bd2f1acc9239445522836ce18064a6fbb16b54499db401044e86545702f344d0c1fb1e2099b911e19dbe4386d2b2828ccc237d2a0e3a982476ae5ec

data/app/models/wco/photo.rb

@@ -6,6 +6,7 @@ class Wco::Photo
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::Paperclip
+  include Mongoid::Paranoia
   include Wco::Utils
   store_in collection: 'photos'
 

data/app/models/wco_email/context.rb

@@ -51,7 +51,7 @@ class WcoEmail::Context
     elsif tmpl&.from_email
       return tmpl.from_email
     else
-      return DEFAULT_FROM_EMAIL
+      return 'no-reply@wasya.co' ## DEFAULT_FROM_EMAIL
     end
   end
   index({ from_email: -1 })

data/app/models/wco_email/email_filter_condition.rb

@@ -11,17 +11,17 @@ class WcoEmail::EmailFilterCondition
   FIELD_BODY_PLAIN  = 'body-plain'
   FIELD_FROM        = 'from'
   FIELD_LEADSET     = 'from-leadset'
-  FIELD_NOT_TAGGED  = 'leadset-not-tagged'
   FIELD_SUBJECT     = 'subject'
-  FIELD_TAGGED      = 'leadset-tagged'
+  FIELD_TAGGED      = 'leadset-tagged'     ## either lead or leadset, actually
+  FIELD_NOT_TAGGED  = 'leadset-not-tagged' ## either lead or leadset, actually
   FIELD_TO_OR_CC    = 'to-or-cc'
   FIELD_OPTS = [
     FIELD_BODY, FIELD_BODY_PLAIN,
     FIELD_FROM,
     FIELD_LEADSET,
-    FIELD_NOT_TAGGED,
     FIELD_SUBJECT,
     FIELD_TAGGED,
+    FIELD_NOT_TAGGED,
     FIELD_TO_OR_CC,
   ];
   field :field
@@ -49,10 +49,11 @@ class WcoEmail::EmailFilterCondition
 
   index({ email_filter_id: 1, field: 1, operator: 1, value: 1 }, unique: true )
 
-  def apply leadset:, message:
+  def apply lead:, leadset:, message:
     cond = self
     reason = nil
     case cond.field
+
     ## from match-i <value>
     when WcoEmail::EmailFilterCondition::FIELD_FROM
       if cond.operator == WcoEmail::EmailFilterCondition::OPERATOR_MATCH
@@ -60,7 +61,35 @@ class WcoEmail::EmailFilterCondition
           reason = "#{email_skip_filter ? 'skip_' : ''}condition from match-i `#{value}`"
         end
       end
-    end
+
+    when WcoEmail::EmailFilterCondition::FIELD_TAGGED
+      ## cond.operator should eql OPERATOR__ID but I don't check b/c if its slug, it should work also.
+      tag   = Wco::Tag.find( cond.value ) rescue nil
+      tag ||= Wco::Tag.where( slug: cond.value ).first
+      if tag
+        if leadset.tags.include?( tag ) ||
+           lead.tags.include?( tag )
+
+          reason = "#{email_skip_filter ? 'skip_' : ''}condition TAGGED `#{tag.slug}`"
+
+        end
+      end
+
+    when WcoEmail::EmailFilterCondition::FIELD_NOT_TAGGED
+      ## cond.operator should eql OPERATOR__ID but I don't check b/c if its slug, it should work also.
+      tag   = Wco::Tag.find( cond.value ) rescue nil
+      tag ||= Wco::Tag.where( slug: cond.value ).first
+      if tag
+        if !leadset.tags.include?( tag ) &&
+           !lead.tags.include?( tag )
+
+          reason = "#{email_skip_filter ? 'skip_' : ''}condition NOT_TAGGED `#{tag.slug}`"
+
+        end
+      end
+
+    end ## end case
+
     # when WcoEmail::FIELD_LEADSET
     #   if cond.operator == WcoEmail::OPERATOR_NOT_HAS_TAG
     #     this_tag = Wco::Tag.find cond.value

data/app/models/wco_email/message.rb

@@ -88,7 +88,8 @@ class WcoEmail::Message
 
   def apply_filter_action action
     message = self
-    aject = action.aject
+    aject   = action.aject
+
     case action.kind
     when WcoEmail::EmailFilterAction::KIND_ADD_TAG
       conv.tags.push aject

data/app/models/wco_email/message_stub.rb

@@ -111,11 +111,6 @@ class WcoEmail::MessageStub
       @message.save_attachment_postal( att )
     end
 
-    ## _TODO
-    # the_mail.cc&.each do |cc|
-    #   Wco::Lead.find_or_create_by_email( cc )
-    # end
-
     @conv.update_attributes({
       status:      WcoEmail::Conversation::STATUS_UNREAD,
       latest_at:   json['date'].to_time.to_s || Time.now.to_datetime,
@@ -135,7 +130,7 @@ class WcoEmail::MessageStub
       reason = nil
 
       filter.conditions.each do |cond|
-        reason ||= cond.apply(leadset: @leadset, message: @message )
+        reason ||= cond.apply(lead: @lead, leadset: @leadset, message: @message )
       end
 
       if reason
@@ -145,13 +140,14 @@ class WcoEmail::MessageStub
         skip_reason = nil
 
         filter.skip_conditions.each do |scond|
-          skip_reason ||= scond.apply(leadset: @leadset, message: @message )
+          skip_reason ||= scond.apply(lead: @lead, leadset: @leadset, message: @message )
         end
 
         if skip_reason
           puts! "NOT Applying2 filter #{filter} to conv #{@message.conversation} for matching #{skip_reason}" if DEBUG
         else
-          @conv.filters << filter; @conv.save
+          @conv.filters << filter
+          @conv.save
           filter.actions.each do |action|
             @message.apply_filter_action( action )
           end

metadata

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