ishapi 0.1.8.221 → 0.1.8.223

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5535374df402db303704a28ec72c3ffc00aa1d7adb39868828a63c2c7a6724fb
-  data.tar.gz: 6eaceebe59b11aa0c9e15434a662a3322a928c9007e02d37e0d9d0d9ea453221
+  metadata.gz: 4713c8ceb10373af0516bafd1226ca2aab981755fb4792b049b142b58143696d
+  data.tar.gz: 1f2b36b9ab6768e32fe18d18d74cf0713ddffe28b198d0aed5018ba8b2877560
 SHA512:
-  metadata.gz: ce63ee0d0e56a785e2628815586d4a3a35cb94a802f68b4be9f5a8275456b27ca97e803f9cc04e4deaa01adc6f6236ab9ed130666f64ae64fdfd96de23545cb3
-  data.tar.gz: 945b43524d99c26498e597690b87a8e05a7e2cab5c4be7d91f6ce1c830df0badf20205bf83ade855f3026b658ff4757b94c2ba86e058d985f8d4da112b41e614
+  metadata.gz: 31fca4d7d89ccb14e14c52771352a7183d6104be3b785e9a703a5acb488d0e2910f2fae836791e3e55b80b5f2d86c66bb05887d24307fd41845b2d4b92bfc168
+  data.tar.gz: b9cc541f597e7aa1d13fadf51be0ca282293f7be2c4dfc0b33f212d3c495372a894e771835d876a91f04c8951756efcce00479539b611cc3411a42388203e7e0

data/app/controllers/ishapi/email_conversations_controller.rb

@@ -10,7 +10,6 @@ module Ishapi
     before_action :check_jwt
 
     def delete
-      puts! params, 'deleting email conversations'
       authorize! :email_conversations_delete, ::Ishapi
       convos = Office::EmailConversation.find params[:ids]
       convos.map &:destroy

data/app/jobs/ishapi/email_message_intake_job.rb

@@ -10,7 +10,6 @@ Ishapi::EmailMessageIntakeJob.perform_now( stub.id.to_s )
 =end
 
 
-
 ##
 ## 2023-02-26 _vp_ let's go
 ## 2023-03-02 _vp_ Continue
@@ -61,10 +60,11 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
       access_key_id:     ::S3_CREDENTIALS[:access_key_id],
       secret_access_key: ::S3_CREDENTIALS[:secret_access_key] })
 
-    _mail          = client.get_object( bucket: ::S3_CREDENTIALS[:bucket_ses], key: stub.object_key ).body.read
-    the_mail       = Mail.new(_mail)
-    message_id     = the_mail.header['message-id'].decoded
-    in_reply_to_id = the_mail.header['in-reply-to']&.to_s
+    _mail              = client.get_object( bucket: ::S3_CREDENTIALS[:bucket_ses], key: stub.object_key ).body.read
+    the_mail           = Mail.new(_mail)
+    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.email_inbox_tag.id
 
     @message = ::Office::EmailMessage.where( message_id: message_id ).first
     @message ||= ::Office::EmailMessage.new
@@ -98,54 +98,39 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
     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.create!({
+        conv = ::Office::EmailConversation.find_or_create_by({
           subject: the_mail.subject,
-          latest_at: the_mail.date,
         })
-        in_reply_to_msg = ::Office::EmailMessage.create!({
+        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.create!({
+      conv = ::Office::EmailConversation.find_or_create_by({
         subject: the_mail.subject,
-        latest_at: the_mail.date,
       })
     end
     @message.email_conversation_id = conv.id
     conv.update_attributes({
       state: Conv::STATE_UNREAD,
       latest_at: the_mail.date,
-      term_ids: (conv.term_ids + stub.term_ids).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.where( company_url: domain ).first
-    if !leadset
-      leadset = Leadset.create!( company_url: domain, name: domain )
-    end
+    leadset = Leadset.find_or_create_by( company_url: domain )
 
     ## Lead
-    lead = Lead.where( email: @message.from ).first
-    if !lead
-      lead = Lead.new( email: @message.from )
-      lead.leadsets.push( leadset )
-      lead.save!
-    end
+    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
-    inbox_tag = WpTag.email_inbox_tag
-    @message.add_tag( inbox_tag )
-    conv.add_tag( inbox_tag )
-
     email_filters = Office::EmailFilter.active
     email_filters.each do |filter|
       if @message.from.match( filter.from_regex ) # || @message.part_html.match( filter.body_regex ) ) # || MiaTagger.analyze( @message.part_html, :is_spammy_recruite ).score > .5
-
         @message.apply_filter( filter )
       end
     end
@@ -161,7 +146,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
     stub.update_attributes({ state: ::Office::EmailMessageStub::STATE_PROCESSED })
 
     ## Notification
-    if @message.wp_term_ids.include?( inbox_tag.id )
+    if @message.wp_term_ids.include?( email_inbox_tag_id )
       # @TODO: send android notification _vp_ 2023-03-01
       ::Ishapi::ApplicationMailer.forwarder_notify( @message.id.to_s ).deliver_later
     end

data/app/models/ishapi/ability.rb

@@ -33,7 +33,6 @@ class Ishapi::Ability
       ## superuser
       ##
       if %w| victor@wasya.co victor@piousbox.com piousbox@gmail.com |.include?( user_profile.email )
-        puts! user_profile, 'ze profile'
 
         can [ :email_conversations_delete ], ::Ishapi
 

metadata

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