DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7788 from tchak/rollback-foreign-keys

Browse source 
Revert "Merge pull request #7637 from tchak/chore-add-missing-foreign…
This commit is contained in:
Colin Darie 2022-09-21 15:33:42 +02:00 committed by GitHub
commit a7ca444781
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 75 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champ < ApplicationRecord
belongs_to :dossier, inverse_of: false, touch: true, optional: false

4
app/models/champs/address_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::AddressChamp < Champs::TextChamp
def full_address?

4
app/models/champs/annuaire_education_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::AnnuaireEducationChamp < Champs::TextChamp
def fetch_external_data?

4
app/models/champs/carte_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::CarteChamp < Champ
# Default map location. Center of the World, ahm, France...

4
app/models/champs/checkbox_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::CheckboxChamp < Champs::YesNoChamp
def true?

4
app/models/champs/civilite_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::CiviliteChamp < Champ
def html_label?

4
app/models/champs/cnaf_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::CnafChamp < Champs::TextChamp
# see https://github.com/betagouv/api-particulier/blob/master/src/presentation/middlewares/cnaf-input-validation.middleware.ts

4
app/models/champs/commune_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::CommuneChamp < Champs::TextChamp
store_accessor :value_json, :departement, :code_departement

4
app/models/champs/date_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::DateChamp < Champ
before_save :format_before_save

4
app/models/champs/datetime_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::DatetimeChamp < Champ
before_save :format_before_save

