ishapi 0.1.8.306 → 0.1.8.308

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6d7b34491e5a45933183a4f57ffaceca8ad582fded9d3e75435fd33589b18af
-  data.tar.gz: 36680f3eebb3154959f50600d9f5b40fe2dc0679db03105c08fdd365c7301f78
+  metadata.gz: d2c02f71e6adddb15a1722d560e9a8b9f56a5a10daa82471cb60bc9b9399000f
+  data.tar.gz: a3d36b4b360ddf7285ce4950e9d5adb9a784beff39117c4b37a23914234d490c
 SHA512:
-  metadata.gz: 8e10c7d52eccd2578dbc67af5aa384916894e57d31619b9fa9e8892ffc78284e1277269826b23b0f2cd827c492b7965afe9169c68d69453a6eabe72a1f1122b9
-  data.tar.gz: 2a1bd018123c3b4282b52c05aaa21b23d5788b54632573cf23f8288b622174658442feaa05a230b5a96194caa1ff519ad07c0a303d55683c106585b040294767
+  metadata.gz: 24949079b8dae5559f5046e42e693610ae5943f9a81fd4e461ee7fa1310998dff2120d60ceaf26b64356bd2d46a98168c0dc9c03e1958f1d4355f9d5a0fd5898
+  data.tar.gz: fc860e2a11a220c176cd5c67f0d0ce7766f6198dbac1fd50be0cdb4b7fdec44c315587f134e355273413b507c723e70515520772db9101be01233461bfba15bb

data/app/jobs/ishapi/email_message_intake_job.rb

@@ -11,7 +11,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
 
 =begin
 
-  object_key = 'n0v5mg6q1t4fjjnfh8vj8a96t85rp9la2ud0gdg1'
+  object_key = 'fom5a97nif6j9urfp46sbchi33sks90e9kkrn181'
   MsgStub.where({ object_key: object_key }).delete
 
   stub = MsgStub.create!({ object_key: object_key })
@@ -41,24 +41,40 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
       message_id         = the_mail.header['message-id'].decoded
       in_reply_to_id     = the_mail.header['in-reply-to']&.to_s
       email_inbox_tag_id = WpTag.emailtag(WpTag::INBOX).id
+      the_mail.to        = [ 'NO-RECIPIENT' ] if !the_mail.to
 
-      if !the_mail.to
-        the_mail.to = [ 'NO-RECIPIENT' ]
-      end
+      subject   = ::Msg.strip_emoji the_mail.subject
+      subject ||= '(wco-no-subject)'
 
 
-      subject   = ::Msg.strip_emoji the_mail.subject
-      subject ||= '(wco no subject)'
+      ## Conversation
+      if in_reply_to_id
+        in_reply_to_msg = ::Office::EmailMessage.where({ message_id: in_reply_to_id }).first
+        if !in_reply_to_msg
+          conv = ::Office::EmailConversation.find_or_create_by({
+            subject: subject,
+          })
+          in_reply_to_msg = ::Office::EmailMessage.find_or_create_by({
+            message_id: in_reply_to_id,
+            email_conversation_id: conv.id,
+          })
+        end
+        conv = in_reply_to_msg.email_conversation
+      else
+        conv = ::Office::EmailConversation.find_or_create_by({
+          subject: subject,
+        })
+      end
 
       @message   = ::Office::EmailMessage.where( message_id: message_id ).first
       @message ||= ::Office::EmailMessage.create({
         raw: raw,
+        email_conversation_id: conv.id,
 
         message_id:     message_id,
         in_reply_to_id: in_reply_to_id,
 
         object_key:  stub.object_key,
-        # object_path: stub.object_path,
 
         subject: subject,
         date:    the_mail.date,
@@ -71,8 +87,6 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
 
         cc:  the_mail.cc ? the_mail.cc[0] : nil,
         ccs:  the_mail.cc,
-
-        # bccs: the_mail.bcc,
       })
       if !@message.persisted?
         throw "Could not create email_message: #{@message.errors.full_messages.join(', ')} ."
@@ -138,6 +152,10 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
         end
       end
 
+      if !@message.save
+        puts! @message.errors.full_messages.join(", "), "Could not save @message"
+      end
+
       ## Leadset, Lead
       domain  = @message.from.split('@')[1] rescue 'unknown.domain'
       leadset = Leadset.find_or_create_by( company_url: domain )
@@ -148,25 +166,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
         Lead.find_or_create_by( email: cc, m3_leadset_id: leadset.id )
       end
 
-      ## Conversation
-      if in_reply_to_id
-        in_reply_to_msg = ::Office::EmailMessage.where({ message_id: in_reply_to_id }).first
-        if !in_reply_to_msg
-          conv = ::Office::EmailConversation.find_or_create_by({
-            subject: @message.subject,
-          })
-          in_reply_to_msg = ::Office::EmailMessage.find_or_create_by({
-            message_id: in_reply_to_id,
-            email_conversation_id: conv.id,
-          })
-        end
-        conv = in_reply_to_msg.email_conversation
-      else
-        conv = ::Office::EmailConversation.find_or_create_by({
-          subject: @message.subject,
-        })
-      end
-      @message.update_attributes({ email_conversation_id: conv.id })
+      # @message.update_attributes({ email_conversation_id: conv.id })
       conv.update_attributes({
         state:       Conv::STATE_UNREAD,
         latest_at:   the_mail.date || Time.now.to_datetime,
@@ -191,7 +191,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
 
           # || MiaTagger.analyze( @message.part_html, :is_spammy_recruite ).score > .5
 
-          puts! "applying filter #{filter} to conv #{conv}" if DEBUG
+          # puts! "applying filter #{filter} to conv #{conv}" if DEBUG
 
           @message.apply_filter( filter )
         end

metadata

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