From 86d6d35de6829bab3894b50cf5787c4130708ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20Charignon?= Date: Mon, 25 Nov 2024 09:41:17 +0100 Subject: [PATCH] Rails 7.2 : Corrige les migrations pour les reviewapps --- bin/reviewappdeploy.sh | 1 + .../2019/20190923191333_migre_cles_etrangeres.rb | 4 +++- ...5120035_valide_les_acces_des_comptes_existants.rb | 4 +--- ...230106103345_modifie_mode_tutoriel_dans_compte.rb | 5 +++++ ...2323_migre_mises_en_action_deja_non_effectuees.rb | 12 ++++++++++++ ...230329085445_renome_nom_technique_question_qcm.rb | 8 ++++++++ ...717_renomme_nom_techniques_questions_bienvenue.rb | 8 ++++++++ ...2713_renome_nom_technique_question_bienvenue16.rb | 8 ++++++++ .../20240917044949_creation_question_numeratie.rb | 10 ++++++---- 9 files changed, 52 insertions(+), 8 deletions(-) diff --git a/bin/reviewappdeploy.sh b/bin/reviewappdeploy.sh index a95119267..64cba9937 100755 --- a/bin/reviewappdeploy.sh +++ b/bin/reviewappdeploy.sh @@ -1,5 +1,6 @@ #!/bin/bash +bundle exec rails db:migrate VERSION=20210305110556 bundle exec rails db:migrate VERSION=20230406135310 bundle exec rake reviewapp:ignore_migrations[20230419084251,20230407134617] bundle exec rails db:migrate VERSION=20240809100708 diff --git a/db/migrate/2019/20190923191333_migre_cles_etrangeres.rb b/db/migrate/2019/20190923191333_migre_cles_etrangeres.rb index 87e2de51c..223dc3f9b 100644 --- a/db/migrate/2019/20190923191333_migre_cles_etrangeres.rb +++ b/db/migrate/2019/20190923191333_migre_cles_etrangeres.rb @@ -1,9 +1,11 @@ class MigreClesEtrangeres < ActiveRecord::Migration[5.2] + class Evaluation < ApplicationRecord; end + def up id_to_uuid('campagnes', 'questionnaire', 'questionnaire') id_to_uuid('campagnes', 'compte', 'compte') id_to_uuid('choix', 'question', 'question') - id_to_uuid('evaluations', 'campagne', 'campagne') + id_to_uuid('evaluations', 'campagne', 'campagne', klass: Evaluation) id_to_uuid('evenements', 'evaluation', 'evaluation') id_to_uuid('evenements', 'situation', 'situation') id_to_uuid('questionnaires_questions', 'questionnaire', 'questionnaire') diff --git a/db/migrate/2021/20210305120035_valide_les_acces_des_comptes_existants.rb b/db/migrate/2021/20210305120035_valide_les_acces_des_comptes_existants.rb index 7b1975d58..476fdc237 100644 --- a/db/migrate/2021/20210305120035_valide_les_acces_des_comptes_existants.rb +++ b/db/migrate/2021/20210305120035_valide_les_acces_des_comptes_existants.rb @@ -1,7 +1,5 @@ class ValideLesAccesDesComptesExistants < ActiveRecord::Migration[6.1] - class Compte < ApplicationRecord - enum :statut_validation, { en_attente: 0, acceptee: 1, refusee: 2 }, prefix: :validation - end + class Compte < ApplicationRecord; end def up Compte.update_all statut_validation: :acceptee diff --git a/db/migrate/2023/20230106103345_modifie_mode_tutoriel_dans_compte.rb b/db/migrate/2023/20230106103345_modifie_mode_tutoriel_dans_compte.rb index d651996dc..c007f13a7 100644 --- a/db/migrate/2023/20230106103345_modifie_mode_tutoriel_dans_compte.rb +++ b/db/migrate/2023/20230106103345_modifie_mode_tutoriel_dans_compte.rb @@ -1,4 +1,9 @@ class ModifieModeTutorielDansCompte < ActiveRecord::Migration[7.0] + class Compte < ApplicationRecord + attribute :statut_validation, :integer + enum :statut_validation, { en_attente: 0, acceptee: 1, refusee: 2 }, prefix: :validation + end + def up structure_ids = Structure.activees.select(:id) comptes = Compte.where(structure_id: structure_ids).validation_acceptee diff --git a/db/migrate/2023/20230228152323_migre_mises_en_action_deja_non_effectuees.rb b/db/migrate/2023/20230228152323_migre_mises_en_action_deja_non_effectuees.rb index 3373c5f55..2861ff89b 100644 --- a/db/migrate/2023/20230228152323_migre_mises_en_action_deja_non_effectuees.rb +++ b/db/migrate/2023/20230228152323_migre_mises_en_action_deja_non_effectuees.rb @@ -1,4 +1,16 @@ class MigreMisesEnActionDejaNonEffectuees < ActiveRecord::Migration[7.0] + class MiseEnAction < ApplicationRecord + REMEDIATIONS = %w[formation_competences_de_base formation_metier + dispositif_remobilisation levee_freins_peripheriques + indetermine].freeze + DIFFICULTES = %w[aucune_offre_formation offre_formation_inaccessible + freins_peripheriques accompagnement_necessaire + indetermine].freeze + attribute :remediation, :string + attribute :difficulte, :string + enum :remediation, REMEDIATIONS.zip(REMEDIATIONS).to_h, suffix: true + enum :difficulte, DIFFICULTES.zip(DIFFICULTES).to_h, suffix: true + end def change MiseEnAction.where(effectuee: false).where(difficulte: nil).update_all(difficulte: 'indetermine') end diff --git a/db/migrate/2023/20230329085445_renome_nom_technique_question_qcm.rb b/db/migrate/2023/20230329085445_renome_nom_technique_question_qcm.rb index 48a1790a6..7a1ecebdc 100644 --- a/db/migrate/2023/20230329085445_renome_nom_technique_question_qcm.rb +++ b/db/migrate/2023/20230329085445_renome_nom_technique_question_qcm.rb @@ -1,4 +1,12 @@ class RenomeNomTechniqueQuestionQcm < ActiveRecord::Migration[7.0] + class Question < ApplicationRecord + CATEGORIE = %i[situation scolarite sante appareils].freeze + attribute :categorie, :string + enum :categorie, CATEGORIE.zip(CATEGORIE.map(&:to_s)).to_h, prefix: true + end + + class QuestionQcm < Question; end + class QuestionSaisie < Question; end def up QuestionQcm.where(nom_technique: 'niveau_etude').update(nom_technique: 'dernier_niveau_etude') QuestionSaisie.where(nom_technique: 'quel_age').update(nom_technique: 'age') diff --git a/db/migrate/2023/20230403150717_renomme_nom_techniques_questions_bienvenue.rb b/db/migrate/2023/20230403150717_renomme_nom_techniques_questions_bienvenue.rb index 06d8c970e..b2a9c0f28 100644 --- a/db/migrate/2023/20230403150717_renomme_nom_techniques_questions_bienvenue.rb +++ b/db/migrate/2023/20230403150717_renomme_nom_techniques_questions_bienvenue.rb @@ -1,4 +1,12 @@ class RenommeNomTechniquesQuestionsBienvenue < ActiveRecord::Migration[7.0] + class Question < ApplicationRecord + CATEGORIE = %i[situation scolarite sante appareils].freeze + attribute :categorie, :string + enum :categorie, CATEGORIE.zip(CATEGORIE.map(&:to_s)).to_h, prefix: true + end + + class QuestionQcm < Question; end + def up QuestionQcm.where(nom_technique: 'bienvenue_1').update(nom_technique: 'concentration') QuestionQcm.where(nom_technique: 'bienvenue_2').update(nom_technique: 'comprehension') diff --git a/db/migrate/2023/20230403152713_renome_nom_technique_question_bienvenue16.rb b/db/migrate/2023/20230403152713_renome_nom_technique_question_bienvenue16.rb index a2fbcb779..226688411 100644 --- a/db/migrate/2023/20230403152713_renome_nom_technique_question_bienvenue16.rb +++ b/db/migrate/2023/20230403152713_renome_nom_technique_question_bienvenue16.rb @@ -1,4 +1,12 @@ class RenomeNomTechniqueQuestionBienvenue16 < ActiveRecord::Migration[7.0] + class Question < ApplicationRecord + CATEGORIE = %i[situation scolarite sante appareils].freeze + attribute :categorie, :string + enum :categorie, CATEGORIE.zip(CATEGORIE.map(&:to_s)).to_h, prefix: true + end + + class QuestionQcm < Question; end + def up bienvenue_16 = QuestionQcm.find_by(nom_technique: 'bienvenue_16') return unless bienvenue_16.present? diff --git a/db/migrate/20240917044949_creation_question_numeratie.rb b/db/migrate/20240917044949_creation_question_numeratie.rb index 3706e9412..93dd534d6 100644 --- a/db/migrate/20240917044949_creation_question_numeratie.rb +++ b/db/migrate/20240917044949_creation_question_numeratie.rb @@ -1,10 +1,12 @@ class CreationQuestionNumeratie < ActiveRecord::Migration[7.0] - class ::Question < ApplicationRecord; end + class ::Question < ApplicationRecord; + attribute :intitule, :string + end class ::Questionnaire < ApplicationRecord; end class ::QuestionnaireQuestion < ApplicationRecord; end def change - numeratie = Questionnaire.find_or_create_by(nom_technique: 'numeratie_2024') do |q| + numeratie = ::Questionnaire.find_or_create_by(nom_technique: 'numeratie_2024') do |q| q.libelle = 'Numératie 2024' end { @@ -14,12 +16,12 @@ def change 'QuestionGlisserDeposer' => ['N1Pon1', 'N1Ron1', 'N1Ron2'] }.each do |type, nom_techniques| nom_techniques.each do |nom_technique| - question = Question.find_or_initialize_by(nom_technique: nom_technique) + question = ::Question.find_or_initialize_by(nom_technique: nom_technique) question.type = type question.type_saisie = :numerique if type == 'QuestionSaisie' question.libelle = nom_technique question.save! - QuestionnaireQuestion.find_or_create_by(questionnaire_id: numeratie.id, question_id: question.id) + ::QuestionnaireQuestion.find_or_create_by(questionnaire_id: numeratie.id, question_id: question.id) end end end