wco_models 3.1.0.52 → 3.1.0.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ae41306d1c2d1a86acdc705f296feae8ba6cb9d31dcef4c1794cabaa69d8b2c
-  data.tar.gz: 1d34eb80dc069bb504a62a08ee25da17c92cebb5805399ff570954c8bd163c3e
+  metadata.gz: 41ed3d61aaea366b6925edbffd7cc4cf955bfffaf21a46f029ab1e3d463e7e17
+  data.tar.gz: efcfd16d8db203ab26fcbe58ea9b82cb08a4d32023c986de52a9a9f61d5eb740
 SHA512:
-  metadata.gz: 46d410929c0405cffbd123b8b376a3629fc748e75df699b56bd94d70b9576c22c09358e64c32f3bfea59fc6b1bd7ed471cb70af2c9c4cd60170b75599df4a0d6
-  data.tar.gz: 5b7280694b1ba7790c33e70e1f0c8555733f6d2912e7af2bdaba73516adfe6417e1594384ca84896cf1d7b6ea3f9cdd1dcf419188f38dd19f0fc69ce1f20a37c
+  metadata.gz: 2be84afa6c6de2b06ba0257553f100523fe052fabddc365292ae9cbe450070e95bb34e2a152eb026751f582e1167ea03b3253566448e42b4e69d2e485a2a6674
+  data.tar.gz: 1a627331788250f7664b617dba05db34a74991aab270bc1604a2c3906860828a1940f8db049fc41ec7c335eaa15d38156bb3e8136bef46471450e62167fd7302

data/app/assets/stylesheets/wco/utils.scss

@@ -113,6 +113,10 @@ h5.title {
   display: flex;
 }
 
+.h-500px {
+  min-height: 500px;
+}
+
 /* M */
 
 .maxwidth {

data/app/models/wco/gallery.rb

@@ -7,23 +7,24 @@ class Wco::Gallery
   include Wco::Utils
   store_in collection: 'galleries'
 
-  PER_PAGE = 6
 
   field :name
   validates :name, :uniqueness => true
   index({ :name => -1 }) ## 2023-09-23 removed uniqueness
 
+  field :slug
+  index({ :slug => -1 }, { :unique => true })
+  validates :slug, presence: true, uniqueness: true
+  before_validation :set_slug, :on => :create
+
   field :subhead
   field :descr,   :as => :description
 
   field :is_public, type: Boolean, default: false
   # has_and_belongs_to_many :shared_profiles, :class_name => 'Wco::Profile', :inverse_of => :shared_galleries
 
-  field :is_trash,   type: Boolean, default: false
-  field :is_done,    type: Boolean, default: false
-
   def published
-    where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc })
+    where({ :is_public => true }).order_by({ :created_at => :desc })
   end
 
   field :x,       :type => Float
@@ -31,15 +32,9 @@ class Wco::Gallery
   field :z,       :type => Float
 
   field :lang,    :default => 'en'
-  # field :username
-  # field :lead_id, type: :integer
 
-  field :slug
-  index({ :slug => -1 }, { :unique => true })
-  validates :slug, presence: true, uniqueness: true
-  before_validation :set_slug, :on => :create
 
-  def self.list conditions = { :is_trash => false }
+  def self.list conditions = {}
     out = self.unscoped.where( conditions ).order_by( :created_at => :desc )
     [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
   end

data/app/models/wco/lead.rb

@@ -14,6 +14,12 @@ class Wco::Lead
   field :address
 
   belongs_to :leadset, class_name: 'Wco::Leadset'
+  before_validation :set_leadset, on: :create
+  def set_leadset
+    domain         = email.split('@')[1]
+    self.leadset ||= Wco::Leadset.find_or_create_by({ company_url: domain })
+  end
+
   has_one :photo,      class_name: 'Wco::Photo'
 
   has_many                :email_messages,          class_name: '::WcoEmail::Message', inverse_of: :lead

data/app/models/wco/photo.rb

@@ -51,14 +51,10 @@ class Wco::Photo
                             s3_region: ::S3_CREDENTIALS[:region]
   validates_attachment_content_type :photo, :content_type => ["image/webp", "image/jpg", "image/jpeg", "image/png", "image/gif", 'application/octet-stream' ]
 
-  def self.n_per_manager_gallery
-    25
-  end
-
   def export_fields
     %w|
       gallery_id
-      name descr weight is_public is_trash
+      name descr weight
 
       photo_file_name photo_content_type photo_file_size photo_updated_at photo_fingerprint
     |

data/app/models/wco_email/context.rb

@@ -35,8 +35,10 @@ class WcoEmail::Context
   def from_email
     if self[:from_email].presence
       return self[:from_email]
-    else
+    elsif tmpl&.from_email
       return tmpl.from_email
+    else
+      return DEFAULT_FROM_EMAIL
     end
   end
 

data/app/models/wco_email/email_template.rb

@@ -1,4 +1,6 @@
 
+DEFAULT_FROM_EMAIL = 'victor@wasya.co'
+
 class WcoEmail::EmailTemplate
   include Mongoid::Document
   include Mongoid::Timestamps
@@ -86,9 +88,20 @@ class WcoEmail::EmailTemplate
     'Wasya Co Mailer <no-reply@wco.com.de>',
     'Wasya Co Mailer <wasyacomailer@gmail.com>',
   ];
