Add get_name function to the BaseEmail

zacck · joshsmith · commit ffc2a1b48c3c · 2017-12-21T10:07:29.000-08:00
diff --git a/emails/receipt.html b/emails/receipt.html
@@ -45,7 +45,7 @@
                               <img src="{{high_five_image_url}}" width="100" height="100" />
                             </p>
                             <p class="donation_text center">
-                              <strong>{{user_first_name}}</strong>, thanks for your monthly donation to <a href="{{project_url}}">{{project_title}}</a>.
+                              Hey {{name}}, thanks for your monthly donation to <a href="{{project_url}}">{{project_title}}</a>.
                             </p>
                             <tr>
                               <td class="donation_goal">
diff --git a/lib/code_corps/emails/base_email.ex b/lib/code_corps/emails/base_email.ex
@@ -1,9 +1,14 @@
 defmodule CodeCorps.Emails.BaseEmail do
   import Bamboo.Email, only: [from: 2, new_email: 0]
+  alias CodeCorps.User
 
   @spec create :: Bamboo.Email.t
   def create do
     new_email()
     |> from("Code Corps<team@codecorps.org>")
   end
+
+  @spec get_name(User.t) :: String.t
+  def get_name(%User{first_name: nil}), do: "there"
+  def get_name(%User{first_name: name}), do: name
 end
diff --git a/lib/code_corps/emails/receipt_email.ex b/lib/code_corps/emails/receipt_email.ex
@@ -5,7 +5,7 @@ defmodule CodeCorps.Emails.ReceiptEmail do
   alias CodeCorps.Emails.BaseEmail
   alias CodeCorps.{DonationGoal, Project, Repo, StripeConnectCharge, StripeConnectSubscription, WebClient}
 
-  @spec create(StripeConnectCharge.t, Stripe.Invoice.t) :: Bamboo.Email.t
+   @spec create(StripeConnectCharge.t, Stripe.Invoice.t) :: Bamboo.Email.t
   def create(%StripeConnectCharge{} = charge, %Stripe.Invoice{} = invoice) do
     with %StripeConnectCharge{} = charge <- Repo.preload(charge, :user),
          %Project{} = project <- get_project(invoice.subscription),
@@ -51,11 +51,11 @@ defmodule CodeCorps.Emails.ReceiptEmail do
       charge_amount: charge.amount |> format_amount(),
       charge_statement_descriptor: charge.statement_descriptor,
       high_five_image_url: high_five_image_url(),
+      name: BaseEmail.get_name(charge.user),
       project_current_donation_goal_description: current_donation_goal.description,
       project_title: project.title,
       project_url: project |> url(),
-      subject: project |> build_subject_line(),
-      user_first_name: charge.user.first_name
+      subject: project |> build_subject_line()
     }
   end
 
diff --git a/test/lib/code_corps/emails/base_email_test.exs b/test/lib/code_corps/emails/base_email_test.exs
@@ -0,0 +1,17 @@
+defmodule CodeCorps.Emails.BaseEmailTest do
+  use CodeCorps.ModelCase
+  use Bamboo.Test
+  alias CodeCorps.Emails.BaseEmail
+
+  describe "get_name/1" do
+    test "get_name returns there on nil name" do
+      user = %CodeCorps.User{}
+      assert BaseEmail.get_name(user) == "there"
+    end
+
+    test "get_name returns first_name of user" do
+      user = %CodeCorps.User{first_name: "Zacck"}
+      assert BaseEmail.get_name(user) == "Zacck"
+    end
+  end
+end
diff --git a/test/lib/code_corps/emails/receipt_email_test.exs b/test/lib/code_corps/emails/receipt_email_test.exs
@@ -46,11 +46,11 @@ defmodule CodeCorps.Emails.ReceiptEmailTest do
     assert template_model == %{
       charge_amount: "$5.00",
       charge_statement_descriptor: "Test descriptor",
+      name: "Jimmy",
       project_title: "Code Corps",
       project_url: "http://localhost:4200/#{project.organization.slug}/#{project.slug}",
       project_current_donation_goal_description: "Test goal",
-      subject: "Your monthly donation to Code Corps",
-      user_first_name: "Jimmy"
+      subject: "Your monthly donation to Code Corps"
     }
     assert high_five_image_url
   end
