pager_tree-integrations 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 346fc5f836fd08b5e13984f0ead3c57af0bfb853c6c7bbe06eab9b9821693d47
-  data.tar.gz: '09642e8b0aadff79bedeeec4a6508e0df60ace5ee8d5d751b9b881675bd5829c'
+  metadata.gz: 1232e60d15e2dce895e6cc02e391cb1ec4f0230bcb3642c65f7d2eebaf499666
+  data.tar.gz: 2b1b7bd0787d7d001127b0391ce02a25bb258e74f86609b128e488e90c9efae4
 SHA512:
-  metadata.gz: 9ed77d1beebab497c91eebc46b0611beabf99fe463498aa993f53ff497d543f604b8ec8115276992d76dd877c665d13e1804786c60b94a08bb16581fe9d74f80
-  data.tar.gz: 3f586f4688d333343ab300a79836947c29698d82372932a59e7ae2b5253fd6709bc9da57ef21fcc7c1e66f891ca034504bfbd997ad0f00321e2bb6713521c6d0
+  metadata.gz: 1d1efc213cc97634b6530653d5f06f14f79f80cf7df72c8f7130e890d968bfe74282cd95142dfc1fa4fbddd70c8634a538354049093f1b1617f9e6cd7f840df1
+  data.tar.gz: b2c8fea7246e9c3e00671b9fde25d0214fe254a28902056b4393e3623ee416113eb984e1b8d9f8b511c2e0b6f747513c1b3ed6c66f09ac416524c986005cb5ba

data/app/controllers/pager_tree/integrations/live_call_routing/twilio/v3_controller.rb

@@ -7,9 +7,20 @@ module PagerTree::Integrations
 
       @integration.adapter_source_log = @integration.logs.create!(level: :info, format: :json, message: params.to_unsafe_h) if @integration.try(:log_incoming_requests?)
       @integration.adapter_controller = self
+      @integration.adapter_incoming_request_params = params
       @integration.adapter_response_music
     end
 
+    def dropped
+      set_integration
+
+      @integration.adapter_source_log = @integration.logs.create!(level: :info, format: :json, message: params.to_unsafe_h) if @integration.try(:log_incoming_requests?)
+      @integration.adapter_controller = self
+      @integration.adapter_alert = @integration.alerts.find_by(thirdparty_id: params[:CallSid])
+      @integration.adapter_incoming_request_params = params
+      @integration.adapter_response_dropped
+    end
+
     def queue_status
       ::PagerTree::Integrations.deferred_request_class.constantize.perform_later_from_request!(request)
 

data/app/mailers/pager_tree/integrations/live_call_routing/twilio/v3_mailer.rb

@@ -0,0 +1,17 @@
+module PagerTree::Integrations
+  class LiveCallRouting::Twilio::V3Mailer < ::ApplicationMailer
+    # Subject can be set in your I18n file at config/locales/en.yml
+    # with the following lookup:
+    #
+    #   en.live_call_routing.twilio.v3_mailer.call_recording.subject
+    #
+    def call_recording
+      @recording_url = params[:recording_url]
+      @alert = params[:alert]
+      @email = params[:email]
+      @from = params[:from]
+
+      mail(to: @email, subject: I18n.t("pager_tree.integrations.live_call_routing.twilio.v3_mailer.call_recording.subject", tiny_id: @alert.tiny_id, from: @from))
+    end
+  end
+end

data/app/models/pager_tree/integrations/channel/hangouts/v3.rb

@@ -63,7 +63,7 @@ module PagerTree::Integrations
     private
 
     def _alert
-      @_alert ||= adapter_outgoing_event.item
+      @_alert ||= adapter_outgoing_event.alert
     end
 
     def _blocks

data/app/models/pager_tree/integrations/channel/microsoft_teams/v3.rb

@@ -63,7 +63,7 @@ module PagerTree::Integrations
     private
 
     def _alert
-      @_alert ||= adapter_outgoing_event.item
+      @_alert ||= adapter_outgoing_event.alert
     end
 
     def _blocks

data/app/models/pager_tree/integrations/channel/slack/v3.rb

@@ -63,7 +63,7 @@ module PagerTree::Integrations
     private
 
     def _alert
