From c981661fe0abd2d84c858e8ae03aa4714c46dd5b Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 10 May 2024 14:12:26 +1000 Subject: [PATCH] Remove obsolete Enterprise#pickup_times --- .../20240510041114_remove_pickup_times_from_enterprises.rb | 7 +++++++ db/schema.rb | 3 +-- lib/tasks/enterprises.rake | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20240510041114_remove_pickup_times_from_enterprises.rb diff --git a/db/migrate/20240510041114_remove_pickup_times_from_enterprises.rb b/db/migrate/20240510041114_remove_pickup_times_from_enterprises.rb new file mode 100644 index 0000000000..bfe62525a6 --- /dev/null +++ b/db/migrate/20240510041114_remove_pickup_times_from_enterprises.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class RemovePickupTimesFromEnterprises < ActiveRecord::Migration[7.0] + def change + remove_column :enterprises, :pickup_times, :text + end +end diff --git a/db/schema.rb b/db/schema.rb index 11699763ba..90f54fd79a 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[7.0].define(version: 2024_05_10_040639) do +ActiveRecord::Schema[7.0].define(version: 2024_05_10_041114) do # These are extensions that must be enabled in order to support this database enable_extension "pg_stat_statements" enable_extension "plpgsql" @@ -204,7 +204,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_05_10_040639) do t.string "abn", limit: 255 t.string "acn", limit: 255 t.integer "address_id" - t.text "pickup_times" t.string "next_collection_at", limit: 255 t.datetime "created_at", precision: nil, null: false t.datetime "updated_at", precision: nil, null: false diff --git a/lib/tasks/enterprises.rake b/lib/tasks/enterprises.rake index 7c2696448c..9dd85acd2f 100644 --- a/lib/tasks/enterprises.rake +++ b/lib/tasks/enterprises.rake @@ -31,7 +31,7 @@ namespace :ofn do def enterprise_header ['name', 'description', 'long_description', 'is_primary_producer', 'is_distributor', - 'contact_name', 'phone', 'email', 'website', 'twitter', 'abn', 'acn', 'pickup_times', + 'contact_name', 'phone', 'email', 'website', 'twitter', 'abn', 'acn', 'next_collection_at', 'visible', 'facebook', 'instagram', 'linkedin', 'address1', 'address2', 'city', 'zipcode', 'state', 'country'] end @@ -40,7 +40,7 @@ namespace :ofn do [enterprise.name, enterprise.description, enterprise.long_description, enterprise.is_primary_producer, enterprise.is_distributor, enterprise.contact_name, enterprise.phone, enterprise.email, enterprise.website, enterprise.twitter, enterprise.abn, - enterprise.acn, enterprise.pickup_times, enterprise.next_collection_at, + enterprise.acn, enterprise.next_collection_at, enterprise.visible, enterprise.facebook, enterprise.instagram, enterprise.linkedin, enterprise.address.address1, enterprise.address.address2, enterprise.address.city, enterprise.address.zipcode, enterprise.address.state_name,