wco_email 0.1.1.15 → 0.1.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e60e5717005c4eeedca0acf6cc252d756c1c89207e33433461c61375e0cbf6d
-  data.tar.gz: 8b9795b50a69d6cf743e41853981b30440ebee9b23e8a96b936ae281d76c42f7
+  metadata.gz: 9ee31f07f0214ecc2c291ebd5ad7b72178fa589f14ab0851d14cb95973a83a04
+  data.tar.gz: d9b626b34660c3ac056bb7cffb6a80a2baf756d2d26d87c5f8e523690f020fce
 SHA512:
-  metadata.gz: dc1c955765c2190d06dd36ed77ffa242f94a8974f08c28e05b5ad0423df1ddc2aaae1dc3bca230589f527f6fbf65557b6247eb4cf9757bbb38df1b2c421879d6
-  data.tar.gz: d0c3b726e150d2323f3042933cdee095b02517aaa9069e0050721dbe24750f87952ab27996c3827d517c1189bab1d0c4096a693adcdc9763ddb8dde2e9ecf0c8
+  metadata.gz: 3052c43baec0b9f77a4435d78d97803a3652ed3856a613691b427ae819bad13907787889f291a09a800159a7c5c0a2aec1f556418fb90cb838cb7c05e65d1822
+  data.tar.gz: ee8fd66a96b4ae2d3e5db106e13604fc5e931e5d5adde8d6cfdaf47597b0d1338b61c1dbfd84a1fb98115bb1c708b2087eadbf3521893a51ed51ae098fe50685

data/app/controllers/wco_email/api_controller.rb

@@ -7,7 +7,7 @@ class WcoEmail::ApiController < ActionController::Base
   def create_email_message
     puts! params, 'params'
 
