Merge pull request #746 from code-corps/add-approved-to-projects-index

Add approved to projects index

Author: joshsmith

lib/code_corps/helpers/query.ex

@@ -7,6 +7,14 @@ defmodule CodeCorps.Helpers.Query do
     query |> where([object], object.id in ^ids)
   end
 
+  # project queries
+
+  def approved_filter(query, approved) do
+    query |> where([object], object.approved == ^approved)
+  end
+
+  # end project queries
+
   # skill queries
 
   def limit_filter(query, %{"limit" => count}) do

test/controllers/project_controller_test.exs

@@ -5,8 +5,9 @@ defmodule CodeCorps.ProjectControllerTest do
   @invalid_attrs %{title: ""}
 
   describe "index" do
-    test "lists all entries on index", %{conn: conn} do
-      [project_1, project_2] = insert_pair(:project)
+    test "lists all approved entries on index", %{conn: conn} do
+      [project_1, project_2] = insert_pair(:project, approved: true)
+      insert(:project, approved: false)
 
       conn
       |> request_index

test/support/factories.ex

@@ -75,11 +75,13 @@ defmodule CodeCorps.Factories do
 
   def project_factory do
     %CodeCorps.Project{
-      title: sequence(:title, &"Project #{&1}"),
+      approved: true,
       slug: sequence(:slug, &"project-#{&1}"),
+      title: sequence(:title, &"Project #{&1}"),
+      website: sequence(:website, &"http://test-#{&1}.com"),
+
       organization: build(:organization),
-      owner: build(:user),
-      website: sequence(:website, &"http://test-#{&1}.com")
+      owner: build(:user)
     }
   end
 

test/views/project_view_test.exs

@@ -4,7 +4,7 @@ defmodule CodeCorps.ProjectViewTest do
   test "renders all attributes and relationships properly" do
     user = insert(:user)
     organization = insert(:organization)
-    project = insert(:project, organization: organization, owner: user, total_monthly_donated: 5000, default_color: "blue")
+    project = insert(:project, organization: organization, owner: user, total_monthly_donated: 5000, default_color: "blue", approved: true)
 
     donation_goal = insert(:donation_goal, project: project)
     project_category = insert(:project_category, project: project)
@@ -21,6 +21,7 @@ defmodule CodeCorps.ProjectViewTest do
     expected_json = %{
       "data" => %{
         "attributes" => %{
+          "approved" => true,
           "can-activate-donations" => false,
           "cloudinary-public-id" => nil,
           "description" => project.description,

web/controllers/project_controller.ex

@@ -2,7 +2,7 @@ defmodule CodeCorps.ProjectController do
   use CodeCorps.Web, :controller
   use JaResource
 
-  import CodeCorps.Helpers.Query, only: [slug_finder: 2]
+  import CodeCorps.Helpers.Query, only: [approved_filter: 2, slug_finder: 2]
 
   alias CodeCorps.Project
 
@@ -21,7 +21,10 @@ defmodule CodeCorps.ProjectController do
     Project
     |> Repo.all(organization_id: slugged_route.organization_id)
   end
-  def handle_index(_conn, _params), do: Project
+  def handle_index(_conn, _params) do
+    Project
+    |> approved_filter(true)
+  end
 
   def handle_create(_conn, attributes) do
     %Project{} |> Project.create_changeset(attributes)

web/views/project_view.ex

@@ -12,11 +12,11 @@ defmodule CodeCorps.ProjectView do
   use JaSerializer.PhoenixView
 
   attributes [
-  	:slug, :title, :can_activate_donations, :cloudinary_public_id,
+  	:approved, :can_activate_donations, :cloudinary_public_id,
     :description, :donations_active, :icon_thumb_url,
-    :icon_large_url, :long_description_body, :long_description_markdown,
-  	:inserted_at, :should_link_externally, :total_monthly_donated, :updated_at,
-    :website
+    :icon_large_url, :inserted_at, :long_description_body,
+    :long_description_markdown, :should_link_externally, :slug, :title,
+    :total_monthly_donated, :updated_at, :website
   ]
 
   has_one :organization, serializer: CodeCorps.OrganizationView