Switch ReplyToConversation email to SparkPost

Author: begedin

lib/code_corps/emails/reply_to_conversation_email.ex

@@ -4,8 +4,6 @@ defmodule CodeCorps.Messages.Emails do
   """
   alias CodeCorps.{
     ConversationPart,
-    Emails,
-    Mailer,
     Message,
     Repo,
     SparkPost
@@ -54,8 +52,7 @@ defmodule CodeCorps.Messages.Emails do
   defp send_reply_to_conversation_emails(%ConversationPart{} = part) do
     part
     |> get_conversation_participants()
-    |> Enum.map(&Emails.ReplyToConversationEmail.create(part, &1))
-    |> Enum.each(&Mailer.deliver_now/1)
+    |> Enum.each(&SparkPost.send_reply_to_conversation_email(part, &1))
   end
 
   @spec get_conversation_participants(ConversationPart.t) :: list(User.t)

lib/code_corps/messages/emails.ex

@@ -22,4 +22,8 @@ defmodule CodeCorps.SparkPost.Emails do
       build_failure -> build_failure
     end
   end
+
+  def send_reply_to_conversation_email(part, user) do
+    part |> Emails.ReplyToConversation.build(user) |> API.send_transmission
+  end
 end

lib/code_corps/sparkpost/emails/emails.ex

@@ -0,0 +1,55 @@
+defmodule CodeCorps.SparkPost.Emails.ReplyToConversation do
+  alias SparkPost.{Content, Transmission}
+  alias CodeCorps.{
+    Conversation,
+    ConversationPart,
+    Message,
+    Organization,
+    Project,
+    SparkPost.Emails.Recipient,
+    User,
+    WebClient
+  }
+
+  @spec build(ConversationPart.t, User.t) :: %Transmission{}
+  def build(
+    %ConversationPart{
+      author: %User{} = author,
+      conversation: %Conversation{
+        message: %Message{
+          project: %Project{} = project
+        }
+      } = conversation
+    },
+    %User{} = user) do
+
+    %Transmission{
+      content: %Content.TemplateRef{template_id: "reply-to-conversation"},
+      options: %Transmission.Options{inline_css: true},
+      recipients: [user |> Recipient.build],
+      substitution_data: %{
+        author_name: author.first_name,
+        from_name: "Code Corps",
+        from_email: "team@codecorps.org",
+        conversation_url: project |> conversation_url(conversation),
+        name: user |> get_name(),
+        project_title: project.title,
+        subject: "#{author.first_name} replied to your conversation in #{project.title}"
+      }
+    }
+  end
+
+  @spec conversation_url(Project.t, Conversation.t) :: String.t
+  defp conversation_url(
+    %Project{organization: %Organization{slug: slug}, slug: project_slug},
+    %Conversation{id: id}) do
+
+    WebClient.url()
+    |> URI.merge("#{slug}/#{project_slug}/conversations/#{id}")
+    |> URI.to_string
+  end
+
+  @spec get_name(User.t) :: String.t
+  defp get_name(%User{first_name: nil}), do: "there"
+  defp get_name(%User{first_name: name}), do: name
+end

lib/code_corps/sparkpost/emails/reply_to_conversation.ex

@@ -8,4 +8,5 @@ defmodule CodeCorps.SparkPost do
   defdelegate send_message_initiated_by_project_email(message, conversation), to: Emails
   defdelegate send_organization_invite_email(invite), to: Emails
   defdelegate send_receipt_email(charge, invoice), to: Emails
+  defdelegate send_reply_to_conversation_email(part, user), to: Emails
 end

lib/code_corps/sparkpost/sparkpost.ex

@@ -8,8 +8,9 @@ defmodule CodeCorps.MessagesTest do
   import Ecto.Query, only: [where: 2]
 
   alias CodeCorps.{
-    Conversation, ConversationPart, Emails, Message, Messages,
-    SparkPost.Emails.MessageInitiatedByProject
+    Conversation, ConversationPart, Message, Messages,
+    SparkPost.Emails.MessageInitiatedByProject,
+    SparkPost.Emails.ReplyToConversation
   }
   alias Ecto.Changeset
 
@@ -302,10 +303,14 @@ defmodule CodeCorps.MessagesTest do
 
       part = part |> Repo.preload([:author, conversation: [message: [[project: :organization]]]])
 
-      refute_delivered_email Emails.ReplyToConversationEmail.create(part, part_author)
-      assert_delivered_email Emails.ReplyToConversationEmail.create(part, target_user)
-      assert_delivered_email Emails.ReplyToConversationEmail.create(part, message_author)
-      assert_delivered_email Emails.ReplyToConversationEmail.create(part, other_participant)
+      part_author_email = ReplyToConversation.build(part, part_author)
+      target_user_email = ReplyToConversation.build(part, target_user)
+      message_author_email = ReplyToConversation.build(part, message_author)
+      other_participant_email = ReplyToConversation.build(part, other_participant)
+      refute_received ^part_author_email
+      assert_received ^target_user_email
+      assert_received ^message_author_email
+      assert_received ^other_participant_email
     end
 
     test "when replied by conversation user, sends appropriate email to other participants" do
@@ -324,10 +329,14 @@ defmodule CodeCorps.MessagesTest do
 
       part = part |> Repo.preload([:author, conversation: [message: [[project: :organization]]]])
 
-      refute_delivered_email Emails.ReplyToConversationEmail.create(part, part_author)
-      assert_delivered_email Emails.ReplyToConversationEmail.create(part, target_user)
-      assert_delivered_email Emails.ReplyToConversationEmail.create(part, message_author)
-      assert_delivered_email Emails.ReplyToConversationEmail.create(part, other_participant)
+      part_author_email = ReplyToConversation.build(part, part_author)
+      target_user_email = ReplyToConversation.build(part, target_user)
+      message_author_email = ReplyToConversation.build(part, message_author)
+      other_participant_email = ReplyToConversation.build(part, other_participant)
+      refute_received ^part_author_email
+      assert_received ^target_user_email
+      assert_received ^message_author_email
+      assert_received ^other_participant_email
     end
   end
 

test/lib/code_corps/emails/reply_to_conversation_email_test.exs

@@ -0,0 +1,62 @@
+defmodule CodeCorps.SparkPost.Emails.ReplyToConversationTest do
+  use CodeCorps.DbAccessCase
+
+  alias CodeCorps.{SparkPost.Emails.ReplyToConversation, WebClient}
+
+  describe "build/1" do
+    test "provides substitution data for all keys used by template" do
+      message = insert(:message)
+
+      preloads = [:author, conversation: [message: [[project: :organization]]]]
+
+      conversation = insert(:conversation, message: message)
+
+      conversation_part =
+        :conversation_part
+        |> insert(conversation: conversation)
+        |> Repo.preload(preloads)
+
+      user = insert(:user)
+
+      %{substitution_data: data} =
+        ReplyToConversation.build(conversation_part, user)
+
+      expected_keys =
+        "reply-to-conversation"
+        |> CodeCorps.SparkPostHelpers.get_keys_used_by_template
+      assert data |> Map.keys == expected_keys
+    end
+
+    test "builds correct transmission model" do
+      message = insert(:message)
+
+      preloads = [:author, conversation: [message: [[project: :organization]]]]
+
+      conversation = insert(:conversation, message: message)
+
+      conversation_part =
+        :conversation_part
+        |> insert(conversation: conversation)
+        |> Repo.preload(preloads)
+
+      %{project: %{organization: %{slug: slug}, slug: project_slug} = project} = message
+
+      user = insert(:user)
+
+      %{substitution_data: data, recipients: [recipient]} =
+        ReplyToConversation.build(conversation_part, user)
+
+      assert data.from_name == "Code Corps"
+      assert data.from_email == "team@codecorps.org"
+
+      assert data.author_name == conversation_part.author.first_name
+      assert data.conversation_url == "#{WebClient.url()}/#{slug}/#{project_slug}/conversations/#{conversation.id}"
+      assert data.name == user.first_name
+      assert data.project_title == project.title
+      assert data.subject == "#{conversation_part.author.first_name} replied to your conversation in #{project.title}"
+
+      assert recipient.address.email == user.email
+      assert recipient.address.name == user.first_name
+    end
+  end
+end