Remove unused `filtered_languages` column (#18533)

* Remove unused `filtered_languages` column

Fixes #18522

* Fix tests

diff --git a/app/models/user.rb b/app/models/user.rb
index f80b47ad796eec65efce04a8475f3963b877787d..59f1278fda875b2a1271339b76396ee4010f295e 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -26,7 +26,6 @@
 #  otp_required_for_login    :boolean          default(FALSE), not null
 #  last_emailed_at           :datetime
 #  otp_backup_codes          :string           is an Array
-#  filtered_languages        :string           default([]), not null, is an Array
 #  account_id                :bigint(8)        not null
 #  disabled                  :boolean          default(FALSE), not null
 #  moderator                 :boolean          default(FALSE), not null
@@ -48,6 +47,7 @@ class User < ApplicationRecord
     current_sign_in_ip
     last_sign_in_ip
     skip_sign_in_token
+    filtered_languages
   )
 
   include Settings::Extend

diff --git a/db/post_migrate/20220527114923_remove_filtered_languages_from_users.rb b/db/post_migrate/20220527114923_remove_filtered_languages_from_users.rb
new file mode 100644 (file)
index 0000000..bd3664c
--- /dev/null
+++ b/db/post_migrate/20220527114923_remove_filtered_languages_from_users.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RemoveFilteredLanguagesFromUsers < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      remove_column :users, :filtered_languages, :string, array: true, default: [], null: false
+    end
+  end
+end

diff --git a/db/schema.rb b/db/schema.rb
index 4552828d6da44f758dfbb188e268d3d6b3f6b04f..07dc11592299e7ca444fff64ef95f1d0f5da4315 100644 (file)
--- 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_04_29_101850) do
+ActiveRecord::Schema.define(version: 2022_05_27_114923) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -986,7 +986,6 @@ ActiveRecord::Schema.define(version: 2022_04_29_101850) do
     t.boolean "otp_required_for_login", default: false, null: false
     t.datetime "last_emailed_at"
     t.string "otp_backup_codes", array: true
-    t.string "filtered_languages", default: [], null: false, array: true
     t.bigint "account_id", null: false
     t.boolean "disabled", default: false, null: false
     t.boolean "moderator", default: false, null: false

diff --git a/spec/controllers/settings/preferences/other_controller_spec.rb b/spec/controllers/settings/preferences/other_controller_spec.rb
index 1b556ac7f7ba268a6cc34678aa130fa4a5ac7079..960378a01874ad20a393b2c6fa261fe23500634a 100644 (file)
--- a/spec/controllers/settings/preferences/other_controller_spec.rb
+++ b/spec/controllers/settings/preferences/other_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Settings::Preferences::OtherController do
   render_views
 
-  let(:user) { Fabricate(:user, filtered_languages: []) }
+  let(:user) { Fabricate(:user, chosen_languages: []) }
 
   before do
     sign_in user, scope: :user