+  FROM_EMAILS_2 = [
+
+    [ 'Victor Pudeyev <piousbox@gmail.com>',    'piousbox@gmail.com' ],
+    [ 'Victor Pudeyev <victor@piousbox.com>',   'victor@piousbox.com' ],
+    [ 'Victor Pudeyev <no-reply@piousbox.com>', 'no-reply@piousbox.com' ],
+
+    [ 'WasyaCo Consulting <no-reply@wasya.co>', 'no-reply@wasya.co' ],
+    [ 'Victor Pudeyev <victor@wasya.co>',       'victor@wasya.co' ],
+
+  ];
   field :from_email
-  def self.from_email_list
-    [ [nil, nil] ] + FROM_EMAILS.map { |i| [i, i] }
+  def self.from_emails_list
+    # [ [nil, nil] ] + FROM_EMAILS.map { |i| [i, i] }
+    FROM_EMAILS_2
   end
 
   SIGNATURE = <<~AOL
@@ -118,7 +131,7 @@ class WcoEmail::EmailTemplate
   def self.blank; self.blank_template; end
 
   def self.list
-    all.map { |p| [ p.id, p.slug ] }
+    all.map { |p| [ p.slug, p.id ] }
   end
 
 end

data/app/models/wco_email/message.rb

@@ -67,7 +67,7 @@ class WcoEmail::Message
   def received_at ; date ; end
 
   belongs_to :conversation, class_name: 'WcoEmail::Conversation'
-  def conv ; email_conversation ; end
+  def conv ; conversation ; end
 
   belongs_to :stub, class_name: 'WcoEmail::MessageStub'
 

data/app/models/wco_email/message_stub.rb

@@ -1,4 +1,10 @@
 
+=begin
+
+key = '01070861907736276273039d9ee-c69a3509-5c85-481d-822e-ba65c204e1ba-000000@eu-central-1.amazonses.com'
+
+=end
+
 ##
 ## Only object_key, no validations.
 ## 2023-12-28 _vp_ Continue.
@@ -13,9 +19,9 @@ class WcoEmail::MessageStub
   STATUS_PENDING   = 'status_pending'
   STATUS_PROCESSED = 'status_processed'
   STATUS_FAILED    = 'status_failed'
-  STATUSES         = [ STATUS_PENDING, STATUS_PROCESSED ]
+  STATUSES         = [ STATUS_PENDING, STATUS_PROCESSED, STATUS_FAILED ]
   field :status, default: STATUS_PENDING
-  scope :pending, ->{ where( status: 'status_pending' ) }
+  scope :pending, ->{ where( status: STATUS_PENDING ) }
 
   field     :bucket # 'ish-ses', 'ish-ses-2024'
 
@@ -31,8 +37,180 @@ class WcoEmail::MessageStub
     {}
   AOL
 
