Change OrganizationInvite title to organization_name

joshsmith · joshsmith · commit a98e5205303f · 2017-10-06T09:42:40.000-07:00
diff --git a/config/dev.exs b/config/dev.exs
@@ -61,9 +61,9 @@ config :code_corps, CodeCorps.Mailer,
 
 config :code_corps,
   postmark_forgot_password_template: "123",
+  postmark_organization_invite_email_template: "123",
   postmark_project_acceptance_template: "123",
-  postmark_receipt_template: "123",
-  postmark_organization_invite_email_template: "123"
+  postmark_receipt_template: "123"
 
 # If the dev environment has no CLOUDEX_API_KEY set, we want the app
 # to still run, with cloudex in test API mode
diff --git a/config/prod.exs b/config/prod.exs
@@ -62,9 +62,9 @@ config :code_corps, CodeCorps.Mailer,
 
 config :code_corps,
   postmark_forgot_password_template: "1989483",
+  postmark_organization_invite_email_template: "3441863",
   postmark_project_acceptance_template: "1447041",
-  postmark_receipt_template: "1255222",
-  postmark_organization_invite_email_template: "3441863"
+  postmark_receipt_template: "1255222"
 
 # ## SSL Support
 #
diff --git a/config/staging.exs b/config/staging.exs
@@ -60,9 +60,9 @@ config :code_corps, CodeCorps.Mailer,
 
 config :code_corps,
   postmark_forgot_password_template: "1989481",
+  postmark_organization_invite_email_template: "3442401",
   postmark_project_acceptance_template: "1447022",
-  postmark_receipt_template: "1252361",
-  postmark_organization_invite_email_template: "3442401"
+  postmark_receipt_template: "1252361"
 
 # ## SSL Support
 #
diff --git a/emails/organization_invite.html b/emails/organization_invite.html
@@ -41,10 +41,10 @@
                       <table width="100%" cellpadding="0" cellspacing="0">
                         <tr>
                           <td>
-                            <p>Hi {{title}},</p>
+                            <p>Hi {{organization_name}},</p>
                             <p>You've just been invited to add your first project on Code Corps.</p>
-                            <p>To create your project, please <a href="{{url}}">click here</a> or paste this link into your browser:</p>
-                            <p><a href="{{url}}">{{url}}</a></p>
+                            <p>To create your project, please <a href="{{invite_url}}">click here</a> or paste this link into your browser:</p>
+                            <p><a href="{{invite_url}}">{{invite_url}}</a></p>
                             <p>If you have any issues, don't hesitate to <a href="https://help.codecorps.org">contact us</a>.</p>
                           </td>
                         </tr>
diff --git a/lib/code_corps/emails/organization_invite_email.ex b/lib/code_corps/emails/organization_invite_email.ex
@@ -1,34 +1,33 @@
 defmodule CodeCorps.Emails.OrganizationInviteEmail do
     import Bamboo.Email
     import Bamboo.PostmarkHelper
-  
-    alias CodeCorps.{OrganizationInvite}
-    alias CodeCorps.Emails.BaseEmail
-  
-    def create(%OrganizationInvite{} = organization_invite) do
+
+    alias CodeCorps.{Emails.BaseEmail, OrganizationInvite}
+
+    def create(%OrganizationInvite{} = invite) do
       BaseEmail.create
-      |> to(organization_invite.email)
-      |> template(template_id(), build_model(organization_invite))
+      |> to(invite.email)
+      |> template(template_id(), build_model(invite))
     end
-  
-    defp build_model(%OrganizationInvite{} = organization_invite) do
+
+    defp build_model(%OrganizationInvite{} = invite) do
       %{
-        title: organization_invite.title,
-        url: url(organization_invite.title, organization_invite.code),
+        organization_name: invite.organization_name,
+        invite_url: invite_url(invite.code, invite.organization_name),
         subject: "Create your first project on Code Corps"
       }
     end
-  
-    defp url(title, code) do
+
+    defp invite_url(code, organization_name) do
       Application.get_env(:code_corps, :site_url)
-      |> URI.merge("/invites/organization" <> "?" <> set_params(code, title))
+      |> URI.merge("/invites/organization" <> "?" <> set_params(code, organization_name))
       |> URI.to_string
     end
 
-    defp set_params(code, title) do
-      %{code: code, organization_title: title } 
+    defp set_params(code, organization_name) do
+      %{code: code, organization_name: organization_name }
       |> URI.encode_query
     end
-  
+
     defp template_id, do: Application.get_env(:code_corps, :organization_invite_email_template)
