wco_email 0.1.1.12 → 0.1.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12cf9a51987708d2c99caa370d30c2fe09466831e570e76b6ec3d4f43b6e8747
-  data.tar.gz: 681fee4ecf20113fb5ef901042326b030de4fa4a08016f9cc31fb5ad1e2e6acd
+  metadata.gz: 38dd6949cfd54cf62dc22d578f5c92d1b15901828e817ca200a7bff21744a9e0
+  data.tar.gz: 1d34eebffc81223a0f39fecee5446b40d1218c658406400550499ab3e45cc21e
 SHA512:
-  metadata.gz: 27452f09a3756eb4622b51fdd165baa5843bf045fc3f1de1e9b06f66e5954cb321a1dcbe6eebb0a63881809597053906035d05c8dabb20c2c05d2382cb024429
-  data.tar.gz: 04c4c2b58ae84f428ff0885630b18e21cda3bbb702e661dd29cd0b2424a67987ba8e1f10daed09375ccdf4ccb859761a96fcdbc59917695041f31bd8f66743fb
+  metadata.gz: 7687dd90c43ef617b71aa6dcfe42d41ba2454636f94c964d42f78ff749091295fcfd497380e09b6c78b4c7e06d290506b8b6bdeab4fa6e95eeb829ef4ba7e066
+  data.tar.gz: 26db851105b6b38d5d2c0cee3a8e750473f04d98085794490116f182e124e013f591f9f0f71d0f55ad78e704e91735226afc0803d0c820b1a7ee7e0b4851e15a

data/README.txt

@@ -1,129 +1,4 @@
-curl https://api.openai.com/v1/chat/completions   -H "Content-Type: application/json"   -H "Authorization: Bearer $OPENAI_API_KEY"   -d '{
-    "model": "gpt-3.5-turbo",
-    "messages": [
-      {
-        "role": "system",
-        "content": "You are a poetic assistant, skilled in explaining complex programming concepts with creative flair."
-      },
-      {
-        "role": "user",
-        "content": "Compose a poem that explains the concept of recursion in programming."
-      }
-    ]
-  }'
 
-curl --include \
-  --request POST \
-  --user admin:$pi_passwd \
-  --header 'Content-type: application/hal+json' \
-  http://pi.local/node?_format=hal_json \
-  --data-binary '{
-    "_links": {
-      "type":{"href":"http://pi.local/rest/type/node/article"}
-    },
-    "title":[{"value":"Test Tree #1" }],
-    "body":[{"value": "<h1>Hello, world!</h1><img src='http://ish-drupal-prod.s3.amazonaws.com/public/2023-09/200x200%20piousbox%20favicon.png?VersionId=6QVFTwCGApZMbrkmP_MlEhaCB2_5J1DG' alt='' />", "format": "full_html" }],
-    "type":[{"target_id":"article"}],
-    "field_image_thumb_url":[{"value": "http://ish-drupal-prod.s3.amazonaws.com/public/2023-09/200x200%20piousbox%20favicon.png?VersionId=6QVFTwCGApZMbrkmP_MlEhaCB2_5J1DG" }],
-    "status": [{"value": 1}],
-    "_embedded": {
-      "http://pi.local/rest/relation/node/article/field_issue": [
-        { "uuid": [{ "value": "56229a95-d675-43e1-99b1-f9e11b5579c5" }] }
-      ],
-      "http://pi.local/rest/relation/node/article/field_tags": [
-        { "uuid": [{ "value": "45646a7d-1a16-42e8-b758-f6e1c8d976f7" }] },
-        { "uuid": [{ "value": "834e34e2-05ae-498d-b876-453798872ce1" }] }
-      ]
-    }
-  }'
 
