Merge pull request #1269 from code-corps/improve-project-creation

joshsmith · web-flow · commit 350065c1785b · 2017-11-30T00:36:11.000-08:00
Improve project creation
diff --git a/lib/code_corps/model/project.ex b/lib/code_corps/model/project.ex
@@ -9,9 +9,10 @@ defmodule CodeCorps.Project do
   import CodeCorps.Helpers.Slug
   import CodeCorps.Helpers.URL, only: [prefix_url: 2]
   import CodeCorps.Validators.SlugValidator
+  import Ecto.Query, only: [where: 3]
 
+  alias CodeCorps.{Category, Repo, Skill, TaskList}
   alias CodeCorps.Services.MarkdownRendererService
-  alias CodeCorps.TaskList
 
   alias Ecto.Changeset
 
@@ -42,10 +43,11 @@ defmodule CodeCorps.Project do
     has_many :task_lists, CodeCorps.TaskList
     has_many :tasks, CodeCorps.Task
 
-    has_many :categories, through: [:project_categories, :category]
-    has_many :skills, through: [:project_skills, :skill]
     has_many :stripe_connect_subscriptions, through: [:stripe_connect_plan, :stripe_connect_subscriptions]
 
+    many_to_many :categories, CodeCorps.Category, join_through: CodeCorps.ProjectCategory
+    many_to_many :skills, CodeCorps.Skill, join_through: CodeCorps.ProjectSkill
+
     timestamps()
   end
 
@@ -54,7 +56,7 @@ defmodule CodeCorps.Project do
     |> cast(params, [:title, :description, :long_description_markdown, :cloudinary_public_id, :default_color, :website])
     |> prefix_url(:website)
     |> validate_format(:website, CodeCorps.Helpers.URL.valid_format())
-    |> validate_required(:title)
+    |> validate_required([:title])
     |> generate_slug(:title, :slug)
     |> validate_slug(:slug)
     |> unique_constraint(:slug, name: :index_projects_on_slug)
@@ -71,12 +73,45 @@ defmodule CodeCorps.Project do
     struct
     |> changeset(params)
     |> cast(params, [:organization_id])
+    |> validate_required([:cloudinary_public_id, :description])
+    |> associate_categories(params)
+    |> validate_length(:categories, min: 1)
+    |> associate_skills(params)
+    |> validate_length(:skills, min: 1)
     |> put_assoc(:task_lists, TaskList.default_task_lists())
     |> put_member_assoc()
     |> generate_icon_color(:default_color)
     |> assoc_constraint(:organization)
   end
 
+  defp associate_categories(changeset, %{"categories_ids" => ids}) when is_list(ids) when length(ids) > 0 do
+    categories = ids |> Enum.map(&String.to_integer/1) |> find_categories()
+    changeset |> put_assoc(:categories, categories)
+  end
+  defp associate_categories(changeset, _) do
+    changeset |> put_assoc(:categories, [])
+  end
+
+  defp find_categories(ids) do
+    Category
+    |> where([object], object.id in ^ids)
+    |> Repo.all()
+  end
+
+  defp associate_skills(changeset, %{"skills_ids" => ids}) when is_list(ids) when length(ids) > 0 do
+    skills = ids |> Enum.map(&String.to_integer/1) |> find_skills()
+    changeset |> put_assoc(:skills, skills)
+  end
+  defp associate_skills(changeset, _) do
+    changeset |> put_assoc(:skills, [])
+  end
+
+  defp find_skills(ids) do
+    Skill
+    |> where([object], object.id in ^ids)
+    |> Repo.all()
+  end
+
   @doc """
   Builds a changeset for updating a project.
   """
diff --git a/lib/code_corps_web/controllers/project_controller.ex b/lib/code_corps_web/controllers/project_controller.ex
@@ -46,8 +46,8 @@ defmodule CodeCorpsWeb.ProjectController do
 
   @preloads [
     :categories, :donation_goals, :github_repos,
-    [organization: :stripe_connect_account],
-    :project_categories, :project_skills, :project_users, :stripe_connect_plan,
+    [organization: :stripe_connect_account], :project_categories,
+    :project_skills, :project_users, :skills, :stripe_connect_plan,
     :task_lists, :tasks
   ]
 
