Merge pull request #707 from code-corps/add-project-acceptance-email

joshsmith · web-flow · commit 3a5410ef7b40 · 2017-03-27T11:51:29.000-07:00
WIP Add project acceptance email
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -193,15 +193,3 @@ We've written some convenience helper modules and functions to help with API tes
 - `CodeCorps.ApiCase` - used to simplify testing JSON API endpoints
 - `CodeCorps.AuthenticationTestHelpers` - provides authentication helpers for authenticating a `conn`
 - `CodeCorps.Factories` - provides factories using [`ex_machina`](https://github.com/thoughtbot/ex_machina), which makes it easy to create test data and associations with Ecto
-
-### Tagged tests
-
-Some tests are tagged like so:
-
-```elixir
-@tag :requires_env
-```
-
-These tests do not run by default when running `mix test` because you do not have access to the environment variables listed in `.env.example` by default.
-
-To read more about the environment variables, see the "Environment" section of our [usage docs](USAGE.md#environment).
diff --git a/circle.yml b/circle.yml
@@ -17,7 +17,7 @@ test:
       if [ ${CIRCLE_PR_USERNAME} ]; then
         MIX_ENV=test mix test;
       else
-        MIX_ENV=test mix coveralls.circle --include requires_env;
+        MIX_ENV=test mix coveralls.circle;
       fi
   post:
     - mix inch.report
diff --git a/config/dev.exs b/config/dev.exs
@@ -60,6 +60,7 @@ config :code_corps, CodeCorps.Mailer,
   adapter: Bamboo.LocalAdapter
 
 config :code_corps,
+  postmark_project_acceptance_template: "123",
   postmark_receipt_template: "123"
 
 # If the dev environment has no CLOUDEX_API_KEY set, we want the app
diff --git a/config/prod.exs b/config/prod.exs
@@ -61,6 +61,7 @@ config :code_corps, CodeCorps.Mailer,
   api_key: System.get_env("POSTMARK_API_KEY")
 
 config :code_corps,
+  postmark_project_acceptance_template: "1447041",
   postmark_receipt_template: "1255222"
 
 # ## SSL Support
diff --git a/config/remote-development.exs b/config/remote-development.exs
@@ -43,6 +43,7 @@ config :code_corps, CodeCorps.Mailer,
   adapter: Bamboo.LocalAdapter
 
 config :code_corps,
+  postmark_project_acceptance_template: "123",
   postmark_receipt_template: "123"
 
 # ## SSL Support
diff --git a/config/staging.exs b/config/staging.exs
@@ -59,6 +59,7 @@ config :code_corps, CodeCorps.Mailer,
   api_key: System.get_env("POSTMARK_API_KEY")
 
 config :code_corps,
+  postmark_project_acceptance_template: "1447022",
   postmark_receipt_template: "1252361"
 
 # ## SSL Support
diff --git a/config/test.exs b/config/test.exs
@@ -48,6 +48,7 @@ config :code_corps, CodeCorps.Mailer,
   adapter: Bamboo.TestAdapter
 
 config :code_corps,
+  postmark_project_acceptance_template: "123",
   postmark_receipt_template: "123"
 
 config :code_corps, :cloudex, CloudexTest
diff --git a/emails/project_user_acceptance.html b/emails/project_user_acceptance.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>{{project_title}} just added you as a contributor</title>
+    <!--
+    Make sure you copy the styles from styles.css into the email template in Postmark before saving there.
+
+    <style type="text/css" rel="stylesheet" media="all">
+    </style>
+    -->
+    <link rel="stylesheet" type="text/css" href="styles.css" media="screen" />
+  </head>
+  <body>
+    <span class="preheader">See what you can do to help on {{project_title}}.</span>
+    <table class="email-wrapper" width="100%" cellpadding="0" cellspacing="0">
+      <tr>
+        <td align="center">
+          <table class="email-content" width="100%" cellpadding="0" cellspacing="0">
+            <tr>
+              <td class="email-masthead" width="100%" cellpadding="0" cellspacing="0">
+                <table class="email-masthead_inner" align="center" width="570" cellpadding="0" cellspacing="0">
+                  <tr>
+                    <td>
+                      <a href="https://www.codecorps.org">
+                        <img src="https://d3pgew4wbk2vb1.cloudfront.net/emails/images/logo-small@2x.png" class="email-masthead_logo" />
+                      </a>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <!-- Email Body -->
+            <tr>
+              <td class="email-body" width="100%" cellpadding="0" cellspacing="0">
+                <table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0">
+                  <!-- Body content -->
+                  <tr>
+                    <td class="content-cell">
+                      <table class="donation" width="100%" cellpadding="0" cellspacing="0">
+                        <tr>
+                          <td>
+                            <ul class="joined_images center">
+                              <li class="photo">
+                                <img src="{{user_image_url}}" width="70" height="70" />
+                              </li>
+                              <li class="icon">
+                                <img src="https://d3pgew4wbk2vb1.cloudfront.net/emails/images/joined-email@2x.png" width="25" height="70" />
+                              </li>
+                              <li class="photo">
+                                <img src="{{project_logo_url}}" width="70" height="70" />
+                              </li>
+                            </ul>
+                            <p class="project-membership--accepted">
+                              <strong>{{user_first_name}}</strong>, you're in!
+                            </p>
+                            <p>
+                              <a href="{{project_url}}">{{project_title}}</a> just accepted your request to start contributing.
+                            </p>
+                            <p>Go check out the project and see what you can do to get started.
+                            </p>
+                          </tr>
+                        </td>
+                      </table>
+                      <table class="body-signature">
+                        <tr>
+                          <td>
+                            <p>
+                              Happy helping!
+                              <br><strong>The Code Corps Team</strong>
+                            </p>
+                            <p class="center small">
+                              Questions? Feedback?
+                              <br>Visit our <strong><a href="https://help.codecorps.org">Help Center</a></strong> or just reply to this email.</p>
+                          </td>
+                        </tr>
+                      </table>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <table class="email-footer" align="center" width="570" cellpadding="0" cellspacing="0">
+                  <tr>
+                    <td class="content-cell" align="center">
+                      <p class="sub align-center">
+                        Code Corps PBC
+                        <br>4166 Wilson Ave #1
+                        <br>San Diego, CA 92104
+                      </p>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+  </body>
+</html>
diff --git a/emails/styles.css b/emails/styles.css
@@ -230,6 +230,37 @@ td {
   text-align: center;
 }
 
+/* Project joining -------------------------------- */
+
+.joined_images {
+  height: 70px;
+  margin: 0 0 30px 0;
+  padding: 0;
+  text-align: center;
+  width: 100%;
+}
+
+.joined_images li {
+  display: inline-block;
+}
+
+.joined_images li.icon {
+  margin: 0 5px;
+  width: 25px;
+}
+
+.joined_images li.photo {
+  width: 70px;
+}
+
+.joined_images li.photo img {
+  border-radius: 4px;
+}
+
+.joined_images li:first-child {
+  /*margin-left: 300px;*/
+}
+
 /* Data table ------------------------------ */
 
 .purchase {
diff --git a/lib/code_corps/emails/project_user_acceptance_email.ex b/lib/code_corps/emails/project_user_acceptance_email.ex
@@ -0,0 +1,35 @@
+defmodule CodeCorps.Emails.ProjectUserAcceptanceEmail do
+  import Bamboo.Email
+  import Bamboo.PostmarkHelper
+
+  alias CodeCorps.{Project, ProjectUser, Repo, User}
+  alias CodeCorps.Emails.BaseEmail
+  alias CodeCorps.Presenters.ImagePresenter
+
+  def create(%ProjectUser{project: project, user: user}) do
+    BaseEmail.create
+    |> to(user.email)
+    |> template(template_id(), build_model(project, user))
+  end
+
+  defp build_model(%Project{} = project, %User{} = user) do
+    %{
+      project_logo_url: ImagePresenter.large(project),
+      project_title: project.title,
+      project_url: project |> preload() |> url(),
+      subject: "#{project.title} just added you as a contributor",
+      user_first_name: user.first_name,
+      user_image_url: ImagePresenter.large(user)
+    }
+  end
+
+  defp preload(%Project{} = project), do: project |> Repo.preload(:organization)
+
+  defp url(project) do
+    Application.get_env(:code_corps, :site_url)
+    |> URI.merge(project.organization.slug <> "/" <> project.slug)
+    |> URI.to_string
+  end
+
+  defp template_id, do: Application.get_env(:code_corps, :postmark_project_acceptance_template)
+end
diff --git a/lib/code_corps/presenters/image_presenter.ex b/lib/code_corps/presenters/image_presenter.ex
@@ -0,0 +1,23 @@
+defmodule CodeCorps.Presenters.ImagePresenter do
+  alias CodeCorps.{Project, User}
+  alias CodeCorps.Cloudex.CloudinaryUrl
+
+  @logo_options %{crop: "fill", height: 500, width: 500}
+
+  def large(%Project{} = project), do: do_large(project, "project")
+  def large(%User{} = user), do: do_large(user, "user")
+
+  defp do_large(%{cloudinary_public_id: cloudinary_id, default_color: color}, type),
+    do: cloudinary_image(cloudinary_id, @logo_options, "large", color, type)
+
+  @thumb_options %{crop: "fill", height: 100, width: 100}
+
+  def thumbnail(%Project{} = project), do: do_thumbnail(project, "project")
+  def thumbnail(%User{} = user), do: do_thumbnail(user, "user")
+
+  defp do_thumbnail(%{cloudinary_public_id: cloudinary_id, default_color: color}, type),
+    do: cloudinary_image(cloudinary_id, @thumb_options, "thumb", color, type)
+
+  defp cloudinary_image(id, options, category, color, type),
+    do: CloudinaryUrl.for(id, options, category, color, type)
+end
diff --git a/test/controllers/project_user_controller_test.exs b/test/controllers/project_user_controller_test.exs
@@ -1,5 +1,6 @@
 defmodule CodeCorps.ProjectUserControllerTest do
   use CodeCorps.ApiCase, resource_name: :project_user
+  use Bamboo.Test
 
   @attrs %{role: "contributor"}
 
@@ -92,6 +93,14 @@ defmodule CodeCorps.ProjectUserControllerTest do
       }
 
       assert_received {:track, ^user_id, "Approved Project Membership", ^tracking_properties}
+
+      email =
+        CodeCorps.ProjectUser
+        |> CodeCorps.Repo.get_by(role: "contributor")
+        |> CodeCorps.Repo.preload([:project, :user])
+        |> CodeCorps.Emails.ProjectUserAcceptanceEmail.create()
+
+      assert_delivered_email email
     end
 
     test "doesn't update and renders 401 when unauthenticated", %{conn: conn} do
diff --git a/test/lib/code_corps/emails/project_user_acceptance_email_test.exs b/test/lib/code_corps/emails/project_user_acceptance_email_test.exs
@@ -0,0 +1,25 @@
+defmodule CodeCorps.Emails.ProjectUserAcceptanceEmailTest do
+  use CodeCorps.ModelCase
+  use Bamboo.Test
+
+  alias CodeCorps.Emails.ProjectUserAcceptanceEmail
+
+  test "receipt email works" do
+    %{project: project, user: user} = project_user = insert(:project_user)
+
+    email = ProjectUserAcceptanceEmail.create(project_user)
+    assert email.from == "Code Corps<team@codecorps.org>"
+    assert email.to == user.email
+
+    template_model = email.private.template_model
+
+    assert template_model == %{
+      project_title: project.title,
+      project_url: "http://localhost:4200/#{project.organization.slug}/#{project.slug}",
+      project_logo_url: "#{Application.get_env(:code_corps, :asset_host)}/icons/project_default_large_.png",
+      user_image_url: "#{Application.get_env(:code_corps, :asset_host)}/icons/user_default_large_.png",
+      user_first_name: user.first_name,
+      subject: "#{project.title} just added you as a contributor"
+    }
+  end
+end
diff --git a/test/lib/code_corps/presenters/image_presenter_test.exs b/test/lib/code_corps/presenters/image_presenter_test.exs
@@ -0,0 +1,28 @@
+defmodule CodeCorps.Presenters.ImagePresenterTest do
+  use ExUnit.Case, async: true
+
+  import CodeCorps.Factories
+
+  alias CodeCorps.Presenters.ImagePresenter
+
+  @project build(:project)
+  @user build(:user)
+
+  describe "large/1" do
+    test "returns proper large image defaults for project" do
+      assert ImagePresenter.large(@project) == "#{Application.get_env(:code_corps, :asset_host)}/icons/project_default_large_.png"
+    end
+    test "returns proper large image defaults for user" do
+      assert ImagePresenter.large(@user) == "#{Application.get_env(:code_corps, :asset_host)}/icons/user_default_large_.png"
+    end
+  end
+
+  describe "thumbnail/1" do
+    test "returns proper thumbnail image defaults for project" do
+      assert ImagePresenter.thumbnail(@project) == "#{Application.get_env(:code_corps, :asset_host)}/icons/project_default_thumb_.png"
+    end
+    test "returns proper thumbnail image defaults for user" do
+      assert ImagePresenter.thumbnail(@user) == "#{Application.get_env(:code_corps, :asset_host)}/icons/user_default_thumb_.png"
+    end
+  end
+end
diff --git a/test/support/factories.ex b/test/support/factories.ex
@@ -229,6 +229,7 @@ defmodule CodeCorps.Factories do
 
   def user_factory do
     %CodeCorps.User{
+      first_name: sequence(:first_name, &"First#{&1}"),
       username: sequence(:username, &"user#{&1}"),
       email: sequence(:email, &"email-#{&1}@example.com")
     }
diff --git a/test/test_helper.exs b/test/test_helper.exs
@@ -2,9 +2,6 @@
 # Needs to be called before ExUnit.start
 {:ok, _} = Application.ensure_all_started(:ex_machina)
 
-# By default, exclude S3 tests
-# To run S3 tests, run `mix test --include requires_env`
-ExUnit.configure exclude: [:requires_env]
 ExUnit.start
 
 Ecto.Adapters.SQL.Sandbox.mode(CodeCorps.Repo, :manual)
diff --git a/web/controllers/project_user_controller.ex b/web/controllers/project_user_controller.ex
diff --git a/web/views/project_view.ex b/web/views/project_view.ex
diff --git a/web/views/user_view.ex b/web/views/user_view.ex
