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

Merge pull request #7146 from betagouv/US/merge-old-user-with-instructeur-and-dossiers-operation-log-2

Browse source 
feat(user.merge): when user have an instructeur having dossier_opertions_logs containing instructeur_id
This commit is contained in:
LeSim 2022-05-04 14:30:37 +02:00 committed by GitHub
commit 19edbdbf6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/dossier_operation_log.rb
View file

@ -12,7 +12,6 @@
# updated_at :datetime not null # updated_at :datetime not null
# bill_signature_id :bigint # bill_signature_id :bigint
# dossier_id :bigint # dossier_id :bigint
# instructeur_id :bigint
# #
class DossierOperationLog < ApplicationRecord class DossierOperationLog < ApplicationRecord
self.ignored_columns = [:instructeur_id] self.ignored_columns = [:instructeur_id]

5
db/migrate/20220406144202_remove_column_instructeur_id_from_dossier_operation_log.rb Normal file
View file

@ -0,0 +1,5 @@
class RemoveColumnInstructeurIdFromDossierOperationLog < ActiveRecord::Migration[6.1]
def change
safety_assured { remove_column :dossier_operation_logs, :instructeur_id }
end
end

3
db/schema.rb
View file

@ -267,13 +267,11 @@ ActiveRecord::Schema.define(version: 2022_04_26_140107) do
t.text "digest" t.text "digest"
t.bigint "dossier_id" t.bigint "dossier_id"
t.datetime "executed_at" t.datetime "executed_at"
t.bigint "instructeur_id"
t.datetime "keep_until" t.datetime "keep_until"
t.string "operation", null: false t.string "operation", null: false
t.datetime "updated_at", null: false t.datetime "updated_at", null: false
t.index ["bill_signature_id"], name: "index_dossier_operation_logs_on_bill_signature_id" t.index ["bill_signature_id"], name: "index_dossier_operation_logs_on_bill_signature_id"
t.index ["dossier_id"], name: "index_dossier_operation_logs_on_dossier_id" t.index ["dossier_id"], name: "index_dossier_operation_logs_on_dossier_id"
t.index ["instructeur_id"], name: "index_dossier_operation_logs_on_instructeur_id"
t.index ["keep_until"], name: "index_dossier_operation_logs_on_keep_until" t.index ["keep_until"], name: "index_dossier_operation_logs_on_keep_until"
end end
@ -874,7 +872,6 @@ ActiveRecord::Schema.define(version: 2022_04_26_140107) do
add_foreign_key "commentaires", "dossiers" add_foreign_key "commentaires", "dossiers"
add_foreign_key "commentaires", "experts" add_foreign_key "commentaires", "experts"
add_foreign_key "dossier_operation_logs", "bill_signatures" add_foreign_key "dossier_operation_logs", "bill_signatures"
add_foreign_key "dossier_operation_logs", "instructeurs"
add_foreign_key "dossier_transfer_logs", "dossiers" add_foreign_key "dossier_transfer_logs", "dossiers"
add_foreign_key "dossiers", "dossier_transfers" add_foreign_key "dossiers", "dossier_transfers"
add_foreign_key "dossiers", "groupe_instructeurs" add_foreign_key "dossiers", "groupe_instructeurs"