model: changement majeur des données de Task

app/controllers/api/v1/tasks_controller.rb

@@ -22,7 +22,7 @@ class Api::V1::TasksController < ApplicationController
       render json: TaskSerializer.new(task).serializable_hash.to_json,
       status: :created
     else
-      render json: { errors: activity.errors }, status: :unprocessable_entity
+      render json: { errors: task.errors }, status: :unprocessable_entity
     end
   end
 
@@ -42,7 +42,7 @@ class Api::V1::TasksController < ApplicationController
   private
 
   def task_params
-    params.require(:task).permit(:name, :description, :duration, :activity_id, :created_at, :updated_at)
+    params.require(:task).permit(:name, :description, :start_time, :end_time, :is_paid, :paid_by, :owner_id, :activity_id)
   end
 
   def set_task
@@ -50,6 +50,6 @@ class Api::V1::TasksController < ApplicationController
   end
 
   def check_owner
-    head :forbidden unless @task.user_id === current_user.id
+    head :forbidden unless @task.owner_id === current_user.id
   end
 end

app/models/task.rb

@@ -1,7 +1,9 @@
 class Task < ApplicationRecord
   validates :name, presence: true
-  validates :user, presence: true
+  validates :owner, presence: true
+  validates :activity, presence: true
+  validates :start_time, presence: true
 
   belongs_to :activity
-  belongs_to :user
+  belongs_to :owner, class_name: "User"
 end

app/models/user.rb

@@ -9,7 +9,7 @@ class User < ApplicationRecord
   has_many :joined_user_activities
   has_many :activities, :through => :joined_user_activities
 
-  has_many :tasks
+  has_many :tasks, foreign_key: 'owner_id', class_name: 'Task'
   
   has_many :memberships, foreign_key: :member_id
   has_many :teams, through: :memberships

app/serializers/task_serializer.rb

@@ -1,6 +1,6 @@
 class TaskSerializer
   include JSONAPI::Serializer
-  attributes :name, :description, :duration, :user_id, :activity_id, :created_at, :updated_at
+  attributes :name, :description, :start_time, :end_time, :is_paid, :paid_by_id, :owner_id, :activity_id
 
   cache_options store: Rails.cache, namespace: 'jsonapi-serializer', expires_in: 1.hour
 end

db/migrate/20210510133939_create_tasks.rb

@@ -4,9 +4,12 @@ class CreateTasks < ActiveRecord::Migration[6.1]
       t.string :name, null: false
       t.index :name
       t.text :description
-      t.integer :duration
+      t.datetime :start_time, null: false
+      t.datetime :end_time, default: nil
+      t.boolean :is_paid, default: false
+      t.references :paid_by, default: nil
       t.references :activity, null: false
-      t.references :user, null: false
+      t.references :owner, null: false
 
       t.timestamps
     end

db/schema.rb

@@ -48,14 +48,18 @@ ActiveRecord::Schema.define(version: 2021_08_03_152520) do
   create_table "tasks", force: :cascade do |t|
     t.string "name", null: false
     t.text "description"
-    t.integer "duration"
+    t.datetime "start_time", null: false
+    t.datetime "end_time"
+    t.boolean "is_paid", default: false
+    t.bigint "paid_by_id"
     t.bigint "activity_id", null: false
-    t.bigint "user_id", null: false
+    t.bigint "owner_id", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.index ["activity_id"], name: "index_tasks_on_activity_id"
     t.index ["name"], name: "index_tasks_on_name"
-    t.index ["user_id"], name: "index_tasks_on_user_id"
+    t.index ["owner_id"], name: "index_tasks_on_owner_id"
+    t.index ["paid_by_id"], name: "index_tasks_on_paid_by_id"
   end
 
   create_table "teams", force: :cascade do |t|

db/seeds.rb

@@ -48,12 +48,13 @@ end
 User.create(username: "admin", email: "admin@email.com", password: "azerty", is_admin: true)
 puts "Created Admin"
 
-30.times do |i|
+60.times do |i|
   task = Task.create(
-    name: Faker::Fantasy::Tolkien.character,
+    name: Faker::Verb.ing_form,
     description: Faker::Fantasy::Tolkien.poem,
-    duration: rand(1..120),
-    user_id: User.all.sample.id,
+    start_time: Faker::Time.between(from: DateTime.now - 1, to: DateTime.now),
+    end_time: Faker::Time.between(from: DateTime.now + 1, to: DateTime.now + 5),
+    owner_id: User.all.sample.id,
     activity_id: Activity.all.sample.id
   )
   puts "Created TASK ##{i+1} - #{task.name}"

test/controllers/api/v1/tasks_controller_test.rb

@@ -30,7 +30,7 @@ class Api::V1::TasksControllerTest < ActionDispatch::IntegrationTest
 
     json_response = JSON.parse(self.response.body)
     assert_equal @task.name, json_response['data']['attributes']['name']
-    assert_equal @task.user_id, json_response['data']['attributes']['user_id']
+    assert_equal @task.owner_id, json_response['data']['attributes']['owner_id']
     assert_equal @task.activity_id, json_response['data']['attributes']['activity_id']
   end
 
@@ -44,7 +44,7 @@ class Api::V1::TasksControllerTest < ActionDispatch::IntegrationTest
   test "should create task" do
     assert_difference("Task.count") do
       post api_v1_activity_tasks_url(@activity),
-      params: { task: { name: @task.name, description: @task.description, user_id: @user, activity_id: @activity } },
+      params: { task: { name: @task.name, description: @task.description, owner_id: @user, activity_id: @activity, start_time: DateTime.now } },
       headers: { Authorization: JsonWebToken.encode(user_id: @user.id) },
       as: :json
     end
@@ -54,7 +54,7 @@ class Api::V1::TasksControllerTest < ActionDispatch::IntegrationTest
   test "should not create task" do
     assert_no_difference("Task.count") do
       post api_v1_activity_tasks_url(@activity),
-      params: { task: { name: @task.name, description: @task.description, user_id: @user, activity_id: @activity } },
+      params: { task: { name: @task.name, description: @task.description, owner_id: @user, activity_id: @activity } },
       as: :json
     end
     assert_response :forbidden

test/fixtures/tasks.yml

@@ -3,6 +3,8 @@
 one:
   name: Do something
   description: Description of a task
-  duration: 60
-  user: one
-  activity: one
+  start_time: <%= DateTime.now - 1%>
+  end_time: <%= DateTime.now +1 %>
+  is_paid: false
+  owner: one
+  activity: one

test/models/task_test.rb

@@ -7,7 +7,7 @@ class TaskTest < ActiveSupport::TestCase
   end
 
   test "task should be valid" do
-    task = Task.new(name: "Write", description: "Write a new line", user_id: @user.id, activity_id: @activity.id)
+    task = Task.new(name: "Write", description: "Write a new line", owner_id: @user.id, activity_id: @activity.id, start_time: DateTime.now)
     assert task.valid?
   end