From 3161d2bf0e86d2f1a9e1c99440785768958dabf7 Mon Sep 17 00:00:00 2001 From: FinnIckler Date: Mon, 9 Dec 2024 11:03:49 +0100 Subject: [PATCH 1/5] remove all unnecessary columns --- .../20241209104407_remove_v1_columns.rb | 12 ++++++++++ db/schema.rb | 22 +++---------------- lib/database_dumper.rb | 6 ----- 3 files changed, 15 insertions(+), 25 deletions(-) create mode 100644 db/migrate/20241209104407_remove_v1_columns.rb diff --git a/db/migrate/20241209104407_remove_v1_columns.rb b/db/migrate/20241209104407_remove_v1_columns.rb new file mode 100644 index 00000000000..f713e92a5c5 --- /dev/null +++ b/db/migrate/20241209104407_remove_v1_columns.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +class RemoveV1Columns < ActiveRecord::Migration[7.2] + def change + remove_column :registrations, :accepted_at + remove_column :registrations, :deleted_at + remove_column :registrations, :accepted_by + remove_column :registrations, :deleted_by + remove_column :Competitions, :registration_version + drop_table :microservice_registrations + end +end diff --git a/db/schema.rb b/db/schema.rb index 76cf2d624c5..81269d721b7 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.2].define(version: 2024_11_24_050607) do +ActiveRecord::Schema[7.2].define(version: 2024_12_09_104407) do create_table "Competitions", id: { type: :string, limit: 32, default: "" }, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t| t.string "name", limit: 50, default: "", null: false t.string "cityName", limit: 50, default: "", null: false @@ -81,7 +81,6 @@ t.integer "posting_by" t.boolean "forbid_newcomers", default: false, null: false t.string "forbid_newcomers_reason" - t.integer "registration_version", default: 0, null: false t.index ["cancelled_at"], name: "index_Competitions_on_cancelled_at" t.index ["countryId"], name: "index_Competitions_on_countryId" t.index ["end_date"], name: "index_Competitions_on_end_date" @@ -794,17 +793,6 @@ t.datetime "updated_at", precision: nil, null: false end - create_table "microservice_registrations", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t| - t.string "competition_id", limit: 32, null: false - t.integer "user_id", null: false - t.text "roles" - t.boolean "is_competing", default: true, null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.index ["competition_id", "user_id"], name: "index_microservice_registrations_on_competition_id_and_user_id", unique: true - t.index ["user_id"], name: "fk_rails_dc6d05bc5e" - end - create_table "oauth_access_grants", id: :integer, charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t| t.integer "resource_owner_id", null: false t.integer "application_id", null: false @@ -1023,13 +1011,11 @@ t.datetime "created_at", precision: nil, null: false t.datetime "updated_at", precision: nil, null: false t.integer "guests", default: 0, null: false - t.datetime "accepted_at", precision: nil - t.integer "accepted_by" - t.datetime "deleted_at", precision: nil - t.integer "deleted_by" t.text "roles" t.boolean "is_competing", default: true t.text "administrative_notes" + t.datetime "rejected_at" + t.datetime "waitlisted_at" t.string "competing_status", default: "pending", null: false t.index ["competition_id", "user_id"], name: "index_registrations_on_competition_id_and_user_id", unique: true t.index ["competition_id"], name: "index_registrations_on_competition_id" @@ -1394,8 +1380,6 @@ add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id" add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id" - add_foreign_key "microservice_registrations", "Competitions", column: "competition_id", on_update: :cascade, on_delete: :cascade - add_foreign_key "microservice_registrations", "users" add_foreign_key "oauth_openid_requests", "oauth_access_grants", column: "access_grant_id", on_delete: :cascade add_foreign_key "payment_intents", "users", column: "initiated_by_id" add_foreign_key "paypal_records", "paypal_records", column: "parent_record_id" diff --git a/lib/database_dumper.rb b/lib/database_dumper.rb index 644cb64f34b..05c1f177aa6 100644 --- a/lib/database_dumper.rb +++ b/lib/database_dumper.rb @@ -107,7 +107,6 @@ def self.actions_to_column_sanitizers(columns_by_action) competition_series_id use_wca_live_for_scoretaking allow_registration_without_qualification - registration_version forbid_newcomers forbid_newcomers_reason ), @@ -571,12 +570,8 @@ def self.actions_to_column_sanitizers(columns_by_action) column_sanitizers: actions_to_column_sanitizers( copy: %w( id - accepted_at - accepted_by competition_id created_at - deleted_at - deleted_by guests updated_at user_id @@ -591,7 +586,6 @@ def self.actions_to_column_sanitizers(columns_by_action) }, ), }.freeze, - "microservice_registrations" => :skip_all_rows, "registration_history_changes" => :skip_all_rows, "registration_history_entries" => :skip_all_rows, "waiting_lists" => { From d4006dec6fa9ad8516a6e6985cc01a9e50232711 Mon Sep 17 00:00:00 2001 From: FinnIckler Date: Mon, 9 Dec 2024 11:44:28 +0100 Subject: [PATCH 2/5] remove enum decleration in competition.rb --- app/models/competition.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/models/competition.rb b/app/models/competition.rb index e7250b7ef83..3684abe531d 100644 --- a/app/models/competition.rb +++ b/app/models/competition.rb @@ -94,10 +94,6 @@ class Competition < ApplicationRecord restricted: 2, }, prefix: true - NEW_REG_SYSTEM_DEFAULT = :v3 - - enum :registration_version, [:v1, :v2, :v3], prefix: true, default: NEW_REG_SYSTEM_DEFAULT - CLONEABLE_ATTRIBUTES = %w( cityName countryId From 279d123d8eeef77dd22f9d425d545711aa3a93d9 Mon Sep 17 00:00:00 2001 From: Gregor Billing Date: Mon, 9 Dec 2024 22:01:44 +0900 Subject: [PATCH 3/5] Remove registration_version setter from tests --- spec/factories/competitions.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/spec/factories/competitions.rb b/spec/factories/competitions.rb index 4d333536652..ba5bd156a61 100644 --- a/spec/factories/competitions.rb +++ b/spec/factories/competitions.rb @@ -99,8 +99,6 @@ refund_policy_percent { 0 } guests_entry_fee_lowest_denomination { 0 } - registration_version { :v3 } - trait :enforces_qualifications do with_organizer qualification_results { true } From b416e0a914a22a9b1a80a64359a4981317bcf150 Mon Sep 17 00:00:00 2001 From: Gregor Billing Date: Wed, 11 Dec 2024 00:15:28 +0900 Subject: [PATCH 4/5] Remove registration_version from cloneable attributes --- app/models/competition.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/competition.rb b/app/models/competition.rb index 83e06f25f96..493d61b0c44 100644 --- a/app/models/competition.rb +++ b/app/models/competition.rb @@ -167,7 +167,6 @@ class Competition < ApplicationRecord waiting_list_deadline_date event_change_deadline_date competition_series_id - registration_version ).freeze VALID_NAME_RE = /\A([-&.:' [:alnum:]]+) (\d{4})\z/ VALID_ID_RE = /\A[a-zA-Z0-9]+\Z/ From 615751e293ad567d7d82225b84d8740c198fce4e Mon Sep 17 00:00:00 2001 From: FinnIckler Date: Tue, 10 Dec 2024 17:02:23 +0100 Subject: [PATCH 5/5] remove old columns --- db/schema.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 81269d721b7..2f929d5817f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1014,8 +1014,6 @@ t.text "roles" t.boolean "is_competing", default: true t.text "administrative_notes" - t.datetime "rejected_at" - t.datetime "waitlisted_at" t.string "competing_status", default: "pending", null: false t.index ["competition_id", "user_id"], name: "index_registrations_on_competition_id_and_user_id", unique: true t.index ["competition_id"], name: "index_registrations_on_competition_id"