-      @_alert ||= adapter_outgoing_event.item
+      @_alert ||= adapter_outgoing_event.alert
     end
 
     def _blocks

data/app/models/pager_tree/integrations/integration.rb

@@ -58,6 +58,10 @@ module PagerTree::Integrations
 
     def adapter_process_other
     end
+
+    def adapter_will_route_alert?
+      false
+    end
     # END basic incoming functions
 
     # START basic outgoing functions

data/app/models/pager_tree/integrations/live_call_routing/twilio/v3.rb

@@ -38,20 +38,24 @@ module PagerTree::Integrations
       voice: "man"
     }
 
-    TWILIO_LIVECALL_CONNECT_NOW = "https://app.pagertree.com/assets/sounds/you-are-now-being-connected.mp3"
-    TWILIO_LIVECALL_MUSIC = "http://com.twilio.sounds.music.s3.amazonaws.com/oldDog_-_endless_goodbye_%28instr.%29.mp3"
-    TWILIO_LIVECALL_PLEASE_WAIT = "https://app.pagertree.com/assets/sounds/please-wait.mp3"
-
     def option_connect_now_media_url
-      option_connect_now_media&.url || TWILIO_LIVECALL_CONNECT_NOW
+      option_connect_now_media.present? ? option_connect_now_media.url : URI.join(Rails.application.routes.url_helpers.root_url, "audios/you-are-now-being-connected.mp3").to_s
     end
 
     def option_music_media_url
-      option_music_media&.url || TWILIO_LIVECALL_MUSIC
+      option_music_media.present? ? option_music_media.url : "http://com.twilio.sounds.music.s3.amazonaws.com/oldDog_-_endless_goodbye_%28instr.%29.mp3"
     end
 
     def option_please_wait_media_url
-      option_please_wait_media&.url || TWILIO_LIVECALL_PLEASE_WAIT
+      option_please_wait_media.present? ? option_please_wait_media.url : URI.join(Rails.application.routes.url_helpers.root_url, "audios/please-wait.mp3").to_s
+    end
+
+    def option_no_answer_media_url
+      option_no_answer_media.present? ? option_no_answer_media.url : URI.join(Rails.application.routes.url_helpers.root_url, "audios/no-answer.mp3").to_s
+    end
+
+    def option_no_answer_thank_you_media_url
+      option_no_answer_thank_you_media.present? ? option_no_answer_thank_you_media.url : URI.join(Rails.application.routes.url_helpers.root_url, "audios/thanks-for-message.mp3").to_s
     end
 
     def option_record_emails=(x)
@@ -90,10 +94,18 @@ module PagerTree::Integrations
       true
     end
 
+    def adapter_outgoing_interest?(event_name)
+      ["alert_acknowledged", "alert_dropped"].include?(event_name) && adapter_alert.source_id == id
+    end
+
     def adapter_incoming_can_defer?
       false
     end
 
+    def adapter_will_route_alert?
+      true
+    end
+
     def adapter_action
       :create
     end
@@ -128,13 +140,19 @@ module PagerTree::Integrations
       end
 
       if selected_team
-        adapter_alert.logs.create!(message: "Caller selected team '#{selected_team.name}'. Playing please wait media.")
-        _twiml.play(url: option_please_wait_media&.url || TWILIO_LIVECALL_PLEASE_WAIT)
+        adapter_alert.logs.create!(message: "Caller selected team '#{selected_team.name}'.") if _teams_size > 1 || option_force_input
+
+        adapter_alert.logs.create!(message: "Play please wait media to caller.")
+        _twiml.play(url: option_please_wait_media_url)
         friendly_name = adapter_alert.id
 
         # create the queue and save it off
         queue = _client.queues.create(friendly_name: friendly_name)
         adapter_alert.meta["live_call_queue_sid"] = queue.sid
+
+        adapter_alert.destination_teams = [selected_team]
+
+        # save the alert
         adapter_alert.save!
 
         _twiml.enqueue(
@@ -144,6 +162,11 @@ module PagerTree::Integrations
           wait_url: PagerTree::Integrations::Engine.routes.url_helpers.music_live_call_routing_twilio_v3_path(id, thirdparty_id: _thirdparty_id),
           wait_url_method: "GET"
         )