-
-curl --include \
-  --request POST \
-  --user admin:$pi_passwd \
-  --header 'Content-type: application/hal+json' \
-  http://pi.local/entity/file?_format=hal_json \
-  --data-binary '{
-    "_links": { "type": { "href": "http://pi.local/rest/type/file/image" } },
-    "filename": [
-      {
-        "value": "favicon-32x32.png"
-      }
-    ],
-    "filemime": [
-      {
-        "value": "image/png"
-      }
-    ],
-    "type":[{"target_id":"image"}],
-    "data": [
-      {
-        "value": "/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAYEBAUEBAYFBQUGBgYHCQ4JCQgICRINDQoOFRIWFhUSFBQXGiEcFxgfGRQUHScdHyIjJSUlFhwpLCgkKyEkJST/2wBDAQYGBgkICREJCREkGBQYJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCT/wgARCAAyADIDASIAAhEBAxEB/8QAGAABAQEBAQAAAAAAAAAAAAAAAQADAgX/xAAWAQEBAQAAAAAAAAAAAAAAAAAAAQX/2gAMAwEAAhADEAAAAfTEysMEAeVqjURARQQKjUhIRYgrmNipAqgpSo//xAAUEAEAAAAAAAAAAAAAAAAAAABQ/9oACAEBAAEFAkf/xAAUEQEAAAAAAAAAAAAAAAAAAABA/9oACAEDAQE/AQf/xAAUEQEAAAAAAAAAAAAAAAAAAABA/9oACAECAQE/AQf/xAAUEAEAAAAAAAAAAAAAAAAAAABQ/9oACAEBAAY/Akf/xAAZEAACAwEAAAAAAAAAAAAAAAAAARARIED/2gAIAQEAAT8hy8PvssY4Y5//2gAMAwEAAgADAAAAEBDRANssv3ci/wCOOAP/xAAVEQEBAAAAAAAAAAAAAAAAAAABQP/aAAgBAwEBPxAg/8QAFhEAAwAAAAAAAAAAAAAAAAAAABEw/9oACAECAQE/EBX/AP/EABoQAQEBAQADAAAAAAAAAAAAAAEAERAgITH/2gAIAQEAAT8QZmeLjzEpM22y2y2y22yzPuWbJbdm2WbJllllnzAfnP/Z"
-      }
-    ]
-  }'
-
-
-
-
-
-
-
-
-
-curl --include \
-  --request POST \
-  --user admin:$pi_passwd \
-  --header 'Content-type: application/hal+json' \
-  http://pi.local/entity/file?_format=hal_json \
-  --data-binary '{
-    "_links": {
-      "type": {
-        "href": "http://pi.local/rest/type/file/image"
-      }
-    },
-    "filename": [
-      {
-        "value": "favicon-32x32.png"
-      }
-    ],
-    "filemime": [
-      {
-        "value": "image/png"
-      }
-    ],
-    "filesize": [
-      {
-        "value": "488"
-      }
-    ],
-    "type": [
-      {
-        "target_id": "image"
-      }
-    ],
-    "data": [
-      {
-        "value": "iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAkUExURUxpcSOq4SOq4SOq4SOq4SOq4SOq4SOq4SOq4SOq4SOq4SOq4U0m8UcAAAAMdFJOUwD/EvAm2qhTPMRrkl4CMYAAAAE1SURBVCjPXZG/S8NQEMePR7Ehnb48khC7BEFFnYJD6/aWOLilVBy6WBVc648/oCii1KlFKDrFwV2tqH+edy9Rk7zh8e7Dfe++944oP5dUO59RDQyPqrFK/WqKCzxUwA30oJyymervlVK8PsVBOd85hh6pyflfhwXg024cjguwBqCjhsCsSOAn+k4MBGpUWAB6Tb6W1VxAgv+MfcPgWUBgazjxoYwlQLrsmBa6MhbH3hep2yu6QJuowWL9Yfs1U4QRSbWOjRts0DMCdEbqjl8s1kYkPqmX7YGRfgy4aJe2IB+0wZJI2s7ojEGbWtJejL1aL55h+wGDVWTWix47+cAug6kAycjs+LkkjFzku0h6dC3D01KxCmdOLrt7pyQ0+Z/tRXT/eEr0dvL7y6zkrbhPtYVPrOAHKZQ53IyepQMAAAAASUVORK5CYII="
-      }
-    ]
-  }'
-
-
-
-
-curl --include \
-  --request POST \
-  --user admin:$pi_passwd \
-  --header 'Content-type: application/hal+json' \
-  http://wco.local:8088/node?_format=hal_json \
-  --data-binary '{
-    "_links": {
-      "type":{"href":"http://wco.local:8088/rest/type/node/article"}
-    },
-    "title":[{"value":"Test Tree #1" }],
-    "body":[{"value": "<h1>Hello, world!</h1><img src='http://ish-drupal-prod.s3.amazonaws.com/public/2023-09/200x200%20piousbox%20favicon.png?VersionId=6QVFTwCGApZMbrkmP_MlEhaCB2_5J1DG' alt='' />", "format": "full_html" }],
-    "type":[{"target_id":"article"}],
-    "field_image_thumb_url":[{"value": "http://ish-drupal-prod.s3.amazonaws.com/public/2023-09/200x200%20piousbox%20favicon.png?VersionId=6QVFTwCGApZMbrkmP_MlEhaCB2_5J1DG" }],
-    "status": [{"value": 1}]
-  }'
+  cd test/dummy
+  be sidekiq -q wco_email_rb_mailers -q wco_email_rb_default -q wco_email_rb

