ishapi 0.1.8.271 → 0.1.8.272

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d08d69bbceb0955e2194960083a649395ae71dfd50f5868888d404632893d78a
-  data.tar.gz: 02b01369f8ab5e36b8aa39454d040c240681d87e11839b5ab5095c4072fb5144
+  metadata.gz: 4a9b5821802e8c966adddf0709fd2ffc3e3bb45dd1530630498480b3a79fc542
+  data.tar.gz: 73c04826bb8d276cd691989bb12c2ff4254b53de47cc05eb08b340517fe75783
 SHA512:
-  metadata.gz: 385e57f53836fb43de6f8497ca9c5bd86d2632a58ea33372854f8743143421066b24e8f68d8cd593d7a05780a61d198faaf2f9f0674ac6df2983c30f5913761e
-  data.tar.gz: 68ac61a6a5fecf04b715c626c7d98c9b0727b8bb1a84996625b75d878474218cd2dbaab5fb157ebde13ff622e5008e6c865b93a8793e6ba668045de62e7a15ac
+  metadata.gz: 84f98f56355046723fa4b7eb2d6d7737b9885647ec5f6f29bdf62ed9ff48c14418451c06096243ec57e0f9d8887a713b5276c07a1ba87a5ae1bae2a20042924f
+  data.tar.gz: c1bb78d47ccd0594eb8720fad830ea1f9c29e0d9f298ebc7753d3d47712bb09630832113fd51e76692322ef548bdc5e1a3e4c4da62093a3cdbcc6a490d31c2c9

data/app/jobs/ishapi/email_message_intake_job.rb

@@ -127,6 +127,11 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
       end
     end
 
+    ## Leadset, Lead
+    domain  = @message.from.split('@')[1]
+    leadset = Leadset.find_or_create_by( company_url: domain )
+    lead    = Lead.find_or_create_by( email: @message.from, m3_leadset_id: leadset.id )
+
     ## Conversation
     if in_reply_to_id
       in_reply_to_msg = ::Office::EmailMessage.where({ message_id: in_reply_to_id }).first
@@ -145,30 +150,22 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
         subject: the_mail.subject,
       })
     end
-    @message.email_conversation_id = conv.id
+    @message.update_attributes({ email_conversation_id: conv.id })
     conv.update_attributes({
-      state: Conv::STATE_UNREAD,
+      state:     Conv::STATE_UNREAD,
       latest_at: the_mail.date || Time.now.to_datetime,
+      lead_ids:  conv.lead_ids.push( lead.id ).uniq,
       wp_term_ids: ( [ email_inbox_tag_id ] + conv.wp_term_ids + stub.wp_term_ids ).uniq,
     })
 
-    ## Leadset
-    domain = @message.from.split('@')[1]
-    leadset = Leadset.find_or_create_by( company_url: domain )
-
-    ## Lead
-    lead = Lead.find_or_create_by( email: @message.from, m3_leadset_id: leadset.id )
-    conv.lead_ids = conv.lead_ids.push( lead.id ).uniq
-
     ## Actions & Filters
     email_filters = Office::EmailFilter.active
     email_filters.each do |filter|
-      if ( filter.from_regex.blank? ||     @message.from.match(         filter.from_regex ) ) &&
-         ( filter.from_exact.blank? ||     @message.from.include?(      filter.from_exact ) ) &&
-        #  ( filter.body_regex.blank? ||     @message.part_html.match(    filter.body_regex ) ) &&
-         ( filter.body_exact.blank? ||     @message.part_html.include?( filter.body_exact ) ) &&
-         ( filter.subject_regex.blank? ||  @message.subject.match(      filter.subject_regex ) ) &&
-         ( filter.subject_exact.blank? ||  @message.subject.include?(   filter.subject_exact ) )
+      if ( filter.from_regex.blank? ||     @message.from.match(             filter.from_regex    ) ) &&
+         ( filter.from_exact.blank? ||     @message.from.downcase.include?( filter.from_exact    ) ) &&
+         ( filter.body_exact.blank? ||     @message.part_html.include?(     filter.body_exact    ) ) &&
+         ( filter.subject_regex.blank? ||  @message.subject.match(          filter.subject_regex ) ) &&
+         ( filter.subject_exact.blank? ||  @message.subject.include?(       filter.subject_exact ) )
 
         # || MiaTagger.analyze( @message.part_html, :is_spammy_recruite ).score > .5
 
@@ -176,17 +173,10 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
       end
     end
 
-    ## Save to exit
-    flag = @message.save
-    # if flag
-    #   puts! @message.message_id, 'Saved this message'
-    # else
-    #   puts! @message.errors.full_messages.join(', '), 'Cannot save email_message'
-    # end
-    conv.save
     stub.update_attributes({ state: ::Office::EmailMessageStub::STATE_PROCESSED })
 
     ## Notification
+    conv.reload
     if conv.wp_term_ids.include?( email_inbox_tag_id )
       out = ::Ishapi::ApplicationMailer.forwarder_notify( @message.id.to_s )
       Rails.env.production? ? out.deliver_later : out.deliver_now

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.271
+  version: 0.1.8.272
 platform: ruby
 authors:
 - piousbox