-    stub = WcoEmail::MessageStub.create!({
+    stub = WcoEmail::MessageStub.find_or_create_by({
       bucket:     params[:bucket],
       object_key: params[:object_key],
     })

data/app/helpers/wco_email/application_helper.rb

@@ -1,20 +1,4 @@
 
 module WcoEmail::ApplicationHelper
 
-  def pretty_date date
-    # date.to_s[0, 10]
-    date&.strftime('%Y-%m-%d')
-  end
-  def pp_date a; pretty_date a; end
-
-  def pp_datetime date
-    date&.strftime('%Y-%m-%d %l:%M%P %z')
-  end
-
-  def pp_time date
-    return nil if !date
-    # return date.strftime('%l:%M%P %z')
-    return date.in_time_zone( Rails.application.config.time_zone ).strftime('%l:%M%P')
-  end
-
 end

data/app/views/wco_email/_main_header.haml

@@ -1,31 +1,30 @@
 
-.application--main-header.main-header.maxwidth{ class: "#{ENV['RAILS_ENV']} #{ENV['RAILS_ENV'][0...3]=="dev" ? "development" : ''}" }
+.application--main-header.main-header{ class: "#{ENV['RAILS_ENV']} #{ENV['RAILS_ENV'][0...3]=="dev" ? "development" : ''}" }
+  .maxwidth
+    %i.fa.fa-compress.collapse-expand#collapseHeaderEmail
+      Wco Email & CRM
+    .flex-row
+      %ul
+        %li= link_to 'Email Messages', conversations_path
+        %li
+          Stubs
+          (#{WcoEmail::MessageStub.pending.length})
+          (#{WcoEmail::MessageStub.all.length})
+        %li= render '/wco_email/email_templates/header'
+        %li= render '/wco_email/email_campaigns/header'
+        %li= render '/wco_email/email_filters/header'
+        %li= render '/wco_email/contexts/header'
+        %li= render '/wco_email/unsubscribes/header'
 
-  %i.fa.fa-compress.collapse-expand#collapseHeaderEmail
-    Wco Email & CRM
-  .flex-row
-    %ul
-      %li= link_to 'Email Messages', conversations_path
-      %li
-        Stubs
-        (#{WcoEmail::MessageStub.pending.length})
-        (#{WcoEmail::MessageStub.all.length})
-      %li= render '/wco_email/email_templates/header'
-      %li= render '/wco_email/email_campaigns/header'
-      %li= render '/wco_email/email_filters/header'
-      %li= render '/wco_email/contexts/header'
-      %li= render '/wco_email/unsubscribes/header'
 
+      %ul
+        %li= render '/wco_email/email_action_templates/header'
+        %li= render '/wco_email/email_actions/header'
 
-    %ul
-      %li= render '/wco_email/email_action_templates/header'
-      %li= render '/wco_email/email_actions/header'
+        -# %li= render '/wco_email/lead_action_templates/header'
+        -# %li= render '/wco_email/lead_actions/header'
 
-      -# %li= render '/wco_email/lead_action_templates/header'
-      -# %li= render '/wco_email/lead_actions/header'
+        -# %li
+        -#   = link_to "OActions (#{Wco::OfficeAction.all.length})", office_actions_path
+        -#   = link_to '[+]', new_office_action_path
 
-      -# %li
-      -#   = link_to "OActions (#{Wco::OfficeAction.all.length})", office_actions_path
-      -#   = link_to '[+]', new_office_action_path
-
-  .c

data/app/views/wco_email/email_templates/_plain.haml

@@ -1,8 +1,4 @@
 
--#
--# WARNING: this is used by contexts, not templates, so @TODO: review _vp_ 2023-03-26
--#
-
 = raw ERB.new( @ctx.body ).result
 
 -# = @ctx.reply_to_message.inspect

data/lib/tasks/db_tasks.rake

@@ -1,34 +1,37 @@
 
-=begin
-
+namespace :db do
 
-## clean
-WcoEmail::EmailAction.each do |act|
-  if !act.lead
-    act.delete
+  desc "clean contexts"
+  task clean_contexts: :environment do
+    WcoEmail::Context.each do |ttt|
+      if !ttt.lead
+        ttt.delete
+      end
+    end
   end
-end
-
 
-
-## clean
-WcoEmail::Context.each do |ttt|
-  if !ttt.lead
-    ttt.delete
+  desk 'clean email actions'
+  task clean_email_actions: :environment do
+    WcoEmail::EmailAction.each do |act|
+      if !act.lead
+        act.delete
+      end
+    end
   end
-end
-
-
-=end
-
-namespace :db do
 
   desc "seed"
   task seed: :environment do
+
     inbox = Wco::Tag.find_or_create_by({ slug: 'inbox' })
     trash = Wco::Tag.find_or_create_by({ slug: 'trash' })
+    spam  = Wco::Tag.find_or_create_by({ slug: 'spam' })
+
+    wasyaco  = Wco::Leadset.find_or_create_by!({ company_url: 'wasya.co' })
+
+    poxlovi  = Wco::Lead.find_or_create_by!({ email: 'poxlovi@gmail.com' })
+    piousbox = Wco::Lead.find_or_create_by!({ email: 'piousbox@gmail.com' })
+    victor   = Wco::Lead.find_or_create_by!({ email: 'victor@wasya.co' })
 
-    poxlovi = Wco::Lead.find_or_create_by!({ email: 'poxlovi@gmail.com' })
   end
 
 end

data/lib/tasks/wco_email_tasks.rake

@@ -37,6 +37,9 @@ namespace :wco_email do
       stub.save!
 
       WcoEmail::MessageIntakeJob.perform_sync( stub.id.to_s )
+
+      sleep 1 # second
+      print '.'
     end
   end
 
@@ -107,6 +110,20 @@ namespace :wco_email do
     puts "ok"
   end
 
+  desc 'remove message duplicates'
+  task remove_message_duplicates: :environment do
+    outs = WcoEmail::Message.collection.aggregate([
+      {"$group" => { "_id" => "$message_id", "count" => { "$sum" => 1 } } },
+      {"$match": {"_id" => { "$ne" => nil } , "count" => {"$gt" => 1} } },
+      {"$project" => {"message_id" => "$_id", "_id" => 0} }
+    ])
+    outs = outs.to_a
+    outs.each do |out|
+      WcoEmail::Message.where( message_id: out['message_id'] )[1].destroy!
+      print '.'
+    end
+  end
+
   desc 'remove duplicates of stubs'
   task remove_stub_duplicates: :environment do
     outs = WcoEmail::MessageStub.collection.aggregate([
@@ -130,7 +147,7 @@ namespace :wco_email do
         print '^'
       end
 
-      duration = Rails.env.production? ? 120 : 15 # 2 minutes or 15 seconds
+      duration = Rails.env.production? ? 15 : 15 # 2 minutes or 15 seconds
       sleep duration
       print '.'
 
@@ -165,7 +182,7 @@ namespace :wco_email do
         print '^'
       end
 
-      duration = Rails.env.production? ? 120 : 15 # 2 minutes or 15 seconds
+      duration = Rails.env.production? ? 15 : 15 # 2 minutes or 15 seconds
       sleep duration
       print '.'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.15
+  version: 0.1.1.17
 platform: ruby
 authors:
 - Victor Pudeyev