data/app/controllers/wco_email/email_action_templates_controller.rb

@@ -6,60 +6,62 @@ class WcoEmail::EmailActionTemplatesController < WcoEmail::ApplicationController
   ## Alphabetized : )
 
   def destroy
-    @act = @email_action = WcoEmail::EmailAction.find( params[:id] )
-    authorize! :delete, @act
-    @act.update_attributes({ deleted_at: Time.now })
+    @tmpl = WcoEmail::EmailActionTemplate.find( params[:id] )
+    authorize! :delete, @tmpl
+    @tmpl.delete
     flash_notice 'Probably success'
     redirect_to action: :index
   end
 
   def edit
-    @act = @email_action = WcoEmail::EmailAction.find( params[:id] )
-    # @act.ties.push WcoEmail::EmailActionTie.new( next_email_action_id: nil )
-    authorize! :edit, @act
+    @tmpl = WcoEmail::EmailActionTemplate.find( params[:id] )
+    @tmpl.ties.push WcoEmail::EmailActionTemplateTie.new( next_tmpl_id: nil )
+    authorize! :edit, @tmpl
   end
 
   def index
-    @email_actions = WcoEmail::EmailAction.where({ :deleted_at => nil })
+    @tmpls = WcoEmail::EmailActionTemplate.all
 
-    authorize! :index, @new_email_action
+    authorize! :index, @new_tmpl
   end
 
   def new
-    authorize! :new, @new_email_action
+    authorize! :new, @new_tmpl
   end
 
   def show
-    @act = @email_action = WcoEmail::EmailAction.find( params[:id] )
-    authorize! :show, @act
+    @tmpl = WcoEmail::EmailActionTemplate.find( params[:id] )
+    authorize! :show, @tmpl
   end
 
-  def update
+  def update # or create
+    puts! params, 'params'
+
     if params[:id]
-      @act = @email_action = WcoEmail::EmailAction.find( params[:id] )
+      @tmpl = WcoEmail::EmailActionTemplate.find( params[:id] )
     else
-      @act = @email_action = WcoEmail::EmailAction.new
+      @tmpl = WcoEmail::EmailActionTemplate.new
     end
-    authorize! :upsert, @act
+    authorize! :upsert, @tmpl
 
-    if params[:email_action][:ties_attributes]
-      params[:email_action][:ties_attributes].each do |k, v|
-        if !v[:next_email_action_id].present?
-          params[:email_action][:ties_attributes].delete( k )
+    if params[:tmpl][:ties_attributes]
+      params[:tmpl][:ties_attributes].each do |k, v|
+        if !v[:next_tmpl_id].present?
+          params[:tmpl][:ties_attributes].delete( k )
         end
         if v[:to_delete] == "1"
