Merge pull request #751 from code-corps/748-remove-project-owner

Remove project owner. Create ProjectUser{role: "owner"} when creating project

Author: joshsmith

lib/code_corps/helpers/policy.ex

@@ -15,39 +15,30 @@ defmodule CodeCorps.Helpers.Policy do
   Determines if the provided organization or project is owned by the provided user
   """
   @spec owned_by?(nil | Organization.t | Project.t, User.t) :: boolean
-  def owned_by?(%{owner_id: owner_id}, %User{id: user_id}), do: owner_id == user_id
+  def owned_by?(%Organization{owner_id: owner_id}, %User{id: user_id}),
+    do: owner_id == user_id
+  def owned_by?(%Project{} = project, %User{} = user),
+    do: project |> get_membership(user) |> get_role |> owner?
   def owned_by?(nil, _), do: false
 
   @doc """
   Determines if the provided project is being administered by the provided User
 
-  Returns `true` if
-    - the user is the owner of the project
-    - the user is an admin or higher member of the project
+  Returns `true` if the user is an admin or higher member of the project
   """
   @spec administered_by?(nil | Project.t, User.t) :: boolean
-  def administered_by?(%Project{} = project, %User{} = user) do
-    case owned_by?(project, user) do
-      true -> true
-      false -> project |> get_membership(user) |> get_role |> admin_or_higher?
-    end
-  end
+  def administered_by?(%Project{} = project, %User{} = user),
+    do: project |> get_membership(user) |> get_role |> admin_or_higher?
   def administered_by?(nil, _), do: false
 
   @doc """
   Determines if the provided project is being contributed to by the provided User
 
-  Returns `true` if
-    - the user is the owner of the project
-    - the user is a contributor or higher member of the project
+  Returns `true` if the user is a contributor or higher member of the project
   """
   @spec contributed_by?(nil | Project.t, User.t) :: boolean
-  def contributed_by?(%Project{} = project, %User{} = user) do
-    case owned_by?(project, user) do
-      true -> true
-      false -> project |> get_membership(user) |> get_role |> contributor_or_higher?
-    end
-  end
+  def contributed_by?(%Project{} = project, %User{} = user),
+    do: project |> get_membership(user) |> get_role |> contributor_or_higher?
   def contributed_by?(nil, _), do: false
 
   @doc """
@@ -88,6 +79,10 @@ defmodule CodeCorps.Helpers.Policy do
   defp contributor_or_higher?(role) when role in ["contributor", "admin", "owner"], do: true
   defp contributor_or_higher?(_), do: false
 
+  @spec owner?(String.t) :: boolean
+  defp owner?("owner"), do: true
+  defp owner?(_), do: false
+
   @doc """
   Retrieves task from associated record
   """
@@ -102,7 +97,6 @@ defmodule CodeCorps.Helpers.Policy do
   @spec task_authored_by?(Task.t, User.t) :: boolean
   def task_authored_by?(%Task{user_id: author_id}, %User{id: user_id}), do: user_id == author_id
 
-
   # Returns `CodeCorps.ProjectUser` for specified `CodeCorps.Project`
   # and `CodeCorps.User`, or nil
   @spec get_membership(Project.t, User.t) :: nil | ProjectUser.t

priv/repo/migrations/20170313130611_remove_project_owner_id.exs

@@ -0,0 +1,9 @@
+defmodule CodeCorps.Repo.Migrations.RemoveProjectOwnerId do
+  use Ecto.Migration
+
+  def change do
+    alter table(:projects) do
+      remove :owner_id
+    end
+  end
+end

priv/repo/structure.sql

@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.5.4
--- Dumped by pg_dump version 9.5.4
+-- Dumped from database version 9.5.1
+-- Dumped by pg_dump version 9.5.1
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -401,7 +401,6 @@ CREATE TABLE projects (
     approved boolean DEFAULT false,
     cloudinary_public_id character varying(255),
     default_color character varying(255),
-    owner_id integer,
     website character varying(255),
     should_link_externally boolean DEFAULT false
 );
@@ -2372,14 +2371,6 @@ 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: -
 --
@@ -2672,5 +2663,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);
+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);
 

test/controllers/donation_goal_controller_test.exs

@@ -44,7 +44,8 @@ defmodule CodeCorps.DonationGoalControllerTest do
   describe "create" do
     @tag :authenticated
     test "creates and renders resource when data is valid", %{conn: conn, current_user: current_user} do
-      project = insert(:project, owner: current_user)
+      project = insert(:project)
+      insert(:project_user, project: project, user: current_user, role: "owner")
 
       attrs = @valid_attrs |> Map.merge(%{project_id: project.id})
       assert conn |> request_create(attrs) |> json_response(201)
