diff --git a/app/models/university.rb b/app/models/university.rb index 2a98d386da18fd905cc73ae127b2f56b88d46c40..c72f3ef0203c5be6d654d31733d672902b45f8ca 100644 --- a/app/models/university.rb +++ b/app/models/university.rb @@ -6,12 +6,15 @@ # address :string # city :string # country :string +# feature_administration :boolean default(TRUE) +# feature_communication :boolean default(TRUE) +# feature_education :boolean default(TRUE) +# feature_research :boolean default(TRUE) # has_sso :boolean default(FALSE) # identifier :string # invoice_amount :string # invoice_date :date # invoice_date_yday :integer -# is_really_a_university :boolean default(TRUE) # mail_from_address :string # mail_from_name :string # name :string diff --git a/db/migrate/20230719073528_add_real_university_to_university.rb b/db/migrate/20230719073528_add_real_university_to_university.rb index c97112214427f346164d680784b747fe543aa715..6197fd776d23f617e2d6307c12a7031a759476bc 100644 --- a/db/migrate/20230719073528_add_real_university_to_university.rb +++ b/db/migrate/20230719073528_add_real_university_to_university.rb @@ -1,9 +1,9 @@ class AddRealUniversityToUniversity < ActiveRecord::Migration[7.0] def change add_column :universities, :is_really_a_university, :boolean, default: true - remove_column :universities, :feature_education - remove_column :universities, :feature_research - remove_column :universities, :feature_communication - remove_column :universities, :feature_administration + remove_column :universities, :feature_education, :boolean, default: true + remove_column :universities, :feature_research, :boolean, default: true + remove_column :universities, :feature_communication, :boolean, default: true + remove_column :universities, :feature_administration, :boolean, default: true end end diff --git a/db/schema.rb b/db/schema.rb index b324b8ece93dd1ae14b34034e8b19c16a3333ac6..355781899a103cb6f37e54d376720389d7da4c36 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: 2023_07_19_073528) do +ActiveRecord::Schema[7.0].define(version: 2023_07_17_160238) do # These are extensions that must be enabled in order to support this database enable_extension "pgcrypto" enable_extension "plpgsql" @@ -918,7 +918,10 @@ ActiveRecord::Schema[7.0].define(version: 2023_07_19_073528) do t.jsonb "sso_mapping" t.string "sso_button_label" t.uuid "default_language_id", null: false - t.boolean "is_really_a_university", default: true + t.boolean "feature_administration", default: true + t.boolean "feature_communication", default: true + t.boolean "feature_research", default: true + t.boolean "feature_education", default: true t.index ["default_language_id"], name: "index_universities_on_default_language_id" end diff --git a/test/fixtures/universities.yml b/test/fixtures/universities.yml index ea220684c1beb52b98191c2318f17d7cbcb7f67d..c0db070bd79537a465e28e0451abc25287636f19 100644 --- a/test/fixtures/universities.yml +++ b/test/fixtures/universities.yml @@ -6,12 +6,15 @@ # address :string # city :string # country :string +# feature_administration :boolean default(TRUE) +# feature_communication :boolean default(TRUE) +# feature_education :boolean default(TRUE) +# feature_research :boolean default(TRUE) # has_sso :boolean default(FALSE) # identifier :string # invoice_amount :string # invoice_date :date # invoice_date_yday :integer -# is_really_a_university :boolean default(TRUE) # mail_from_address :string # mail_from_name :string # name :string