This is a unique field used to refer to this field in the API
+ <%= c.text_field :key, class: "field__input", data: { slugify: true } %> +<%= field.hint %>
<% end %> diff --git a/config/routes.rb b/config/routes.rb index c8bbf451..c50a37ef 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -82,6 +82,7 @@ resources :accessibilities, only: [:index] get "me", to: "me#show" resources :services, only: [:index, :show] + resources :custom_fields, only: [:index] end end diff --git a/db/migrate/20241111163850_add_custom_field_label.rb b/db/migrate/20241111163850_add_custom_field_label.rb new file mode 100644 index 00000000..53b64363 --- /dev/null +++ b/db/migrate/20241111163850_add_custom_field_label.rb @@ -0,0 +1,14 @@ +class AddCustomFieldLabel < ActiveRecord::Migration[6.0] + def change + # Add new label column + add_column :custom_fields, :label, :string + + # Copy data from key to label (only on up migration) + reversible do |dir| + dir.up do + CustomField.reset_column_information + CustomField.update_all('label = key') + end + end + end +end diff --git a/db/migrate/20241111181710_add_service_meta_label.rb b/db/migrate/20241111181710_add_service_meta_label.rb new file mode 100644 index 00000000..7eab7033 --- /dev/null +++ b/db/migrate/20241111181710_add_service_meta_label.rb @@ -0,0 +1,14 @@ +class AddServiceMetaLabel < ActiveRecord::Migration[6.0] + def change + # Add new label column + add_column :service_meta, :label, :string + + # Copy data from key to label (only on up migration) + reversible do |dir| + dir.up do + ServiceMeta.reset_column_information + ServiceMeta.update_all('label = key') + end + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 32ba2452..49336f1a 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: 2024_09_18_091413) do +ActiveRecord::Schema.define(version: 2024_11_11_181710) do # These are extensions that must be enabled in order to support this database enable_extension "pg_trgm" @@ -87,6 +87,7 @@ t.string "hint" t.bigint "custom_field_section_id", null: false t.string "options" + t.string "label" t.index ["custom_field_section_id"], name: "index_custom_fields_on_custom_field_section_id" end @@ -318,6 +319,7 @@ t.string "value" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.string "label" t.index ["service_id"], name: "index_service_meta_on_service_id" end diff --git a/lib/tasks/data_import/custom_fields/custom_fields.rake b/lib/tasks/data_import/custom_fields/custom_fields.rake index f41a7eeb..124e01ff 100644 --- a/lib/tasks/data_import/custom_fields/custom_fields.rake +++ b/lib/tasks/data_import/custom_fields/custom_fields.rake @@ -43,7 +43,7 @@ namespace :import do Rails.logger.info("🟠Field: \"#{row["name"]}\" already exists, skipping.") else custom_field = CustomField.new( - key: row["name"]&.strip, + label: row["name"]&.strip, field_type: row["field_type"].downcase, options: row["field_options"], hint: row["hint"], diff --git a/lib/tasks/data_import/services/import_services.rake b/lib/tasks/data_import/services/import_services.rake index 15a25068..ca50bb1f 100644 --- a/lib/tasks/data_import/services/import_services.rake +++ b/lib/tasks/data_import/services/import_services.rake @@ -68,7 +68,7 @@ namespace :import do def import_service_meta(type, service_id, fields_for_import, row) fields_for_import.map do |t| # Find the existing custom field to add this service meta to - custom_field = CustomField.where(field_type: type).find{|cf| cf.key.downcase.delete("^a-zA-Z0-9 ").gsub(' ', '_') === t} + custom_field = CustomField.where(field_type: type).find{|cf| cf.label.downcase.delete("^a-zA-Z0-9 ").gsub(' ', '_') === t} unless custom_field.present? Rails.logger.info("🟠Custom field \"#{t}\" of type #{type} does not exist. Please check the field name or create the custom field in order to add this service data. Perhaps you have forgotten to run the custom field import?") @@ -91,7 +91,7 @@ namespace :import do end if value.present? - new_service_meta = ServiceMeta.find_or_initialize_by(service_id: service_id, key: custom_field.key) do |new_sm| + new_service_meta = ServiceMeta.find_or_initialize_by(service_id: service_id, label: custom_field.label) do |new_sm| new_sm.value = value end diff --git a/spec/factories/custom_field.rb b/spec/factories/custom_field.rb index 1ae24899..ac0393a2 100644 --- a/spec/factories/custom_field.rb +++ b/spec/factories/custom_field.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :custom_field do - key { Faker::Lorem.sentence } + label { Faker::Lorem.sentence } field_type { 'text' } custom_field_section diff --git a/spec/factories/service_meta.rb b/spec/factories/service_meta.rb index c5fe941f..2edf68c9 100644 --- a/spec/factories/service_meta.rb +++ b/spec/factories/service_meta.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :service_meta do - key { Faker::Lorem.sentence } + label { Faker::Lorem.sentence } value { Faker::Number.number } end end \ No newline at end of file diff --git a/spec/models/custom_field_spec.rb b/spec/models/custom_field_spec.rb index 21d844fc..ca040e4f 100644 --- a/spec/models/custom_field_spec.rb +++ b/spec/models/custom_field_spec.rb @@ -3,7 +3,7 @@ RSpec.describe CustomField, type: :model do subject { FactoryBot.build :custom_field } - it { should validate_presence_of :key } - it { should validate_uniqueness_of :key } + it { should validate_presence_of :label } + it { should validate_uniqueness_of :label } it { should validate_presence_of :field_type } end diff --git a/spec/models/regular_schedule_spec.rb b/spec/models/regular_schedule_spec.rb index 828296ce..ba95d84a 100644 --- a/spec/models/regular_schedule_spec.rb +++ b/spec/models/regular_schedule_spec.rb @@ -405,10 +405,10 @@ context 'event times' do - let(:dtstart) { DateTime.new(2023, 10, 4) } # Wednesday + let(:dtstart) { Date.new(2023, 10, 4) } # Wednesday context 'single event time' do it 'should return description of the single event time' do - expect(regular_schedule.description).to eq("#{dtstart.strftime('%A%e %B %Y')} from #{opens_at.strftime("%I:%M%P")} to #{closes_at.strftime("%I:%M%P")}") + expect(regular_schedule.description).to eq("#{dtstart.strftime('%A %e %B %Y')} from #{opens_at.strftime("%I:%M%P")} to #{closes_at.strftime("%I:%M%P")}") end end diff --git a/spec/models/service_meta_spec.rb b/spec/models/service_meta_spec.rb index 7ecab145..04fed37a 100644 --- a/spec/models/service_meta_spec.rb +++ b/spec/models/service_meta_spec.rb @@ -3,6 +3,6 @@ RSpec.describe ServiceMeta, type: :model do subject { FactoryBot.create :service_meta, service: FactoryBot.create(:service) } - it { should validate_presence_of(:key) } - it { should validate_uniqueness_of(:key).scoped_to(:service_id) } + it { should validate_presence_of(:label) } + it { should validate_uniqueness_of(:label).scoped_to(:service_id) } end diff --git a/spec/tasks/data_import/services_spec.rb b/spec/tasks/data_import/services_spec.rb index eb888116..08dc6111 100644 --- a/spec/tasks/data_import/services_spec.rb +++ b/spec/tasks/data_import/services_spec.rb @@ -58,11 +58,11 @@ context 'with custom fields in the DB' do before do - FactoryBot.create :custom_field, key: 'text field' - FactoryBot.create :custom_field, :number, key: 'number field' - FactoryBot.create :custom_field, :checkbox, key: 'checkbox field' - FactoryBot.create :custom_field, :date, key: 'date field' - FactoryBot.create :custom_field, :select, key: 'select field' + FactoryBot.create :custom_field, label: 'text field' + FactoryBot.create :custom_field, :number, label: 'number field' + FactoryBot.create :custom_field, :checkbox, label: 'checkbox field' + FactoryBot.create :custom_field, :date, label: 'date field' + FactoryBot.create :custom_field, :select, label: 'select field' end it 'creates the service meta' do