diff --git a/lib/code_corps_web/views/project_view.ex b/lib/code_corps_web/views/project_view.ex
@@ -23,6 +23,7 @@ defmodule CodeCorpsWeb.ProjectView do
   has_many :project_categories, serializer: CodeCorpsWeb.ProjectCategoryView, identifiers: :always
   has_many :project_skills, serializer: CodeCorpsWeb.ProjectSkillView, identifiers: :always
   has_many :project_users, serializer: CodeCorpsWeb.ProjectUserView, identifiers: :always
+  has_many :skills, serializer: CodeCorpsWeb.SkillView, identifiers: :always
   has_many :tasks, serializer: CodeCorpsWeb.TaskView, identifiers: :always
   has_many :task_lists, serializer: CodeCorpsWeb.TaskListView, identifiers: :always
 
diff --git a/test/lib/code_corps/model/project_test.exs b/test/lib/code_corps/model/project_test.exs
@@ -83,8 +83,17 @@ defmodule CodeCorps.ProjectTest do
 
   describe "create_changeset/3" do
     test "with valid attributes" do
+      category = insert(:category)
+      skill = insert(:skill)
       organization = insert(:organization)
-      attrs = %{title: "A title", organization_id: organization.id}
+      attrs = %{
+        "categories_ids" => [category.id |> Integer.to_string()],
+        "cloudinary_public_id" => "foo123",
+        "description" => "Description",
+        "skills_ids" => [skill.id |> Integer.to_string()],
+        "title" => "A title",
+        "organization_id" => organization.id
+      }
       changeset = create_changeset(%Project{}, attrs)
       assert changeset.valid?
     end
@@ -95,7 +104,16 @@ defmodule CodeCorps.ProjectTest do
     end
 
     test "casts :organization_id and ensures organization exists" do
-      attrs = %{title: "A title", organization_id: -1}
+      category = insert(:category)
+      skill = insert(:skill)
+      attrs = %{
+        "categories_ids" => [category.id |> Integer.to_string()],
+        "cloudinary_public_id" => "foo123",
+        "description" => "Description",
+        "skills_ids" => [skill.id |> Integer.to_string()],
+        "title" => "A title",
+        "organization_id" => -1
+      }
       changeset = create_changeset(%Project{}, attrs)
 
       assert {:error, failed_insert_changeset} = changeset |> Repo.insert()
@@ -105,8 +123,17 @@ defmodule CodeCorps.ProjectTest do
     end
 
     test "casts and inserts proper associated records" do
+      category = insert(:category)
+      skill = insert(:skill)
       organization = insert(:organization)
-      attrs = %{title: "A title", organization_id: organization.id}
+      attrs = %{
+        "categories_ids" => [category.id |> Integer.to_string()],
+        "cloudinary_public_id" => "foo123",
+        "description" => "Description",
+        "skills_ids" => [skill.id |> Integer.to_string()],
+        "title" => "A title",
+        "organization_id" => organization.id
+      }
       changeset = Project.create_changeset(%Project{}, attrs)
 
       {_, project} = Repo.insert(changeset)
diff --git a/test/lib/code_corps_web/controllers/project_controller_test.exs b/test/lib/code_corps_web/controllers/project_controller_test.exs
@@ -3,7 +3,11 @@ defmodule CodeCorpsWeb.ProjectControllerTest do
 
   use CodeCorpsWeb.ApiCase, resource_name: :project
 
-  @valid_attrs %{title: "Valid project"}
+  @valid_attrs %{
+    cloudinary_public_id: "foo123",
+    description: "Valid description",
+    title: "Valid project"
+  }
   @invalid_attrs %{title: ""}
 
   describe "index" do
@@ -83,8 +87,17 @@ defmodule CodeCorpsWeb.ProjectControllerTest do
   describe "create" do
     @tag :authenticated
     test "creates and renders resource when attributes are valid", %{conn: conn, current_user: current_user} do
+      category = insert(:category)
       organization = insert(:organization, owner: current_user)
-      attrs = @valid_attrs |> Map.merge(%{organization: organization})
+      skill = insert(:skill)
+
+      params = %{
+        categories: [category],
+        organization: organization,
+        skills: [skill]
+      }
+
+      attrs = @valid_attrs |> Map.merge(params)
       response = conn |> request_create(attrs)
       assert %{assigns: %{data: %{task_lists: [_inbox, _backlog, _in_progress, _done]}}} = response
       assert response |> json_response(201)