-          EActie.find( v[:id] ).delete
-          params[:email_action][:ties_attributes].delete( k )
+          WcoEmail::EmailActionTemplateTie.find( v[:id] ).delete
+          params[:tmpl][:ties_attributes].delete( k )
         end
       end
     end
 
-    flag = @act.update_attributes( params[:email_action].permit! )
+    flag = @tmpl.update_attributes( params[:tmpl].permit! )
     if flag
       flash[:notice] = 'Success'
       redirect_to action: 'index'
     else
-      flash[:alert] = "No luck: #{@act.errors.full_messages.join(', ')}. #{@act.ties.map { |t| t.errors.full_messages.join(', ') }.join(' | ') }"
+      flash[:alert] = "No luck: #{@tmpl.errors.full_messages.join(', ')}. #{@tmpl.ties.map { |t| t.errors.full_messages.join(', ') }.join(' | ') }"
       render action: 'edit'
     end
 
@@ -71,7 +73,9 @@ class WcoEmail::EmailActionTemplatesController < WcoEmail::ApplicationController
   private
 
   def set_lists
-    @new_email_action = WcoEmail::EmailAction.new
+    @email_action_templates_list = WcoEmail::EmailActionTemplate.list
+    @email_templates_list = WcoEmail::EmailTemplate.list
+    @new_tmpl = WcoEmail::EmailActionTemplate.new
   end
 
 end

data/app/controllers/wco_email/email_actions_controller.rb

@@ -6,7 +6,7 @@ class WcoEmail::EmailActionsController < WcoEmail::ApplicationController
   before_action :set_lists
 
   def create
-    @sch = Sch.new( params[:sch].permit! )
+    @sch = Sch.new( params[:email_action].permit! )
     authorize! :create, @sch
 
     flag = @sch.save
@@ -29,7 +29,7 @@ class WcoEmail::EmailActionsController < WcoEmail::ApplicationController
   end
 
   def new
-    @sch = Sch.new
+    @email_action = WcoEmail::EmailAction.new
     authorize! :new, @sch
   end
 
@@ -42,7 +42,7 @@ class WcoEmail::EmailActionsController < WcoEmail::ApplicationController
   def update
     @sch = Sch.find params[:id]
     authorize! :update, @sch
-    flag = @sch.update_attributes( params[:sch].permit! )
+    flag = @sch.update_attributes( params[:email_action].permit! )
     if flag
       flash[:notice] = "Success."
     else
@@ -51,5 +51,15 @@ class WcoEmail::EmailActionsController < WcoEmail::ApplicationController
     render action: 'edit'
   end
 
+  ##
+  ## private
+  ##
+  private
+
+  def set_lists
+    @email_action_templates_list = WcoEmail::EmailActionTemplate.list
+    @leads_list = Wco::Lead.list
+  end
+
 end
 

data/app/jobs/wco_email/message_intake_job.rb

@@ -33,7 +33,7 @@ class WcoEmail::MessageIntakeJob
     puts "+++ +++ Performing WcoEmail::MessageIntakeJob for object_key `#{stub.object_key}`."
 
     if [ WcoEmail::MessageStub::STATUS_PROCESSED, WcoEmail::MessageStub::STATUS_FAILED ].include?( stub.status )
-      raise "This stub has already been processed: #{stub.id.to_s}."
+      raise "This stub has already been processed, or errored out: #{stub.id.to_s}."
       return
     end
 

data/app/views/wco_email/email_action_templates/_form.haml

@@ -1,13 +1,9 @@
 
-- eact = email_action
-- url  = email_action.new_record? ? email_actions_path : email_action_path( email_action )
+.email-action-templates--form
 
-.email-actions--form
-
-  = form_for email_action, url: url, as: :email_action, :html => { :multipart => true } do |f|
-    .row
-      .col-sm-6
-        = f.submit :submit
+  = form_for tmpl, as: :tmpl, :html => { :multipart => true } do |f|
+    .a
+      = f.submit :submit
 
     .row
       .col-md-6