4
app/models/champs/decimal_number_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::DecimalNumberChamp < Champ
validates :value, numericality: {

4
app/models/champs/departement_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::DepartementChamp < Champs::TextChamp
end

4
app/models/champs/dgfip_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::DgfipChamp < Champs::TextChamp
# see https://github.com/betagouv/api-particulier/blob/master/src/presentation/middlewares/dgfip-input-validation.middleware.ts

4
app/models/champs/dossier_link_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::DossierLinkChamp < Champ
end

4
app/models/champs/drop_down_list_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::DropDownListChamp < Champ
THRESHOLD_NB_OPTIONS_AS_RADIO = 5

4
app/models/champs/email_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::EmailChamp < Champs::TextChamp
end

4
app/models/champs/engagement_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::EngagementChamp < Champs::CheckboxChamp
end

4
app/models/champs/explication_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::ExplicationChamp < Champs::TextChamp
def search_terms

4
app/models/champs/header_section_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::HeaderSectionChamp < Champ
def search_terms

4
app/models/champs/iban_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::IbanChamp < Champ
validates_with IbanValidator

4
app/models/champs/integer_number_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::IntegerNumberChamp < Champ
validates :value, numericality: {

4
app/models/champs/linked_drop_down_list_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::LinkedDropDownListChamp < Champ
delegate :primary_options, :secondary_options, to: 'type_de_champ.dynamic_type'

4
app/models/champs/mesri_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::MesriChamp < Champs::TextChamp
# see https://github.com/betagouv/api-particulier/blob/master/src/presentation/middlewares/mesri-input-validation.middleware.ts

4
app/models/champs/multiple_drop_down_list_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::MultipleDropDownListChamp < Champ
before_save :format_before_save

4
app/models/champs/number_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::NumberChamp < Champ
end

4
app/models/champs/pays_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::PaysChamp < Champs::TextChamp
def localized_value

4
app/models/champs/phone_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::PhoneChamp < Champs::TextChamp
# We want to allow:

4
app/models/champs/piece_justificative_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::PieceJustificativeChamp < Champ
FILE_MAX_SIZE = 200.megabytes

4
app/models/champs/pole_emploi_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::PoleEmploiChamp < Champs::TextChamp
# see https://github.com/betagouv/api-particulier/blob/master/src/presentation/middlewares/pole-emploi-input-validation.middleware.ts

4
app/models/champs/region_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::RegionChamp < Champs::TextChamp
end

4
app/models/champs/repetition_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::RepetitionChamp < Champ
accepts_nested_attributes_for :champs, allow_destroy: true

4
app/models/champs/siret_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::SiretChamp < Champ
def search_terms

4
app/models/champs/text_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::TextChamp < Champ
end

4
app/models/champs/textarea_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::TextareaChamp < Champs::TextChamp
def for_export

4
app/models/champs/titre_identite_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::TitreIdentiteChamp < Champ
FILE_MAX_SIZE = 20.megabytes

4
app/models/champs/yes_no_champ.rb
View file

@ -13,11 +13,11 @@
# value_json :jsonb
# created_at :datetime
# updated_at :datetime
# dossier_id :integer not null
# dossier_id :integer
# etablissement_id :integer
# external_id :string
# parent_id :bigint
# type_de_champ_id :integer not null
# type_de_champ_id :integer
#
class Champs::YesNoChamp < Champ
def search_terms

11
db/migrate/20220727084308_add_missing_foreign_keys.rb
View file

@ -1,11 +0,0 @@
class AddMissingForeignKeys < ActiveRecord::Migration[6.1]
def change
add_foreign_key :champs, :dossiers, validate: false
add_foreign_key :champs, :types_de_champ, validate: false
add_foreign_key :champs, :etablissements, validate: false
add_foreign_key :etablissements, :dossiers, validate: false
add_check_constraint :champs, "dossier_id IS NOT NULL", name: "champs_dossier_id_null", validate: false
add_check_constraint :champs, "type_de_champ_id IS NOT NULL", name: "champs_type_de_champ_id_null", validate: false
end
end

8
db/migrate/20220727085155_validate_missing_foreign_keys.rb
View file

@ -1,8 +0,0 @@
class ValidateMissingForeignKeys < ActiveRecord::Migration[6.1]
def change
validate_foreign_key :champs, :dossiers
validate_foreign_key :champs, :types_de_champ
validate_foreign_key :champs, :etablissements
validate_foreign_key :etablissements, :dossiers
end
end

7
db/migrate/20220727132450_validate_not_null_champs_type_de_champ_id.rb
View file

@ -1,7 +0,0 @@
class ValidateNotNullChampsTypeDeChampId < ActiveRecord::Migration[6.1]
def change
validate_check_constraint :champs, name: "champs_type_de_champ_id_null"
change_column_null :champs, :type_de_champ_id, false
remove_check_constraint :champs, name: "champs_type_de_champ_id_null"
end
end

7
db/migrate/20220727132456_validate_not_null_champs_dossier_id.rb
View file

@ -1,7 +0,0 @@
class ValidateNotNullChampsDossierId < ActiveRecord::Migration[6.1]
def change
validate_check_constraint :champs, name: "champs_dossier_id_null"
change_column_null :champs, :dossier_id, false
remove_check_constraint :champs, name: "champs_dossier_id_null"
end
end

5
db/migrate/20220728082905_add_foreign_key_to_attachments_blob_id.rb
View file

@ -1,5 +0,0 @@
class AddForeignKeyToAttachmentsBlobId < ActiveRecord::Migration[6.1]
def change
add_foreign_key :active_storage_attachments, :active_storage_blobs, column: :blob_id, validate: false
end
end

5
db/migrate/20220728082914_validate_foreign_key_on_attachments_blob_id.rb
View file

@ -1,5 +0,0 @@
class ValidateForeignKeyOnAttachmentsBlobId < ActiveRecord::Migration[6.1]
def change
validate_foreign_key :active_storage_attachments, :active_storage_blobs, column: :blob_id
end
end

11
db/schema.rb
View file

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2022_09_04_151920) do
ActiveRecord::Schema.define(version: 2022_09_02_151920) do
# These are extensions that must be enabled in order to support this database
enable_extension "pgcrypto"
@ -185,7 +185,7 @@ ActiveRecord::Schema.define(version: 2022_09_04_151920) do
create_table "champs", id: :serial, force: :cascade do |t|
t.datetime "created_at"
t.jsonb "data"
t.integer "dossier_id", null: false
t.integer "dossier_id"
t.integer "etablissement_id"
t.string "external_id"
t.string "fetch_external_data_exceptions", array: true
@ -194,7 +194,7 @@ ActiveRecord::Schema.define(version: 2022_09_04_151920) do
t.datetime "rebased_at"
t.integer "row"
t.string "type"
t.integer "type_de_champ_id", null: false
t.integer "type_de_champ_id"
t.datetime "updated_at"
t.string "value"
t.jsonb "value_json"
@ -869,7 +869,6 @@ ActiveRecord::Schema.define(version: 2022_09_04_151920) do
t.index ["acronym"], name: "index_zones_on_acronym", unique: true
end
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 "administrateurs", "users"
add_foreign_key "administrateurs_instructeurs", "administrateurs"
@ -886,9 +885,6 @@ ActiveRecord::Schema.define(version: 2022_09_04_151920) do
add_foreign_key "bulk_messages_groupe_instructeurs", "bulk_messages"
add_foreign_key "bulk_messages_groupe_instructeurs", "groupe_instructeurs"
add_foreign_key "champs", "champs", column: "parent_id"
add_foreign_key "champs", "dossiers"
add_foreign_key "champs", "etablissements"
add_foreign_key "champs", "types_de_champ"
add_foreign_key "closed_mails", "procedures"
add_foreign_key "commentaires", "dossiers"
add_foreign_key "commentaires", "experts"
@ -898,7 +894,6 @@ ActiveRecord::Schema.define(version: 2022_09_04_151920) do
add_foreign_key "dossiers", "groupe_instructeurs"
add_foreign_key "dossiers", "procedure_revisions", column: "revision_id"
add_foreign_key "dossiers", "users"
add_foreign_key "etablissements", "dossiers"
add_foreign_key "experts", "users"
add_foreign_key "experts_procedures", "experts"
add_foreign_key "experts_procedures", "procedures"