@@ -55,7 +56,8 @@ defmodule CodeCorps.DonationGoalControllerTest do
 
     @tag :authenticated
     test "does not create resource and renders errors when data is invalid", %{conn: conn, current_user: current_user} do
-      project = insert(:project, owner: current_user)
+      project = insert(:project)
+      insert(:project_user, project: project, user: current_user, role: "owner")
 
       attrs = @invalid_attrs |> Map.merge(%{project_id: project.id})
       assert conn |> request_create(attrs) |> json_response(422)
@@ -74,7 +76,8 @@ defmodule CodeCorps.DonationGoalControllerTest do
   describe "update" do
     @tag :authenticated
     test "updates and renders chosen resource when data is valid", %{conn: conn, current_user: current_user} do
-      project = insert(:project, owner: current_user)
+      project = insert(:project)
+      insert(:project_user, project: project, user: current_user, role: "owner")
 
       donation_goal = insert(:donation_goal, project: project)
 
@@ -87,7 +90,8 @@ defmodule CodeCorps.DonationGoalControllerTest do
 
     @tag authenticated: :admin
     test "does not update chosen resource and renders errors when data is invalid", %{conn: conn, current_user: current_user} do
-      project = insert(:project, owner: current_user)
+      project = insert(:project)
+      insert(:project_user, project: project, user: current_user, role: "owner")
       donation_goal = insert(:donation_goal, project: project)
 
       assert conn |> request_update(donation_goal, @invalid_attrs) |> json_response(422)
@@ -111,7 +115,8 @@ defmodule CodeCorps.DonationGoalControllerTest do
   describe "delete" do
     @tag :authenticated
     test "deletes chosen resource", %{conn: conn, current_user: current_user} do
-      project = insert(:project, owner: current_user)
+      project = insert(:project)
+      insert(:project_user, project: project, user: current_user, role: "owner")
       donation_goal = insert(:donation_goal, project: project)
       assert conn |> request_delete(donation_goal) |> response(204)
     end

test/controllers/project_category_controller_test.exs

@@ -45,15 +45,17 @@ defmodule CodeCorps.ProjectCategoryControllerTest do
     @tag :authenticated
     test "creates and renders resource when data is valid", %{conn: conn, current_user: current_user} do
       category = insert(:category)
-      project = insert(:project, owner: current_user)
+      project = insert(:project)
+      insert(:project_user, project: project, user: current_user, role: "owner")
 
       attrs = %{category: category, project: project}
       assert conn |> request_create(attrs) |> json_response(201)
     end
 
     @tag :authenticated
     test "renders 422 when data is invalid", %{conn: conn, current_user: current_user} do
-      project = insert(:project, owner: current_user)
+      project = insert(:project)
+      insert(:project_user, project: project, user: current_user, role: "owner")
       invalid_attrs = %{project: project}
       assert conn |> request_create(invalid_attrs) |> json_response(422)
     end
@@ -71,7 +73,8 @@ defmodule CodeCorps.ProjectCategoryControllerTest do
   describe "delete" do
     @tag :authenticated
     test "deletes resource", %{conn: conn, current_user: current_user} do
-      project = insert(:project, owner: current_user)
+      project = insert(:project)
+      insert(:project_user, project: project, user: current_user, role: "owner")
       project_category = insert(:project_category, project: project)
       assert conn |> request_delete(project_category) |> response(204)
     end

test/controllers/project_controller_test.exs

@@ -73,7 +73,7 @@ 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, owner: current_user)
-      attrs = @valid_attrs |> Map.merge(%{organization: organization, owner_id: current_user.id})
+      attrs = @valid_attrs |> Map.merge(%{organization: organization})
       response = conn |> request_create(attrs)
       assert %{assigns: %{data: %{task_lists: [_inbox, _backlog, _in_progress, _done]}}} = response
       assert response |> json_response(201)
@@ -82,7 +82,7 @@ defmodule CodeCorps.ProjectControllerTest do
     @tag :authenticated
     test "renders 422 when attributes are invalid", %{conn: conn, current_user: current_user} do
       organization = insert(:organization, owner: current_user)
-      attrs = @invalid_attrs |> Map.merge(%{organization: organization, owner_id: current_user.id})
+      attrs = @invalid_attrs |> Map.merge(%{organization: organization})
       assert conn |> request_create(attrs) |> json_response(422)
     end
 
@@ -101,13 +101,15 @@ defmodule CodeCorps.ProjectControllerTest do
   describe "update" do
     @tag :authenticated
     test "updates and renders resource when attributes are valid", %{conn: conn, current_user: current_user} do
