Merge pull request #720 from christopherstyles/710-make-user-owner-of-project

Make user an owner of a project directly

Author: joshsmith

blueprint/api.apib

@@ -2374,6 +2374,8 @@ This endpoint allows you to check whether a username is valid (by running a vali
     + relationships
         + organizations
             + data(Organization Resource Identifier) - Identifier of organization this project is being created for
+        + owner
+            + data(User Resource Identifier) - Identifier of owner (user) this project belongs to
 
 ## Project Resource (object)
 + include Project Resource Identifier

priv/repo/migrations/20170226050552_add_owner_to_projects.exs

@@ -0,0 +1,9 @@
+defmodule CodeCorps.Repo.Migrations.AddOwnerToProjects do
+  use Ecto.Migration
+
+  def change do
+    alter table(:projects) do
+      add :owner_id, references(:users, on_delete: :nothing)
+    end
+  end
+end

priv/repo/structure.sql

@@ -334,7 +334,8 @@ CREATE TABLE projects (
     total_monthly_donated integer DEFAULT 0,
     approved boolean DEFAULT false,
     cloudinary_public_id character varying(255),
-    default_color character varying(255)
+    default_color character varying(255),
+    owner_id integer
 );
 
 
@@ -2227,6 +2228,14 @@ ALTER TABLE ONLY projects
     ADD CONSTRAINT projects_organization_id_fkey FOREIGN KEY (organization_id) REFERENCES organizations(id);
 
 
+--
+-- Name: projects_owner_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY projects
+    ADD CONSTRAINT projects_owner_id_fkey FOREIGN KEY (owner_id) REFERENCES users(id);
+
+
 --
 -- Name: role_skills_role_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -2519,5 +2528,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);
+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), (20170226050552);
 

test/controllers/project_controller_test.exs

@@ -72,8 +72,9 @@ defmodule CodeCorps.ProjectControllerTest do
     @tag :authenticated
     test "creates and renders resource when attributes are valid", %{conn: conn, current_user: current_user} do
       organization = insert(:organization)
+      user = insert(:user)
       insert(:organization_membership, role: "admin", member: current_user, organization: organization)
-      attrs = @valid_attrs |> Map.merge(%{organization: organization})
+      attrs = @valid_attrs |> Map.merge(%{organization: organization, owner_id: user.id})
       response = conn |> request_create(attrs)
       assert %{assigns: %{data: %{task_lists: [_inbox, _backlog, _in_progress, _done]}}} = response
       assert response |> json_response(201)

test/models/project_test.exs

@@ -3,16 +3,16 @@ defmodule CodeCorps.ProjectTest do
 
   alias CodeCorps.Project
 
-  @valid_attrs %{title: "A title"}
-  @invalid_attrs %{}
+  describe "changeset" do
+    @valid_attrs %{title: "A title"}
+    @invalid_attrs %{}
 
-  describe "changeset/2" do
-    test "with valid attributes is valid" do
+    test "with valid attributes" do
       changeset = Project.changeset(%Project{}, @valid_attrs)
       assert changeset.valid?
     end
 
-    test "with invalid attributes is invalid and has errors" do
+    test "with invalid attributes" do
       changeset = Project.changeset(%Project{}, @invalid_attrs)
       refute changeset.valid?
 
@@ -43,17 +43,31 @@ defmodule CodeCorps.ProjectTest do
     end
   end
 
-  describe "create_changeset/2" do
+  describe "create_changeset" do
+    @valid_attrs %{title: "A title", organization_id: 1, owner_id: 1}
+    @invalid_attrs %{}
+
+    test "with valid attributes" do
+      changeset = Project.create_changeset(%Project{}, @valid_attrs)
+      assert changeset.valid?
+    end
+
+    test "with invalid attributes" do
+      changeset = Project.create_changeset(%Project{}, @invalid_attrs)
+      refute changeset.valid?
+    end
+
     test "accepts setting of organization_id" do
       changeset = Project.create_changeset(%Project{}, %{organization_id: 1})
       assert {:ok, 1} == changeset |> fetch_change(:organization_id)
     end
 
     test "associates the ordered default task lists to the project" do
       organization = insert(:organization)