@@ -15,11 +11,11 @@
           %label Slug
           = f.text_field :slug
         -# .field
-        -#   %label Descr
-        -#   = f.text_area :descr
-        .field.flex-row
+        -#   %label from_email
+        -#   = f.select :from_email, options_for_select( WcoEmail::EmailTemplate::FROM_EMAILS_2, selected: tmpl.from_email ), {}, { class: 'select2' }
+        .field
           %label Template
-          = f.select :email_template_id, options_for_select( @email_templates_list, selected: eact.email_template_id ), {}, class: 'select2'
+          = f.select :email_template_id, options_for_select( @email_templates_list, selected: tmpl.email_template_id ), {}, class: 'select2'
 
       .col-md-6
         .field
@@ -30,12 +26,12 @@
 
           = f.fields_for :ties do |next_f|
             .flex-row.field
-              = next_f.label :next_at_exe
-              = next_f.text_field :next_at_exe, class: 'flex-grow'
+              %label next_at_exe
+              = next_f.text_field :next_at_exe, class: 'flex-grow-1 w-100'
             .flex-row.field
               = next_f.label :to_delete
               = next_f.check_box :to_delete
-              = next_f.select :next_email_action_id, options_for_select( @email_actions_list, selected: next_f.object.next_email_action_id ), { }, { class: 'select2' }
+              = next_f.select :next_tmpl_id, options_for_select( @email_action_templates_list, selected: next_f.object.next_tmpl_id ), { }, { class: 'select2' }
             %br
 
     .row

data/app/views/wco_email/email_action_templates/_show_cell.haml

@@ -0,0 +1,7 @@
+
+= link_to '[~]', edit_email_action_template_path( tmpl )
+= link_to tmpl.slug, email_action_template_path( tmpl )
+-# %br
+-# <b>from_email:</b> #{tmpl.from_email}
+-# %br
+-# <b>subject:</b> #{tmpl.subject}

data/app/views/wco_email/email_action_templates/edit.haml

@@ -1,7 +1,7 @@
 
 .email-actions-edit.padded
   .header
-    %h2.title Edit Email Action
+    %h5.title Edit Email Action Template
 
-  = render 'form', email_action: @act
+  = render 'form', tmpl: @tmpl
 

data/app/views/wco_email/email_action_templates/index.haml

@@ -1,36 +1,45 @@
 
-.email-actions-index.padded
+.email-action-templates-index.padded
 
   .header
     %h2.title
