dont refactor api particulier

etalab · Nov 29, 2024 · 4184842 · 4184842
1 parent 3d9db79
commit 4184842
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/app/models/authorization_request/api_particulier.rb b/app/models/authorization_request/api_particulier.rb
@@ -2,17 +2,19 @@ class AuthorizationRequest::APIParticulier < AuthorizationRequest
   include AuthorizationExtensions::BasicInfos
   include AuthorizationExtensions::PersonalData
   include AuthorizationExtensions::CadreJuridique
-  include AuthorizationExtensions::Modalities
-
-  MODALITIES = %w[params formulaire_qf].freeze
-
-  validate :modalities_in_available_values
 
   add_document :maquette_projet, content_type: ['application/pdf'], size: { less_than: 10.megabytes }
 
   add_attributes :date_prevue_mise_en_production,
     :volumetrie_approximative
 
+  add_attribute :modalities,
+    type: :array,
+    validation: {
+      presence: true,
+      intersection: { in: %w[params formulaire_qf] },
+    }
+
   add_scopes(validation: {
     presence: true, if: -> { need_complete_validation?(:scopes) }
   })

diff --git a/app/models/concerns/authorization_extensions/modalities.rb b/app/models/concerns/authorization_extensions/modalities.rb
@@ -1,9 +1,7 @@
 module AuthorizationExtensions::Modalities
   extend ActiveSupport::Concern
-  include AuthorizationCore::Attributes
-
   included do
-    add_attributes :modalities, type: :array
+    add_attributes :modalities
 
     validates :modalities,
       presence: true,

diff --git a/spec/models/authorization_request/api_particulier_spec.rb b/spec/models/authorization_request/api_particulier_spec.rb
@@ -13,7 +13,7 @@
     context 'with values' do
       let(:authorization_request) { create(:authorization_request, :api_particulier, modalities: %w[params formulaire_qf]) }
 
-      it { is_expected.to eq(%w[params formulaire_qf]) }
+      it { is_expected.to eq(%w[formulaire_qf params]) }
     end
   end