-  ## This only saves a local messafe from mbox to s3.
-  def do_process message
+  def do_process
+    @client ||= Aws::S3::Client.new({
+      region:            ::S3_CREDENTIALS[:region_ses],
+      access_key_id:     ::S3_CREDENTIALS[:access_key_id_ses],
+      secret_access_key: ::S3_CREDENTIALS[:secret_access_key_ses],
+    })
+    stub = self
+
+    raw                = @client.get_object( bucket: stub.bucket, key: stub.object_key ).body.read
+    the_mail           = Mail.new( raw )
+
+    message_id         = the_mail.header['message-id']&.decoded
+    message_id       ||= "#{the_mail.date&.iso8601}::#{the_mail.from}"
+    # puts! message_id, 'message_id'
+
+    in_reply_to_id     = the_mail.header['in-reply-to']&.to_s
+    puts! in_reply_to_id, 'in_reply_to_id'
+
+    the_mail.to        = [ 'NO-RECIPIENT' ] if !the_mail.to
+    subject            = WcoEmail::Message.strip_emoji( the_mail.subject || '(wco-no-subject)' )
+    puts! subject, 'subject'
+
+    ## Conversation
+    if in_reply_to_id
+      in_reply_to_msg = WcoEmail::Message.where({ message_id: in_reply_to_id }).first
+      if !in_reply_to_msg
+        conv = WcoEmail::Conversation.find_or_create_by({
+          subject: subject,
+        })
+        in_reply_to_msg = WcoEmail::Message.find_or_create_by({
+          message_id: in_reply_to_id,
+          conversation: conv,
+        })
+      end
+      conv = in_reply_to_msg.conversation
+    else
+      conv = WcoEmail::Conversation.find_or_create_by({
+        subject: subject,
+      })
+    end
+
+
+    ## 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 ).first
+    leadset ||= Wco::Leadset.create( company_url: domain, email: from )
+    lead      = Wco::Lead.find_or_create_by( email: from, leadset: leadset )
+
+
+    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.delete
+    end
+    @message = WcoEmail::Message.create!({
+      stub:         stub,
+      conversation: conv,
+      lead:         lead,
+
+      message_id:     message_id,
+      in_reply_to_id: in_reply_to_id,
+      object_key:     stub.object_key,
+
+      subject: subject,
+      date:    the_mail.date,
+
+      from:  from,
+      froms: the_mail.from,
+
+      to:  the_mail.to ? the_mail.to[0] : nil,
+      tos: the_mail.to,
+
+      cc:  the_mail.cc ? the_mail.cc[0] : nil,
+      ccs:  the_mail.cc,
+    })
+
+    ## Parts
+    the_mail.parts.each do |part|
+      @message.churn_subpart( part )
+    end
+    @message.save
+
+    if the_mail.parts.length == 0
+      body = the_mail.body.decoded.encode('UTF-8', invalid: :replace, undef: :replace, replace: '?')
+      if the_mail.content_type&.include?('text/html')
+        @message.part_html = body
+      elsif the_mail.content_type&.include?('text/plain')
+        @message.part_txt = body
+      elsif the_mail.content_type.blank?
+        @message.part_txt = body
+      else
+        @message.logs.push "mail body of unknown type: #{the_mail.content_type}"
+      end
+      @message.save
+    end
+
+    ## Attachments
+    the_mail.attachments.each do |att|
+      @message.save_attachment( att )
+    end
+
+    if !@message.save
+      puts! @message.errors.full_messages.join(", "), "Could not save @message"
+    end
+
+
+    conv.leads.push lead
+    conv.save
+    # lead.conversations.push conv
+    # lead.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 )
+    end
+
+    conv.update_attributes({
+      status:      WcoEmail::Conversation::STATUS_UNREAD,
+      latest_at:   the_mail.date || Time.now.to_datetime,
+      from_emails: ( conv.from_emails + the_mail.from ).uniq,
+      preview:     @message.preview_str,
+    })
+
+    ##
+    ## Tags
+    ##
+    inbox_tag = Wco::Tag.inbox
+    conv.tags.push inbox_tag
+    conv.tags.push stub.tags
+    conv.save
+    # inbox_tag.conversations.push conv
+    # inbox_tag.save
+
+
+    ## Actions & Filters
+    email_filters = WcoEmail::EmailFilter.active
+    email_filters.each do |filter|
+      if ( filter.from_regex.blank?   ||  @message.from.match(                 filter.from_regex    ) ) &&
+        ( filter.from_exact.blank?    ||  @message.from.downcase.include?(     filter.from_exact&.downcase ) ) &&
+        ( 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.downcase.include?(  filter.subject_exact&.downcase ) )
+
+        # || MiaTagger.analyze( @message.part_html, :is_spammy_recruite ).score > .5
+
+        puts! "applying filter #{filter} to conv #{conv}" if DEBUG
+
+        @message.apply_filter( filter )
+      end
+    end
+
+    stub.update_attributes({ status: WcoEmail::MessageStub::STATUS_PROCESSED })
+
+    ## Notification
+    config = JSON.parse(stub.config)
+    if config['skip_notification']
+      ;
+    else
+      conv = WcoEmail::Conversation.find( conv.id )
+      if conv.tags.include? inbox_tag
+        out = WcoEmail::ApplicationMailer.forwarder_notify( @message.id.to_s )
+        Rails.env.production? ? out.deliver_later : out.deliver_now
+      end
+    end
+
+    puts 'ok'
+  end
+
+  ## This only saves a local message from mbox to s3.
+  def save_mbox_to_m3 message
     the_mail = Mail.new(message)
     key      = the_mail.message_id || "no-key-#{Time.now.to_i}.#{rand(1000)}"
 
@@ -82,7 +260,7 @@ class WcoEmail::MessageStub
 
         if message
           if skip < @count
-            do_process message
+            save_mbox_to_m3 message
             print "#{@count}."
           else
             print "s-#{@count}."
@@ -98,7 +276,7 @@ class WcoEmail::MessageStub
 
     if message
       if skip < @count
-        do_process message
+        save_mbox_to_m3 message
         print "#{@count}."
       else
         print "s-#{@count}."

metadata

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