diff --git a/test/lib/code_corps_web/views/project_view_test.exs b/test/lib/code_corps_web/views/project_view_test.exs
@@ -8,7 +8,8 @@ defmodule CodeCorpsWeb.ProjectViewTest do
     donation_goal = insert(:donation_goal, project: project)
     project_category = insert(:project_category, project: project)
     github_repo = insert(:github_repo, project: project)
-    project_skill = insert(:project_skill, project: project)
+    skill = insert(:skill)
+    project_skill = insert(:project_skill, project: project, skill: skill)
     project_user = insert(:project_user, project: project)
     stripe_connect_plan = insert(:stripe_connect_plan, project: project)
     task_list = insert(:task_list, project: project)
@@ -87,6 +88,14 @@ defmodule CodeCorpsWeb.ProjectViewTest do
               %{"id" => project_user.id |> Integer.to_string, "type" => "project-user"}
             ]
           },
+          "skills" => %{
+            "data" => [
+              %{
+                "id" => skill.id |> Integer.to_string,
+                "type" => "skill"
+              }
+            ]
+          },
           "stripe-connect-plan" => %{
             "data" => %{
               "id" => stripe_connect_plan.id |> Integer.to_string,
diff --git a/test/support/json_api_helpers.ex b/test/support/json_api_helpers.ex
@@ -23,6 +23,7 @@ defmodule CodeCorps.JsonAPIHelpers do
 
   @spec attribute?(tuple) :: boolean
   defp attribute?({_key, %DateTime{} = _val}), do: true
+  defp attribute?({_key, val}) when is_list(val), do: false
   defp attribute?({_key, val}) when is_map(val), do: false
   defp attribute?({_key, _val}), do: true
 
@@ -31,23 +32,28 @@ defmodule CodeCorps.JsonAPIHelpers do
     attrs |> Map.put(key |> Atom.to_string, value)
   end
 
-  @spec build_relationships(map) :: map
+  @spec build_relationships(list | map) :: map
   defp build_relationships(%{} = attrs) do
     attrs
     |> Enum.filter(&relationship?(&1))
     |> Enum.reduce(%{}, &add_relationship(&1, &2))
   end
 
   @spec relationship?(any) :: boolean
-  defp relationship?(tupple), do: !attribute?(tupple)
+  defp relationship?(tuple), do: !attribute?(tuple)
 
-  @spec add_attribute(tuple, map) :: map
+  @spec add_relationship(tuple, map) :: map
+  defp add_relationship({_, []}, %{} = rels), do: rels
+  defp add_relationship({atom_key, list}, %{} = rels) when is_list(list) do
+    string_key = atom_key |> Atom.to_string
+    items = list |> Enum.map(&resource_identifier_from_record(&1))
+    rels |> Map.put(string_key, %{"data" => items})
+  end
   defp add_relationship({atom_key, record}, %{} = rels) do
-    with id <- record.id |> to_correct_type(),
-         type <- record |> model_name_as_string(),
+    with resource_identifier <- record |> resource_identifier_from_record(),
          string_key = atom_key |> Atom.to_string
     do
-      rels |> Map.put(string_key, %{"data" => %{"id" => id, "type" => type}})
+      rels |> Map.put(string_key, %{"data" => resource_identifier})
     end
   end
 
@@ -62,4 +68,11 @@ defmodule CodeCorps.JsonAPIHelpers do
   @spec to_correct_type(any) :: any
   defp to_correct_type(value) when is_integer(value), do: value |> Integer.to_string
   defp to_correct_type(value), do: value
+
+  defp resource_identifier_from_record(record) do
+    %{
+      "id" => record.id |> to_correct_type(),
+      "type" => record |> model_name_as_string()
+    }
+  end
 end

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ defmodule CodeCorpsWeb.ProjectController do`
`46`	`46`
`47`	`47`	`@preloads [`
`48`	`48`	`:categories, :donation_goals, :github_repos,`
`49`		`- [organization: :stripe_connect_account],`
`50`		`- :project_categories, :project_skills, :project_users, :stripe_connect_plan,`
	`49`	`+ [organization: :stripe_connect_account], :project_categories,`
	`50`	`+ :project_skills, :project_users, :skills, :stripe_connect_plan,`
`51`	`51`	`:task_lists, :tasks`
`52`	`52`	`]`
`53`	`53`