-      project = insert(:project, owner: current_user)
+      project = insert(:project)
+      insert(:project_user, project: project, user: current_user, role: "owner")
       assert conn |> request_update(project, @valid_attrs) |> json_response(200)
     end
 
     @tag :authenticated
     test "renders errors when attributes are invalid", %{conn: conn, current_user: current_user} do
-      project = insert(:project, owner: current_user)
+      project = insert(:project)
+      insert(:project_user, project: project, user: current_user, role: "owner")
       assert conn |> request_update(project, @invalid_attrs) |> json_response(422)
     end
 

test/controllers/project_skill_controller_test.exs

@@ -44,7 +44,8 @@ defmodule CodeCorps.ProjectSkillControllerTest do
   describe "create" do
     @tag :authenticated
     test "creates and renders resource when data is valid", %{conn: conn, current_user: current_user} do
-      project = insert(:project, owner: current_user)
+      project = insert(:project)
+      insert(:project_user, project: project, user: current_user, role: "owner")
       skill = insert(:skill)
 
       attrs = %{project: project, skill: skill}
@@ -53,7 +54,8 @@ defmodule CodeCorps.ProjectSkillControllerTest do
 
     @tag :authenticated
     test "renders 422 error when data is invalid", %{conn: conn, current_user: current_user} do
-      project = insert(:project, owner: current_user)
+      project = insert(:project)
+      insert(:project_user, project: project, user: current_user, role: "owner")
 
       invalid_attrs = %{project: project}
       assert conn |> request_create(invalid_attrs) |> json_response(422)
@@ -64,18 +66,16 @@ defmodule CodeCorps.ProjectSkillControllerTest do
     end
 
     @tag :authenticated
-    test "renders 403 when not authorized", %{conn: conn, current_user: current_user} do
-      organization = insert(:organization)
-      insert(:organization_membership, role: "contributor", member: current_user, organization: organization)
-
+    test "renders 403 when not authorized", %{conn: conn} do
       assert conn |> request_create |> json_response(403)
     end
   end
 
   describe "delete" do
     @tag :authenticated
     test "deletes chosen resource", %{conn: conn, current_user: current_user} do
-      project = insert(:project, owner: current_user)
+      project = insert(:project)
+      insert(:project_user, project: project, user: current_user, role: "owner")
       project_skill = insert(:project_skill, project: project)
       assert conn |> request_delete(project_skill) |> response(204)
     end

test/controllers/stripe_connect_plan_controller_test.exs

@@ -4,7 +4,8 @@ defmodule CodeCorps.StripeConnectPlanControllerTest do
   describe "show" do
     @tag :authenticated
     test "shows resource when authenticated and authorized", %{conn: conn, current_user: current_user} do
-      project = insert(:project, owner: current_user)
+      project = insert(:project)
+      insert(:project_user, project: project, user: current_user, role: "owner")
       stripe_connect_plan = insert(:stripe_connect_plan, project: project)
 
       conn
@@ -37,7 +38,8 @@ defmodule CodeCorps.StripeConnectPlanControllerTest do
     test "creates and renders resource when user is authenticated and authorized", %{conn: conn, current_user: current_user} do
       organization = insert(:organization)
       insert(:stripe_connect_account, organization: organization, charges_enabled: true, transfers_enabled: true)
-      project = insert(:project, organization: organization, owner: current_user)
+      project = insert(:project, organization: organization)
+      insert(:project_user, project: project, user: current_user, role: "owner")
       insert(:donation_goal, project: project)
 
       assert conn |> request_create(%{project: project}) |> json_response(201)
@@ -51,9 +53,8 @@ defmodule CodeCorps.StripeConnectPlanControllerTest do
     end
 
     @tag :authenticated
-    test "does not create resource and renders 403 when not authorized", %{conn: conn, current_user: current_user} do
+    test "does not create resource and renders 403 when not authorized", %{conn: conn} do
       organization = insert(:organization)
-      insert(:organization_membership, role: "admin", member: current_user, organization: organization)
       project = insert(:project, organization: organization)
 
       assert conn |> request_create(%{project: project}) |> json_response(403)
@@ -63,7 +64,8 @@ defmodule CodeCorps.StripeConnectPlanControllerTest do
     test "does not create resource and renders 422 when no donation goals exist and transfers not enabled", %{conn: conn, current_user: current_user} do
       organization = insert(:organization)
       insert(:stripe_connect_account, organization: organization, transfers_enabled: false)
-      project = insert(:project, organization: organization, owner: current_user)
+      project = insert(:project, organization: organization)
+      insert(:project_user, project: project, user: current_user, role: "owner")
 
       assert conn |> request_create(%{project: project}) |> json_response(422)
     end