Merge pull request code-corps#310 from mitchellhenke/not_null_constraints

joshsmith · web-flow · commit 7f985d2b2387 · 2016-10-03T16:23:38.000-07:00
Not null constraints
diff --git a/priv/repo/migrations/20161003185918_add_not_null_constraints.exs b/priv/repo/migrations/20161003185918_add_not_null_constraints.exs
@@ -0,0 +1,31 @@
+defmodule CodeCorps.Repo.Migrations.AddNotNullConstraints do
+  use Ecto.Migration
+
+  def up do
+    execute "ALTER TABLE comments ALTER COLUMN user_id SET NOT NULL, ALTER COLUMN task_id SET NOT NULL"
+    execute "ALTER TABLE organizations ALTER COLUMN name SET NOT NULL, ALTER COLUMN description SET NOT NULL, ALTER COLUMN slug SET NOT NULL"
+    execute "ALTER TABLE previews ALTER COLUMN user_id SET NOT NULL"
+    execute "ALTER TABLE project_skills ALTER COLUMN project_id SET NOT NULL, ALTER COLUMN skill_id SET NOT NULL"
+    execute "ALTER TABLE projects ALTER COLUMN organization_id SET NOT NULL"
+    execute "ALTER TABLE role_skills ALTER COLUMN role_id SET NOT NULL, ALTER COLUMN skill_id SET NOT NULL"
+    execute "ALTER TABLE slugged_routes ALTER COLUMN slug SET NOT NULL"
+    execute "ALTER TABLE tasks ALTER COLUMN title SET NOT NULL, ALTER COLUMN state SET NOT NULL"
+    execute "ALTER TABLE user_categories ALTER COLUMN user_id SET NOT NULL, ALTER COLUMN category_id SET NOT NULL"
+    execute "ALTER TABLE user_roles ALTER COLUMN user_id SET NOT NULL, ALTER COLUMN role_id SET NOT NULL"
+    execute "ALTER TABLE user_skills ALTER COLUMN user_id SET NOT NULL, ALTER COLUMN skill_id SET NOT NULL"
+  end
+
+  def down do
+    execute "ALTER TABLE comments ALTER COLUMN user_id DROP NOT NULL, ALTER COLUMN task_id DROP NOT NULL"
+    execute "ALTER TABLE organizations ALTER COLUMN name DROP NOT NULL, ALTER COLUMN description DROP NOT NULL, ALTER COLUMN slug DROP NOT NULL"
+    execute "ALTER TABLE previews ALTER COLUMN user_id DROP NOT NULL"
+    execute "ALTER TABLE project_skills ALTER COLUMN project_id DROP NOT NULL, ALTER COLUMN skill_id DROP NOT NULL"
+    execute "ALTER TABLE projects ALTER COLUMN organization_id DROP NOT NULL"
+    execute "ALTER TABLE role_skills ALTER COLUMN role_id DROP NOT NULL, ALTER COLUMN skill_id DROP NOT NULL"
+    execute "ALTER TABLE slugged_routes ALTER COLUMN slug DROP NOT NULL"
+    execute "ALTER TABLE tasks ALTER COLUMN title DROP NOT NULL, ALTER COLUMN state DROP NOT NULL"
+    execute "ALTER TABLE tasks ALTER COLUMN user_id DROP NOT NULL, ALTER COLUMN category_id DROP NOT NULL"
+    execute "ALTER TABLE user_roles ALTER COLUMN user_id DROP NOT NULL, ALTER COLUMN role_id DROP NOT NULL"
+    execute "ALTER TABLE user_skills ALTER COLUMN user_id DROP NOT NULL, ALTER COLUMN skill_id DROP NOT NULL"
+  end
+end
diff --git a/test/controllers/project_skill_controller_test.exs b/test/controllers/project_skill_controller_test.exs
@@ -125,7 +125,7 @@ defmodule CodeCorps.ProjectSkillControllerTest do
   describe "delete" do
     @tag authenticated: :admin
     test "deletes chosen resource", %{conn: conn} do
-      project_skill = Repo.insert! %ProjectSkill{}
+      project_skill = insert(:project_skill)
       path = conn |> project_skill_path(:delete, project_skill)
       assert conn |> delete(path) |> response(204)
       refute Repo.get(ProjectSkill, project_skill.id)
diff --git a/test/models/project_test.exs b/test/models/project_test.exs
@@ -49,8 +49,8 @@ defmodule CodeCorps.ProjectTest do
     end
 
     test "validates slug is unique" do
-      insert(:project, slug: "used-slug")
-      changeset = Project.changeset(%Project{}, %{title: "Used Slug"})
+      project = insert(:project, slug: "used-slug")
+      changeset = Project.changeset(%Project{organization_id: project.organization_id}, %{title: "Used Slug"})
 
       {result, changeset} = Repo.insert(changeset)
       {message, _} = changeset.errors[:slug]
diff --git a/test/support/factories.ex b/test/support/factories.ex
@@ -22,6 +22,7 @@ defmodule CodeCorps.Factories do
   def organization_factory do
     %CodeCorps.Organization{
       name: sequence(:username, &"Organization #{&1}"),
+      slug: sequence(:slug, &"organization-#{&1}"),
       description: sequence(:email, &"Description of organization #{&1}"),
     }
   end

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ defmodule CodeCorps.Factories do`
`22`	`22`	`def organization_factory do`
`23`	`23`	`%CodeCorps.Organization{`
`24`	`24`	`name: sequence(:username, &"Organization #{&1}"),`
	`25`	`+ slug: sequence(:slug, &"organization-#{&1}"),`
`25`	`26`	`description: sequence(:email, &"Description of organization #{&1}"),`
`26`	`27`	`}`
`27`	`28`	`end`