+        adapter_alert.logs.create!(message: "Enqueue caller in Twilio queue '#{friendly_name}'.")
+
+        # kick off the alert workflow
+        adapter_alert.route_later
+        adapter_alert.logs.create!(message: "Successfully enqueued alert team workflow.")
       else
         adapter_alert.meta["live_call_repeat_count"] ||= 0
         adapter_alert.meta["live_call_repeat_count"] += 1
@@ -159,6 +182,7 @@ module PagerTree::Integrations
           end
         else
           adapter_alert.logs.create!(message: "Caller input bad input (too many times). Hangup.")
+          adapter_alert.resolve!(self)
           _twiml.say(message: "Too much invalid input. Goodbye.", **SPEAK_OPTIONS)
           _twiml.hangup
         end
@@ -193,15 +217,11 @@ module PagerTree::Integrations
       adapter_controller&.render(xml: _twiml.to_xml)
     end
 
-    def response_dropped
+    def adapter_response_dropped
       recording_url = adapter_incoming_request_params.dig("RecordingUrl")
 
       if recording_url
-        if option_no_answer_thank_you_media.present?
-          _twiml.play(url: option_no_answer_thank_you_media.url)
-        else
-          _twiml.say(message: "Thank you for your message. Goodbye.")
-        end
+        _twiml.play(url: option_no_answer_thank_you_media_url)
         _twiml.hangup
 
         adapter_alert.additional_data.push(AdditionalDatum.new(format: "link", label: "Voicemail", value: recording_url).to_h)
@@ -209,18 +229,18 @@ module PagerTree::Integrations
 
         adapter_alert.logs.create!(message: "Caller left a <a href='#{recording_url}' target='_blank'>voicemail</a>.")
 
-        adapter_record_emails.each do |email|
-          TwilioLiveCallRouting::V3Mailer.with(email: email, alert: alert).call_recording.deliver_later
+        option_record_emails.each do |email|
+          LiveCallRouting::Twilio::V3Mailer.with(email: email, alert: adapter_alert, from: adapter_incoming_request_params.dig("From"), recording_url: recording_url).call_recording.deliver_later
         end
-      elsif record
+      elsif option_record
         _twiml.play(url: option_no_answer_media_url)
         _twiml.record(max_length: 60)
       else
-        _twiml.say(message: "No one is available to answer this call. Goodbye.")
+        _twiml.say(message: "No one is available to answer this call. Goodbye.", **SPEAK_OPTIONS)
         _twiml.hangup
       end
 
-      controller.render(xml: _twiml.to_xml)
+      adapter_controller.render(xml: _twiml.to_xml)
     end
 
     def adapter_process_queue_status_deferred
@@ -229,18 +249,20 @@ module PagerTree::Integrations
 
       if queue_result == "hangup"
         self.adapter_alert = alerts.find_by(thirdparty_id: _thirdparty_id)
+        adapter_alert.logs.create!(message: "Caller hungup while waiting in queue.")
+        adapter_alert.resolve!(self)
         queue_destroy
       end
 
       adapter_source_log&.save!
     end
 
-    def perform_outgoing(**params)
-      event = params[:event]
-      if event == "alert.acknowledged"
-        on_acknowledge
-      elsif event == "alert.dropped"
-        on_drop
+    def adapter_process_outgoing
+      event = adapter_outgoing_event.event_name.to_s
+      if event == "alert_acknowledged"
+        _on_acknowledge
+      elsif event == "alert_dropped"
+        _on_drop
       end
     end
 
@@ -269,7 +291,7 @@ module PagerTree::Integrations
     end
 
     def _call
-      @_call ||= _client.calls(call_sid).fetch
+      @_call ||= _client.calls(adapter_alert.thirdparty_id).fetch
     end
 
     def _twiml
@@ -299,23 +321,44 @@ module PagerTree::Integrations
       nil
     end
 
-    def on_acknowledge
+    def _on_acknowledge
       # log that we are going to transfer
-      adapter_alert.logs.create!(message: "Attempting to transfer the call...")
+      adapter_alert.logs.create!(message: "The alert was acknowledged. Attempting to transfer the call...")
 
       # try to transfer the caller