-      Email Actions (#{@email_actions.length})
-      = link_to '[+]', new_email_action_path
+      Email Action Templates (#{@tmpls.length})
+      = link_to '[+]', new_email_action_template_path
 
   %table.bordered
     %tr
-      %th= check_box_tag 'abba'
-      %th
-      %th slug
+      %th= check_box_tag 'hmm'
+      %th  
+      %th Slug
+      %th From
+      %th Tmpl
       %th next actions
-    - @email_actions.each do |eact|
+    - @tmpls.each_with_index do |tmpl, idx|
       %tr
-        %td= check_box_tag 'abba'
-        %td.flex-row
-
-          = link_to '[~]', edit_email_action_path( eact )
-          = button_to '[x]', email_action_path( eact ), data: { confirm: 'Are you sure?' }, method: :delete
+        %td
+          .gray= idx+1
+          = check_box_tag 'hmm'
+        %td
+          .flex-row
+            = link_to '[~]', edit_email_action_template_path( tmpl )
+            = button_to '[x]', email_action_template_path( tmpl ), data: { confirm: 'Are you sure?' }, method: :delete
 
         %td
-          -# = link_to eact.slug, email_action_path( eact )
-          = eact.slug
-          .em.small= eact.descr
+          = tmpl.slug
+        %td
+          = tmpl.from_email
+        %td.tmpl
+          = render '/wco_email/email_templates/show_cell', tmpl: tmpl.email_template
+
         %td
+          - if tmpl.ties.blank?
+            No ties
           %ul
-            - eact.ties.map do |next_a|
+            - tmpl.ties.map do |tie|
               %li
-                .a= next_a.next_at_exe
+                .a= tie.next_at_exe
                 .a
-                  - if next_a.next_email_action.slug == eact.slug
+                  - if tie.next_tmpl.slug == tmpl.slug
                     (same)
-                  = next_a.next_email_action.slug
+                  = tie.next_tmpl.slug
 

data/app/views/wco_email/email_action_templates/new.haml

@@ -1,9 +1,7 @@
 
--# padded b/c eval(next_time_at) is long
-
-.email-actions-new.padded
+.email-action-templates-new.maxwidth
   .header
     %h2.title
-      New Email Action
+      New Email Action Template
 
-  = render 'form', email_action: @new_email_action
+  = render 'form', tmpl: @new_tmpl

data/app/views/wco_email/email_action_templates/show.haml

@@ -1,11 +1,10 @@
 
 .email-actions-show.maxwidth
   .header
-    .title Email Action #{@act.id}
+    %h5.title Email Action Template `#{@tmpl}`
 
   %ul
-    - @act.ties.map do |next_a|
+    - @tmpl.ties.map do |tie|
       %li
-        .a <b>Next act:</b> #{"(same)" if next_a.next_email_action.slug == @act.slug} #{next_a.next_email_action.slug}
-        .a <b>Next at exe:</b> #{next_a.next_at_exe}
-        .a <b>Eval'ed:</b> #{eval( next_a.next_at_exe )}
+        .a <b>Next tmpl:</b> #{"(same)" if tie.next_tmpl.slug == @tmpl.slug} #{tie.next_tmpl.slug}
+        .a <b>Next at exe:</b> #{tie.next_at_exe} <b>Eval'ed:</b> #{eval( tie.next_at_exe )}

data/app/views/wco_email/email_actions/_form.haml

@@ -1,24 +1,20 @@
 
-- sch_a = scheduled_email_action
-- url = sch_a.new_record? ? scheduled_email_actions_path : scheduled_email_action_path(sch_a.id)
-
-.scheduled-email-actions--form
-  = form_for scheduled_email_action, url: url, as: :sch do |f|
+.email-actions--form
+  = form_for email_action do |f|
     .header
-      %h5.title Schedule an email action
+      %h5.title Schedule an Email Action
 
     .flex-row
-      = f.label :lead
-      = f.select :lead_id, options_for_select(@leads_list, selected: sch_a[:lead_id]||params[:lead_id] ), {}, class: 'select2'
-    .flex-row
-      %label State
-      = f.select :state, options_for_select(::Office::ScheduledEmailAction::STATES, selected: sch_a.state )
+      %label Status
+      = f.select :status, options_for_select(WcoEmail::EmailAction::STATUSES, selected: email_action.status )
+
     .flex-row
-      = f.label :email_action
-      = f.select :email_action, options_for_select( @email_actions_list, selected: sch_a[:email_action_id] ), {}, class: 'select2'
+      = f.label :lead
+      = f.select :lead_id, options_for_select(@leads_list, selected: email_action[:lead_id]||params[:lead_id] ), {}, class: 'select2'
+      = f.label :email_action_template
+      = f.select :email_action_template, options_for_select( @email_action_templates_list, selected: email_action[:email_action_template_id] ), {}, class: 'select2'
+
     .flex-row
       = f.label :perform_at
-      = f.text_field :perform_at, value: sch_a.new_record? ? Time.now : sch_a.perform_at
-
-    .actions
+      = f.text_field :perform_at, value: email_action.new_record? ? Time.now : email_action.perform_at, class: 'flex-grow-1'
       = submit_tag 'Schedule'

data/app/views/wco_email/email_actions/edit.haml

@@ -1,4 +1,4 @@
 
 .scheduled-email-actions-edit.maxwidth
 
-  = render 'form', scheduled_email_action: @sch
+  = render 'form', email_action: @sch

data/app/views/wco_email/email_actions/index.haml

@@ -11,18 +11,21 @@
       %tr
         %td
         %td Active?
-        %td From
-        %td To
-        %td Tmpl
+        %td Email Action Template
+        %td To <br />(Lead)
+        %td.tmpl Email Template
         %td Perform at
     %tbody
       - @schs.each do |sch|
         %tr
           %td= link_to '[~]', edit_email_action_path(sch)
           %td= sch.status == 'active' ? 'Y' : '-'
-          %td= sch.tmpl.from_email
-          %td= link_to sch.lead.email, lead_path(sch.lead)
-          %td= link_to sch.tmpl.email_template.slug, email_template_path(sch.tmpl.email_template)
+          %td.email_action_template
+            = render '/wco_email/email_action_templates/show_cell', tmpl: sch.tmpl
+          %td.to
+            = link_to sch.lead.email, wco.lead_path(sch.lead)
+          %td.tmpl
+            = render '/wco_email/email_templates/show_cell', tmpl: sch.tmpl.email_template
           %td= sch.perform_at.in_time_zone
 
 

data/app/views/wco_email/email_actions/new.haml

@@ -1,4 +1,4 @@
 
-.scheduled-email-actions-new.maxwidth
+.email-actions-new.maxwidth
 
-  = render 'form', scheduled_email_action: @scheduled_email_action
+  = render 'form', email_action: @email_action

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

@@ -0,0 +1,6 @@
+= link_to '[~]', edit_email_template_path(tmpl)
+= link_to tmpl.slug, email_template_path(tmpl)
+%br
+<b>From:</b> #{tmpl.from_email}
+%br
+<b>Subject:</b> #{tmpl.subject}

data/config/routes.rb

@@ -17,6 +17,7 @@ WcoEmail::Engine.routes.draw do
   post 'conversations/rmtag/:slug',         to: 'conversations#rmtag'
   resources :conversations
 
+  post 'email_action_templates', to: 'email_action_templates#update'
   resources :email_action_templates
   resources :email_actions
   resources :email_campaigns

data/lib/tasks/wco_email_tasks.rake

@@ -6,6 +6,7 @@ namespace :wco_email do
   ##
   desc 'churn_n_stubs n=<num> [tagname=<some-new-slug>] [process_images=<false|true>] [status=<status>]'
   task churn_n_stubs: :environment do
+    puts! ENV, 'ENV'
 
     ## Usage
     if !ENV['n']
@@ -27,7 +28,7 @@ namespace :wco_email do
     status ||= WcoEmail::MessageStub::STATUS_PENDING
 
     n = ENV['n'].to_i
-    stubs = WcoEmail::MessageStub.where( status: status ).limit n
+    stubs = WcoEmail::MessageStub.where( status: status ).limit(n)
     stubs.each_with_index do |stub, idx|
       puts "+++ +++ churning ##{idx+1} object_key: #{stub.object_key}"
 
@@ -39,6 +40,37 @@ namespace :wco_email do
     end
   end
 
+  ##
+  ## 2024-01-10
+  ## WcoEmail::MessageStub.all.update_all({ bucket: 'ish-ses-2024' })
+  ## WcoEmail::MessageIntakeJob.perform_sync( stub.id.to_s )
+  ##
+  desc 'import objectkey list'
+  task import_objectkey_list: :environment do
+
+    # bucket = 'ish-ses'
+    bucket = 'ish-test-2024'
+    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],
+    })
+
+    # lines = File.read( './data/20240110_ish-ses_objectkeys' )
+    lines = File.read( './data/out_head' )
+    lines.split("\n").each_with_index do |line, idx|
+
+        object_key = line.split.last
+        stub = WcoEmail::MessageStub.create( object_key: object_key, bucket: bucket )
+        if stub.persisted?
+          print "#{idx+1}."
+        else
+          puts! stub.errors.full_messages.join(", ")
+        end
+
+    end
+  end
+
   desc "Usage: wco_email:mbox_info mbox_path=<filepath> "
   task mbox_info: :environment do
 
