diff --git a/app/controllers/dunlop/user_filters_controller.rb b/app/controllers/dunlop/user_filters_controller.rb index 2a302c7..7875cba 100644 --- a/app/controllers/dunlop/user_filters_controller.rb +++ b/app/controllers/dunlop/user_filters_controller.rb @@ -9,7 +9,7 @@ class Dunlop::UserFiltersController < Dunlop::ApplicationController end def permitted_params - [:scope_key, :is_default, filters: {}] + [:name, :description, :scope_key, :is_default, filters: {}] # user is ALWAYS current_user (until it is not :O) end def check_current_user diff --git a/app/serializers/dunlop/user_filter_serializer.rb b/app/serializers/dunlop/user_filter_serializer.rb index ea72e84..46c0cf7 100644 --- a/app/serializers/dunlop/user_filter_serializer.rb +++ b/app/serializers/dunlop/user_filter_serializer.rb @@ -2,6 +2,8 @@ module Dunlop class UserFilterSerializer < ActiveModel::Serializer # manual key transform to preserve filters lowercases type 'dunlop/user-filter' + attribute :name + attribute :description attribute :scope_key, key: 'scope-key' attribute :filters attribute :is_default, key: 'is-default' diff --git a/db/migrate/20181128144538_add_name_to_dunlop_user_filters.rb b/db/migrate/20181128144538_add_name_to_dunlop_user_filters.rb new file mode 100644 index 0000000..eb3931d --- /dev/null +++ b/db/migrate/20181128144538_add_name_to_dunlop_user_filters.rb @@ -0,0 +1,6 @@ +class AddNameToDunlopUserFilters < ActiveRecord::Migration[5.2] + def change + add_column :dunlop_user_filters, :name, :string + add_index :dunlop_user_filters, :scope_key + end +end diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb index 232f2b2..20b2cd0 100644 --- a/spec/dummy/db/schema.rb +++ b/spec/dummy/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: 2018_11_14_140017) do +ActiveRecord::Schema.define(version: 2018_11_28_144538) do create_table "contractor_initializations", force: :cascade do |t| t.integer "workflow_instance_id" @@ -59,6 +59,8 @@ ActiveRecord::Schema.define(version: 2018_11_14_140017) do t.text "filters" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "name" + t.index ["scope_key"], name: "index_dunlop_user_filters_on_scope_key" t.index ["user_id"], name: "index_dunlop_user_filters_on_user_id" end