-      number = "+19402733696"
-      _twiml.play(url: option_connect_now_media_url)
-      _twiml.pause(length: 1)
-      _twiml.dial(number: number, caller_id: _call.to, answer_on_bridge: true)
-      _call.update(twiml: _twiml.to_xml)
-
-      # log if we successfully transfered or failed
-      adapter_alert.logs.create!(message: "Tranferring the call succeeded.")
+      account_user = adapter_outgoing_event.account_user
+      number = account_user.user.phone&.phone
+
+      adapter_alert.logs.create!(message: "Attempting to transfer the call to #{account_user.user.name} at #{number}...")
+
+      if number.present?
+        _twiml.play(url: option_connect_now_media_url)
+        _twiml.pause(length: 1)
+        _twiml.dial(number: number, caller_id: _call.to, answer_on_bridge: true)
+        _call.update(twiml: _twiml.to_xml)
+        # log if we successfully transfered or failed
+        adapter_alert.logs.create!(message: "Tranferring the call succeeded.")
+      else
+        _twiml.say(message: "Someone has acknowledged this call, but they do not have a phone number on file. Goodbye.")
+        _twiml.hangup
+        _call.update(twiml: _twiml.to_xml)
+        adapter_alert.logs.create!(message: "Tranferring the call failed. #{account_user.user.name} has no phone number on file.")
+      end
+    rescue ::Twilio::REST::RestError => e
+      # 21220 - Unable to update record. Call is not in-progress. Cannot redirect.
+      if e.code != 21220
+        adapter_alert.logs.create!(message: "Tranferring the call failed. #{e.message}")
+      end
     end
 
-    def on_drop
-      _call.update(url: PagerTree::Integrations::Engine.routes.url_helpers.dropped_twilio_live_call_routing_v3_url(id, thirdparty_id: thirdparty_id))
+    def _on_drop
+      # log that we are going to transer
+      adapter_alert.logs.create!(message: "The alert was dropped. Attempting to transfer the call...")
+      _call.update(url: PagerTree::Integrations::Engine.routes.url_helpers.dropped_live_call_routing_twilio_v3_url(id, thirdparty_id: adapter_alert.thirdparty_id))
+      music_live_call_routing_twilio_v3_path
+      adapter_alert.logs.create!(message: "Tranferring the call succeeded.")
+    rescue ::Twilio::REST::RestError => e
+      adapter_alert.logs.create!(message: "Tranferring the call failed. #{e.message}")
     end
 
     def queue_destroy

data/app/models/pager_tree/integrations/outgoing_event.rb

@@ -8,6 +8,10 @@ module PagerTree::Integrations
     attr_accessor :item
     attr_accessor :changes
     attr_accessor :outgoing_rules_data
+    attr_accessor :alert
+    attr_accessor :handoff
+    attr_accessor :team
+    attr_accessor :account_user
 
     define_model_callbacks :initialize
 
@@ -22,6 +26,11 @@ module PagerTree::Integrations
       self.item ||= nil
       self.changes ||= nil
       self.outgoing_rules_data ||= {}
+
+      self.alert ||= nil
+      self.handoff ||= nil
+      self.team ||= nil
+      self.account_user ||= nil
     end
   end
 end

data/app/models/pager_tree/integrations/outgoing_webhook/v3.rb