-end
+end
diff --git a/lib/code_corps/model/organization_invite.ex b/lib/code_corps/model/organization_invite.ex
@@ -8,8 +8,8 @@ defmodule CodeCorps.OrganizationInvite do
   schema "organization_invites" do
     field :code, :string
     field :email, :string
-    field :title, :string
     field :fulfilled, :boolean, default: false
+    field :organization_name, :string
 
     timestamps()
   end
@@ -19,8 +19,8 @@ defmodule CodeCorps.OrganizationInvite do
   """
   def changeset(struct, params \\ %{}) do
     struct
-    |> cast(params, [:email, :title, :fulfilled])
-    |> validate_required([:email, :title])
+    |> cast(params, [:email, :organization_name, :fulfilled])
+    |> validate_required([:email, :organization_name])
     |> validate_format(:email, ~r/@/)
     |> validate_change(:fulfilled, &check_fulfilled_changes_to_true/2)
   end
@@ -32,21 +32,25 @@ defmodule CodeCorps.OrganizationInvite do
     struct
     |> changeset(params)
     |> generate_code
+    |> unique_constraint(:code)
   end
 
   defp generate_code(changeset) do
     case changeset do
       %Ecto.Changeset{valid?: true}  ->
-        length = 10
-        code = length
-        |> :crypto.strong_rand_bytes
-        |> Base.encode64
-        |> binary_part(0, length)
+        code = do_generate_code(10)
         put_change(changeset, :code, code)
       _ -> changeset
      end
   end
 
+  defp do_generate_code(length) do
+    length
+    |> :crypto.strong_rand_bytes
+    |> Base.encode64
+    |> binary_part(0, length)
+  end
+
   defp check_fulfilled_changes_to_true :fulfilled, fulfilled do
     if fulfilled == false do
       [fulfillled: "Fulfilled can only change from false to true"]
diff --git a/lib/code_corps_web/views/organization_invite_view.ex b/lib/code_corps_web/views/organization_invite_view.ex
@@ -3,6 +3,6 @@ defmodule CodeCorpsWeb.OrganizationInviteView do
   use JaSerializer.PhoenixView
 
   attributes [
-    :email, :title, :updated_at, :inserted_at, :fulfilled
+    :email, :fulfilled, :inserted_at, :organization_name, :updated_at
   ]
 end
diff --git a/priv/repo/migrations/20171006161407_change_organization_invite_title_to_organization_name.exs b/priv/repo/migrations/20171006161407_change_organization_invite_title_to_organization_name.exs
@@ -0,0 +1,7 @@
+defmodule CodeCorps.Repo.Migrations.ChangeOrganizationInviteTitleToOrganizationName do
+  use Ecto.Migration
+
+  def change do
+    rename table(:organization_invites), :title, to: :organization_name
+  end
+end
diff --git a/priv/repo/structure.sql b/priv/repo/structure.sql
@@ -344,7 +344,7 @@ CREATE TABLE organization_invites (
     id bigint NOT NULL,
     code character varying(255) NOT NULL,
     email character varying(255) NOT NULL,
-    title character varying(255) NOT NULL,
+    organization_name character varying(255) NOT NULL,
     fulfilled boolean DEFAULT false NOT NULL,
     inserted_at timestamp without time zone NOT NULL,
     updated_at timestamp without time zone NOT NULL
@@ -2570,6 +2570,13 @@ CREATE UNIQUE INDEX user_tasks_user_id_task_id_index ON user_tasks USING btree (
 CREATE UNIQUE INDEX users_email_index ON users USING btree (email);
 
 
+--
+-- Name: users_github_id_index; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE UNIQUE INDEX users_github_id_index ON users USING btree (github_id);
+
+
 --
 -- Name: users_lower_username_index; Type: INDEX; Schema: public; Owner: -
 --
@@ -3044,5 +3051,5 @@ ALTER TABLE ONLY user_tasks
 -- PostgreSQL database dump complete
 --
 
-INSERT INTO "schema_migrations" (version) VALUES (20160723215749), (20160804000000), (20160804001111), (20160805132301), (20160805203929), (20160808143454), (20160809214736), (20160810124357), (20160815125009), (20160815143002), (20160816020347), (20160816034021), (20160817220118), (20160818000944), (20160818132546), (20160820113856), (20160820164905), (20160822002438), (20160822004056), (20160822011624), (20160822020401), (20160822044612), (20160830081224), (20160830224802), (20160911233738), (20160912002705), (20160912145957), (20160918003206), (20160928232404), (20161003185918), (20161019090945), (20161019110737), (20161020144622), (20161021131026), (20161031001615), (20161121005339), (20161121014050), (20161121043941), (20161121045709), (20161122015942), (20161123081114), (20161123150943), (20161124085742), (20161125200620), (20161126045705), (20161127054559), (20161205024856), (20161207112519), (20161209192504), (20161212005641), (20161214005935), (20161215052051), (20161216051447), (20161218005913), (20161219160401), (20161219163909), (20161220141753), (20161221085759), (20161226213600), (20161231063614), (20170102130055), (20170102181053), (20170104113708), (20170104212623), (20170104235423), (20170106013143), (20170115035159), (20170115230549), (20170121014100), (20170131234029), (20170201014901), (20170201025454), (20170201035458), (20170201183258), (20170220032224), (20170224233516), (20170226050552), (20170228085250), (20170308214128), (20170308220713), (20170308222552), (20170313130611), (20170318032449), (20170318082740), (20170324194827), (20170424215355), (20170501225441), (20170505224222), (20170526095401), (20170602000208), (20170622205732), (20170626231059), (20170628092119), (20170628213609), (20170629183404), (20170630140136), (20170706132431), (20170707213648), (20170711122252), (20170717092127), (20170725060612), (20170727052644), (20170731130121), (20170814131722), (20170913114958), (20170921014405), (20170925214512), (20170925230419), (20170926134646), (20170927100300), (20170928234412), (20171003225853);
+INSERT INTO "schema_migrations" (version) VALUES (20160723215749), (20160804000000), (20160804001111), (20160805132301), (20160805203929), (20160808143454), (20160809214736), (20160810124357), (20160815125009), (20160815143002), (20160816020347), (20160816034021), (20160817220118), (20160818000944), (20160818132546), (20160820113856), (20160820164905), (20160822002438), (20160822004056), (20160822011624), (20160822020401), (20160822044612), (20160830081224), (20160830224802), (20160911233738), (20160912002705), (20160912145957), (20160918003206), (20160928232404), (20161003185918), (20161019090945), (20161019110737), (20161020144622), (20161021131026), (20161031001615), (20161121005339), (20161121014050), (20161121043941), (20161121045709), (20161122015942), (20161123081114), (20161123150943), (20161124085742), (20161125200620), (20161126045705), (20161127054559), (20161205024856), (20161207112519), (20161209192504), (20161212005641), (20161214005935), (20161215052051), (20161216051447), (20161218005913), (20161219160401), (20161219163909), (20161220141753), (20161221085759), (20161226213600), (20161231063614), (20170102130055), (20170102181053), (20170104113708), (20170104212623), (20170104235423), (20170106013143), (20170115035159), (20170115230549), (20170121014100), (20170131234029), (20170201014901), (20170201025454), (20170201035458), (20170201183258), (20170220032224), (20170224233516), (20170226050552), (20170228085250), (20170308214128), (20170308220713), (20170308222552), (20170313130611), (20170318032449), (20170318082740), (20170324194827), (20170424215355), (20170501225441), (20170505224222), (20170526095401), (20170602000208), (20170622205732), (20170626231059), (20170628092119), (20170628213609), (20170629183404), (20170630140136), (20170706132431), (20170707213648), (20170711122252), (20170717092127), (20170725060612), (20170727052644), (20170731130121), (20170814131722), (20170913114958), (20170921014405), (20170925214512), (20170925230419), (20170926134646), (20170927100300), (20170928234412), (20171003134956), (20171003225853), (20171006161407);
 
diff --git a/test/lib/code_corps/emails/organization_invite_email_test.exs b/test/lib/code_corps/emails/organization_invite_email_test.exs
@@ -1,26 +1,26 @@
 defmodule CodeCorps.Emails.OrganizationInviteEmailTest do
     use CodeCorps.ModelCase
     use Bamboo.Test
-    
+
     alias CodeCorps.Emails.OrganizationInviteEmail
-  
+
     test "organization email invite works" do
-      organization_invite = insert(:organization_invite)    
-      email = OrganizationInviteEmail.create(organization_invite)
+      invite = insert(:organization_invite)
+      email = OrganizationInviteEmail.create(invite)
 
       assert email.from == "Code Corps<team@codecorps.org>"
-      assert email.to == organization_invite.email
-      
+      assert email.to == invite.email
+
       template_model = email.private.template_model
-      params = 
-        %{code: organization_invite.code, organization_title: organization_invite.title}
+      params =
+        %{code: invite.code, organization_name: invite.organization_name}
         |> URI.encode_query
+      invite_url = "#{Application.get_env(:code_corps, :site_url)}/invites/organization?#{params}"
 
       assert template_model == %{
-        title: organization_invite.title,
-        url: "#{Application.get_env(:code_corps, :site_url)}/invites/organization?#{params}",
+        invite_url: invite_url,
+        organization_name: invite.organization_name,
         subject: "Create your first project on Code Corps"
       }
     end
   end
-  
diff --git a/test/lib/code_corps/model/organization_invite_test.exs b/test/lib/code_corps/model/organization_invite_test.exs
@@ -3,10 +3,10 @@ defmodule CodeCorps.OrganizationInviteTest do
 
   alias CodeCorps.OrganizationInvite
 
-  @valid_attrs %{email: "code@corps.com", title: "Code Corps"}
+  @valid_attrs %{email: "code@corps.com", organization_name: "Code Corps"}
   @invalid_attrs %{}
 
-  describe "changeset" do
+  describe "changeset/2" do
     test "with valid attributes" do
       changeset = OrganizationInvite.changeset(%OrganizationInvite{}, @valid_attrs)
       assert changeset.valid?
@@ -27,7 +27,7 @@ defmodule CodeCorps.OrganizationInviteTest do
   end
 
 
- describe "creation_changeset" do
+ describe "create_changeset/2" do
    test "with valid attributes" do
      changeset = OrganizationInvite.create_changeset(%OrganizationInvite{}, @valid_attrs)
      assert changeset.valid?
@@ -38,7 +38,7 @@ defmodule CodeCorps.OrganizationInviteTest do
      refute changeset.valid?
    end
 
-   test "genearates code" do
+   test "generates code" do
      changeset = OrganizationInvite.create_changeset(%OrganizationInvite{}, @valid_attrs)
      assert changeset.changes.code != nil
    end
diff --git a/test/lib/code_corps_web/controllers/organization_invite_controller_test.exs b/test/lib/code_corps_web/controllers/organization_invite_controller_test.exs
@@ -2,8 +2,8 @@ defmodule CodeCorpsWeb.OrganizationInviteControllerTest do
   use CodeCorpsWeb.ApiCase, resource_name: :organization_invite
   use Bamboo.Test
 
-  @valid_attrs %{email: "code@corps.com", title: "Code Corps"}
-  @invalid_attrs %{email: "code", title: ""}
+  @valid_attrs %{email: "code@corps.com", organization_name: "Code Corps"}
+  @invalid_attrs %{email: "code", organization_name: ""}
 
   describe "show" do
     test "shows chosen resource", %{conn: conn} do
@@ -36,13 +36,13 @@ defmodule CodeCorpsWeb.OrganizationInviteControllerTest do
     test "creates and renders resource when data is valid, sends valid email", %{conn: conn} do
       assert conn |> request_create(@valid_attrs) |> json_response(201)
 
-      organization_invite_email = 
+      organization_invite_email =
         CodeCorps.OrganizationInvite
         |> first()
         |> Repo.one()
         |> CodeCorps.Emails.OrganizationInviteEmail.create()
 
-      assert_delivered_email organization_invite_email  
+      assert_delivered_email organization_invite_email
     end
 
     @tag authenticated: :admin
@@ -70,4 +70,4 @@ defmodule CodeCorpsWeb.OrganizationInviteControllerTest do
       assert conn |> request_update(:not_found) |> json_response(404)
     end
   end
-end
+end
diff --git a/test/lib/code_corps_web/views/organization_invite_view_test.exs b/test/lib/code_corps_web/views/organization_invite_view_test.exs
@@ -15,8 +15,8 @@ defmodule CodeCorpsWeb.OrganizationInviteViewTest do
         "attributes" => %{
           "email" => organization_invite.email,
           "fulfilled" => organization_invite.fulfilled,
-          "title" => organization_invite.title,
           "inserted-at" => organization_invite.inserted_at,
+          "organization-name" => organization_invite.organization_name,
           "updated-at" => organization_invite.updated_at
         }
       },
diff --git a/test/support/factories.ex b/test/support/factories.ex
@@ -58,10 +58,10 @@ defmodule CodeCorps.Factories do
 
   def organization_invite_factory do
     %CodeCorps.OrganizationInvite{
-      email: sequence(:email, &"email_#{&1}@mail.com"),
-      title: sequence(:title, &"organization-#{&1}"),
       code: sequence(:code, &"n43crhiqR-#{&1}"),
-      fulfilled: false
+      email: sequence(:email, &"email_#{&1}@mail.com"),
+      fulfilled: false,
+      organization_name: sequence(:organization_name, &"organization-#{&1}")
     }
   end
 

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ defmodule CodeCorpsWeb.OrganizationInviteView do`
`3`	`3`	`use JaSerializer.PhoenixView`
`4`	`4`
`5`	`5`	`attributes [`
`6`		`- :email, :title, :updated_at, :inserted_at, :fulfilled`
	`6`	`+ :email, :fulfilled, :inserted_at, :organization_name, :updated_at`
`7`	`7`	`]`
`8`	`8`	`end`