tryign to reset views

Author: snewcomer

lib/code_corps_web/views/comment_view.ex

@@ -2,7 +2,6 @@ defmodule CodeCorpsWeb.CommentView do
   @moduledoc false
   use CodeCorpsWeb, :view
   use JaSerializer.PhoenixView
-  use JSONAPI.View, type: "comment"
 
   attributes [
     :body, :created_at, :created_from, :inserted_at, :markdown, :modified_at,

lib/code_corps_web/views/project_view.ex

@@ -5,15 +5,6 @@ defmodule CodeCorpsWeb.ProjectView do
 
   use CodeCorpsWeb, :view
   use JaSerializer.PhoenixView
-  use JSONAPI.View, type: "project"
-
-  def fields do
-    [:approved, :can_activate_donations, :cloudinary_public_id,
-    :description, :donations_active, :icon_thumb_url,
-    :icon_large_url, :inserted_at, :long_description_body,
-    :long_description_markdown, :should_link_externally, :slug, :title,
-    :total_monthly_donated, :updated_at, :website]
-  end
 
   attributes [
   	:approval_requested,

lib/code_corps_web/views/task_list_view.ex

@@ -15,7 +15,7 @@ defmodule CodeCorpsWeb.TaskListView do
 
   def fields, do: [:done, :inbox, :name, :order, :pull_requests, :inserted_at, :updated_at]
 
-  def relationships do
-    [project: ProjectView, tasks: TaskView]
-  end
+  # def relationships do
+  #   [project: ProjectView, tasks: TaskView]
+  # end
 end

lib/code_corps_web/views/task_view.ex

@@ -1,39 +1,39 @@
 defmodule CodeCorpsWeb.TaskView do
   @moduledoc false
   use CodeCorpsWeb, :view
-  use JSONAPI.View, type: "task"
+  use JaSerializer.PhoenixView
 
-  alias CodeCorpsWeb.{GithubIssueView, GithubPullRequestView, GithubRepoView, ProjectView,
-    TaskListView, UserView, UserTaskView, CommentView, TaskSkillView}
+  attributes [
+    :archived, :body, :created_at, :created_from, :has_github_pull_request,
+    :inserted_at, :markdown, :modified_at, :modified_from, :number, :order,
+    :overall_status, :status, :title, :updated_at
+  ]
 
-  def fields do
-    [:archived, :body, :created_at, :created_from, :inserted_at, :markdown,
-    :modified_at, :modified_from, :number, :order, :status, :title, :updated_at]
-  end
-
-  def relationships do
-    [comments: CommentView, task_skills: TaskSkillView]
-  end
+  has_one :github_issue, type: "github-issue", field: :github_issue_id
+  has_one :github_pull_request, serializer: CodeCorpsWeb.GithubPullRequestView, identifiers: :always
+  has_one :github_repo, type: "github-repo", field: :github_repo_id
+  has_one :project, type: "project", field: :project_id
+  has_one :task_list, type: "task-list", field: :task_list_id
+  has_one :user, type: "user", field: :user_id
+  has_one :user_task, serializer: CodeCorpsWeb.UserTaskView, identifiers: :always
 
-# <<<<<<< HEAD
-#   has_many :comments, serializer: CodeCorpsWeb.CommentView, identifiers: :always
-#   has_many :task_skills, serializer: CodeCorpsWeb.TaskSkillView, identifiers: :always
+  has_many :comments, serializer: CodeCorpsWeb.CommentView, identifiers: :always
+  has_many :task_skills, serializer: CodeCorpsWeb.TaskSkillView, identifiers: :always
 
-#   def has_github_pull_request(%{
-#     github_pull_request: %CodeCorps.GithubPullRequest{}
-#   }), do: true
-#   def has_github_pull_request(%{github_pull_request: nil}), do: false
+  def has_github_pull_request(%{
+    github_pull_request: %CodeCorps.GithubPullRequest{}
+  }), do: true
+  def has_github_pull_request(%{github_pull_request: nil}), do: false
 
-#   def overall_status(%{
-#     github_pull_request: %CodeCorps.GithubPullRequest{merged: merged, state: state}
-#   }, _conn) do
-#     case merged do
-#       true -> "merged"
-#       false -> state
-#     end
-#   end
-#   def overall_status(%{github_pull_request: nil, status: status}, _conn) do
-#     status
-#   end
-# =======
-end
+  def overall_status(%{
+    github_pull_request: %CodeCorps.GithubPullRequest{merged: merged, state: state}
+  }, _conn) do
+    case merged do
+      true -> "merged"
+      false -> state
+    end
+  end
+  def overall_status(%{github_pull_request: nil, status: status}, _conn) do
+    status
+  end
+end

test/lib/code_corps_web/views/task_list_view_test.exs

@@ -1,6 +1,7 @@
 defmodule CodeCorpsWeb.TaskListViewTest do
   use CodeCorpsWeb.ViewCase
 
+  @tag :wip
   test "renders all attributes and relationships properly" do
     project = insert(:project)
     task_list = insert(:task_list, order: 1000, project: project)