@@ -89,34 +121,54 @@ namespace :wco_email do
     end
   end
 
-  ##
-  ## 2024-01-10
-  ## WcoEmail::MessageStub.all.update_all({ bucket: 'ish-ses-2024' })
-  ## WcoEmail::MessageIntakeJob.perform_sync( stub.id.to_s )
-  ##
-  desc 'import objectkey list'
-  task import_objectkey_list: :environment do
+  desc 'email actions, send and roll'
+  task run_email_actions: :environment do
+    while true do
 
-    # bucket = 'ish-ses'
-    bucket = 'ish-test-2024'
-    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],
-    })
+      WcoEmail::EmailAction.active.where({ :perform_at.lte => Time.now }).each do |sch|
+        sch.send_and_roll
+        print '^'
+      end
 
-    # lines = File.read( './data/20240110_ish-ses_objectkeys' )
-    lines = File.read( './data/out_head' )
-    lines.split("\n").each_with_index do |line, idx|
+      duration = Rails.env.production? ? 120 : 15 # 2 minutes or 15 seconds
+      sleep duration
+      print '.'
 
-        object_key = line.split.last
-        stub = WcoEmail::MessageStub.create( object_key: object_key, bucket: bucket )
-        if stub.persisted?
-          print "#{idx+1}."
+    end
+  end
+
+  desc 'send contexts'
+  task send_contexts: :environment do
+    while true do
+
+      ctxs = WcoEmail::Context.scheduled.notsent
+      ctxs.map do |ctx|
+
+        unsub = WcoEmail::Unsubscribe.where({ lead_id: ctx.lead_id, template_id: ctx.email_template_id }).first
+        if unsub
+          puts! 'This user is unsubscribed; the context cannot be sent.' if DEBUG
+          # Office::AdminMessage.create({ message: "Lead `#{ctx.lead.full_name}` [mailto:#{ctx.lead.email}] has already unsubscribed from template `#{Ish::EmailTemplate.find( ctx.email_template_id ).slug}` ." })
+          email_action_template_ids = WcoEmail::EmailActionTemplate.where({ email_template_id: ctx.email_template_id }).map(&:id)
+          schs = WcoEmail::EmailAction.active.where({
+            lead_id: ctx.lead_id,
+            :email_action_template_id.in => email_action_template_ids,
+          })
+          schs.update({ status: WcoEmail::EmailAction::STATUS_UNSUBSCRIBED })
+          ctx.update({
+            unsubscribed_at: Time.now.to_s,
+          })
         else