+      user = insert(:user)
       changeset = Project.create_changeset(
         %Project{},
-        %{organization_id: organization.id, title: "Title"}
+        %{organization_id: organization.id, title: "Title", owner_id: user.id}
       )
 
       {_, project} = Repo.insert(changeset)
@@ -63,9 +77,21 @@ defmodule CodeCorps.ProjectTest do
       assert Enum.all?(task_list_orders), "some of the orders are not set (nil)"
       assert task_list_orders == Enum.sort(task_list_orders), "task lists order does not correspond to their position"
     end
+
+    test "ensures owner (user) actually exists" do
+      organization = insert(:organization)
+      attrs = Map.merge(@valid_attrs, %{organization_id: organization.id})
+
+      changeset = Project.create_changeset(%Project{}, attrs)
+
+      {result, changeset} = changeset |> Repo.insert
+
+      assert result == :error
+      changeset |> assert_error_message(:owner, "does not exist")
+    end
   end
 
-  describe "update_changeset/2" do
+  describe "update_changeset" do
     test "rejects setting of organization id" do
       changeset = Project.update_changeset(%Project{}, %{organization_id: 1})
       assert :error == changeset |> fetch_change(:organization_id)

test/support/factories.ex

@@ -76,7 +76,8 @@ defmodule CodeCorps.Factories do
     %CodeCorps.Project{
       title: sequence(:title, &"Project #{&1}"),
       slug: sequence(:slug, &"project-#{&1}"),
-      organization: build(:organization)
+      organization: build(:organization),
+      owner: build(:user)
     }
   end
 

test/views/project_view_test.exs

@@ -2,8 +2,9 @@ defmodule CodeCorps.ProjectViewTest do
   use CodeCorps.ViewCase
 
   test "renders all attributes and relationships properly" do
+    user = insert(:user)
     organization = insert(:organization)
-    project = insert(:project, organization: organization, total_monthly_donated: 5000, default_color: "blue")
+    project = insert(:project, organization: organization, owner: user, total_monthly_donated: 5000, default_color: "blue")
 
     donation_goal = insert(:donation_goal, project: project)
     project_category = insert(:project_category, project: project)
@@ -47,6 +48,12 @@ defmodule CodeCorps.ProjectViewTest do
               "type" => "organization"
             }
           },
+          "owner" => %{
+            "data" => %{
+              "id" => user.id |> Integer.to_string,
+              "type" => "user"
+            }
+          },
           "project-categories" => %{
             "data" => [
               %{

web/models/project.ex

@@ -26,6 +26,7 @@ defmodule CodeCorps.Project do
     field :total_monthly_donated, :integer, default: 0
 
     belongs_to :organization, CodeCorps.Organization
+    belongs_to :owner, CodeCorps.User
 
     has_one :stripe_connect_plan, CodeCorps.StripeConnectPlan
 
@@ -57,8 +58,10 @@ defmodule CodeCorps.Project do
   """
   def create_changeset(struct, params) do
     struct
-    |> cast(params, [:organization_id])
     |> changeset(params)
+    |> cast(params, [:organization_id, :owner_id])
+    |> validate_required(:owner_id)
+    |> assoc_constraint(:owner)
     |> put_assoc(:task_lists, TaskList.default_task_lists())
     |> generate_icon_color(:default_color)
   end

web/views/project_view.ex

@@ -5,7 +5,7 @@ defmodule CodeCorps.ProjectView do
   use CodeCorps.PreloadHelpers,
     default_preloads: [
       :donation_goals, [organization: :stripe_connect_account],
-      :project_categories, :project_skills, :stripe_connect_plan, :task_lists, :tasks
+      :owner, :project_categories, :project_skills, :stripe_connect_plan, :task_lists, :tasks
     ]
   use CodeCorps.Web, :view
   use JaSerializer.PhoenixView
@@ -17,6 +17,7 @@ defmodule CodeCorps.ProjectView do
   	:inserted_at, :total_monthly_donated, :updated_at]
 
   has_one :organization, serializer: CodeCorps.OrganizationView
+  has_one :owner, serializer: CodeCorps.UserView
   has_one :stripe_connect_plan, serializer: CodeCorps.StripeConnectPlanView
 
   has_many :donation_goals, serializer: CodeCorps.DonationGoalView, identifiers: :always