@@ -71,7 +71,7 @@ module PagerTree::Integrations
       if self.option_template.present?
         begin
           body = JSON.parse(handlebars(self.option_template, {
-            alert: adapter_outgoing_event.item.try(:v3_format) || adapter_outgoing_event.item,
+            alert: adapter_outgoing_event.alert.try(:v3_format) || adapter_outgoing_event.alert,
             event: {
               type: event_type
             }
@@ -84,7 +84,7 @@ module PagerTree::Integrations
       end
 
       body ||= {
-        data: adapter_outgoing_event.item.try(:v3_format) || adapter_outgoing_event.item,
+        data: adapter_outgoing_event.alert.try(:v3_format) || adapter_outgoing_event.alert,
         type: event_type
       }
 

data/app/views/layouts/pager_tree/integrations/live_call_routing/twilio/mailer.html.erb

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/app/views/layouts/pager_tree/integrations/live_call_routing/twilio/mailer.text.erb

@@ -0,0 +1 @@
+<%= yield %>

data/app/views/pager_tree/integrations/live_call_routing/twilio/v3_mailer/call_recording.html.erb

@@ -0,0 +1 @@
+<%= t(".body", tiny_id: @alert.tiny_id, from: @from) %>: <a href="<%=@recording_url%>"><%= @recording_url %></a>

data/app/views/pager_tree/integrations/live_call_routing/twilio/v3_mailer/call_recording.text.erb

@@ -0,0 +1 @@
+<%= t(".body", tiny_id: @alert.tiny_id, from: @from) %>: <%= @recording_url %>

data/config/locales/en.yml

@@ -59,6 +59,10 @@ en:
               option_force_input_hint_html: "Force the caller to select a team (even if the integration only has one team)"
               option_record_hint_html: "Record a voicemail when no one acknowledges the call"
               option_record_emails_list_hint_html: "List of email addresses to notify when a voicemail has been recorded"
+          v3_mailer:
+            call_recording:
+              subject: "🎧 Alert #%{tiny_id} - New voicemail from %{from}"
+              body: "Alert #%{tiny_id} - New voicemail from %{from}"
       mattermost:
         outgoing_webhook:
           v3:
@@ -79,10 +83,10 @@ en:
         v3:
           form_options:
             option_token_hint_html: "The PagerTree-Token header can be used to authenticate requests (optional)"
-            option_capture_additional_data_hint_html: "Capture additional data from the webhook (optional)"              
+            option_capture_additional_data_hint_html: "Capture additional data from the webhook (optional)"       
       # SCAFFOLD_INTEGRATION
         
-
+  
   activerecord:
     attributes:
       "pager_tree/integrations/integration":

data/config/routes.rb

@@ -5,6 +5,7 @@ PagerTree::Integrations::Engine.routes.draw do
         member do
           get :music
           post :queue_status
+          post :dropped
         end
       end
     end

data/lib/pager_tree/integrations/version.rb

@@ -1,5 +1,5 @@
 module PagerTree
   module Integrations
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pager_tree-integrations
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Austin Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -85,6 +85,7 @@ files:
 - app/jobs/pager_tree/integrations/application_job.rb
 - app/jobs/pager_tree/integrations/outgoing_webhook_job.rb
 - app/mailers/pager_tree/integrations/application_mailer.rb
+- app/mailers/pager_tree/integrations/live_call_routing/twilio/v3_mailer.rb
 - app/models/pager_tree/integrations/additional_datum.rb
 - app/models/pager_tree/integrations/alert.rb
 - app/models/pager_tree/integrations/apex_ping/v3.rb
@@ -137,6 +138,8 @@ files:
 - app/models/pager_tree/integrations/webhook/v3.rb
 - app/models/pager_tree/integrations/zendesk/v3.rb
 - app/views/layouts/pager_tree/integrations/application.html.erb
+- app/views/layouts/pager_tree/integrations/live_call_routing/twilio/mailer.html.erb
+- app/views/layouts/pager_tree/integrations/live_call_routing/twilio/mailer.text.erb
 - app/views/pager_tree/integrations/apex_ping/v3/_form_options.html.erb
 - app/views/pager_tree/integrations/apex_ping/v3/_show_options.html.erb
 - app/views/pager_tree/integrations/app_dynamics/v3/_form_options.html.erb
@@ -187,6 +190,8 @@ files:
 - app/views/pager_tree/integrations/kapacitor/v3/_show_options.html.erb
 - app/views/pager_tree/integrations/live_call_routing/twilio/v3/_form_options.html.erb
 - app/views/pager_tree/integrations/live_call_routing/twilio/v3/_show_options.html.erb
+- app/views/pager_tree/integrations/live_call_routing/twilio/v3_mailer/call_recording.html.erb
+- app/views/pager_tree/integrations/live_call_routing/twilio/v3_mailer/call_recording.text.erb
 - app/views/pager_tree/integrations/logic_monitor/v3/_form_options.html.erb
 - app/views/pager_tree/integrations/logic_monitor/v3/_show_options.html.erb
 - app/views/pager_tree/integrations/mattermost/outgoing_webhook/v3/_form_options.html.erb