-          puts! stub.errors.full_messages.join(", ")
+          out = WcoEmail::ApplicationMailer.send_context_email( ctx[:id].to_s )
+          Rails.env.production? ? out.deliver_later : out.deliver_now
         end
 
+        print '^'
+      end
+
+      duration = Rails.env.production? ? 120 : 15 # 2 minutes or 15 seconds
+      sleep duration
+      print '.'
+
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.12
+  version: 0.1.1.14
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2024-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -377,6 +377,7 @@ files:
 - app/views/wco_email/conversations/show.haml
 - app/views/wco_email/email_action_templates/_form.haml
 - app/views/wco_email/email_action_templates/_header.haml
+- app/views/wco_email/email_action_templates/_show_cell.haml
 - app/views/wco_email/email_action_templates/edit.haml
 - app/views/wco_email/email_action_templates/index.haml
 - app/views/wco_email/email_action_templates/new.haml
@@ -426,6 +427,7 @@ files:
 - app/views/wco_email/email_templates/_piousbox_social.html.erb
 - app/views/wco_email/email_templates/_plain.haml
 - app/views/wco_email/email_templates/_rec_resume_shared_with_you.html.erb
+- app/views/wco_email/email_templates/_show_cell.haml
 - app/views/wco_email/email_templates/_slug-1.html.erb
 - app/views/wco_email/email_templates/_slug-2.html.erb
 - app/views/wco_email/email_templates/_slug-3.html.erb