From a71e83dabe5b6717ffaeecce55ae95a079e98946 Mon Sep 17 00:00:00 2001 From: mfo Date: Tue, 24 Sep 2024 09:55:59 +0200 Subject: [PATCH] clean(db): remove ignored column --- app/models/dossier.rb | 2 +- app/models/instructeur.rb | 2 -- app/models/procedure.rb | 7 ------- app/models/traitement.rb | 1 - app/models/type_de_champ.rb | 2 -- .../20240923125619_drop_ignored_columns.rb | 18 ++++++++++++++++++ db/schema.rb | 13 +------------ 7 files changed, 20 insertions(+), 25 deletions(-) create mode 100644 db/migrate/20240923125619_drop_ignored_columns.rb diff --git a/app/models/dossier.rb b/app/models/dossier.rb index 468868ea2..689c20ac5 100644 --- a/app/models/dossier.rb +++ b/app/models/dossier.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Dossier < ApplicationRecord - self.ignored_columns += [:re_instructed_at, :search_terms, :private_search_terms] + self.ignored_columns += [:search_terms, :private_search_terms] include DossierCloneConcern include DossierCorrectableConcern diff --git a/app/models/instructeur.rb b/app/models/instructeur.rb index 8d54f0baf..b9e105802 100644 --- a/app/models/instructeur.rb +++ b/app/models/instructeur.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true class Instructeur < ApplicationRecord - self.ignored_columns += [:agent_connect_id] - include UserFindByConcern has_and_belongs_to_many :administrateurs diff --git a/app/models/procedure.rb b/app/models/procedure.rb index 1265171b0..14c489861 100644 --- a/app/models/procedure.rb +++ b/app/models/procedure.rb @@ -12,13 +12,6 @@ class Procedure < ApplicationRecord include Discard::Model self.discard_column = :hidden_at - self.ignored_columns += [ - :direction, - :durees_conservation_required, - :cerfa_flag, - :test_started_at, - :lien_demarche - ] default_scope -> { kept } diff --git a/app/models/traitement.rb b/app/models/traitement.rb index f5fd431d2..0a3929b57 100644 --- a/app/models/traitement.rb +++ b/app/models/traitement.rb @@ -2,7 +2,6 @@ class Traitement < ApplicationRecord belongs_to :dossier, optional: false - self.ignored_columns += [:process_expired, :process_expired_migrated] scope :en_construction, -> { where(state: Dossier.states.fetch(:en_construction)) } scope :en_instruction, -> { where(state: Dossier.states.fetch(:en_instruction)) } scope :termine, -> { where(state: Dossier::TERMINE) } diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb index f8640127a..fa84045f4 100644 --- a/app/models/type_de_champ.rb +++ b/app/models/type_de_champ.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true class TypeDeChamp < ApplicationRecord - self.ignored_columns += [:migrated_parent, :revision_id, :parent_id, :order_place] - FILE_MAX_SIZE = 200.megabytes FEATURE_FLAGS = { engagement_juridique: :engagement_juridique_type_de_champ, diff --git a/db/migrate/20240923125619_drop_ignored_columns.rb b/db/migrate/20240923125619_drop_ignored_columns.rb new file mode 100644 index 000000000..c720ffb17 --- /dev/null +++ b/db/migrate/20240923125619_drop_ignored_columns.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +class DropIgnoredColumns < ActiveRecord::Migration[7.0] + def change + safety_assured do + remove_column :dossiers, :re_instructed_at + remove_column :instructeurs, :agent_connect_id + remove_column :procedures, :direction + remove_column :procedures, :durees_conservation_required + remove_column :procedures, :cerfa_flag + remove_column :procedures, :test_started_at + remove_column :procedures, :lien_demarche + remove_column :traitements, :process_expired + remove_column :traitements, :process_expired_migrated + remove_column :active_storage_blobs, :lock_version + end + end +end diff --git a/db/schema.rb b/db/schema.rb index d4202b2ae..6998464ea 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_09_19_151603) do +ActiveRecord::Schema[7.0].define(version: 2024_09_23_125619) do # These are extensions that must be enabled in order to support this database enable_extension "pg_buffercache" enable_extension "pg_stat_statements" @@ -47,7 +47,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_09_19_151603) do t.datetime "created_at", precision: nil, null: false t.string "filename", null: false t.string "key", null: false - t.integer "lock_version" t.text "metadata" t.string "service_name", null: false t.string "virus_scan_result" @@ -500,7 +499,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_09_19_151603) do t.boolean "prefilled" t.string "private_search_terms" t.datetime "processed_at", precision: nil - t.datetime "re_instructed_at" t.bigint "revision_id" t.string "search_terms" t.string "state" @@ -796,7 +794,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_09_19_151603) do end create_table "instructeurs", id: :serial, force: :cascade do |t| - t.string "agent_connect_id" t.string "agent_connect_id_token" t.boolean "bypass_email_login_token", default: false, null: false t.datetime "created_at", precision: nil @@ -804,7 +801,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_09_19_151603) do t.datetime "login_token_created_at", precision: nil t.datetime "updated_at", precision: nil t.bigint "user_id", null: false - t.index ["agent_connect_id"], name: "index_instructeurs_on_agent_connect_id", unique: true t.index ["user_id"], name: "index_instructeurs_on_user_id" end @@ -916,7 +912,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_09_19_151603) do t.date "auto_archive_on" t.string "cadre_juridique" t.bigint "canonical_procedure_id" - t.boolean "cerfa_flag", default: false t.jsonb "chorus", default: {}, null: false t.boolean "cloned_from_library", default: false t.datetime "closed_at", precision: nil @@ -930,12 +925,10 @@ ActiveRecord::Schema[7.0].define(version: 2024_09_19_151603) do t.string "description" t.string "description_pj" t.string "description_target_audience" - t.string "direction" t.datetime "dossiers_count_computed_at", precision: nil t.bigint "draft_revision_id" t.integer "duree_conservation_dossiers_dans_ds" t.boolean "duree_conservation_etendue_par_ds", default: false, null: false - t.boolean "durees_conservation_required", default: true t.string "encrypted_api_particulier_token" t.integer "estimated_dossiers_count" t.boolean "estimated_duration_visible", default: true, null: false @@ -949,7 +942,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_09_19_151603) do t.boolean "instructeurs_self_management_enabled", default: false t.boolean "juridique_required", default: true t.string "libelle" - t.string "lien_demarche" t.string "lien_dpo" t.text "lien_dpo_error" t.string "lien_notice" @@ -971,7 +963,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_09_19_151603) do t.jsonb "sva_svr", default: {}, null: false t.text "tags", default: [], array: true t.boolean "template", default: false, null: false - t.datetime "test_started_at", precision: nil t.datetime "unpublished_at", precision: nil t.datetime "updated_at", precision: nil, null: false t.string "web_hook_url" @@ -1131,8 +1122,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_09_19_151603) do t.bigint "dossier_id" t.string "instructeur_email" t.string "motivation" - t.boolean "process_expired" - t.boolean "process_expired_migrated", default: false t.datetime "processed_at", precision: nil t.string "state" t.index ["dossier_id"], name: "index_traitements_on_dossier_id"