wco_models 3.1.0.91 → 3.1.0.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c267b89943c2cb18139bdd044522d142fca56a81cadd7930b21eec7f6349d813
-  data.tar.gz: 42c005b73cdb2d15d3157b2d485a57166519a594383caf5a959400c18ae693cb
+  metadata.gz: 8acb70bd0285b4695c50cab2fa2c2338fa51dacb535df93fcfa805cd58e47f6f
+  data.tar.gz: 0c1ce2b3a16a79982db08be8d129eced17acbf36cc246c6b095fbed813f14c43
 SHA512:
-  metadata.gz: 77f0973a4e5ecddd767b045a6c77a5ba6b1dc98eacef09931fbc71413143f5966a3104fa763526f61b0f4a96029b082b025918423146e8703c434469455e74a5
-  data.tar.gz: 564da09016bf7490ad15c0c394d15ffb1b453f610536dc4bd9f0cafb8fa8e855f6d7a66c999c5e7f75c4347157ec3a1cbe5e99d77a6dac1809555fe89757e6e0
+  metadata.gz: efd8df489b52203a347f640a572433eb71f567de9454ac5de57d2949f08de48836d6dc394dd0bcc9ac025b7303004bb9575080618eebfc02d144f93d1efb871f
+  data.tar.gz: 6bf11e6d4cf82022a4db7d1f07e7fb520bbe47d4a9e00c15bf31ecb73c5c7576f3c12a46c808912da35ea24002df622b72ae895028e2d72dc3912f9c790de06f

data/app/models/wco/lead.rb

@@ -28,6 +28,24 @@ class Wco::Lead
       self[:email] = a
     end
   end
+  def self.normalize_email a
+    a = a.downcase
+    if a.index('+')
+      a.slice!( a[a.index('+')...a.index('@')] )
+    end
+    return a
+  end
+  def self.find_or_create_by_email email
+    email = self.normalize_email email
+    out = where( email: email ).first
+    if !out
+      domain    = email.split('@')[1]
+      leadset   = Wco::Leadset.where(  company_url: domain ).first
+      leadset ||= Wco::Leadset.create( company_url: domain, email: email )
+      out = create!( email: email, leadset: leadset )
+    end
+    return out
+  end
 
 
   has_one :photo,      class_name: 'Wco::Photo'

data/app/models/wco_email/message_stub.rb

@@ -86,17 +86,13 @@ class WcoEmail::MessageStub
 
     ## Leadset, Lead
     from      = the_mail.from ? the_mail.from[0] : "nobody@unknown-doma.in"
-    domain    = from.split('@')[1]
-    leadset   = Wco::Leadset.where(  company_url: domain.downcase ).first
-    leadset ||= Wco::Leadset.create( company_url: domain.downcase, email: from.downcase )
-    lead      = Wco::Lead.find_or_create_by( email: from, leadset: leadset )
-
+    lead      = Wco::Lead.find_or_create_by_email( from )
 
     message   = WcoEmail::Message.unscoped.where( message_id: message_id ).first
     if message
       message.message_id = "#{Time.now.strftime('%Y%m%d')}-trash-#{message.message_id}"
       message.object_key = "#{Time.now.strftime('%Y%m%d')}-trash-#{message.object_key}"
-      message.save!( validate: false )
+      message.save( validate: false )
       message.delete
     end
 
@@ -119,7 +115,7 @@ class WcoEmail::MessageStub
       tos: the_mail.to,
 
       cc:  the_mail.cc ? the_mail.cc[0] : nil,
-      ccs:  the_mail.cc,
+      ccs: the_mail.cc,
     })
     puts! @message, '@message'
 
@@ -156,9 +152,7 @@ class WcoEmail::MessageStub
     conv.save
 
     the_mail.cc&.each do |cc|
-      domain  = cc.split('@')[1] rescue 'unknown.domain'
-      leadset = Wco::Leadset.find_or_create_by( company_url: domain )
-      Wco::Lead.find_or_create_by( email: cc, leadset: leadset )
+      Wco::Lead.find_or_create_by_email( cc )
     end
 
     conv.update_attributes({

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.91
+  version: 3.1.0.92
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-18 00:00:00.000000000 Z
+date: 2024-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3