ishapi 0.1.8.220 → 0.1.8.222

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 705138dc08f34502468bf711899f0dc2ad9574ccddaace8629db1f4fb8c27bc1
-  data.tar.gz: fd7216c25e25a03c96a07ebf3d692f05c0f05803c55a644577c9a12f3b19a8b8
+  metadata.gz: 79a045487ac24d706f7d8f02f10a548153673b0b0b13bb151fb284a3ccb3837e
+  data.tar.gz: '08a915a9769757ec0519b5171ac2bbb17d9cc431af3dbea113b9558e1a090403'
 SHA512:
-  metadata.gz: 9f1aef9fe0ef31e814a2361ce511904067024adb608b60ed6175c496baaf51c118e2c55a1d05b4a95fe68296362ee8759fd5dfc673d88f888858a436b2ff360b
-  data.tar.gz: 50b7b3bdb7e30cbaf1e101cc6ab9cef9436cdb50c221152e06fb8ae073b08751ca79238876904b239981484ac35694322b2ecfe389295b349b9f5c5cfe55bfb4
+  metadata.gz: 74c144dc50c96c1e6e684e064f1ff1696aba730573eccc9dc4673ab7fe35f3469cc995fdf0d2bcfee4e60b1f0c50aa81fadecac44ae53c354aeb888b69811110
+  data.tar.gz: 5338869bbdd4d2762a050b60eccd91b8feaaed1613a9569ba0afb9e62b3419012d2a54f5400ee4dc1400976bbb20dd5fc7f14f738b1de498a056e734d7567b50

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

@@ -9,7 +9,19 @@ Ishapi::EmailMessageIntakeJob.perform_now( stub.id.to_s )
 
 =end
 
-
+## align companies do leads' domains
+=begin
+outs = Lead.all.map do |lead|
+  domain = lead.email.split('@')[1]
+  if lead.company.company_url == domain
+    ;
+  else
+    company = Leadset.find_or_create_by( company_url: domain )
+    lead.m3_leadset_id = company.id
+    lead.save
+  end
+end.compact
+=end
 
 ##
 ## 2023-02-26 _vp_ let's go
@@ -98,54 +110,43 @@ 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: ( [ WpTag.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 )
+    # 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

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.220
+  version: 0.1.8.222
 platform: ruby
 authors:
 - piousbox