diff --git a/app/controllers/api/v1/tickets_controller.rb b/app/controllers/api/v1/tickets_controller.rb index 90b3126..058428d 100644 --- a/app/controllers/api/v1/tickets_controller.rb +++ b/app/controllers/api/v1/tickets_controller.rb @@ -51,7 +51,7 @@ def show private def update_params - params.require(:ticket).permit(:status, :category_id, :department_id, :resolver_id, :reason_for_update).merge(id: params[:id]) + params.require(:ticket).permit(:status, :category_id, :department_id, :resolver_id, :reason_for_update, :eta).merge(id: params[:id]) end def ticket_params diff --git a/app/serializers/ticket_serializer.rb b/app/serializers/ticket_serializer.rb index 9b8cc7f..c9c3537 100644 --- a/app/serializers/ticket_serializer.rb +++ b/app/serializers/ticket_serializer.rb @@ -1,7 +1,7 @@ class TicketSerializer < ActiveModel::Serializer attributes :id, :title, :description, :ticket_number, :status, :priority, :reason_for_update, :ticket_type, :resolved_at, :created_at, :category, :category_id, :department, :department_id, - :resolver, :resolver_id, :requester, :requester_id, :updated_at, :permited_transitions + :resolver, :resolver_id, :requester, :requester_id, :updated_at, :permited_transitions, :eta def category diff --git a/db/migrate/20221206095309_add_eta_to_tickets.rb b/db/migrate/20221206095309_add_eta_to_tickets.rb new file mode 100644 index 0000000..21e1f05 --- /dev/null +++ b/db/migrate/20221206095309_add_eta_to_tickets.rb @@ -0,0 +1,5 @@ +class AddEtaToTickets < ActiveRecord::Migration[6.1] + def change + add_column :tickets, :eta, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index 53b107f..5adfd00 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2022_11_10_074726) do +ActiveRecord::Schema.define(version: 2022_12_06_095309) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -19,7 +19,7 @@ t.string "assigned_from", null: false t.string "assigned_to", null: false t.string "description" - t.string "asset_url" + t.string "asset_url", default: [], array: true t.integer "current_ticket_status", default: 0 t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false @@ -97,6 +97,8 @@ t.datetime "updated_at", precision: 6, null: false t.integer "organization_id" t.string "reason_for_update" + t.string "asset_url", default: [], array: true + t.date "eta" t.index ["category_id"], name: "index_tickets_on_category_id" t.index ["department_id"], name: "index_tickets_on_department_id" t.index ["requester_id"], name: "index_tickets_on_requester_id"