Merge pull request #697 from code-corps/fix-user-tasks

Fix user tasks

Author: joshsmith

test/views/task_view_test.exs

@@ -5,6 +5,7 @@ defmodule CodeCorps.TaskViewTest do
     task = insert(:task, order: 1000)
     comment = insert(:comment, task: task)
     task_skill = insert(:task_skill, task: task)
+    user_task = insert(:user_task, task: task)
 
     rendered_json =  render(CodeCorps.TaskView, "show.json-api", data: task)
 
@@ -52,6 +53,12 @@ defmodule CodeCorps.TaskViewTest do
               "type" => "user"
             }
           },
+          "user-task" => %{
+            "data" => %{
+              "id" => user_task.id |> Integer.to_string,
+              "type" => "user-task"
+            }
+          },
           "task-list" => %{
             "data" => %{
               "id" => task.task_list_id |> Integer.to_string,

web/models/task.ex

@@ -23,6 +23,8 @@ defmodule CodeCorps.Task do
     belongs_to :task_list, CodeCorps.TaskList
     belongs_to :user, CodeCorps.User
 
+    has_one :user_task, CodeCorps.UserTask
+
     has_many :comments, CodeCorps.Comment
     has_many :task_skills, CodeCorps.TaskSkill
 

web/models/user_task.ex

@@ -8,8 +8,8 @@ defmodule CodeCorps.UserTask do
   @type t :: %__MODULE__{}
 
   schema "user_tasks" do
-    belongs_to :user, CodeCorps.Skill
     belongs_to :task, CodeCorps.Task
+    belongs_to :user, CodeCorps.User
 
     timestamps()
   end

web/views/task_view.ex

@@ -1,14 +1,15 @@
 defmodule CodeCorps.TaskView do
   use CodeCorps.PreloadHelpers,
-      default_preloads: [:project, :user, :task_list, :task_skills, :comments]
+      default_preloads: [:project, :user, :task_list, :task_skills, :comments, :user_task]
   use CodeCorps.Web, :view
   use JaSerializer.PhoenixView
 
   attributes [:body, :markdown, :number, :task_type, :status, :state, :title, :order, :inserted_at, :updated_at]
 
   has_one :project, serializer: CodeCorps.ProjectView
-  has_one :user, serializer: CodeCorps.UserView
   has_one :task_list, serializer: CodeCorps.TaskListView
+  has_one :user, serializer: CodeCorps.UserView
+  has_one :user_task, serializer: CodeCorps.UserTaskView, identifiers: :always
 
   has_many :comments, serializer: CodeCorps.CommentView, identifiers: :always
   has_many :task_skills, serializer: CodeCorps.TaskSkillView, identifiers: :always