From 0712816ab00933e2c772110e046308a9aad13403 Mon Sep 17 00:00:00 2001 From: Camille Regnault Date: Thu, 6 Aug 2026 18:38:49 +0200 Subject: [PATCH 01/15] refactor: fusionne les 2 controllers de choix du mode en un wizard Wicked MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remplace les 2 controllers par un unique Candidate::GroupingWizardController basé sur Wicked (même pattern que MarketApplicationsController), où Précédent/Continuer naviguent toujours d'un cran réel dans une séquence figée plutôt que de recalculer la destination à chaque clic. Centralise la cascade de résolution "prochaine étape requise" dans MarketApplication#next_required_wizard_step, utilisée par sessions_controller, ApplicationModeGuard et l'API éditeur (api/v1/market_applications_controller) pour éviter les divergences entre ces 3 points d'entrée. --- .../api/v1/market_applications_controller.rb | 13 +- .../candidate/application_modes_controller.rb | 65 ---- .../grouping_legal_types_controller.rb | 44 --- .../candidate/grouping_wizard_controller.rb | 149 ++++++++ .../candidate/sessions_controller.rb | 20 +- .../candidate/application_mode_guard.rb | 9 +- app/models/market_application.rb | 15 + .../application_mode.html.erb} | 4 +- .../grouping_legal_type.html.erb} | 12 +- config/routes.rb | 6 +- .../step_definitions/candidacy_mode_steps.rb | 8 +- .../grouping_legal_type_steps.rb | 2 +- .../create_applications_for_mode_spec.rb | 10 + spec/models/market_application_spec.rb | 57 +++ .../api/v1/market_applications_spec.rb | 19 + .../candidate/application_modes_spec.rb | 257 -------------- .../candidate/company_identifications_spec.rb | 2 +- .../candidate/grouping_legal_types_spec.rb | 85 ----- .../candidate/grouping_wizard_spec.rb | 336 ++++++++++++++++++ .../requests/candidate/lot_selections_spec.rb | 2 +- .../candidate/market_applications_spec.rb | 5 +- spec/requests/candidate/sessions_spec.rb | 2 +- 22 files changed, 633 insertions(+), 489 deletions(-) delete mode 100644 app/controllers/candidate/application_modes_controller.rb delete mode 100644 app/controllers/candidate/grouping_legal_types_controller.rb create mode 100644 app/controllers/candidate/grouping_wizard_controller.rb rename app/views/candidate/{application_modes/show.html.erb => grouping_wizard/application_mode.html.erb} (96%) rename app/views/candidate/{grouping_legal_types/show.html.erb => grouping_wizard/grouping_legal_type.html.erb} (88%) delete mode 100644 spec/requests/candidate/application_modes_spec.rb delete mode 100644 spec/requests/candidate/grouping_legal_types_spec.rb create mode 100644 spec/requests/candidate/grouping_wizard_spec.rb diff --git a/app/controllers/api/v1/market_applications_controller.rb b/app/controllers/api/v1/market_applications_controller.rb index 5f2369ad..4f01e00b 100644 --- a/app/controllers/api/v1/market_applications_controller.rb +++ b/app/controllers/api/v1/market_applications_controller.rb @@ -75,11 +75,8 @@ def success_response(market_application) end def application_url_for(market_application) - if market_application.application_mode_choice_required? - return Rails.application.routes.url_helpers.application_mode_candidate_market_application_url( - market_application.identifier - ) - end + target, step = market_application.next_required_wizard_step + return wizard_step_url(target, step) if target Rails.application.routes.url_helpers.step_candidate_market_application_url( market_application.identifier, @@ -87,6 +84,12 @@ def application_url_for(market_application) ) end + def wizard_step_url(market_application, step) + Rails.application.routes.url_helpers.grouping_wizard_step_candidate_market_application_url( + market_application.identifier, step + ) + end + def validate_application_completed return if @market_application.completed? diff --git a/app/controllers/candidate/application_modes_controller.rb b/app/controllers/candidate/application_modes_controller.rb deleted file mode 100644 index f5322d01..00000000 --- a/app/controllers/candidate/application_modes_controller.rb +++ /dev/null @@ -1,65 +0,0 @@ -# frozen_string_literal: true - -module Candidate - class ApplicationModesController < Candidate::ApplicationController - include Candidate::GroupementFeatureGuard - include Candidate::MarketApplicationGuard - - prepend_before_action :find_market_application - before_action :redirect_if_mode_already_chosen - - def show - @already_mandataire = already_mandataire_elsewhere? - @readonly = @market_application.application_mode.present? - @readonly_continue_path = next_step_path(@market_application) if @readonly - end - - def update - result = Candidate::CreateApplicationsForMode.call( - market_application: @market_application, - application_mode: params[:application_mode] - ) - - return handle_success(result) if result.success? - - @already_mandataire = already_mandataire_elsewhere? - @errors = result.errors - render :show, status: :unprocessable_content - end - - private - - def find_market_application - @market_application = MarketApplication.find_by!(identifier: params[:identifier]) - rescue ActiveRecord::RecordNotFound - render plain: "La candidature recherchée n'a pas été trouvée", status: :not_found - end - - def redirect_if_mode_already_chosen - return if @market_application.application_mode.nil? - return if action_name == 'show' && params[:readonly].present? - - redirect_to next_step_path(@market_application) - end - - def next_step_path(market_application) - if market_application.grouping_legal_type_choice_required? - grouping_legal_type_candidate_market_application_path(market_application.identifier) - else - company_identification_candidate_market_application_path(market_application.identifier) - end - end - - def already_mandataire_elsewhere? - Grouping - .joins(:mandataire_market_application) - .where(public_market: @market_application.public_market, market_applications: { siret: @market_application.siret }) - .where.not(market_applications: { id: @market_application.id }) - .exists? - end - - def handle_success(result) - redirect_to next_step_path(result.market_application) - end - end -end diff --git a/app/controllers/candidate/grouping_legal_types_controller.rb b/app/controllers/candidate/grouping_legal_types_controller.rb deleted file mode 100644 index 03da97a3..00000000 --- a/app/controllers/candidate/grouping_legal_types_controller.rb +++ /dev/null @@ -1,44 +0,0 @@ -# frozen_string_literal: true - -module Candidate - class GroupingLegalTypesController < Candidate::ApplicationController - include Candidate::GroupementFeatureGuard - include Candidate::MarketApplicationGuard - - prepend_before_action :find_market_application - before_action :redirect_unless_mandataire - - def show; end - - def update - result = Candidate::SetGroupingLegalType.call( - market_application: @market_application, - legal_type: params[:legal_type] - ) - - return handle_success if result.success? - - @errors = result.errors - render :show, status: :unprocessable_content - end - - private - - def find_market_application - @market_application = MarketApplication.find_by!(identifier: params[:identifier]) - rescue ActiveRecord::RecordNotFound - render plain: "La candidature recherchée n'a pas été trouvée", status: :not_found - end - - def redirect_unless_mandataire - @grouping = Grouping.joins(:mandataire_market_application).find_by(market_applications: { id: @market_application.id }) - return if @grouping - - redirect_to application_mode_candidate_market_application_path(@market_application.identifier) - end - - def handle_success - redirect_to company_identification_candidate_market_application_path(@market_application.identifier) - end - end -end diff --git a/app/controllers/candidate/grouping_wizard_controller.rb b/app/controllers/candidate/grouping_wizard_controller.rb new file mode 100644 index 00000000..6ac65dd2 --- /dev/null +++ b/app/controllers/candidate/grouping_wizard_controller.rb @@ -0,0 +1,149 @@ +# frozen_string_literal: true + +module Candidate + class GroupingWizardController < Candidate::ApplicationController + include Wicked::Wizard + include Candidate::GroupementFeatureGuard + include Candidate::MarketApplicationGuard + + rescue_from Wicked::Wizard::InvalidStepError, with: :redirect_to_application_mode + + prepend_before_action :set_steps + prepend_before_action :find_market_application + before_action :redirect_unless_mandataire, unless: -> { params[:id] == 'application_mode' } + + def show + case step + when :application_mode then show_application_mode + when :grouping_legal_type then show_grouping_legal_type + end + + render_wizard unless performed? + end + + def update + case step + when :application_mode then update_application_mode + when :grouping_legal_type then update_grouping_legal_type + end + end + + private + + def set_steps + self.steps = if @market_application&.groupement? + %i[application_mode grouping_legal_type] + else + %i[application_mode] + end + end + + def find_market_application + @market_application = MarketApplication.find_by!(identifier: params[:identifier]) + rescue ActiveRecord::RecordNotFound + render plain: "La candidature recherchée n'a pas été trouvée", status: :not_found + end + + def finish_wizard_path + company_identification_candidate_market_application_path(@market_application.identifier) + end + + def redirect_to_application_mode + redirect_to grouping_wizard_step_candidate_market_application_path(@market_application.identifier, :application_mode) + end + + def redirect_unless_mandataire + return if grouping + + redirect_to_application_mode + end + + def next_wizard_step_path(from_step) + counterpart = @market_application.groupement_counterpart + return counterpart_next_wizard_step_path(counterpart) if counterpart + + next_real_step = next_step(from_step) + return finish_wizard_path if next_real_step == Wicked::FINISH_STEP + + wizard_step_path(@market_application, next_real_step) + end + + def counterpart_next_wizard_step_path(counterpart) + return wizard_step_path(counterpart, :grouping_legal_type) if counterpart.grouping_legal_type_choice_required? + + finish_wizard_path + end + + def wizard_step_path(market_application, step) + grouping_wizard_step_candidate_market_application_path(market_application.identifier, step) + end + + # --- application_mode step --- + + def show_application_mode + return redirect_to(next_wizard_step_path(:application_mode)) if @market_application.application_mode.present? && !params[:readonly] + + @already_mandataire = already_mandataire_elsewhere? + @readonly = @market_application.application_mode.present? + @readonly_continue_path = readonly_continue_path if @readonly + end + + def readonly_continue_path + next_wizard_step_path(:application_mode) + end + + def update_application_mode + result = Candidate::CreateApplicationsForMode.call( + market_application: @market_application, + application_mode: params[:application_mode] + ) + + return handle_application_mode_success(result) if result.success? + + @already_mandataire = already_mandataire_elsewhere? + @errors = result.errors + render_wizard(nil, status: :unprocessable_content) + end + + def handle_application_mode_success(result) + @market_application = result.market_application + set_steps + redirect_to next_wizard_step_path(:application_mode) + end + + def already_mandataire_elsewhere? + Grouping + .joins(:mandataire_market_application) + .where(public_market: @market_application.public_market, market_applications: { siret: @market_application.siret }) + .where.not(market_applications: { id: @market_application.id }) + .exists? + end + + # --- grouping_legal_type step --- + + def show_grouping_legal_type + @grouping = grouping + end + + def update_grouping_legal_type + result = Candidate::SetGroupingLegalType.call( + market_application: @market_application, + legal_type: params[:legal_type] + ) + + if result.success? + redirect_to next_wizard_step_path(:grouping_legal_type) + else + @grouping = grouping + @errors = result.errors + render_wizard(nil, status: :unprocessable_content) + end + end + + def grouping + return @grouping if defined?(@grouping) + + @grouping = Grouping.joins(:mandataire_market_application).find_by(market_applications: { id: @market_application.id }) + end + end +end diff --git a/app/controllers/candidate/sessions_controller.rb b/app/controllers/candidate/sessions_controller.rb index cd84b3b1..499825c3 100644 --- a/app/controllers/candidate/sessions_controller.rb +++ b/app/controllers/candidate/sessions_controller.rb @@ -45,16 +45,22 @@ def sign_in_candidate(user, market_application) end def first_step_path(market_application) - if market_application.completed? - return deadline_passed_candidate_market_application_path(market_application.identifier) unless market_application.public_market.open? + return completed_application_path(market_application) if market_application.completed? - return candidate_sync_status_path(market_application.identifier) - end + target, step = market_application.next_required_wizard_step + return company_identification_candidate_market_application_path(market_application.identifier) unless target - return application_mode_candidate_market_application_path(market_application.identifier) if market_application.application_mode_choice_required? - return grouping_legal_type_candidate_market_application_path(market_application.identifier) if market_application.grouping_legal_type_choice_required? + wizard_step_path(target, step) + end + + def completed_application_path(market_application) + return deadline_passed_candidate_market_application_path(market_application.identifier) unless market_application.public_market.open? + + candidate_sync_status_path(market_application.identifier) + end - company_identification_candidate_market_application_path(market_application.identifier) + def wizard_step_path(market_application, step) + grouping_wizard_step_candidate_market_application_path(market_application.identifier, step) end def handle_magic_link_sent(result) diff --git a/app/controllers/concerns/candidate/application_mode_guard.rb b/app/controllers/concerns/candidate/application_mode_guard.rb index 848431f7..de5d7899 100644 --- a/app/controllers/concerns/candidate/application_mode_guard.rb +++ b/app/controllers/concerns/candidate/application_mode_guard.rb @@ -11,9 +11,14 @@ module ApplicationModeGuard private def redirect_to_application_mode_choice - return unless @market_application&.application_mode_choice_required? + return unless @market_application - redirect_to application_mode_candidate_market_application_path(@market_application.identifier) + target, step = @market_application.next_required_wizard_step + redirect_to_wizard_step(step, target) if target + end + + def redirect_to_wizard_step(step, market_application = @market_application) + redirect_to grouping_wizard_step_candidate_market_application_path(market_application.identifier, step) end end end diff --git a/app/models/market_application.rb b/app/models/market_application.rb index 36ee72ea..17e544a0 100644 --- a/app/models/market_application.rb +++ b/app/models/market_application.rb @@ -57,6 +57,21 @@ def grouping_legal_type_choice_required? Grouping.joins(:mandataire_market_application).exists?(legal_type: nil, market_applications: { id: }) end + def groupement_counterpart + return nil if groupement? + + MarketApplication.where(public_market:, siret:, application_mode: :groupement, user_id:).where.not(id:).first + end + + def next_required_wizard_step + return [self, :application_mode] if application_mode_choice_required? + + target = groupement_counterpart || self + return [target, :grouping_legal_type] if target.grouping_legal_type_choice_required? + + nil + end + def update_api_status(api_name, status:, fields_filled: 0) with_lock do updated_status = (api_fetch_status || {}).dup diff --git a/app/views/candidate/application_modes/show.html.erb b/app/views/candidate/grouping_wizard/application_mode.html.erb similarity index 96% rename from app/views/candidate/application_modes/show.html.erb rename to app/views/candidate/grouping_wizard/application_mode.html.erb index ab949d30..792df0a6 100644 --- a/app/views/candidate/application_modes/show.html.erb +++ b/app/views/candidate/grouping_wizard/application_mode.html.erb @@ -28,9 +28,7 @@ <% end %> - <%= form_with url: application_mode_candidate_market_application_path(@market_application.identifier), - method: :patch, - data: { controller: "enable-on-choice" } do |form| %> + <%= form_with url: wizard_path, method: :patch, data: { controller: "enable-on-choice" } do |form| %>
> <%= t('candidate.application_modes.title') %> diff --git a/app/views/candidate/grouping_legal_types/show.html.erb b/app/views/candidate/grouping_wizard/grouping_legal_type.html.erb similarity index 88% rename from app/views/candidate/grouping_legal_types/show.html.erb rename to app/views/candidate/grouping_wizard/grouping_legal_type.html.erb index 632a4385..5f2527dd 100644 --- a/app/views/candidate/grouping_legal_types/show.html.erb +++ b/app/views/candidate/grouping_wizard/grouping_legal_type.html.erb @@ -2,7 +2,7 @@

<%= t('candidate.grouping_legal_types.step_current') %>

-

<%= t('candidate.grouping_legal_types.title') %>

+

<%= t('candidate.grouping_legal_types.title') %>

@@ -15,7 +15,7 @@ <%= t('candidate.grouping_legal_types.step_next_label') %>

-

<%= t('candidate.grouping_legal_types.question') %>

+

<%= t('candidate.grouping_legal_types.question') %>

<% if @errors.present? %> - <%= form_with url: grouping_legal_type_candidate_market_application_path(@market_application.identifier), - method: :patch, - data: { controller: "enable-on-choice" } do |form| %> + <%= form_with url: wizard_path, method: :patch, data: { controller: "enable-on-choice" } do |form| %>
<%= t('candidate.grouping_legal_types.question') %> @@ -57,7 +55,7 @@ <%= t("candidate.grouping_legal_types.#{legal_type}.label") %> <% if legal_type == 'conjoint_mandataire_solidaire' %> - + <%= t('candidate.grouping_legal_types.most_common_badge') %> <% end %> @@ -76,7 +74,7 @@
<%= link_to t('candidate.grouping_legal_types.back'), - application_mode_candidate_market_application_path(@market_application.identifier, readonly: true), + previous_wizard_path(readonly: true), class: "fr-btn fr-btn--secondary fr-icon-arrow-left-line fr-btn--icon-left" %> <%= form.button t('candidate.grouping_legal_types.continue'), type: "submit", diff --git a/config/routes.rb b/config/routes.rb index 2a72b6d6..2693f63b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -86,10 +86,8 @@ resources :market_applications, param: :identifier, only: [:destroy] do member do get 'deadline_passed', to: 'deadline_passed#show', as: :deadline_passed - get 'application_mode', to: 'application_modes#show', as: :application_mode - patch 'application_mode', to: 'application_modes#update' - get 'grouping_legal_type', to: 'grouping_legal_types#show', as: :grouping_legal_type - patch 'grouping_legal_type', to: 'grouping_legal_types#update' + get 'grouping_wizard/:id', to: 'grouping_wizard#show', as: :grouping_wizard_step + patch 'grouping_wizard/:id', to: 'grouping_wizard#update' get 'company_identification', to: 'company_identifications#show', as: :company_identification patch 'company_identification', to: 'company_identifications#update' get 'lots', to: 'lot_selections#show', as: :lot_selection diff --git a/features/step_definitions/candidacy_mode_steps.rb b/features/step_definitions/candidacy_mode_steps.rb index b5154420..913d8913 100644 --- a/features/step_definitions/candidacy_mode_steps.rb +++ b/features/step_definitions/candidacy_mode_steps.rb @@ -32,14 +32,14 @@ Then('I should be on the grouping legal type step') do expect(page).to have_current_path( - grouping_legal_type_candidate_market_application_path(@market_application.identifier), + grouping_wizard_step_candidate_market_application_path(@market_application.identifier, :grouping_legal_type), ignore_query: true ) end Then('I should be on the candidacy mode choice step') do expect(page).to have_current_path( - application_mode_candidate_market_application_path(@market_application.identifier), + grouping_wizard_step_candidate_market_application_path(@market_application.identifier, :application_mode), ignore_query: true ) end @@ -52,9 +52,9 @@ end Then('I should land on the grouping legal type step of the groupement application') do - expect(page).to have_current_path(%r{/candidate/market_applications/.+/grouping_legal_type}) + expect(page).to have_current_path(%r{/candidate/market_applications/.+/grouping_wizard/grouping_legal_type}) - landed_identifier = page.current_path[%r{/candidate/market_applications/([^/]+)/grouping_legal_type}, 1] + landed_identifier = page.current_path[%r{/candidate/market_applications/([^/]+)/grouping_wizard/grouping_legal_type}, 1] expect(landed_identifier).not_to eq(@market_application.identifier) @groupement_market_application = MarketApplication.find_by!(identifier: landed_identifier) diff --git a/features/step_definitions/grouping_legal_type_steps.rb b/features/step_definitions/grouping_legal_type_steps.rb index f43358eb..82e44566 100644 --- a/features/step_definitions/grouping_legal_type_steps.rb +++ b/features/step_definitions/grouping_legal_type_steps.rb @@ -6,7 +6,7 @@ end When('I visit the grouping legal type step directly') do - visit grouping_legal_type_candidate_market_application_path(@market_application.identifier) + visit grouping_wizard_step_candidate_market_application_path(@market_application.identifier, :grouping_legal_type) end Then('the grouping legal type should be {string}') do |legal_type| diff --git a/spec/interactors/candidate/create_applications_for_mode_spec.rb b/spec/interactors/candidate/create_applications_for_mode_spec.rb index 3dbcb0aa..c23927d5 100644 --- a/spec/interactors/candidate/create_applications_for_mode_spec.rb +++ b/spec/interactors/candidate/create_applications_for_mode_spec.rb @@ -103,6 +103,16 @@ expect(Grouping.count).to eq(1) expect(Grouping.last.mandataire_market_application).to eq(result.market_application) end + + context 'when the candidate is already authenticated on the solo application' do + let(:user) { create(:user) } + let!(:market_application) { create(:market_application, public_market:, siret:, user:) } + + it 'links the groupement counterpart to the same user' do + result = subject + expect(result.market_application.user).to eq(user) + end + end end context 'when mixte mode finds an existing groupement application owned by another user' do diff --git a/spec/models/market_application_spec.rb b/spec/models/market_application_spec.rb index 04697da4..79fa1691 100644 --- a/spec/models/market_application_spec.rb +++ b/spec/models/market_application_spec.rb @@ -206,6 +206,63 @@ end end + describe '#groupement_counterpart' do + let(:siret) { '73282932000074' } + + it 'finds the groupement application for the same SIRET and market when called on the solo one' do + solo = create(:market_application, public_market:, siret:, application_mode: :solo) + groupement = create(:market_application, public_market:, siret:, application_mode: :groupement) + + expect(solo.groupement_counterpart).to eq(groupement) + end + + it 'returns nil when the application is not mixte-related (only a solo exists)' do + solo = create(:market_application, public_market:, siret:, application_mode: :solo) + + expect(solo.groupement_counterpart).to be_nil + end + + it 'returns nil when the application itself is the groupement one' do + groupement = create(:market_application, public_market:, siret:, application_mode: :groupement) + + expect(groupement.groupement_counterpart).to be_nil + end + + it 'returns nil for a solo application that is not part of a mixte pair on another market' do + other_market = create(:public_market, :completed, editor:) + create(:market_application, public_market: other_market, siret:, application_mode: :groupement) + solo = create(:market_application, public_market:, siret:, application_mode: :solo) + + expect(solo.groupement_counterpart).to be_nil + end + end + + describe '#next_required_wizard_step' do + it 'returns application_mode when the mode has not been chosen yet' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) + application = build(:market_application, public_market:, application_mode: nil) + + expect(application.next_required_wizard_step).to eq([application, :application_mode]) + end + + it 'returns grouping_legal_type on the groupement counterpart for a mixte solo application' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) + siret = '73282932000074' + solo = create(:market_application, public_market:, siret:, application_mode: :solo) + groupement = create(:market_application, public_market:, siret:, application_mode: :groupement) + create(:grouping, public_market:, mandataire_market_application: groupement, legal_type: nil) + + expect(solo.next_required_wizard_step).to eq([groupement, :grouping_legal_type]) + end + + it 'returns nil once nothing is required' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) + application = create(:market_application, public_market:, application_mode: :solo) + + expect(application.next_required_wizard_step).to be_nil + end + end + describe '#in_progress?' do it 'returns true when not completed' do application = build(:market_application, public_market:) diff --git a/spec/requests/api/v1/market_applications_spec.rb b/spec/requests/api/v1/market_applications_spec.rb index b0a93bc7..614b7865 100644 --- a/spec/requests/api/v1/market_applications_spec.rb +++ b/spec/requests/api/v1/market_applications_spec.rb @@ -7,6 +7,8 @@ let(:public_market) { create(:public_market, :published, editor:) } let(:access_token) { oauth_access_token_for(editor) } + before { allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(false) } + describe 'POST /api/v1/public_markets/:public_market_id/market_applications' do let(:valid_siret) { '73282932000074' } let(:invalid_siret) { '12345678901234' } @@ -111,6 +113,23 @@ expect(json_response['application_url']).to include('/company_identification') end + it 'points to the groupement counterpart grouping_legal_type step when the existing application is mixte' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) + solo_application = create(:market_application, public_market:, siret: valid_siret, application_mode: :solo) + groupement_application = create(:market_application, public_market:, siret: valid_siret, application_mode: :groupement) + create(:grouping, public_market:, mandataire_market_application: groupement_application, legal_type: nil) + + post "/api/v1/public_markets/#{public_market.identifier}/market_applications", + params: valid_params, + headers: { 'Authorization' => "Bearer #{access_token}" }, + as: :json + + expect(response).to have_http_status(:ok) + json_response = response.parsed_body + expect(json_response['identifier']).to eq(solo_application.identifier) + expect(json_response['application_url']).to include("/#{groupement_application.identifier}/grouping_wizard/grouping_legal_type") + end + it 'returns error when public market not found' do post '/api/v1/public_markets/NONEXISTENT/market_applications', params: valid_params, diff --git a/spec/requests/candidate/application_modes_spec.rb b/spec/requests/candidate/application_modes_spec.rb deleted file mode 100644 index c703f90c..00000000 --- a/spec/requests/candidate/application_modes_spec.rb +++ /dev/null @@ -1,257 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe 'Candidate::ApplicationModes', type: :request do - let(:editor) { create(:editor) } - let(:public_market) { create(:public_market, :completed, editor:) } - let(:market_application) { create(:market_application, public_market:, siret: '73282932000074') } - let(:user) { create(:user) } - - before do - allow(SiretValidator).to receive(:valid?).and_return(true) - allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) - sign_in_as_candidate(user, market_application) - end - - describe 'authentication' do - it 'renders the login form instead of the page when not authenticated' do - other_application = create(:market_application, public_market:, siret: '11122233300014') - - get application_mode_candidate_market_application_path(other_application.identifier) - - expect(response).to have_http_status(:ok) - expect(response.body).to include(I18n.t('candidate.sessions.new.title')) - expect(response.body).not_to include(I18n.t('candidate.application_modes.title')) - end - end - - describe 'GET /candidate/market_applications/:identifier/application_mode' do - it 'renders successfully when the mode is not chosen yet' do - get application_mode_candidate_market_application_path(market_application.identifier) - expect(response).to have_http_status(:ok) - end - - it 'returns 404 when the feature flag is disabled' do - allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(false) - - get application_mode_candidate_market_application_path(market_application.identifier) - expect(response).to have_http_status(:not_found) - end - - it 'redirects to company_identification when the mode is already chosen' do - market_application.update!(application_mode: :solo) - - get application_mode_candidate_market_application_path(market_application.identifier) - expect(response).to redirect_to( - company_identification_candidate_market_application_path(market_application.identifier) - ) - end - - context 'when the mode is groupement and the legal type is not chosen yet' do - before do - market_application.update!(application_mode: :groupement) - create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: nil) - end - - it 'redirects to grouping_legal_type instead of company_identification' do - get application_mode_candidate_market_application_path(market_application.identifier) - - expect(response).to redirect_to( - grouping_legal_type_candidate_market_application_path(market_application.identifier) - ) - end - end - - context 'when the mode is groupement and the legal type is already chosen' do - before do - market_application.update!(application_mode: :groupement) - create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: :conjoint) - end - - it 'redirects to company_identification' do - get application_mode_candidate_market_application_path(market_application.identifier) - - expect(response).to redirect_to( - company_identification_candidate_market_application_path(market_application.identifier) - ) - end - end - - context 'when readonly is requested and the mode is already chosen' do - before do - market_application.update!(application_mode: :groupement) - create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: :conjoint) - end - - it 'renders the screen instead of redirecting' do - get application_mode_candidate_market_application_path(market_application.identifier, readonly: true) - - expect(response).to have_http_status(:ok) - end - - it 'disables the fieldset' do - get application_mode_candidate_market_application_path(market_application.identifier, readonly: true) - - rendered = Nokogiri::HTML(response.body) - expect(rendered.at_css('fieldset')['disabled']).to eq('disabled') - end - - it 'checks the already chosen mode' do - get application_mode_candidate_market_application_path(market_application.identifier, readonly: true) - - rendered = Nokogiri::HTML(response.body) - expect(rendered.at_css('#application_mode_groupement')['checked']).to eq('checked') - end - - it 'does not show the already-mandataire-elsewhere callout for its own grouping' do - get application_mode_candidate_market_application_path(market_application.identifier, readonly: true) - - rendered = Nokogiri::HTML(response.body) - expect(rendered.text).not_to include(I18n.t('candidate.application_modes.already_mandataire_box.title')) - end - - it 'points the continue link to company_identification since the legal type is already chosen' do - get application_mode_candidate_market_application_path(market_application.identifier, readonly: true) - - rendered = Nokogiri::HTML(response.body) - link = rendered.at_css('a.fr-icon-arrow-right-line') - expect(link['href']).to eq(company_identification_candidate_market_application_path(market_application.identifier)) - end - end - - context 'when readonly is requested and the legal type is not chosen yet' do - before do - market_application.update!(application_mode: :groupement) - create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: nil) - end - - it 'points the continue link to grouping_legal_type' do - get application_mode_candidate_market_application_path(market_application.identifier, readonly: true) - - rendered = Nokogiri::HTML(response.body) - link = rendered.at_css('a.fr-icon-arrow-right-line') - expect(link['href']).to eq(grouping_legal_type_candidate_market_application_path(market_application.identifier)) - end - end - - context 'when the application is already completed' do - let(:market_application) do - create(:market_application, :completed, public_market:, siret: '73282932000074') - end - - it 'redirects to sync status instead of showing the choice screen' do - get application_mode_candidate_market_application_path(market_application.identifier) - - expect(response).to redirect_to(candidate_sync_status_path(market_application.identifier)) - end - end - end - - describe 'PATCH /candidate/market_applications/:identifier/application_mode' do - it 'sets the mode to solo and redirects to company_identification' do - patch application_mode_candidate_market_application_path(market_application.identifier), - params: { application_mode: 'solo' } - - expect(market_application.reload).to be_solo - expect(response).to redirect_to( - company_identification_candidate_market_application_path(market_application.identifier) - ) - end - - it 'creates a grouping when choosing groupement' do - expect do - patch application_mode_candidate_market_application_path(market_application.identifier), - params: { application_mode: 'groupement' } - end.to change(Grouping, :count).by(1) - - expect(market_application.reload).to be_groupement - expect(response).to redirect_to( - grouping_legal_type_candidate_market_application_path(market_application.identifier) - ) - end - - it 'does not require re-authentication when reaching the next step after choosing groupement' do - patch application_mode_candidate_market_application_path(market_application.identifier), - params: { application_mode: 'groupement' } - - get company_identification_candidate_market_application_path(market_application.identifier) - - expect(response).to have_http_status(:ok) - expect(response.body).not_to include(I18n.t('candidate.sessions.new.siret_label')) - end - - it 'creates two applications when choosing mixte and redirects to grouping_legal_type' do - expect do - patch application_mode_candidate_market_application_path(market_application.identifier), - params: { application_mode: 'mixte' } - end.to change(MarketApplication, :count).by(1) - - groupement_application = MarketApplication.find_by(public_market:, siret: market_application.siret, - application_mode: :groupement) - expect(response).to redirect_to( - grouping_legal_type_candidate_market_application_path(groupement_application.identifier) - ) - end - - it 'associates the authenticated user to the groupement counterpart created in mixte mode' do - patch application_mode_candidate_market_application_path(market_application.identifier), - params: { application_mode: 'mixte' } - - groupement_application = MarketApplication.where(public_market:, siret: market_application.siret, - application_mode: :groupement).sole - - expect(groupement_application.user).to eq(user) - end - - it 'does not require re-authentication when reaching the next step after choosing mixte' do - patch application_mode_candidate_market_application_path(market_application.identifier), - params: { application_mode: 'mixte' } - - groupement_application = MarketApplication.where(public_market:, siret: market_application.siret, - application_mode: :groupement).sole - - get company_identification_candidate_market_application_path(groupement_application.identifier) - - expect(response).to have_http_status(:ok) - expect(response.body).not_to include(I18n.t('candidate.sessions.new.siret_label')) - end - - context 'when the SIRET is already mandataire of a grouping on this market' do - before do - other_application = create(:market_application, public_market:, siret: market_application.siret, - application_mode: :groupement) - create(:grouping, public_market:, mandataire_market_application: other_application) - end - - it 'rejects groupement mode with a 422' do - patch application_mode_candidate_market_application_path(market_application.identifier), - params: { application_mode: 'groupement' } - - expect(response).to have_http_status(:unprocessable_content) - expect(market_application.reload.application_mode).to be_nil - end - - it 'renders the already-mandataire error message and re-disables groupement/mixte' do - patch application_mode_candidate_market_application_path(market_application.identifier), - params: { application_mode: 'groupement' } - - rendered = Nokogiri::HTML(response.body) - expect(rendered.text).to include(I18n.t('candidate.validations.already_mandataire')) - expect(rendered.text).to include(I18n.t('candidate.application_modes.already_mandataire_box.title')) - - expect(rendered.at_css('#application_mode_groupement')['disabled']).to eq('disabled') - expect(rendered.at_css('#application_mode_mixte')['disabled']).to eq('disabled') - end - - it 'still allows solo mode' do - patch application_mode_candidate_market_application_path(market_application.identifier), - params: { application_mode: 'solo' } - - expect(response).to redirect_to( - company_identification_candidate_market_application_path(market_application.identifier) - ) - end - end - end -end diff --git a/spec/requests/candidate/company_identifications_spec.rb b/spec/requests/candidate/company_identifications_spec.rb index fab8764d..5b1bd3a4 100644 --- a/spec/requests/candidate/company_identifications_spec.rb +++ b/spec/requests/candidate/company_identifications_spec.rb @@ -45,7 +45,7 @@ get company_identification_candidate_market_application_path(market_application.identifier) expect(response).to redirect_to( - application_mode_candidate_market_application_path(market_application.identifier) + grouping_wizard_step_candidate_market_application_path(market_application.identifier, :application_mode) ) end end diff --git a/spec/requests/candidate/grouping_legal_types_spec.rb b/spec/requests/candidate/grouping_legal_types_spec.rb deleted file mode 100644 index 58a088d1..00000000 --- a/spec/requests/candidate/grouping_legal_types_spec.rb +++ /dev/null @@ -1,85 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe 'Candidate::GroupingLegalTypes', type: :request do - let(:editor) { create(:editor) } - let(:public_market) { create(:public_market, :completed, editor:) } - let(:market_application) do - create(:market_application, public_market:, siret: '73282932000074', application_mode: :groupement) - end - let(:user) { create(:user) } - - before do - allow(SiretValidator).to receive(:valid?).and_return(true) - allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) - sign_in_as_candidate(user, market_application) - end - - describe 'GET /candidate/market_applications/:identifier/grouping_legal_type' do - context 'when the market_application is mandataire of a grouping' do - before { create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: nil) } - - it 'renders successfully' do - get grouping_legal_type_candidate_market_application_path(market_application.identifier) - expect(response).to have_http_status(:ok) - expect(response.body).to include(I18n.t('candidate.grouping_legal_types.title')) - end - - it 'returns 404 when the feature flag is disabled' do - allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(false) - - get grouping_legal_type_candidate_market_application_path(market_application.identifier) - expect(response).to have_http_status(:not_found) - end - end - - context 'when the market_application is not mandataire of any grouping' do - it 'redirects to application_mode' do - get grouping_legal_type_candidate_market_application_path(market_application.identifier) - - expect(response).to redirect_to( - application_mode_candidate_market_application_path(market_application.identifier) - ) - end - end - - context 'when the application mode is solo' do - let(:market_application) do - create(:market_application, public_market:, siret: '73282932000074', application_mode: :solo) - end - - it 'redirects to application_mode' do - get grouping_legal_type_candidate_market_application_path(market_application.identifier) - - expect(response).to redirect_to( - application_mode_candidate_market_application_path(market_application.identifier) - ) - end - end - end - - describe 'PATCH /candidate/market_applications/:identifier/grouping_legal_type' do - before { create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: nil) } - - it 'sets the legal_type and redirects to company_identification' do - patch grouping_legal_type_candidate_market_application_path(market_application.identifier), - params: { legal_type: 'conjoint_mandataire_solidaire' } - - expect(Grouping.joins(:mandataire_market_application).find_by(market_applications: { id: market_application.id }).legal_type) - .to eq('conjoint_mandataire_solidaire') - expect(response).to redirect_to( - company_identification_candidate_market_application_path(market_application.identifier) - ) - end - - it 'rejects an invalid legal_type with a 422' do - patch grouping_legal_type_candidate_market_application_path(market_application.identifier), - params: { legal_type: 'invalid_garbage' } - - expect(response).to have_http_status(:unprocessable_content) - rendered = Nokogiri::HTML(response.body) - expect(rendered.text).to include(I18n.t('candidate.validations.legal_type_invalid')) - end - end -end diff --git a/spec/requests/candidate/grouping_wizard_spec.rb b/spec/requests/candidate/grouping_wizard_spec.rb new file mode 100644 index 00000000..b31606ad --- /dev/null +++ b/spec/requests/candidate/grouping_wizard_spec.rb @@ -0,0 +1,336 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe 'Candidate::GroupingWizard', type: :request do + let(:editor) { create(:editor) } + let(:public_market) { create(:public_market, :completed, editor:) } + let(:market_application) { create(:market_application, public_market:, siret: '73282932000074') } + let(:user) { create(:user) } + + before do + allow(SiretValidator).to receive(:valid?).and_return(true) + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) + sign_in_as_candidate(user, market_application) + end + + def wizard_step_path(market_application, step) + grouping_wizard_step_candidate_market_application_path(market_application.identifier, step) + end + + describe 'authentication' do + it 'renders the login form instead of the page when not authenticated' do + other_application = create(:market_application, public_market:, siret: '11122233300014') + + get wizard_step_path(other_application, :application_mode) + + expect(response).to have_http_status(:ok) + expect(response.body).to include(I18n.t('candidate.sessions.new.title')) + expect(response.body).not_to include(I18n.t('candidate.application_modes.title')) + end + end + + describe 'GET .../grouping_wizard/application_mode' do + it 'renders successfully when the mode is not chosen yet' do + get wizard_step_path(market_application, :application_mode) + expect(response).to have_http_status(:ok) + end + + it 'returns 404 when the feature flag is disabled' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(false) + + get wizard_step_path(market_application, :application_mode) + expect(response).to have_http_status(:not_found) + end + + it 'redirects to company_identification when the mode is already chosen and readonly is not requested' do + market_application.update!(application_mode: :solo) + + get wizard_step_path(market_application, :application_mode) + expect(response).to redirect_to( + company_identification_candidate_market_application_path(market_application.identifier) + ) + end + + context 'when the application is already completed' do + let(:market_application) do + create(:market_application, :completed, public_market:, siret: '73282932000074') + end + + it 'redirects to sync status instead of showing the choice screen' do + get wizard_step_path(market_application, :application_mode) + + expect(response).to redirect_to(candidate_sync_status_path(market_application.identifier)) + end + end + end + + describe 'PATCH .../grouping_wizard/application_mode' do + it 'sets the mode to solo and redirects to company_identification' do + patch wizard_step_path(market_application, :application_mode), params: { application_mode: 'solo' } + + expect(market_application.reload).to be_solo + expect(response).to redirect_to( + company_identification_candidate_market_application_path(market_application.identifier) + ) + end + + it 'creates a grouping when choosing groupement and redirects to grouping_legal_type' do + expect do + patch wizard_step_path(market_application, :application_mode), params: { application_mode: 'groupement' } + end.to change(Grouping, :count).by(1) + + expect(market_application.reload).to be_groupement + expect(response).to redirect_to(wizard_step_path(market_application, :grouping_legal_type)) + end + + it 'creates two applications when choosing mixte and redirects to grouping_legal_type of the groupement counterpart' do + expect do + patch wizard_step_path(market_application, :application_mode), params: { application_mode: 'mixte' } + end.to change(MarketApplication, :count).by(1) + + groupement_application = MarketApplication.find_by(public_market:, siret: market_application.siret, + application_mode: :groupement) + expect(response).to redirect_to(wizard_step_path(groupement_application, :grouping_legal_type)) + end + + it 'does not require re-authentication when reaching the next step after choosing groupement' do + patch wizard_step_path(market_application, :application_mode), params: { application_mode: 'groupement' } + + get wizard_step_path(market_application, :grouping_legal_type) + + expect(response).to have_http_status(:ok) + expect(response.body).not_to include(I18n.t('candidate.sessions.new.siret_label')) + end + + it 'associates the authenticated user to the groupement counterpart created in mixte mode' do + patch wizard_step_path(market_application, :application_mode), params: { application_mode: 'mixte' } + + groupement_application = MarketApplication.where(public_market:, siret: market_application.siret, + application_mode: :groupement).sole + + expect(groupement_application.user).to eq(user) + end + + it 'does not require re-authentication when reaching the next step after choosing mixte' do + patch wizard_step_path(market_application, :application_mode), params: { application_mode: 'mixte' } + + groupement_application = MarketApplication.where(public_market:, siret: market_application.siret, + application_mode: :groupement).sole + + get wizard_step_path(groupement_application, :grouping_legal_type) + + expect(response).to have_http_status(:ok) + expect(response.body).not_to include(I18n.t('candidate.sessions.new.siret_label')) + end + + context 'when the SIRET is already mandataire of a grouping on this market' do + before do + other_application = create(:market_application, public_market:, siret: market_application.siret, + application_mode: :groupement) + create(:grouping, public_market:, mandataire_market_application: other_application) + end + + it 'rejects groupement mode with a 422' do + patch wizard_step_path(market_application, :application_mode), params: { application_mode: 'groupement' } + + expect(response).to have_http_status(:unprocessable_content) + expect(market_application.reload.application_mode).to be_nil + end + + it 'renders the already-mandataire error message and re-disables groupement/mixte' do + patch wizard_step_path(market_application, :application_mode), params: { application_mode: 'groupement' } + + rendered = Nokogiri::HTML(response.body) + expect(rendered.text).to include(I18n.t('candidate.validations.already_mandataire')) + expect(rendered.text).to include(I18n.t('candidate.application_modes.already_mandataire_box.title')) + + expect(rendered.at_css('#application_mode_groupement')['disabled']).to eq('disabled') + expect(rendered.at_css('#application_mode_mixte')['disabled']).to eq('disabled') + end + + it 'still allows solo mode' do + patch wizard_step_path(market_application, :application_mode), params: { application_mode: 'solo' } + + expect(response).to redirect_to( + company_identification_candidate_market_application_path(market_application.identifier) + ) + end + end + end + + describe 'readonly navigation (application_mode already chosen)' do + context 'when the mode is groupement and no co-traitant has been added yet' do + before do + market_application.update!(application_mode: :groupement) + create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: :conjoint) + end + + it 'renders the screen in readonly instead of redirecting' do + get wizard_step_path(market_application, :application_mode), params: { readonly: true } + + expect(response).to have_http_status(:ok) + end + + it 'disables the fieldset' do + get wizard_step_path(market_application, :application_mode), params: { readonly: true } + + rendered = Nokogiri::HTML(response.body) + expect(rendered.at_css('fieldset')['disabled']).to eq('disabled') + end + + it 'checks the already chosen mode' do + get wizard_step_path(market_application, :application_mode), params: { readonly: true } + + rendered = Nokogiri::HTML(response.body) + expect(rendered.at_css('#application_mode_groupement')['checked']).to eq('checked') + end + + it 'does not show the already-mandataire-elsewhere callout for its own grouping' do + get wizard_step_path(market_application, :application_mode), params: { readonly: true } + + rendered = Nokogiri::HTML(response.body) + expect(rendered.text).not_to include(I18n.t('candidate.application_modes.already_mandataire_box.title')) + end + + it 'points the continue link to grouping_legal_type, not skipping it' do + get wizard_step_path(market_application, :application_mode), params: { readonly: true } + + rendered = Nokogiri::HTML(response.body) + link = rendered.at_css('a.fr-icon-arrow-right-line') + expect(link['href']).to eq(wizard_step_path(market_application, :grouping_legal_type)) + end + end + + context 'regression: revisiting application_mode after the legal type is already chosen must not skip it' do + before do + market_application.update!(application_mode: :groupement) + create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: :conjoint) + end + + it 'still points the continue link to grouping_legal_type (never jumps straight to grouping_composition)' do + get wizard_step_path(market_application, :application_mode), params: { readonly: true } + + rendered = Nokogiri::HTML(response.body) + link = rendered.at_css('a.fr-icon-arrow-right-line') + expect(link['href']).to eq(wizard_step_path(market_application, :grouping_legal_type)) + end + + it 'allows navigating back to grouping_legal_type and seeing the previously chosen type' do + get wizard_step_path(market_application, :grouping_legal_type) + + rendered = Nokogiri::HTML(response.body) + expect(rendered.at_css('#legal_type_conjoint')['checked']).to eq('checked') + end + end + + context 'when the mode is not groupement/mixte (solo)' do + before { market_application.update!(application_mode: :solo) } + + it 'points the continue link to company_identification' do + get wizard_step_path(market_application, :application_mode), params: { readonly: true } + + rendered = Nokogiri::HTML(response.body) + link = rendered.at_css('a.fr-icon-arrow-right-line') + expect(link['href']).to eq(company_identification_candidate_market_application_path(market_application.identifier)) + end + end + + context 'for the solo side of a mixte application with an incomplete groupement counterpart' do + let!(:groupement_application) do + create(:market_application, public_market:, siret: market_application.siret, application_mode: :groupement, user:) + end + + before do + market_application.update!(application_mode: :solo) + create(:grouping, public_market:, mandataire_market_application: groupement_application, legal_type: nil) + end + + it 'points the continue link to the groupement counterpart grouping_legal_type step' do + get wizard_step_path(market_application, :application_mode), params: { readonly: true } + + rendered = Nokogiri::HTML(response.body) + link = rendered.at_css('a.fr-icon-arrow-right-line') + expect(link['href']).to eq(wizard_step_path(groupement_application, :grouping_legal_type)) + end + end + + context 'for the solo side of a mixte application with a completed groupement counterpart' do + let!(:groupement_application) do + create(:market_application, public_market:, siret: market_application.siret, application_mode: :groupement, user:) + end + + before do + market_application.update!(application_mode: :solo) + grouping = create(:grouping, public_market:, mandataire_market_application: groupement_application, legal_type: :conjoint) + create(:grouping_member, :co_traitant, grouping:, invitation_token_created_at: Time.current) + end + + it 'points the continue link to its own company_identification step' do + get wizard_step_path(market_application, :application_mode), params: { readonly: true } + + rendered = Nokogiri::HTML(response.body) + link = rendered.at_css('a.fr-icon-arrow-right-line') + expect(link['href']).to eq(company_identification_candidate_market_application_path(market_application.identifier)) + end + end + end + + describe 'GET .../grouping_wizard/grouping_legal_type' do + context 'when the market_application is mandataire of a grouping' do + before do + market_application.update!(application_mode: :groupement) + create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: nil) + end + + it 'renders successfully' do + get wizard_step_path(market_application, :grouping_legal_type) + expect(response).to have_http_status(:ok) + expect(response.body).to include(I18n.t('candidate.grouping_legal_types.title')) + end + end + + context 'when the market_application is not mandataire of any grouping (mode not chosen)' do + it 'redirects to application_mode' do + get wizard_step_path(market_application, :grouping_legal_type) + + expect(response).to redirect_to(wizard_step_path(market_application, :application_mode)) + end + end + + context 'when the application mode is solo' do + before { market_application.update!(application_mode: :solo) } + + it 'redirects to application_mode' do + get wizard_step_path(market_application, :grouping_legal_type) + + expect(response).to redirect_to(wizard_step_path(market_application, :application_mode)) + end + end + end + + describe 'PATCH .../grouping_wizard/grouping_legal_type' do + before do + market_application.update!(application_mode: :groupement) + create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: nil) + end + + it 'sets the legal_type and redirects to company_identification' do + patch wizard_step_path(market_application, :grouping_legal_type), params: { legal_type: 'conjoint_mandataire_solidaire' } + + expect(Grouping.joins(:mandataire_market_application).find_by(market_applications: { id: market_application.id }).legal_type) + .to eq('conjoint_mandataire_solidaire') + expect(response).to redirect_to( + company_identification_candidate_market_application_path(market_application.identifier) + ) + end + + it 'rejects an invalid legal_type with a 422' do + patch wizard_step_path(market_application, :grouping_legal_type), params: { legal_type: 'invalid_garbage' } + + expect(response).to have_http_status(:unprocessable_content) + rendered = Nokogiri::HTML(response.body) + expect(rendered.text).to include(I18n.t('candidate.validations.legal_type_invalid')) + end + end +end diff --git a/spec/requests/candidate/lot_selections_spec.rb b/spec/requests/candidate/lot_selections_spec.rb index 3d27848f..22ed98b5 100644 --- a/spec/requests/candidate/lot_selections_spec.rb +++ b/spec/requests/candidate/lot_selections_spec.rb @@ -24,7 +24,7 @@ get lot_selection_candidate_market_application_path(market_application.identifier) expect(response).to redirect_to( - application_mode_candidate_market_application_path(market_application.identifier) + grouping_wizard_step_candidate_market_application_path(market_application.identifier, :application_mode) ) end end diff --git a/spec/requests/candidate/market_applications_spec.rb b/spec/requests/candidate/market_applications_spec.rb index c45b030d..6c7b103f 100644 --- a/spec/requests/candidate/market_applications_spec.rb +++ b/spec/requests/candidate/market_applications_spec.rb @@ -17,6 +17,7 @@ let(:completed_market_application) { create(:market_application, :completed, public_market:, siret: '73282932000074') } before do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(false) allow_any_instance_of(Candidate::ApplicationController).to receive(:current_candidate).and_return(candidate_user) allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(false) @@ -101,7 +102,7 @@ get "/candidate/market_applications/#{market_application.identifier}/summary" expect(response).to redirect_to( - application_mode_candidate_market_application_path(market_application.identifier) + grouping_wizard_step_candidate_market_application_path(market_application.identifier, :application_mode) ) end end @@ -622,7 +623,7 @@ def verify_navigation_through_status_page delete candidate_market_application_path(market_application.identifier) expect(response).not_to redirect_to( - application_mode_candidate_market_application_path(market_application.identifier) + grouping_wizard_step_candidate_market_application_path(market_application.identifier, :application_mode) ) end end diff --git a/spec/requests/candidate/sessions_spec.rb b/spec/requests/candidate/sessions_spec.rb index 19384d07..855c2d90 100644 --- a/spec/requests/candidate/sessions_spec.rb +++ b/spec/requests/candidate/sessions_spec.rb @@ -248,7 +248,7 @@ params: { token:, market_application_id: market_application.identifier } expect(response).to redirect_to( - application_mode_candidate_market_application_path(market_application.identifier) + grouping_wizard_step_candidate_market_application_path(market_application.identifier, :application_mode) ) end From c936e1c3b81982eab21c348cc7d4d8a1e6835627 Mon Sep 17 00:00:00 2001 From: Camille Regnault Date: Thu, 6 Aug 2026 18:39:02 +0200 Subject: [PATCH 02/15] =?UTF-8?q?test:=20ajoute=20le=20sc=C3=A9nario=20cuc?= =?UTF-8?q?umber=20de=20reconnexion=20en=20mode=20mixte?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Vérifie qu'une reconnexion via magic link pendant le funnel groupement d'une candidature mixte ramène bien sur l'étape en attente côté groupement, plutôt que de perdre ce funnel au profit de la candidature solo. --- features/candidacy_mode_choice.feature | 9 +++++++++ .../candidate_authentication_steps.rb | 13 +++++++++++++ 2 files changed, 22 insertions(+) diff --git a/features/candidacy_mode_choice.feature b/features/candidacy_mode_choice.feature index fac695db..67cb0197 100644 --- a/features/candidacy_mode_choice.feature +++ b/features/candidacy_mode_choice.feature @@ -45,6 +45,15 @@ Feature: Candidate chooses their candidacy mode And my application mode should be "solo" And a second market application should exist with mode "groupement" + @javascript + Scenario: Candidate reconnects from the groupement funnel after choosing mixte + When I visit the magic link + And I choose the candidacy mode "mixte" + Then I should land on the grouping legal type step of the groupement application + When I request a new magic link for the groupement application + And I click the link from the latest email + Then I should land on the grouping legal type step of the groupement application + Scenario: The choice screen is never shown again once a mode is chosen Given the candidate application already has the mode "solo" When I visit the magic link diff --git a/features/step_definitions/candidate_authentication_steps.rb b/features/step_definitions/candidate_authentication_steps.rb index 4f19f21b..51ef62db 100644 --- a/features/step_definitions/candidate_authentication_steps.rb +++ b/features/step_definitions/candidate_authentication_steps.rb @@ -47,6 +47,19 @@ ) end +When('I request a new magic link for the groupement application') do + visit new_candidate_sessions_path(market_application_id: @groupement_market_application.identifier) + fill_in I18n.t('candidate.sessions.new.email_label'), with: @user.email + find_button(I18n.t('candidate.sessions.new.submit'), disabled: false).click + expect(page).to have_current_path(sent_candidate_sessions_path, ignore_query: true) +end + +When('I click the link from the latest email') do + mail = ActionMailer::Base.deliveries.last + url = mail.text_part.body.decoded[%r{https?://\S+}] + visit URI(url).request_uri +end + Then('I should see the authentication form') do expect(page).to have_selector('form[action*="candidate/sessions"]') end From d0261681c78efbd33ecf039e733a72981d398530 Mon Sep 17 00:00:00 2001 From: Camille Regnault Date: Fri, 7 Aug 2026 13:17:36 +0200 Subject: [PATCH 03/15] =?UTF-8?q?fix:=20emp=C3=AAche=20de=20rejouer=20le?= =?UTF-8?q?=20choix=20de=20mode=20et=20corrige=20la=20liaison=20user=20en?= =?UTF-8?q?=20mixte?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - update_application_mode redirige désormais vers l'étape courante si le mode est déjà choisi, au lieu d'accepter un PATCH qui écrasait le mode (et orphelinait le Grouping existant) sans passer par le garde-fou GET. - sign_in_candidate propage désormais le user au groupement counterpart d'une candidature mixte, pas seulement à l'application solo signée. Sans ça, groupement_counterpart (filtré par user_id) ne retrouvait plus le counterpart après une connexion différée, cassant la redirection du wizard pour ce candidat. --- .../candidate/grouping_wizard_controller.rb | 2 ++ .../candidate/sessions_controller.rb | 8 ++++++- .../candidate/grouping_wizard_spec.rb | 21 +++++++++++++++++++ spec/requests/candidate/sessions_spec.rb | 16 ++++++++++++++ 4 files changed, 46 insertions(+), 1 deletion(-) diff --git a/app/controllers/candidate/grouping_wizard_controller.rb b/app/controllers/candidate/grouping_wizard_controller.rb index 6ac65dd2..e6fc1dcf 100644 --- a/app/controllers/candidate/grouping_wizard_controller.rb +++ b/app/controllers/candidate/grouping_wizard_controller.rb @@ -93,6 +93,8 @@ def readonly_continue_path end def update_application_mode + return redirect_to(next_wizard_step_path(:application_mode)) if @market_application.application_mode.present? + result = Candidate::CreateApplicationsForMode.call( market_application: @market_application, application_mode: params[:application_mode] diff --git a/app/controllers/candidate/sessions_controller.rb b/app/controllers/candidate/sessions_controller.rb index 499825c3..27496f18 100644 --- a/app/controllers/candidate/sessions_controller.rb +++ b/app/controllers/candidate/sessions_controller.rb @@ -38,12 +38,18 @@ def destroy def sign_in_candidate(user, market_application) reconnection = market_application.user_id.present? - market_application.update!(user:) unless reconnection + link_candidate_to_application(user, market_application) unless reconnection session[:user_id] = user.id session[:market_application_identifier] = market_application.identifier redirect_to first_step_path(market_application) end + def link_candidate_to_application(user, market_application) + counterpart = market_application.groupement_counterpart + market_application.update!(user:) + counterpart&.update!(user:) + end + def first_step_path(market_application) return completed_application_path(market_application) if market_application.completed? diff --git a/spec/requests/candidate/grouping_wizard_spec.rb b/spec/requests/candidate/grouping_wizard_spec.rb index b31606ad..d8d3185a 100644 --- a/spec/requests/candidate/grouping_wizard_spec.rb +++ b/spec/requests/candidate/grouping_wizard_spec.rb @@ -157,6 +157,27 @@ def wizard_step_path(market_application, step) ) end end + + context 'when the mode is already chosen' do + before do + market_application.update!(application_mode: :groupement) + create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: :conjoint) + end + + it 'ignores the resubmitted mode and redirects to the current step, without changing application_mode' do + expect do + patch wizard_step_path(market_application, :application_mode), params: { application_mode: 'solo' } + end.not_to change { market_application.reload.application_mode } + + expect(response).to redirect_to(wizard_step_path(market_application, :grouping_legal_type)) + end + + it 'does not orphan the existing grouping' do + expect do + patch wizard_step_path(market_application, :application_mode), params: { application_mode: 'solo' } + end.not_to change(Grouping, :count) + end + end end describe 'readonly navigation (application_mode already chosen)' do diff --git a/spec/requests/candidate/sessions_spec.rb b/spec/requests/candidate/sessions_spec.rb index 855c2d90..422300e2 100644 --- a/spec/requests/candidate/sessions_spec.rb +++ b/spec/requests/candidate/sessions_spec.rb @@ -262,6 +262,22 @@ step_candidate_market_application_path(market_application.identifier, :company_identification) ) end + + context 'when the application is the solo side of a mixte candidacy without a user yet' do + let!(:groupement_application) do + create(:market_application, public_market: market_application.public_market, siret: market_application.siret, + application_mode: :groupement) + end + + before { market_application.update!(application_mode: :solo) } + + it 'also links the user to the groupement counterpart' do + expect do + get verify_candidate_sessions_path, + params: { token:, market_application_id: market_application.identifier } + end.to change { groupement_application.reload.user_id }.from(nil).to(user.id) + end + end end context 'when market has lots and no lots are selected' do From 98d5217ed0aa0e908f893fb6b3eb7325717aeda7 Mon Sep 17 00:00:00 2001 From: Camille Regnault Date: Thu, 6 Aug 2026 18:42:13 +0200 Subject: [PATCH 04/15] =?UTF-8?q?feat:=20=C3=A9tend=20GroupingMember=20pou?= =?UTF-8?q?r=20la=20composition=20du=20groupement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ajoute company_name (résolue via API Entreprise à l'ajout d'un co-traitant), la validation d'unicité du SIRET dans un groupement, le rejet du SIRET du mandataire pour un co-traitant, et invitation_sent? pour distinguer les co-traitants déjà invités. --- app/models/grouping_member.rb | 15 ++++++++- ...55_add_company_name_to_grouping_members.rb | 5 +++ db/queue_schema.rb | 3 +- db/schema.rb | 3 +- spec/models/grouping_member_spec.rb | 33 +++++++++++++++++++ 5 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20260804154855_add_company_name_to_grouping_members.rb diff --git a/app/models/grouping_member.rb b/app/models/grouping_member.rb index bf14ef89..4274c357 100644 --- a/app/models/grouping_member.rb +++ b/app/models/grouping_member.rb @@ -13,14 +13,27 @@ class GroupingMember < ApplicationRecord before_validation :set_public_market validates :siret, presence: true, siret: true + validates :siret, uniqueness: { scope: :grouping_id } validates :siret, uniqueness: { scope: :public_market_id }, if: :mandataire? - validates :email, presence: true, if: :co_traitant? + validates :email, presence: true, email: true, if: :co_traitant? validates :grouping_id, uniqueness: { scope: :role }, if: :mandataire? validates :market_application, presence: true, if: :mandataire? + validate :siret_not_mandataire, if: :co_traitant? + + def invitation_sent? + invitation_token_created_at.present? + end private def set_public_market self.public_market_id = grouping.public_market_id if grouping end + + def siret_not_mandataire + mandataire_siret = grouping&.mandataire_grouping_member&.siret + return if siret != mandataire_siret + + errors.add(:siret, :same_as_mandataire) + end end diff --git a/db/migrate/20260804154855_add_company_name_to_grouping_members.rb b/db/migrate/20260804154855_add_company_name_to_grouping_members.rb new file mode 100644 index 00000000..04408119 --- /dev/null +++ b/db/migrate/20260804154855_add_company_name_to_grouping_members.rb @@ -0,0 +1,5 @@ +class AddCompanyNameToGroupingMembers < ActiveRecord::Migration[8.1] + def change + add_column :grouping_members, :company_name, :string + end +end diff --git a/db/queue_schema.rb b/db/queue_schema.rb index ef120376..e739cf10 100644 --- a/db/queue_schema.rb +++ b/db/queue_schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.1].define(version: 2026_07_29_100623) do +ActiveRecord::Schema[8.1].define(version: 2026_08_04_154855) do # These are extensions that must be enabled in order to support this database enable_extension "pg_catalog.plpgsql" @@ -84,6 +84,7 @@ end create_table "grouping_members", force: :cascade do |t| + t.string "company_name" t.datetime "created_at", null: false t.string "email" t.bigint "grouping_id", null: false diff --git a/db/schema.rb b/db/schema.rb index ef120376..e739cf10 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[8.1].define(version: 2026_07_29_100623) do +ActiveRecord::Schema[8.1].define(version: 2026_08_04_154855) do # These are extensions that must be enabled in order to support this database enable_extension "pg_catalog.plpgsql" @@ -84,6 +84,7 @@ end create_table "grouping_members", force: :cascade do |t| + t.string "company_name" t.datetime "created_at", null: false t.string "email" t.bigint "grouping_id", null: false diff --git a/spec/models/grouping_member_spec.rb b/spec/models/grouping_member_spec.rb index 23c78c25..c6e64495 100644 --- a/spec/models/grouping_member_spec.rb +++ b/spec/models/grouping_member_spec.rb @@ -83,4 +83,37 @@ expect(member).to be_status_completed end end + + describe 'siret' do + it 'rejects a co_traitant siret equal to the mandataire siret' do + member = build(:grouping_member, :co_traitant, grouping:, siret: grouping.mandataire_grouping_member.siret) + + expect(member).not_to be_valid + expect(member.errors[:siret]).to be_present + end + + it 'allows the mandataire own member to have the mandataire siret' do + expect(grouping.mandataire_grouping_member).to be_valid + end + + it 'is enforced unique within a grouping at the database level' do + create(:grouping_member, :co_traitant, grouping:, siret: '80245139600027') + duplicate = build(:grouping_member, :co_traitant, grouping:, siret: '80245139600027') + + expect(duplicate).not_to be_valid + expect(duplicate.errors[:siret]).to be_present + end + end + + describe '#invitation_sent?' do + it 'is false when the invitation has not been sent yet' do + member = build(:grouping_member, :co_traitant, grouping:, invitation_token_created_at: nil) + expect(member.invitation_sent?).to be false + end + + it 'is true once the invitation has been sent' do + member = build(:grouping_member, :co_traitant, grouping:, invitation_token_created_at: Time.current) + expect(member.invitation_sent?).to be true + end + end end From 70580cc2f3da6945da24aededde2967f9ba14093 Mon Sep 17 00:00:00 2001 From: Camille Regnault Date: Fri, 14 Aug 2026 11:32:10 +0200 Subject: [PATCH 05/15] =?UTF-8?q?feat:=20ajoute=20FetchRaisonSociale,=20r?= =?UTF-8?q?=C3=A9solution=20SIRET=E2=86=92raison=20sociale=20via=20API=20E?= =?UTF-8?q?ntreprise?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Interroge l'API Entreprise (SIRENE) pour résoudre la raison sociale d'un co-traitant à partir de son SIRET, afin de l'afficher dans le tableau de composition du groupement sans que le mandataire ait à la saisir. Remplace FetchBuyerName, qui faisait le même appel mais n'avait aucun appelant applicatif (FetchPublicMarketBuyerNameJob utilise le pipeline Insee, pas cet organizer). --- .../extract_name.rb | 4 +-- .../make_request.rb | 10 ++++--- app/organizers/fetch_buyer_name.rb | 6 ---- app/organizers/fetch_raison_sociale.rb | 6 ++++ .../extract_name_spec.rb | 12 ++++---- .../make_request_spec.rb | 30 +++++++++++-------- ...e_spec.rb => fetch_raison_sociale_spec.rb} | 26 +++++++--------- 7 files changed, 48 insertions(+), 46 deletions(-) rename app/interactors/{fetch_buyer_name => fetch_raison_sociale}/extract_name.rb (50%) rename app/interactors/{fetch_buyer_name => fetch_raison_sociale}/make_request.rb (62%) delete mode 100644 app/organizers/fetch_buyer_name.rb create mode 100644 app/organizers/fetch_raison_sociale.rb rename spec/interactors/{fetch_buyer_name => fetch_raison_sociale}/extract_name_spec.rb (79%) rename spec/interactors/{fetch_buyer_name => fetch_raison_sociale}/make_request_spec.rb (70%) rename spec/organizers/{fetch_buyer_name_spec.rb => fetch_raison_sociale_spec.rb} (64%) diff --git a/app/interactors/fetch_buyer_name/extract_name.rb b/app/interactors/fetch_raison_sociale/extract_name.rb similarity index 50% rename from app/interactors/fetch_buyer_name/extract_name.rb rename to app/interactors/fetch_raison_sociale/extract_name.rb index 408cfdbd..6cd1d796 100644 --- a/app/interactors/fetch_buyer_name/extract_name.rb +++ b/app/interactors/fetch_raison_sociale/extract_name.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true -class FetchBuyerName::ExtractName < ApplicationInteractor +class FetchRaisonSociale::ExtractName < ApplicationInteractor def call body = JSON.parse(context.response.body) - context.buyer_name = body.dig('data', 'unite_legale', 'personne_morale_attributs', 'raison_sociale') + context.raison_sociale = body.dig('data', 'unite_legale', 'personne_morale_attributs', 'raison_sociale') rescue JSON::ParserError context.fail!(error: 'Invalid JSON response') end diff --git a/app/interactors/fetch_buyer_name/make_request.rb b/app/interactors/fetch_raison_sociale/make_request.rb similarity index 62% rename from app/interactors/fetch_buyer_name/make_request.rb rename to app/interactors/fetch_raison_sociale/make_request.rb index 68d02411..2aaa2bb3 100644 --- a/app/interactors/fetch_buyer_name/make_request.rb +++ b/app/interactors/fetch_raison_sociale/make_request.rb @@ -1,13 +1,15 @@ # frozen_string_literal: true -class FetchBuyerName::MakeRequest < MakeRequest +class FetchRaisonSociale::MakeRequest < MakeRequest + delegate :siret, to: :context + def call validate_credentials super end def endpoint_url - "v3/insee/sirene/etablissements/#{context.public_market.siret}" + "v3/insee/sirene/etablissements/#{siret}" end private @@ -19,10 +21,10 @@ def validate_credentials end def request_recipient - context.public_market.siret + siret end def request_object - "Configuration marché: #{context.public_market.name}" + context.request_object || 'Réponse appel offre' end end diff --git a/app/organizers/fetch_buyer_name.rb b/app/organizers/fetch_buyer_name.rb deleted file mode 100644 index 73b888c3..00000000 --- a/app/organizers/fetch_buyer_name.rb +++ /dev/null @@ -1,6 +0,0 @@ -# frozen_string_literal: true - -class FetchBuyerName < ApplicationOrganizer - organize FetchBuyerName::MakeRequest, - FetchBuyerName::ExtractName -end diff --git a/app/organizers/fetch_raison_sociale.rb b/app/organizers/fetch_raison_sociale.rb new file mode 100644 index 00000000..889e100b --- /dev/null +++ b/app/organizers/fetch_raison_sociale.rb @@ -0,0 +1,6 @@ +# frozen_string_literal: true + +class FetchRaisonSociale < ApplicationOrganizer + organize FetchRaisonSociale::MakeRequest, + FetchRaisonSociale::ExtractName +end diff --git a/spec/interactors/fetch_buyer_name/extract_name_spec.rb b/spec/interactors/fetch_raison_sociale/extract_name_spec.rb similarity index 79% rename from spec/interactors/fetch_buyer_name/extract_name_spec.rb rename to spec/interactors/fetch_raison_sociale/extract_name_spec.rb index d10e71ca..bbea5637 100644 --- a/spec/interactors/fetch_buyer_name/extract_name_spec.rb +++ b/spec/interactors/fetch_raison_sociale/extract_name_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -RSpec.describe FetchBuyerName::ExtractName, type: :interactor do +RSpec.describe FetchRaisonSociale::ExtractName, type: :interactor do include ApiResponses::InseeResponses let(:siret) { '13002526500013' } @@ -24,14 +24,14 @@ def build_response_body(raison_sociale:) subject { described_class.call(response:) } context 'when raison_sociale is present' do - let(:response) { instance_double(Net::HTTPOK, body: build_response_body(raison_sociale: 'Ville de Paris')) } + let(:response) { instance_double(Net::HTTPOK, body: build_response_body(raison_sociale: 'OCTO TECHNOLOGY')) } it 'succeeds' do expect(subject).to be_success end - it 'sets buyer_name in context' do - expect(subject.buyer_name).to eq('Ville de Paris') + it 'sets raison_sociale in context' do + expect(subject.raison_sociale).to eq('OCTO TECHNOLOGY') end end @@ -42,8 +42,8 @@ def build_response_body(raison_sociale:) expect(subject).to be_success end - it 'sets buyer_name to nil' do - expect(subject.buyer_name).to be_nil + it 'sets raison_sociale to nil' do + expect(subject.raison_sociale).to be_nil end end diff --git a/spec/interactors/fetch_buyer_name/make_request_spec.rb b/spec/interactors/fetch_raison_sociale/make_request_spec.rb similarity index 70% rename from spec/interactors/fetch_buyer_name/make_request_spec.rb rename to spec/interactors/fetch_raison_sociale/make_request_spec.rb index 7a3936e1..d130e804 100644 --- a/spec/interactors/fetch_buyer_name/make_request_spec.rb +++ b/spec/interactors/fetch_raison_sociale/make_request_spec.rb @@ -2,11 +2,10 @@ require 'rails_helper' -RSpec.describe FetchBuyerName::MakeRequest, type: :interactor do +RSpec.describe FetchRaisonSociale::MakeRequest, type: :interactor do include ApiResponses::InseeResponses let(:siret) { '13002526500013' } - let(:public_market) { create(:public_market, :completed, siret:) } let(:base_url) { 'https://entreprise.api.gouv.fr/' } let(:token) { 'test_bearer_token_123' } let(:endpoint_url) { "#{base_url}v3/insee/sirene/etablissements/#{siret}" } @@ -14,7 +13,7 @@ { 'context' => 'Candidature marché public', 'recipient' => siret, - 'object' => "Configuration marché: #{public_market.name}" + 'object' => 'Réponse appel offre' } end @@ -26,7 +25,7 @@ end describe '.call' do - subject { described_class.call(public_market:) } + subject { described_class.call(siret:) } context 'when the API request is successful (HTTP 200)' do before do @@ -47,23 +46,30 @@ it_behaves_like 'a successful API request' - it 'uses the public market SIRET in the endpoint URL' do + it 'uses the given SIRET in the endpoint URL' do subject expect(a_request(:get, endpoint_url).with(query: hash_including(query_params))).to have_been_made.once end + end - it 'sends the public market SIRET as recipient' do - subject - expect( - a_request(:get, endpoint_url).with(query: hash_including('recipient' => siret)) - ).to have_been_made.once + context 'when a custom request_object is given' do + subject { described_class.call(siret:, request_object: 'Configuration marché: Travaux de voirie') } + + before do + stub_request(:get, endpoint_url) + .with(query: hash_including(query_params.merge('object' => 'Configuration marché: Travaux de voirie'))) + .to_return( + status: 200, + body: successful_response_body, + headers: { 'Content-Type' => 'application/json' } + ) end - it 'sends the market name as object' do + it 'sends the custom object as audit label' do subject expect( a_request(:get, endpoint_url) - .with(query: hash_including('object' => "Configuration marché: #{public_market.name}")) + .with(query: hash_including('object' => 'Configuration marché: Travaux de voirie')) ).to have_been_made.once end end diff --git a/spec/organizers/fetch_buyer_name_spec.rb b/spec/organizers/fetch_raison_sociale_spec.rb similarity index 64% rename from spec/organizers/fetch_buyer_name_spec.rb rename to spec/organizers/fetch_raison_sociale_spec.rb index 01a6fcbf..186db57f 100644 --- a/spec/organizers/fetch_buyer_name_spec.rb +++ b/spec/organizers/fetch_raison_sociale_spec.rb @@ -2,25 +2,21 @@ require 'rails_helper' -RSpec.describe FetchBuyerName, type: :organizer do +RSpec.describe FetchRaisonSociale, type: :organizer do include ApiResponses::InseeResponses let(:siret) { '13002526500013' } - let(:public_market) { create(:public_market, :completed, siret:) } let(:base_url) { 'https://entreprise.api.gouv.fr/' } let(:api_url) { "#{base_url}v3/insee/sirene/etablissements/#{siret}" } let(:token) { 'test_token_123' } - ApiEntrepriseCredentials = Struct.new(:base_url, :token) - before do - allow(Rails.application.credentials).to receive(:api_entreprise).and_return( - ApiEntrepriseCredentials.new(base_url, token) - ) + allow(Rails.application.credentials).to receive_message_chain(:api_entreprise, :base_url).and_return(base_url) + allow(Rails.application.credentials).to receive_message_chain(:api_entreprise, :token).and_return(token) end describe '.call' do - subject { described_class.call(public_market:) } + subject { described_class.call(siret:) } context 'when the API call is successful' do before do @@ -29,7 +25,7 @@ query: hash_including( 'context' => 'Candidature marché public', 'recipient' => siret, - 'object' => "Configuration marché: #{public_market.name}" + 'object' => 'Réponse appel offre' ), headers: { 'Authorization' => "Bearer #{token}" } ) @@ -44,8 +40,8 @@ expect(subject).to be_success end - it 'sets buyer_name in context' do - expect(subject.buyer_name).to eq('OCTO TECHNOLOGY') + it 'sets raison_sociale in context' do + expect(subject.raison_sociale).to eq('OCTO TECHNOLOGY') end end @@ -60,16 +56,14 @@ expect(subject).to be_failure end - it 'does not set buyer_name' do - expect(subject.buyer_name).to be_nil + it 'does not set raison_sociale' do + expect(subject.raison_sociale).to be_nil end end context 'when credentials are missing' do before do - allow(Rails.application.credentials).to receive(:api_entreprise).and_return( - OpenStruct.new(base_url:, token: nil) - ) + allow(Rails.application.credentials).to receive_message_chain(:api_entreprise, :token).and_return(nil) end it 'fails' do From ef88c7a2bc1b3a579d8dfec556941955892c39cf Mon Sep 17 00:00:00 2001 From: Camille Regnault Date: Thu, 6 Aug 2026 18:43:12 +0200 Subject: [PATCH 06/15] feat: le mandataire ajoute et retire des co-traitants MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Étend GroupingWizardController avec le step grouping_composition et les sous-routes Turbo Stream create_member/destroy_member. Le mandataire ajoute un co-traitant par SIRET+email (résolution automatique de la raison sociale, retrait possible tant que l'invitation n'a pas été envoyée). --- app/assets/stylesheets/application.css | 49 ++++++ .../candidate/grouping_wizard_controller.rb | 99 +++++++++++- .../candidate/add_grouping_member.rb | 78 +++++++++ .../candidate/remove_grouping_member.rb | 29 ++++ .../controllers/enable_on_fill_controller.js | 18 +++ app/models/market_application.rb | 15 ++ .../_composition_actions.html.erb | 9 ++ .../grouping_wizard/_member_form.html.erb | 51 ++++++ .../grouping_wizard/_members_table.html.erb | 70 +++++++++ .../grouping_composition.html.erb | 25 +++ config/routes.rb | 3 + .../candidate/add_grouping_member_spec.rb | 148 ++++++++++++++++++ .../candidate/remove_grouping_member_spec.rb | 76 +++++++++ spec/models/market_application_spec.rb | 52 ++++++ 14 files changed, 721 insertions(+), 1 deletion(-) create mode 100644 app/interactors/candidate/add_grouping_member.rb create mode 100644 app/interactors/candidate/remove_grouping_member.rb create mode 100644 app/javascript/controllers/enable_on_fill_controller.js create mode 100644 app/views/candidate/grouping_wizard/_composition_actions.html.erb create mode 100644 app/views/candidate/grouping_wizard/_member_form.html.erb create mode 100644 app/views/candidate/grouping_wizard/_members_table.html.erb create mode 100644 app/views/candidate/grouping_wizard/grouping_composition.html.erb create mode 100644 spec/interactors/candidate/add_grouping_member_spec.rb create mode 100644 spec/interactors/candidate/remove_grouping_member_spec.rb diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 52f915f3..63216709 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1017,3 +1017,52 @@ display: flex; justify-content: space-between; } + +.grouping-legal-type-actions .fr-btn[aria-disabled="true"] { + background-color: var(--background-disabled-grey); + color: var(--text-disabled-grey); + pointer-events: none; + cursor: not-allowed; +} + +.grouping-member-form { + background-color: var(--background-alt-blue-france); + border-left: 4px solid var(--border-plain-blue-france); + padding: 32px 40px; +} + +#grouping_members_table .fr-table, +#grouping_members_table .fr-table__wrapper, +#grouping_members_table .fr-table__container, +#grouping_members_table .fr-table__content { + display: block !important; + width: 100% !important; + max-width: none !important; + border: none !important; +} + +#grouping_members_table table { + display: table !important; + width: 100% !important; + table-layout: fixed !important; + border-collapse: collapse !important; + border: 1px solid var(--light-decisions-border-border-default-grey, #ddd) !important; +} + +#grouping_members_table th, +#grouping_members_table td { + border: none !important; + background-image: none !important; + border-bottom: 1px solid var(--light-decisions-border-border-default-grey, #ddd) !important; +} + +#grouping_members_table thead, +#grouping_members_table tbody, +#grouping_members_table tbody::after, +#grouping_members_table thead::after { + background-image: none !important; +} + +#grouping_members_table tbody tr { + background-color: var(--background-default-grey, #fff) !important; +} diff --git a/app/controllers/candidate/grouping_wizard_controller.rb b/app/controllers/candidate/grouping_wizard_controller.rb index e6fc1dcf..becc9545 100644 --- a/app/controllers/candidate/grouping_wizard_controller.rb +++ b/app/controllers/candidate/grouping_wizard_controller.rb @@ -10,12 +10,17 @@ class GroupingWizardController < Candidate::ApplicationController prepend_before_action :set_steps prepend_before_action :find_market_application + skip_before_action :setup_wizard, only: %i[create_member destroy_member] before_action :redirect_unless_mandataire, unless: -> { params[:id] == 'application_mode' } + before_action :redirect_to_composition_if_no_co_traitant, + if: -> { action_name == 'show' && params[:id] == 'grouping_composition_confirmation' } def show case step when :application_mode then show_application_mode when :grouping_legal_type then show_grouping_legal_type + when :grouping_composition then show_grouping_composition + when :grouping_composition_confirmation then show_confirmation end render_wizard unless performed? @@ -25,14 +30,39 @@ def update case step when :application_mode then update_application_mode when :grouping_legal_type then update_grouping_legal_type + when :grouping_composition_confirmation then update_confirmation end end + def create_member + result = Candidate::AddGroupingMember.call(grouping:, siret: params[:siret], email: params[:email]) + assign_create_member_result(result) + + render turbo_stream: member_form_turbo_streams, status: result.success? ? :ok : :unprocessable_content + end + + def destroy_member + Candidate::RemoveGroupingMember.call(grouping:, grouping_member_id: params[:id]) + + render turbo_stream: [ + turbo_stream.replace( + 'grouping_members_table', + partial: 'candidate/grouping_wizard/members_table', + locals: { grouping:, market_application: @market_application, editable: true } + ), + turbo_stream.replace( + 'grouping_composition_actions', + partial: 'candidate/grouping_wizard/composition_actions', + locals: { grouping: } + ) + ] + end + private def set_steps self.steps = if @market_application&.groupement? - %i[application_mode grouping_legal_type] + %i[application_mode grouping_legal_type grouping_composition grouping_composition_confirmation] else %i[application_mode] end @@ -58,6 +88,12 @@ def redirect_unless_mandataire redirect_to_application_mode end + def redirect_to_composition_if_no_co_traitant + return if grouping.grouping_members.co_traitant.any? + + redirect_to grouping_wizard_step_candidate_market_application_path(@market_application.identifier, :grouping_composition) + end + def next_wizard_step_path(from_step) counterpart = @market_application.groupement_counterpart return counterpart_next_wizard_step_path(counterpart) if counterpart @@ -70,6 +106,7 @@ def next_wizard_step_path(from_step) def counterpart_next_wizard_step_path(counterpart) return wizard_step_path(counterpart, :grouping_legal_type) if counterpart.grouping_legal_type_choice_required? + return wizard_step_path(counterpart, :grouping_composition) if counterpart.grouping_composition_choice_required? finish_wizard_path end @@ -142,6 +179,66 @@ def update_grouping_legal_type end end + # --- grouping_composition step --- + + def show_grouping_composition + resolve_mandataire_company_name + @grouping = grouping + @grouping_member = GroupingMember.new + end + + def assign_create_member_result(result) + if result.success? + @grouping_member = GroupingMember.new + else + @grouping_member = grouping.grouping_members.new(siret: params[:siret], email: params[:email]) + @errors = result.errors + end + end + + def member_form_turbo_streams + [ + turbo_stream.replace( + 'grouping_members_table', + partial: 'candidate/grouping_wizard/members_table', + locals: { grouping:, market_application: @market_application, editable: true } + ), + turbo_stream.replace( + 'grouping_member_form', + partial: 'candidate/grouping_wizard/member_form', + locals: { grouping:, market_application: @market_application, grouping_member: @grouping_member, errors: @errors } + ), + turbo_stream.replace( + 'grouping_composition_actions', + partial: 'candidate/grouping_wizard/composition_actions', + locals: { grouping: } + ) + ] + end + + def resolve_mandataire_company_name + mandataire_member = grouping.grouping_members.mandataire.first + return if mandataire_member.nil? || mandataire_member.company_name.present? + + result = FetchRaisonSociale.call(siret: mandataire_member.siret) + mandataire_member.update(company_name: result.raison_sociale) if result.success? + end + + # --- grouping_composition_confirmation step --- + + def show_confirmation + @grouping = grouping + end + + def update_confirmation + result = Candidate::ConfirmGroupingComposition.call(grouping:) + return redirect_to candidate_dashboard_path, notice: t('candidate.grouping_compositions.success') if result.success? + + @grouping = grouping + @errors = result.errors + render_wizard(nil, status: :unprocessable_content) + end + def grouping return @grouping if defined?(@grouping) diff --git a/app/interactors/candidate/add_grouping_member.rb b/app/interactors/candidate/add_grouping_member.rb new file mode 100644 index 00000000..97f243a1 --- /dev/null +++ b/app/interactors/candidate/add_grouping_member.rb @@ -0,0 +1,78 @@ +# frozen_string_literal: true + +module Candidate + class AddGroupingMember < ApplicationInteractor + delegate :grouping, :siret, :email, to: :context + + def call + validate_siret + validate_email + create_member + end + + private + + def validate_siret + return fail_siret_blank if siret.blank? + return fail_siret_invalid unless SiretValidator.valid?(siret) + return fail_siret_same_as_mandataire if siret == mandataire_siret + + fail_siret_already_added if grouping.grouping_members.exists?(siret:) + end + + def mandataire_siret + grouping.mandataire_grouping_member&.siret + end + + def validate_email + return fail_email_blank if email.blank? + + fail_email_invalid unless EmailValidator.valid?(email) + end + + def create_member + member = grouping.grouping_members.new(role: :co_traitant, siret:, email:, company_name: fetch_company_name) + return context.grouping_member = member if member.save + + context.fail!(errors: errors_from(member)) + end + + def fetch_company_name + result = FetchRaisonSociale.call(siret:) + result.raison_sociale if result.success? + rescue StandardError => e + Sentry.capture_exception(e) + nil + end + + def fail_siret_blank + context.fail!(errors: { siret: [I18n.t('candidate.validations.siret_blank')] }) + end + + def fail_siret_invalid + context.fail!(errors: { siret: [I18n.t('candidate.validations.siret_invalid')] }) + end + + def fail_siret_same_as_mandataire + context.fail!(errors: { siret: [I18n.t('candidate.validations.siret_same_as_mandataire')] }) + end + + def fail_siret_already_added + context.fail!(errors: { siret: [I18n.t('candidate.validations.siret_already_added')] }) + end + + def fail_email_blank + context.fail!(errors: { email: [I18n.t('candidate.validations.email_blank')] }) + end + + def fail_email_invalid + context.fail!(errors: { email: [I18n.t('candidate.validations.email_invalid')] }) + end + + def errors_from(record) + record.errors.each_with_object({}) do |error, hash| + (hash[error.attribute] ||= []) << error.message + end + end + end +end diff --git a/app/interactors/candidate/remove_grouping_member.rb b/app/interactors/candidate/remove_grouping_member.rb new file mode 100644 index 00000000..6f2e1dbe --- /dev/null +++ b/app/interactors/candidate/remove_grouping_member.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true + +module Candidate + class RemoveGroupingMember < ApplicationInteractor + delegate :grouping, :grouping_member_id, to: :context + + def call + context.grouping_member = find_member + return fail_not_found unless context.grouping_member + return fail_already_invited if context.grouping_member.invitation_sent? + + context.grouping_member.destroy + end + + private + + def find_member + grouping.grouping_members.co_traitant.find_by(id: grouping_member_id) + end + + def fail_not_found + context.fail!(errors: { grouping_member: [I18n.t('candidate.validations.grouping_member_not_found')] }) + end + + def fail_already_invited + context.fail!(errors: { grouping_member: [I18n.t('candidate.validations.grouping_member_already_invited')] }) + end + end +end diff --git a/app/javascript/controllers/enable_on_fill_controller.js b/app/javascript/controllers/enable_on_fill_controller.js new file mode 100644 index 00000000..becb5a10 --- /dev/null +++ b/app/javascript/controllers/enable_on_fill_controller.js @@ -0,0 +1,18 @@ +import { Controller } from "@hotwired/stimulus" + +export default class extends Controller { + static targets = ["input", "submitButton"] + + connect() { + this._update() + } + + toggle() { + this._update() + } + + _update() { + const allFilled = this.inputTargets.every(input => input.value.trim().length > 0) + this.submitButtonTargets.forEach(btn => { btn.disabled = !allFilled }) + } +} diff --git a/app/models/market_application.rb b/app/models/market_application.rb index 17e544a0..fde8f3ff 100644 --- a/app/models/market_application.rb +++ b/app/models/market_application.rb @@ -57,6 +57,20 @@ def grouping_legal_type_choice_required? Grouping.joins(:mandataire_market_application).exists?(legal_type: nil, market_applications: { id: }) end + def grouping_composition_choice_required? + return false unless FeatureFlags::Groupement.enabled? && groupement? + + grouping = mandataire_grouping + return false if grouping.nil? || grouping.legal_type.nil? + + grouping.grouping_members.co_traitant.none?(&:invitation_sent?) + end + + def mandataire_grouping + Grouping.joins(:mandataire_grouping_member) + .find_by(mandataire_grouping_member: { market_application_id: id }) + end + def groupement_counterpart return nil if groupement? @@ -68,6 +82,7 @@ def next_required_wizard_step target = groupement_counterpart || self return [target, :grouping_legal_type] if target.grouping_legal_type_choice_required? + return [target, :grouping_composition] if target.grouping_composition_choice_required? nil end diff --git a/app/views/candidate/grouping_wizard/_composition_actions.html.erb b/app/views/candidate/grouping_wizard/_composition_actions.html.erb new file mode 100644 index 00000000..d59b5919 --- /dev/null +++ b/app/views/candidate/grouping_wizard/_composition_actions.html.erb @@ -0,0 +1,9 @@ + diff --git a/app/views/candidate/grouping_wizard/_member_form.html.erb b/app/views/candidate/grouping_wizard/_member_form.html.erb new file mode 100644 index 00000000..6412491c --- /dev/null +++ b/app/views/candidate/grouping_wizard/_member_form.html.erb @@ -0,0 +1,51 @@ +
+
+

<%= t('candidate.grouping_compositions.add_member_title') %>

+ + <%= form_with url: grouping_wizard_members_candidate_market_application_path(market_application.identifier), + method: :post, + data: { turbo_stream: true, controller: "enable-on-fill" } do |form| %> +
+
+
+ + <%= form.text_field :siret, value: grouping_member.siret, id: "grouping_member_siret", + class: "fr-input #{'fr-input--error' if errors&.dig(:siret)}", + data: { "enable-on-fill-target": "input", action: "input->enable-on-fill#toggle" } %> + <% if errors&.dig(:siret) %> +

<%= Array(errors[:siret]).first %>

+ <% end %> +
+
+ +
+
+ + <%= form.text_field :email, value: grouping_member.email, id: "grouping_member_email", + class: "fr-input #{'fr-input--error' if errors&.dig(:email)}", + data: { "enable-on-fill-target": "input", action: "input->enable-on-fill#toggle" } %> + <% if errors&.dig(:email) %> +

<%= Array(errors[:email]).first %>

+ <% end %> +
+
+
+ + <%= form.button t('candidate.grouping_compositions.add_button'), + type: "submit", + disabled: true, + class: "fr-btn fr-icon-user-add-line fr-btn--icon-left fr-mt-3w", + data: { "enable-on-fill-target": "submitButton" } %> + <% end %> +
+
diff --git a/app/views/candidate/grouping_wizard/_members_table.html.erb b/app/views/candidate/grouping_wizard/_members_table.html.erb new file mode 100644 index 00000000..1c4f6aae --- /dev/null +++ b/app/views/candidate/grouping_wizard/_members_table.html.erb @@ -0,0 +1,70 @@ +
+
+ + + + + + + <% if editable %> + + <% end %> + + + + + + + + <% if editable %> + + <% end %> + + + + <% grouping.grouping_members.order(:role).each do |member| %> + + + + + + <% if editable %> + + <% end %> + + <% end %> + <% if grouping.grouping_members.co_traitant.none? %> + + + + <% end %> + +
<%= t('candidate.grouping_compositions.table_company') %><%= t('candidate.grouping_compositions.table_email') %><%= t('candidate.grouping_compositions.table_role') %><%= t('candidate.grouping_compositions.table_status') %>
+ <%= member.company_name.presence || t('candidate.grouping_compositions.company_unknown') %>
+ <%= t('candidate.grouping_compositions.siret_label') %> <%= member.siret %> + 		<%= member.email %> + + <%= t("candidate.grouping_compositions.role_#{member.role}") %> + + + <% if member.mandataire? %> + - + <% elsif member.invitation_sent? %> + <%= t('candidate.grouping_compositions.status_sent') %> + <% else %> + <%= t('candidate.grouping_compositions.status_not_sent') %> + <% end %> + + <% if member.co_traitant? && !member.invitation_sent? %> + <%= button_to t('candidate.grouping_compositions.remove_button'), + grouping_wizard_member_candidate_market_application_path(market_application.identifier, member), + method: :delete, + form: { data: { turbo_stream: true } }, + class: "fr-btn fr-btn--secondary fr-btn--sm fr-icon-delete-line fr-btn--icon-left" %> + <% end %> +
+ <%= t('candidate.grouping_compositions.no_co_traitant_line1') %>
+ <%= t('candidate.grouping_compositions.no_co_traitant_line2') %> +
+
+
diff --git a/app/views/candidate/grouping_wizard/grouping_composition.html.erb b/app/views/candidate/grouping_wizard/grouping_composition.html.erb new file mode 100644 index 00000000..42770a3b --- /dev/null +++ b/app/views/candidate/grouping_wizard/grouping_composition.html.erb @@ -0,0 +1,25 @@ +<% content_for :title, t('candidate.grouping_compositions.title') %> + +
+

<%= t('candidate.grouping_compositions.step_current') %>

+

<%= t('candidate.grouping_compositions.title') %>

+ +
+
+
+
+
+ +

+ <%= t('candidate.grouping_compositions.step_next') %> + <%= t('candidate.grouping_compositions.step_next_label') %> +

+ +

<%= t('candidate.grouping_compositions.title') %>

+

<%= t('candidate.grouping_compositions.intro') %>

+ + <%= render 'members_table', grouping: @grouping, market_application: @market_application, editable: true %> + <%= render 'member_form', grouping: @grouping, market_application: @market_application, grouping_member: @grouping_member, errors: @errors %> + + <%= render 'composition_actions', grouping: @grouping %> +
diff --git a/config/routes.rb b/config/routes.rb index 2693f63b..74a44f89 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -77,6 +77,7 @@ namespace :candidate do get 'dashboard', to: 'dashboards#index', as: :dashboard + get 'grouping_invitations/:token', to: 'grouping_invitations#show', as: :grouping_invitation resource :sessions, only: %i[new create destroy] do get :verify @@ -88,6 +89,8 @@ get 'deadline_passed', to: 'deadline_passed#show', as: :deadline_passed get 'grouping_wizard/:id', to: 'grouping_wizard#show', as: :grouping_wizard_step patch 'grouping_wizard/:id', to: 'grouping_wizard#update' + post 'grouping_wizard/members', to: 'grouping_wizard#create_member', as: :grouping_wizard_members + delete 'grouping_wizard/members/:id', to: 'grouping_wizard#destroy_member', as: :grouping_wizard_member get 'company_identification', to: 'company_identifications#show', as: :company_identification patch 'company_identification', to: 'company_identifications#update' get 'lots', to: 'lot_selections#show', as: :lot_selection diff --git a/spec/interactors/candidate/add_grouping_member_spec.rb b/spec/interactors/candidate/add_grouping_member_spec.rb new file mode 100644 index 00000000..f44e6aa8 --- /dev/null +++ b/spec/interactors/candidate/add_grouping_member_spec.rb @@ -0,0 +1,148 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Candidate::AddGroupingMember, type: :interactor do + let(:editor) { create(:editor) } + let(:public_market) { create(:public_market, :completed, editor:) } + let(:mandataire_application) do + create(:market_application, public_market:, siret: '73282932000074', application_mode: :groupement) + end + let(:grouping) do + create(:grouping, public_market:, mandataire_market_application: mandataire_application, legal_type: :conjoint) + end + + before do + allow(SiretValidator).to receive(:valid?).and_return(true) + end + + describe '.call' do + subject(:result) { described_class.call(grouping:, siret:, email:) } + + let(:siret) { '80245139600027' } + let(:email) { 'contact@menuiseries-loire.fr' } + + context 'when the SIRET and email are valid and the SIRET is not already in the grouping' do + before do + allow(FetchRaisonSociale).to receive(:call).and_return( + OpenStruct.new(success?: true, raison_sociale: 'MENUISERIES DE LOIRE SARL') + ) + end + + it 'succeeds' do + expect(result).to be_success + end + + it 'creates a co_traitant grouping member' do + expect { result }.to change { grouping.grouping_members.co_traitant.count }.by(1) + end + + it 'stores the resolved company name' do + member = result.grouping_member + expect(member.company_name).to eq('MENUISERIES DE LOIRE SARL') + end + + it 'does not send an invitation yet' do + member = result.grouping_member + expect(member.invitation_sent?).to be false + end + end + + context 'when the company name API call fails' do + before do + allow(FetchRaisonSociale).to receive(:call).and_return( + OpenStruct.new(success?: false, raison_sociale: nil) + ) + end + + it 'still succeeds and creates the member without a company name' do + expect(result).to be_success + expect(result.grouping_member.company_name).to be_nil + end + end + + context 'when the company name API call raises (network error, WebMock, ...)' do + before do + allow(FetchRaisonSociale).to receive(:call).and_raise(SocketError, 'connection failed') + allow(Sentry).to receive(:capture_exception) + end + + it 'still succeeds and creates the member without a company name' do + expect(result).to be_success + expect(result.grouping_member.company_name).to be_nil + end + + it 'reports the exception to Sentry' do + result + expect(Sentry).to have_received(:capture_exception) + end + end + + context 'when the SIRET is blank' do + let(:siret) { '' } + + it 'fails with a siret error' do + expect(result).to be_failure + expect(result.errors[:siret]).to be_present + end + + it 'does not clear the email error slot' do + expect(result.errors[:email]).to be_blank + end + end + + context 'when the SIRET is invalid' do + before { allow(SiretValidator).to receive(:valid?).with(siret).and_return(false) } + + it 'fails with a siret error' do + expect(result).to be_failure + expect(result.errors[:siret]).to be_present + end + end + + context 'when the SIRET is the mandataire own SIRET' do + let(:siret) { mandataire_application.siret } + + it 'fails with a siret error' do + expect(result).to be_failure + expect(result.errors[:siret]).to be_present + end + end + + context 'when the SIRET has already been added to the grouping' do + before do + allow(FetchRaisonSociale).to receive(:call).and_return( + OpenStruct.new(success?: true, raison_sociale: 'MENUISERIES DE LOIRE SARL') + ) + create(:grouping_member, :co_traitant, grouping:, siret:) + end + + it 'fails with a siret error' do + expect(result).to be_failure + expect(result.errors[:siret]).to be_present + end + end + + context 'when the email is blank' do + let(:email) { '' } + + it 'fails with an email error' do + expect(result).to be_failure + expect(result.errors[:email]).to be_present + end + + it 'does not clear the siret error slot' do + expect(result.errors[:siret]).to be_blank + end + end + + context 'when the email is invalid' do + let(:email) { 'not-an-email' } + + it 'fails with an email error' do + expect(result).to be_failure + expect(result.errors[:email]).to be_present + end + end + end +end diff --git a/spec/interactors/candidate/remove_grouping_member_spec.rb b/spec/interactors/candidate/remove_grouping_member_spec.rb new file mode 100644 index 00000000..9ff2af93 --- /dev/null +++ b/spec/interactors/candidate/remove_grouping_member_spec.rb @@ -0,0 +1,76 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Candidate::RemoveGroupingMember, type: :interactor do + let(:editor) { create(:editor) } + let(:public_market) { create(:public_market, :completed, editor:) } + let(:mandataire_application) do + create(:market_application, public_market:, siret: '73282932000074', application_mode: :groupement) + end + let(:grouping) do + create(:grouping, public_market:, mandataire_market_application: mandataire_application, legal_type: :conjoint) + end + + before do + allow(SiretValidator).to receive(:valid?).and_return(true) + end + + describe '.call' do + subject(:result) { described_class.call(grouping:, grouping_member_id:) } + + context 'when the member exists, belongs to the grouping and has not been invited yet' do + let!(:member) { create(:grouping_member, :co_traitant, grouping:, invitation_token_created_at: nil) } + let(:grouping_member_id) { member.id } + + it 'succeeds' do + expect(result).to be_success + end + + it 'destroys the member' do + expect { result }.to change(GroupingMember, :count).by(-1) + end + end + + context 'when the member has already been invited' do + let!(:member) { create(:grouping_member, :co_traitant, grouping:, invitation_token_created_at: Time.current) } + let(:grouping_member_id) { member.id } + + it 'fails' do + expect(result).to be_failure + end + + it 'does not destroy the member' do + expect { result }.not_to change(GroupingMember, :count) + end + end + + context 'when the member does not belong to the grouping' do + let(:other_grouping) do + other_application = create(:market_application, public_market:, siret: '80245139600027', + application_mode: :groupement) + create(:grouping, public_market:, mandataire_market_application: other_application, legal_type: :conjoint) + end + let!(:member) { create(:grouping_member, :co_traitant, grouping: other_grouping, invitation_token_created_at: nil) } + let(:grouping_member_id) { member.id } + + before { grouping } + + it 'fails' do + expect(result).to be_failure + end + + it 'does not destroy the member' do + expect { result }.not_to change(GroupingMember, :count) + end + end + + context 'when the member does not exist' do + let(:grouping_member_id) { -1 } + + it 'fails' do + expect(result).to be_failure + end + end + end +end diff --git a/spec/models/market_application_spec.rb b/spec/models/market_application_spec.rb index 79fa1691..55f282f4 100644 --- a/spec/models/market_application_spec.rb +++ b/spec/models/market_application_spec.rb @@ -206,6 +206,49 @@ end end + describe '#grouping_composition_choice_required?' do + it 'returns false when the groupement feature flag is disabled' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(false) + application = create(:market_application, public_market:, application_mode: :groupement) + create(:grouping, public_market:, mandataire_market_application: application, legal_type: :conjoint) + + expect(application.grouping_composition_choice_required?).to be false + end + + it 'returns false when the legal_type has not been chosen yet' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) + application = create(:market_application, public_market:, application_mode: :groupement) + create(:grouping, public_market:, mandataire_market_application: application, legal_type: nil) + + expect(application.grouping_composition_choice_required?).to be false + end + + it 'returns true when legal_type is chosen but no invitation has been sent yet' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) + application = create(:market_application, public_market:, application_mode: :groupement) + grouping = create(:grouping, public_market:, mandataire_market_application: application, legal_type: :conjoint) + create(:grouping_member, :co_traitant, grouping:, invitation_token_created_at: nil) + + expect(application.grouping_composition_choice_required?).to be true + end + + it 'returns false once at least one invitation has been sent' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) + application = create(:market_application, public_market:, application_mode: :groupement) + grouping = create(:grouping, public_market:, mandataire_market_application: application, legal_type: :conjoint) + create(:grouping_member, :co_traitant, grouping:, invitation_token_created_at: Time.current) + + expect(application.grouping_composition_choice_required?).to be false + end + + it 'returns false when the mode is not groupement' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) + application = build(:market_application, public_market:, application_mode: :solo) + + expect(application.grouping_composition_choice_required?).to be false + end + end + describe '#groupement_counterpart' do let(:siret) { '73282932000074' } @@ -255,6 +298,15 @@ expect(solo.next_required_wizard_step).to eq([groupement, :grouping_legal_type]) end + it 'returns grouping_composition when the legal_type is chosen but no invitation has been sent' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) + application = create(:market_application, public_market:, application_mode: :groupement) + grouping = create(:grouping, public_market:, mandataire_market_application: application, legal_type: :conjoint) + create(:grouping_member, :co_traitant, grouping:, invitation_token_created_at: nil) + + expect(application.next_required_wizard_step).to eq([application, :grouping_composition]) + end + it 'returns nil once nothing is required' do allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) application = create(:market_application, public_market:, application_mode: :solo) From 72eb748729994049c8894d82f5b9f2bae5888a6e Mon Sep 17 00:00:00 2001 From: Camille Regnault Date: Thu, 6 Aug 2026 18:43:42 +0200 Subject: [PATCH 07/15] =?UTF-8?q?feat:=20le=20mandataire=20confirme=20la?= =?UTF-8?q?=20composition=20et=20les=20invitations=20sont=20envoy=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ajoute le step grouping_composition_confirmation : récapitulatif du groupement, confirmation qui déclenche l'envoi d'un email d'invitation à chaque co-traitant (GroupingInvitationMailer). Ajoute la route placeholder de consultation de l'invitation par le co-traitant (grouping_invitations#show), le contenu de la page viendra dans un ticket dédié. --- ...ouping_invitation_email_component.html.erb | 66 ++++++ .../grouping_invitation_email_component.rb | 16 ++ .../grouping_invitations_controller.rb | 10 + .../candidate/confirm_grouping_composition.rb | 29 +++ app/mailers/grouping_invitation_mailer.rb | 11 + .../grouping_invitations/show.html.erb | 4 + ...grouping_composition_confirmation.html.erb | 46 +++++ .../invitation.html.erb | 1 + .../invitation.text.erb | 10 + config/locales/fr.yml | 53 +++++ .../confirm_grouping_composition_spec.rb | 84 ++++++++ .../grouping_invitation_mailer_spec.rb | 40 ++++ .../grouping_invitation_mailer_preview.rb | 14 ++ .../candidate/grouping_invitations_spec.rb | 39 ++++ .../candidate/grouping_wizard_spec.rb | 189 +++++++++++++++++- 15 files changed, 606 insertions(+), 6 deletions(-) create mode 100644 app/components/grouping_invitation_email_component.html.erb create mode 100644 app/components/grouping_invitation_email_component.rb create mode 100644 app/controllers/candidate/grouping_invitations_controller.rb create mode 100644 app/interactors/candidate/confirm_grouping_composition.rb create mode 100644 app/mailers/grouping_invitation_mailer.rb create mode 100644 app/views/candidate/grouping_invitations/show.html.erb create mode 100644 app/views/candidate/grouping_wizard/grouping_composition_confirmation.html.erb create mode 100644 app/views/grouping_invitation_mailer/invitation.html.erb create mode 100644 app/views/grouping_invitation_mailer/invitation.text.erb create mode 100644 spec/interactors/candidate/confirm_grouping_composition_spec.rb create mode 100644 spec/mailers/grouping_invitation_mailer_spec.rb create mode 100644 spec/mailers/previews/grouping_invitation_mailer_preview.rb create mode 100644 spec/requests/candidate/grouping_invitations_spec.rb diff --git a/app/components/grouping_invitation_email_component.html.erb b/app/components/grouping_invitation_email_component.html.erb new file mode 100644 index 00000000..6b1042f8 --- /dev/null +++ b/app/components/grouping_invitation_email_component.html.erb @@ -0,0 +1,66 @@ + + + + +
+ + + <%# Header %> + + + + + <%# Body %> + + + + <%# Logo %> + + + + <%# Footer %> + + + + +
+

+ <%= t('grouping_invitation_mailer.invitation.subject') %> +

+
+

+ <%= t('grouping_invitation_mailer.invitation.greeting') %> +

+ +

+ <%= t('grouping_invitation_mailer.invitation.intro') %> + “<%= @market_name %>” +

+ +

+ <%= t('grouping_invitation_mailer.invitation.cta_intro') %> +

+ + + + + +
+ <%= link_to t('grouping_invitation_mailer.invitation.cta'), @url, + style: "display: inline-block; padding: 12px 24px; color: #ffffff; font-size: 15px; font-weight: 700; text-decoration: none; white-space: nowrap;" %> +
+ 		+ +
+

+ <%= t('auth_mailer.magic_link.footer.privacy') %> +  |  + <%= t('auth_mailer.magic_link.footer.legal') %> +

+

<%= t('auth_mailer.magic_link.footer.copyright') %>

+

<%= t('auth_mailer.magic_link.footer.contact') %>

+
+
diff --git a/app/components/grouping_invitation_email_component.rb b/app/components/grouping_invitation_email_component.rb new file mode 100644 index 00000000..4fb51856 --- /dev/null +++ b/app/components/grouping_invitation_email_component.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +class GroupingInvitationEmailComponent < ViewComponent::Base + def initialize(url:, market_name:) + @url = url + @market_name = market_name + end + + private + + def logo_data_uri + image_path = Rails.root.join('app/assets/images/passe-marche-logo-email.jpg') + base64 = Base64.strict_encode64(File.binread(image_path)) + "data:image/jpeg;base64,#{base64}" + end +end diff --git a/app/controllers/candidate/grouping_invitations_controller.rb b/app/controllers/candidate/grouping_invitations_controller.rb new file mode 100644 index 00000000..527322f8 --- /dev/null +++ b/app/controllers/candidate/grouping_invitations_controller.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +module Candidate + class GroupingInvitationsController < ::ApplicationController + def show + @grouping_member = GroupingMember.find_by(invitation_token: params[:token]) + render plain: "Cette invitation n'a pas été trouvée", status: :not_found if @grouping_member.nil? + end + end +end diff --git a/app/interactors/candidate/confirm_grouping_composition.rb b/app/interactors/candidate/confirm_grouping_composition.rb new file mode 100644 index 00000000..c5aa5cbd --- /dev/null +++ b/app/interactors/candidate/confirm_grouping_composition.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true + +module Candidate + class ConfirmGroupingComposition < ApplicationInteractor + delegate :grouping, to: :context + + def call + pending_members = grouping.grouping_members.co_traitant.reject(&:invitation_sent?) + return fail_no_co_traitant if grouping.grouping_members.co_traitant.none? + + pending_members.each { |member| invite(member) } + end + + private + + def invite(member) + member.update!(invitation_token: SecureRandom.urlsafe_base64(32), invitation_token_created_at: Time.current) + GroupingInvitationMailer.invitation(member, invitation_url(member)).deliver_later + end + + def invitation_url(member) + Rails.application.routes.url_helpers.candidate_grouping_invitation_url(member.invitation_token) + end + + def fail_no_co_traitant + context.fail!(errors: { grouping: [I18n.t('candidate.validations.no_co_traitant')] }) + end + end +end diff --git a/app/mailers/grouping_invitation_mailer.rb b/app/mailers/grouping_invitation_mailer.rb new file mode 100644 index 00000000..af2bf089 --- /dev/null +++ b/app/mailers/grouping_invitation_mailer.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class GroupingInvitationMailer < ApplicationMailer + def invitation(grouping_member, url) + @grouping_member = grouping_member + @url = url + @market_name = grouping_member.grouping.public_market.name + + mail(to: @grouping_member.email, subject: I18n.t('grouping_invitation_mailer.invitation.subject')) + end +end diff --git a/app/views/candidate/grouping_invitations/show.html.erb b/app/views/candidate/grouping_invitations/show.html.erb new file mode 100644 index 00000000..3434d209 --- /dev/null +++ b/app/views/candidate/grouping_invitations/show.html.erb @@ -0,0 +1,4 @@ +
+

<%= t('candidate.grouping_invitations.title') %>

+

<%= t('candidate.grouping_invitations.pending') %>

+
diff --git a/app/views/candidate/grouping_wizard/grouping_composition_confirmation.html.erb b/app/views/candidate/grouping_wizard/grouping_composition_confirmation.html.erb new file mode 100644 index 00000000..069b77e9 --- /dev/null +++ b/app/views/candidate/grouping_wizard/grouping_composition_confirmation.html.erb @@ -0,0 +1,46 @@ +<% content_for :title, t('candidate.grouping_compositions.confirm.title') %> + +
+

<%= t('candidate.grouping_compositions.confirm.step_current') %>

+

<%= t('candidate.grouping_compositions.confirm.step_next_label') %>

+ +
+
+
+
+
+ +

<%= t('candidate.grouping_compositions.confirm.title') %>

+ + <% if @errors.present? %> + + <% end %> + +

+ <%= t('candidate.grouping_compositions.confirm.legal_type_label') %> + + <%= t("candidate.grouping_legal_types.#{@grouping.legal_type}.label") %> + +

+ + <%= render 'members_table', grouping: @grouping, market_application: @market_application, editable: false %> + +
+ <%= link_to t('candidate.grouping_compositions.confirm.modify'), + previous_wizard_path, + class: "fr-btn fr-btn--secondary fr-icon-arrow-left-line fr-btn--icon-left" %> + <%= button_to t('candidate.grouping_compositions.confirm.submit'), + wizard_path, + method: :patch, + class: "fr-btn fr-icon-send-plane-line fr-btn--icon-right" %> +
+
diff --git a/app/views/grouping_invitation_mailer/invitation.html.erb b/app/views/grouping_invitation_mailer/invitation.html.erb new file mode 100644 index 00000000..057e32fc --- /dev/null +++ b/app/views/grouping_invitation_mailer/invitation.html.erb @@ -0,0 +1 @@ +<%= render GroupingInvitationEmailComponent.new(url: @url, market_name: @market_name) %> diff --git a/app/views/grouping_invitation_mailer/invitation.text.erb b/app/views/grouping_invitation_mailer/invitation.text.erb new file mode 100644 index 00000000..9ba2f613 --- /dev/null +++ b/app/views/grouping_invitation_mailer/invitation.text.erb @@ -0,0 +1,10 @@ +<%= t('grouping_invitation_mailer.invitation.greeting') %> + +<%= t('grouping_invitation_mailer.invitation.intro') %> +<%= @market_name %> + +<%= t('grouping_invitation_mailer.invitation.cta_intro') %> +<%= @url %> + +<%= t('auth_mailer.magic_link.footer.copyright') %> +<%= t('auth_mailer.magic_link.footer.contact') %> diff --git a/config/locales/fr.yml b/config/locales/fr.yml index f1bc888d..80a09fcb 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -33,6 +33,15 @@ fr: market_intro: "Vous pouvez accéder au formulaire de candidature pour le marché :" cta_intro: "Cliquez sur le bouton ci-dessous pour vous reconnecter et continuer :" cta: Poursuivre ma candidature + + grouping_invitation_mailer: + invitation: + subject: "Vous avez été invité à candidater en groupement" + greeting: Bonjour, + intro: "Vous avez été invité à rejoindre un groupement en tant que co-traitant pour candidater au marché :" + cta_intro: "Cliquez sur le bouton ci-dessous pour rejoindre le groupement :" + cta: Rejoindre le groupement + source_types: authentic_source: label: Récupéré automatiquement @@ -594,6 +603,9 @@ fr: mixte: label: "Candidater seul et en groupement" hint: "Je réponds seul sur certains lots et je suis mandataire du groupement sur d'autres" + grouping_invitations: + title: "Invitation au groupement" + pending: "Votre invitation est en cours de traitement." grouping_legal_types: title: "Le type de groupement" step_current: "Étape 1 sur 3" @@ -613,6 +625,41 @@ fr: conjoint_mandataire_solidaire: label: "Conjoint + mandataire solidaire" hint: "Chaque membre est responsable de sa propre part du marché. En revanche, le mandataire est solidaire des autres membres : si l'un d'eux est défaillant, seul le mandataire devra répondre de ses obligations vis-à-vis de l'acheteur." + grouping_compositions: + title: "Les membres du groupement" + step_current: "Étape 2 sur 3" + step_next: "Étape suivante :" + step_next_label: "Confirmation de la composition" + intro: "Ajoutez les co-traitants qui candidateront avec vous. Les invitations ne partiront qu'après confirmation de la composition." + table_company: "Entreprise" + table_email: "Email" + table_role: "Rôle" + table_status: "Statut des invitations" + company_unknown: "Entreprise" + role_mandataire: "MANDATAIRE" + role_co_traitant: "CO-TRAITANT" + status_not_sent: "NON ENVOYÉ" + status_sent: "ENVOYÉ" + no_co_traitant_line1: "Aucun co-traitant dans le groupement pour l'instant." + no_co_traitant_line2: "Ajoutez au moins un co-traitant ci-dessous pour pouvoir continuer." + add_member_title: "Ajouter un co-traitant" + siret_label: "Numéro de SIRET" + siret_hint: "Consultez" + siret_hint_link: "l'annuaire des entreprises" + email_label: "Email du contact" + email_hint: "Destinataire de l'invitation" + add_button: "Ajouter au groupement" + remove_button: "Retirer" + back: "Précédent" + continue: "Continuer" + success: "Le groupement a été créé et les invitations ont été envoyées" + confirm: + title: "Récapitulatif du groupement" + step_current: "Étape 3 sur 3" + step_next_label: "Confirmation de la composition" + legal_type_label: "Type de groupement :" + modify: "Modifier la composition" + submit: "Confirmer et envoyer les invitations" lot_selection: title: "Sélectionnez un ou plusieurs lot(s)" subtitle: "Sélectionnez le ou les lots pour lequel/lesquels vous souhaitez soumettre une candidature." @@ -657,12 +704,17 @@ fr: validations: siret_blank: "Veuillez renseigner votre numéro de SIRET" siret_invalid: "Le numéro de SIRET saisi est invalide" + siret_same_as_mandataire: "Ce numéro de SIRET est celui de votre entreprise, vous faites déjà partie du groupement" + siret_already_added: "Ce numéro de SIRET a déjà été ajouté au groupement" email_blank: "Veuillez renseigner votre adresse email" email_invalid: "L'adresse email doit avoir un format valide (exemple@domaine.com)" already_mandataire: "Vous êtes déjà mandataire d'un groupement sur ce marché" application_mode_invalid: "Le mode de candidature sélectionné n'est pas valide" grouping_not_found: "Aucun groupement trouvé pour cette candidature" legal_type_invalid: "Le type de groupement sélectionné n'est pas valide" + grouping_member_not_found: "Ce co-traitant n'a pas été trouvé dans le groupement" + grouping_member_already_invited: "Ce co-traitant a déjà reçu son invitation, il ne peut plus être retiré" + no_co_traitant: "Veuillez ajouter au moins un co-traitant avant de continuer" request_magic_link: no_application_found: "Aucune candidature trouvée pour ce numéro SIRET" no_market_context: "Veuillez accéder à Passe Marché depuis votre plateforme de marchés publics" @@ -1414,6 +1466,7 @@ fr: messages: record_invalid: "La validation a échoué : %{errors}" cannot_be_alone: "ne peut pas être seul" + same_as_mandataire: "correspond au SIRET du mandataire, vous faites déjà partie du groupement" inclusion: "n'est pas inclus dans la liste des valeurs autorisées" invalid: "n'est pas valide" blank: "ne peut pas être vide" diff --git a/spec/interactors/candidate/confirm_grouping_composition_spec.rb b/spec/interactors/candidate/confirm_grouping_composition_spec.rb new file mode 100644 index 00000000..66ef2acf --- /dev/null +++ b/spec/interactors/candidate/confirm_grouping_composition_spec.rb @@ -0,0 +1,84 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Candidate::ConfirmGroupingComposition, type: :interactor do + let(:editor) { create(:editor) } + let(:public_market) { create(:public_market, :completed, editor:) } + let(:mandataire_application) do + create(:market_application, public_market:, siret: '73282932000074', application_mode: :groupement) + end + let(:grouping) do + create(:grouping, public_market:, mandataire_market_application: mandataire_application, legal_type: :conjoint) + end + + before do + allow(SiretValidator).to receive(:valid?).and_return(true) + end + + describe '.call' do + subject(:result) { described_class.call(grouping:) } + + context 'when the grouping has at least one co_traitant' do + let!(:member1) { create(:grouping_member, :co_traitant, grouping:, invitation_token_created_at: nil) } + let!(:member2) { create(:grouping_member, :co_traitant, grouping:, invitation_token_created_at: nil) } + + it 'succeeds' do + expect(result).to be_success + end + + it 'generates an invitation token for each co_traitant' do + result + expect(member1.reload.invitation_token).to be_present + expect(member2.reload.invitation_token).to be_present + end + + it 'marks each co_traitant as invited' do + result + expect(member1.reload.invitation_sent?).to be true + expect(member2.reload.invitation_sent?).to be true + end + + it 'sends an invitation email to each co_traitant' do + expect { result }.to have_enqueued_mail(GroupingInvitationMailer, :invitation).twice + end + + it 'does not affect the mandataire member' do + mandataire_member = grouping.mandataire_grouping_member + result + expect(mandataire_member.reload.invitation_token).to be_nil + end + end + + context 'when a co_traitant has already been invited' do + let!(:already_invited) do + create(:grouping_member, :co_traitant, grouping:, invitation_token: 'existing-token', + invitation_token_created_at: 1.day.ago) + end + let!(:new_member) { create(:grouping_member, :co_traitant, grouping:, invitation_token_created_at: nil) } + + it 'does not resend an invitation to the already invited member' do + expect { result }.to have_enqueued_mail(GroupingInvitationMailer, :invitation).once + end + + it 'does not change the already invited token' do + result + expect(already_invited.reload.invitation_token).to eq('existing-token') + end + end + + context 'when the grouping has no co_traitant' do + it 'fails' do + expect(result).to be_failure + end + + it 'sets an error' do + expect(result.errors[:grouping]).to be_present + end + + it 'does not send any email' do + expect { result }.not_to have_enqueued_mail(GroupingInvitationMailer, :invitation) + end + end + end +end diff --git a/spec/mailers/grouping_invitation_mailer_spec.rb b/spec/mailers/grouping_invitation_mailer_spec.rb new file mode 100644 index 00000000..1258d31b --- /dev/null +++ b/spec/mailers/grouping_invitation_mailer_spec.rb @@ -0,0 +1,40 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe GroupingInvitationMailer, type: :mailer do + let(:editor) { create(:editor) } + let(:public_market) { create(:public_market, :completed, editor:, name: 'Marché test informatique') } + let(:mandataire_application) do + create(:market_application, public_market:, siret: '73282932000074', application_mode: :groupement) + end + let(:grouping) do + create(:grouping, public_market:, mandataire_market_application: mandataire_application, legal_type: :conjoint) + end + let(:grouping_member) do + create(:grouping_member, :co_traitant, grouping:, email: 'contact@menuiseries-loire.fr') + end + let(:url) { 'http://localhost:3000/candidate/grouping_invitations/abc123' } + + before { allow(SiretValidator).to receive(:valid?).and_return(true) } + + describe '#invitation' do + let(:mail) { described_class.invitation(grouping_member, url) } + + it 'sends to the grouping member email' do + expect(mail.to).to eq([grouping_member.email]) + end + + it 'sends from the application address' do + expect(mail.from).to eq(['noreply@passemarche.data.gouv.fr']) + end + + it 'includes the invitation URL in the text body' do + expect(mail.text_part.body.decoded).to include(url) + end + + it 'includes the market name in the html body' do + expect(mail.html_part.body.decoded).to include('Marché test informatique') + end + end +end diff --git a/spec/mailers/previews/grouping_invitation_mailer_preview.rb b/spec/mailers/previews/grouping_invitation_mailer_preview.rb new file mode 100644 index 00000000..9aaf85f1 --- /dev/null +++ b/spec/mailers/previews/grouping_invitation_mailer_preview.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +class GroupingInvitationMailerPreview < ActionMailer::Preview + def invitation + public_market = PublicMarket.new( + name: "Système d'acquisition dynamique (SAD) pour la fourniture de matériels informatiques" + ) + grouping = Grouping.new(public_market:) + grouping_member = GroupingMember.new(email: 'contact@menuiseries-loire.fr', siret: '80245139600027', grouping:) + url = 'http://localhost:3000/candidate/grouping_invitations/abc123' + + GroupingInvitationMailer.invitation(grouping_member, url) + end +end diff --git a/spec/requests/candidate/grouping_invitations_spec.rb b/spec/requests/candidate/grouping_invitations_spec.rb new file mode 100644 index 00000000..6050cb54 --- /dev/null +++ b/spec/requests/candidate/grouping_invitations_spec.rb @@ -0,0 +1,39 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe 'Candidate::GroupingInvitations', type: :request do + let(:editor) { create(:editor) } + let(:public_market) { create(:public_market, :completed, editor:) } + let(:mandataire_application) do + create(:market_application, public_market:, siret: '73282932000074', application_mode: :groupement) + end + let(:grouping) do + create(:grouping, public_market:, mandataire_market_application: mandataire_application, legal_type: :conjoint) + end + + before { allow(SiretValidator).to receive(:valid?).and_return(true) } + + describe 'GET /candidate/grouping_invitations/:token' do + context 'when the token matches an invited grouping member' do + let(:grouping_member) do + create(:grouping_member, :co_traitant, grouping:, invitation_token: 'valid-token-123', + invitation_token_created_at: Time.current) + end + + it 'returns a successful response' do + get candidate_grouping_invitation_path(grouping_member.invitation_token) + + expect(response).to have_http_status(:ok) + end + end + + context 'when the token does not match any grouping member' do + it 'returns a 404' do + get candidate_grouping_invitation_path('unknown-token') + + expect(response).to have_http_status(:not_found) + end + end + end +end diff --git a/spec/requests/candidate/grouping_wizard_spec.rb b/spec/requests/candidate/grouping_wizard_spec.rb index d8d3185a..f4f5af65 100644 --- a/spec/requests/candidate/grouping_wizard_spec.rb +++ b/spec/requests/candidate/grouping_wizard_spec.rb @@ -336,14 +336,13 @@ def wizard_step_path(market_application, step) create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: nil) end - it 'sets the legal_type and redirects to company_identification' do + it 'sets the legal_type and redirects to grouping_composition' do patch wizard_step_path(market_application, :grouping_legal_type), params: { legal_type: 'conjoint_mandataire_solidaire' } - expect(Grouping.joins(:mandataire_market_application).find_by(market_applications: { id: market_application.id }).legal_type) - .to eq('conjoint_mandataire_solidaire') - expect(response).to redirect_to( - company_identification_candidate_market_application_path(market_application.identifier) - ) + grouping = Grouping.joins(:mandataire_grouping_member) + .find_by(mandataire_grouping_member: { market_application_id: market_application.id }) + expect(grouping.legal_type).to eq('conjoint_mandataire_solidaire') + expect(response).to redirect_to(wizard_step_path(market_application, :grouping_composition)) end it 'rejects an invalid legal_type with a 422' do @@ -354,4 +353,182 @@ def wizard_step_path(market_application, step) expect(rendered.text).to include(I18n.t('candidate.validations.legal_type_invalid')) end end + + describe 'GET .../grouping_wizard/grouping_composition' do + context 'when the market_application is mandataire of a grouping with a legal_type' do + before do + market_application.update!(application_mode: :groupement) + create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: :conjoint) + allow(FetchRaisonSociale).to receive(:call).and_return(OpenStruct.new(success?: true, raison_sociale: 'ATLANTIQUE BÂTIMENT SAS')) + end + + it 'renders successfully' do + get wizard_step_path(market_application, :grouping_composition) + + expect(response).to have_http_status(:ok) + expect(response.body).to include(I18n.t('candidate.grouping_compositions.title')) + end + end + + context 'when the mandataire member has no company_name yet' do + before { market_application.update!(application_mode: :groupement) } + + let!(:grouping) { create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: :conjoint) } + let!(:mandataire_member) { grouping.mandataire_grouping_member.tap { |m| m.update!(company_name: nil) } } + + before do + allow(FetchRaisonSociale).to receive(:call).and_return( + OpenStruct.new(success?: true, raison_sociale: 'ATLANTIQUE BÂTIMENT SAS') + ) + end + + it 'resolves and persists the company name' do + get wizard_step_path(market_application, :grouping_composition) + + expect(mandataire_member.reload.company_name).to eq('ATLANTIQUE BÂTIMENT SAS') + end + + it 'displays the resolved company name' do + get wizard_step_path(market_application, :grouping_composition) + + expect(response.body).to include('ATLANTIQUE BÂTIMENT SAS') + end + end + + context 'when the mandataire member already has a company_name' do + before { market_application.update!(application_mode: :groupement) } + + let!(:grouping) { create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: :conjoint) } + let!(:mandataire_member) do + grouping.mandataire_grouping_member.tap { |m| m.update!(company_name: 'ATLANTIQUE BÂTIMENT SAS') } + end + + it 'does not call the API again' do + allow(FetchRaisonSociale).to receive(:call) + + get wizard_step_path(market_application, :grouping_composition) + + expect(FetchRaisonSociale).not_to have_received(:call) + end + end + + context 'when the market_application is not mandataire of any grouping' do + it 'redirects to application_mode' do + get wizard_step_path(market_application, :grouping_composition) + + expect(response).to redirect_to(wizard_step_path(market_application, :application_mode)) + end + end + end + + describe 'POST .../grouping_wizard/members' do + before { market_application.update!(application_mode: :groupement) } + + let!(:grouping) do + create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: :conjoint) + end + + before do + allow(FetchRaisonSociale).to receive(:call).and_return( + OpenStruct.new(success?: true, raison_sociale: 'MENUISERIES DE LOIRE SARL') + ) + end + + it 'creates a co_traitant member and returns a turbo stream response' do + post grouping_wizard_members_candidate_market_application_path(market_application.identifier), + params: { siret: '80245139600027', email: 'contact@menuiseries-loire.fr' }, + headers: { 'Accept' => 'text/vnd.turbo-stream.html' } + + expect(response).to have_http_status(:ok) + expect(response.media_type).to eq('text/vnd.turbo-stream.html') + expect(grouping.grouping_members.co_traitant.count).to eq(1) + end + + it 'renders errors inline without creating a member when the siret is invalid' do + allow(SiretValidator).to receive(:valid?).with('0000000000').and_return(false) + + post grouping_wizard_members_candidate_market_application_path(market_application.identifier), + params: { siret: '0000000000', email: 'contact@menuiseries-loire.fr' }, + headers: { 'Accept' => 'text/vnd.turbo-stream.html' } + + expect(response).to have_http_status(:unprocessable_content) + expect(grouping.grouping_members.co_traitant.count).to eq(0) + expect(response.body).to include(I18n.t('candidate.validations.siret_invalid')) + end + end + + describe 'DELETE .../grouping_wizard/members/:id' do + before { market_application.update!(application_mode: :groupement) } + + let!(:grouping) do + create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: :conjoint) + end + let!(:member) { create(:grouping_member, :co_traitant, grouping:, invitation_token_created_at: nil) } + + it 'removes the member and returns a turbo stream response' do + delete grouping_wizard_member_candidate_market_application_path(market_application.identifier, member.id), + headers: { 'Accept' => 'text/vnd.turbo-stream.html' } + + expect(response).to have_http_status(:ok) + expect(GroupingMember.exists?(member.id)).to be false + end + end + + describe 'GET .../grouping_wizard/grouping_composition_confirmation' do + before { market_application.update!(application_mode: :groupement) } + + let!(:grouping) do + create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: :conjoint) + end + + it 'renders the summary' do + create(:grouping_member, :co_traitant, grouping:) + + get wizard_step_path(market_application, :grouping_composition_confirmation) + + expect(response).to have_http_status(:ok) + expect(response.body).to include(I18n.t('candidate.grouping_compositions.confirm.title')) + end + + it 'redirects back to grouping_composition when there is no co-traitant yet' do + get wizard_step_path(market_application, :grouping_composition_confirmation) + + expect(response).to redirect_to(wizard_step_path(market_application, :grouping_composition)) + end + end + + describe 'PATCH .../grouping_wizard/grouping_composition_confirmation' do + before { market_application.update!(application_mode: :groupement) } + + let!(:grouping) do + create(:grouping, public_market:, mandataire_market_application: market_application, legal_type: :conjoint) + end + + context 'when the grouping has at least one co_traitant' do + before { create(:grouping_member, :co_traitant, grouping:, invitation_token_created_at: nil) } + + it 'sends invitations and redirects to the dashboard with a success message' do + patch wizard_step_path(market_application, :grouping_composition_confirmation) + + expect(response).to redirect_to(candidate_dashboard_path) + follow_redirect! + expect(response.body).to include(I18n.t('candidate.grouping_compositions.success')) + end + end + + context 'when the confirmation interactor fails' do + before { create(:grouping_member, :co_traitant, grouping:, invitation_token_created_at: nil) } + + it 'renders the summary with an error' do + allow(Candidate::ConfirmGroupingComposition).to receive(:call).and_return( + OpenStruct.new(success?: false, errors: { grouping: [I18n.t('candidate.validations.no_co_traitant')] }) + ) + + patch wizard_step_path(market_application, :grouping_composition_confirmation) + + expect(response).to have_http_status(:unprocessable_content) + expect(response.body).to include(I18n.t('candidate.validations.no_co_traitant')) + end + end + end end From ab5fbab017e0f3b10c43c90c94297385bb855990 Mon Sep 17 00:00:00 2001 From: Camille Regnault Date: Thu, 6 Aug 2026 18:46:17 +0200 Subject: [PATCH 08/15] =?UTF-8?q?test:=20ajoute=20les=20sc=C3=A9narios=20c?= =?UTF-8?q?ucumber=20de=20composition=20du=20groupement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Couvre l'ajout/retrait de co-traitant, les erreurs de validation (SIRET invalide, déjà présent, propre SIRET du mandataire, email invalide) et la confirmation avec envoi des invitations. --- features/grouping_composition.feature | 104 ++++++++++++++++++ features/grouping_legal_type.feature | 2 +- .../step_definitions/candidacy_mode_steps.rb | 7 ++ .../grouping_composition_steps.rb | 62 +++++++++++ 4 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 features/grouping_composition.feature create mode 100644 features/step_definitions/grouping_composition_steps.rb diff --git a/features/grouping_composition.feature b/features/grouping_composition.feature new file mode 100644 index 00000000..00b16e6c --- /dev/null +++ b/features/grouping_composition.feature @@ -0,0 +1,104 @@ +Feature: Mandataire composes the grouping and sends invitations + + As a mandataire candidate + I want to add my co-traitants (SIRET + email) and confirm the composition + So that invitations are sent to them + + Background: + Given the groupement feature flag is enabled + And a public market exists + And a candidate application exists for SIRET "73282932000074" + And a candidate "candidat@example.com" has a valid magic link token + + @javascript + Scenario: Mandataire sees the grouping composition screen + When I visit the magic link + And I choose the candidacy mode "groupement" + And I choose the grouping legal type "conjoint_mandataire_solidaire" + Then I should see "Les membres du groupement" + And I should see "MANDATAIRE" in the members table + + @javascript + Scenario: Add button is disabled until both fields are filled + When I visit the magic link + And I choose the candidacy mode "groupement" + And I choose the grouping legal type "conjoint_mandataire_solidaire" + Then the "Ajouter au groupement" button should be disabled + + @javascript + Scenario: Continue link is disabled until at least one co-traitant is added + When I visit the magic link + And I choose the candidacy mode "groupement" + And I choose the grouping legal type "conjoint_mandataire_solidaire" + Then the "Continuer" link should be disabled + + @javascript + Scenario: Mandataire adds a valid co-traitant + When I visit the magic link + And I choose the candidacy mode "groupement" + And I choose the grouping legal type "conjoint_mandataire_solidaire" + And I add a co-traitant with SIRET "80245139600021" and email "contact@menuiseries-loire.fr" + Then I should see "80245139600021" in the members table + And the co-traitant "80245139600021" status should be "NON ENVOYÉ" + And the "Continuer" link should be enabled + + @javascript + Scenario: Mandataire cannot add a co-traitant with an invalid SIRET + When I visit the magic link + And I choose the candidacy mode "groupement" + And I choose the grouping legal type "conjoint_mandataire_solidaire" + And I add a co-traitant with SIRET "0000000000" and email "contact@menuiseries-loire.fr" + Then I should see an error about the SIRET + And the email field should still contain "contact@menuiseries-loire.fr" + + @javascript + Scenario: Mandataire cannot add a co-traitant with their own SIRET + When I visit the magic link + And I choose the candidacy mode "groupement" + And I choose the grouping legal type "conjoint_mandataire_solidaire" + And I add a co-traitant with SIRET "73282932000074" and email "contact@menuiseries-loire.fr" + Then I should see an error about the SIRET + + @javascript + Scenario: Mandataire cannot add the same SIRET twice + When I visit the magic link + And I choose the candidacy mode "groupement" + And I choose the grouping legal type "conjoint_mandataire_solidaire" + And I add a co-traitant with SIRET "80245139600021" and email "contact@menuiseries-loire.fr" + And I add a co-traitant with SIRET "80245139600021" and email "other@menuiseries-loire.fr" + Then I should see an error about the SIRET + + @javascript + Scenario: Mandataire cannot add a co-traitant with an invalid email + When I visit the magic link + And I choose the candidacy mode "groupement" + And I choose the grouping legal type "conjoint_mandataire_solidaire" + And I add a co-traitant with SIRET "80245139600021" and email "not-an-email" + Then I should see an error about the email + And the SIRET field should still contain "80245139600021" + + @javascript + Scenario: Mandataire removes a co-traitant before confirmation + When I visit the magic link + And I choose the candidacy mode "groupement" + And I choose the grouping legal type "conjoint_mandataire_solidaire" + And I add a co-traitant with SIRET "80245139600021" and email "contact@menuiseries-loire.fr" + And I remove the co-traitant "80245139600021" + Then I should not see "80245139600021" in the members table + + @javascript + Scenario: Mandataire confirms the composition and invitations are sent + When I visit the magic link + And I choose the candidacy mode "groupement" + And I choose the grouping legal type "conjoint_mandataire_solidaire" + And I add a co-traitant with SIRET "80245139600021" and email "contact@menuiseries-loire.fr" + And I click on "Continuer" + Then I should see "Récapitulatif du groupement" + When I click on "Confirmer et envoyer les invitations" + Then I should see "Le groupement a été créé et les invitations ont été envoyées" + And an invitation email should have been sent for the co-traitant "80245139600021" + + Scenario: A candidate who is not mandataire of a grouping cannot access the composition screen + Given I am authenticated for my application + When I visit the grouping composition step directly + Then I should be on the candidacy mode choice step diff --git a/features/grouping_legal_type.feature b/features/grouping_legal_type.feature index 98102da2..c54fe3c2 100644 --- a/features/grouping_legal_type.feature +++ b/features/grouping_legal_type.feature @@ -30,7 +30,7 @@ Feature: Mandataire defines the grouping legal type When I visit the magic link And I choose the candidacy mode "groupement" And I choose the grouping legal type "conjoint_mandataire_solidaire" - Then I should be on the company identification step + Then I should be on the grouping composition step And the grouping legal type should be "conjoint_mandataire_solidaire" Scenario: A candidate who is not mandataire of a grouping cannot access the screen diff --git a/features/step_definitions/candidacy_mode_steps.rb b/features/step_definitions/candidacy_mode_steps.rb index 913d8913..d62cdf26 100644 --- a/features/step_definitions/candidacy_mode_steps.rb +++ b/features/step_definitions/candidacy_mode_steps.rb @@ -37,6 +37,13 @@ ) end +Then('I should be on the grouping composition step') do + expect(page).to have_current_path( + grouping_wizard_step_candidate_market_application_path(@market_application.identifier, :grouping_composition), + ignore_query: true + ) +end + Then('I should be on the candidacy mode choice step') do expect(page).to have_current_path( grouping_wizard_step_candidate_market_application_path(@market_application.identifier, :application_mode), diff --git a/features/step_definitions/grouping_composition_steps.rb b/features/step_definitions/grouping_composition_steps.rb new file mode 100644 index 00000000..57d08ae0 --- /dev/null +++ b/features/step_definitions/grouping_composition_steps.rb @@ -0,0 +1,62 @@ +# frozen_string_literal: true + +When('I add a co-traitant with SIRET {string} and email {string}') do |siret, email| + fill_in I18n.t('candidate.grouping_compositions.siret_label'), with: siret + fill_in I18n.t('candidate.grouping_compositions.email_label'), with: email + find_button(I18n.t('candidate.grouping_compositions.add_button'), disabled: false).click + + within('#grouping_members_table') { page.has_content?(siret) } || page.has_css?('.fr-error-text') +end + +When('I remove the co-traitant {string}') do |siret| + member = GroupingMember.find_by!(siret:) + within("form[action='#{grouping_wizard_member_candidate_market_application_path(@market_application.identifier, member)}']") do + click_button I18n.t('candidate.grouping_compositions.remove_button') + end +end + +When('I visit the grouping composition step directly') do + visit grouping_wizard_step_candidate_market_application_path(@market_application.identifier, :grouping_composition) +end + +Then('I should see {string} in the members table') do |text| + within('#grouping_members_table') { expect(page).to have_content(text) } +end + +Then('I should not see {string} in the members table') do |text| + within('#grouping_members_table') { expect(page).not_to have_content(text) } +end + +Then('the co-traitant {string} status should be {string}') do |siret, status| + member_row = find('#grouping_members_table').find('tr', text: siret) + expect(member_row).to have_content(status) +end + +Then('I should see an error about the SIRET') do + expect(page).to have_css('.fr-error-text') +end + +Then('I should see an error about the email') do + expect(page).to have_css('.fr-error-text') +end + +Then('the SIRET field should still contain {string}') do |siret| + expect(page).to have_field(I18n.t('candidate.grouping_compositions.siret_label'), with: siret) +end + +Then('the email field should still contain {string}') do |email| + expect(page).to have_field(I18n.t('candidate.grouping_compositions.email_label'), with: email) +end + +Then('the {string} link should be disabled') do |label| + expect(page).to have_css("a[aria-disabled='true']", text: label) +end + +Then('the {string} link should be enabled') do |label| + expect(page).to have_css("a[aria-disabled='false']", text: label) +end + +Then('an invitation email should have been sent for the co-traitant {string}') do |siret| + member = GroupingMember.find_by!(siret:) + expect(member.reload.invitation_sent?).to be true +end From 026e8cf9b25cfc5375e60194480279e596bb4758 Mon Sep 17 00:00:00 2001 From: Camille Regnault Date: Wed, 19 Aug 2026 14:28:32 +0200 Subject: [PATCH 09/15] =?UTF-8?q?feat:=20ajoute=20la=20d=C3=A9tection=20de?= =?UTF-8?q?=20l'=C3=A9tape=20choix=20du=20mode=20par=20lot=20au=20wizard?= =?UTF-8?q?=20(FAS-561)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MarketApplication#lot_selection_mode_choice_required? et #solo_counterpart (symétrique de #groupement_counterpart) permettent d'insérer une nouvelle étape entre application_mode et grouping_legal_type, uniquement quand le marché a des lots et que le candidat est en mode groupement/mixte. --- app/models/market_application.rb | 18 ++++++ spec/models/market_application_spec.rb | 89 +++++++++++++++++++++++++- 2 files changed, 106 insertions(+), 1 deletion(-) diff --git a/app/models/market_application.rb b/app/models/market_application.rb index fde8f3ff..d1ed05a0 100644 --- a/app/models/market_application.rb +++ b/app/models/market_application.rb @@ -52,6 +52,13 @@ def application_mode_choice_required? FeatureFlags::Groupement.enabled? && application_mode.nil? end + def lot_selection_mode_choice_required? + return false unless FeatureFlags::Groupement.enabled? && groupement? + return false if public_market.lots.none? + + mandataire_applications.sum { |app| app.lots.count }.zero? + end + def grouping_legal_type_choice_required? FeatureFlags::Groupement.enabled? && groupement? && Grouping.joins(:mandataire_market_application).exists?(legal_type: nil, market_applications: { id: }) @@ -77,10 +84,17 @@ def groupement_counterpart MarketApplication.where(public_market:, siret:, application_mode: :groupement, user_id:).where.not(id:).first end + def solo_counterpart + return nil if solo? + + MarketApplication.where(public_market:, siret:, application_mode: :solo, user_id:).where.not(id:).first + end + def next_required_wizard_step return [self, :application_mode] if application_mode_choice_required? target = groupement_counterpart || self + return [target, :lot_selection_mode] if target.lot_selection_mode_choice_required? return [target, :grouping_legal_type] if target.grouping_legal_type_choice_required? return [target, :grouping_composition] if target.grouping_composition_choice_required? @@ -150,6 +164,10 @@ def all_security_scans_complete? private + def mandataire_applications + MarketApplication.where(public_market:, siret:, user_id:).where(application_mode: %i[solo groupement]) + end + def generate_identifier return if identifier.present? diff --git a/spec/models/market_application_spec.rb b/spec/models/market_application_spec.rb index 55f282f4..68abef4d 100644 --- a/spec/models/market_application_spec.rb +++ b/spec/models/market_application_spec.rb @@ -249,6 +249,58 @@ end end + describe '#lot_selection_mode_choice_required?' do + it 'returns false when the groupement feature flag is disabled' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(false) + application = create(:market_application, public_market:, application_mode: :groupement) + create(:lot, public_market:) + + expect(application.lot_selection_mode_choice_required?).to be false + end + + it 'returns false when the mode is not groupement' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) + application = build(:market_application, public_market:, application_mode: :solo) + + expect(application.lot_selection_mode_choice_required?).to be false + end + + it 'returns false when the public market has no lots' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) + application = create(:market_application, public_market:, application_mode: :groupement) + + expect(application.lot_selection_mode_choice_required?).to be false + end + + it 'returns true when groupement and no lot has been assigned yet' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) + application = create(:market_application, public_market:, application_mode: :groupement) + create(:lot, public_market:) + + expect(application.lot_selection_mode_choice_required?).to be true + end + + it 'returns false once a lot has been assigned to the groupement application' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) + application = create(:market_application, public_market:, application_mode: :groupement) + lot = create(:lot, public_market:) + application.lots << lot + + expect(application.lot_selection_mode_choice_required?).to be false + end + + it 'returns false once a lot has been assigned to the solo counterpart in mixte mode' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) + siret = '73282932000074' + solo = create(:market_application, public_market:, siret:, application_mode: :solo) + groupement = create(:market_application, public_market:, siret:, application_mode: :groupement) + lot = create(:lot, public_market:) + solo.lots << lot + + expect(groupement.lot_selection_mode_choice_required?).to be false + end + end + describe '#groupement_counterpart' do let(:siret) { '73282932000074' } @@ -280,6 +332,29 @@ end end + describe '#solo_counterpart' do + let(:siret) { '73282932000074' } + + it 'finds the solo application for the same SIRET and market when called on the groupement one' do + solo = create(:market_application, public_market:, siret:, application_mode: :solo) + groupement = create(:market_application, public_market:, siret:, application_mode: :groupement) + + expect(groupement.solo_counterpart).to eq(solo) + end + + it 'returns nil when the application is not mixte-related (only a groupement exists)' do + groupement = create(:market_application, public_market:, siret:, application_mode: :groupement) + + expect(groupement.solo_counterpart).to be_nil + end + + it 'returns nil when the application itself is the solo one' do + solo = create(:market_application, public_market:, siret:, application_mode: :solo) + + expect(solo.solo_counterpart).to be_nil + end + end + describe '#next_required_wizard_step' do it 'returns application_mode when the mode has not been chosen yet' do allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) @@ -288,11 +363,23 @@ expect(application.next_required_wizard_step).to eq([application, :application_mode]) end - it 'returns grouping_legal_type on the groupement counterpart for a mixte solo application' do + it 'returns lot_selection_mode on the groupement counterpart when no lot has been assigned yet' do allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) siret = '73282932000074' solo = create(:market_application, public_market:, siret:, application_mode: :solo) groupement = create(:market_application, public_market:, siret:, application_mode: :groupement) + create(:lot, public_market:) + + expect(solo.next_required_wizard_step).to eq([groupement, :lot_selection_mode]) + end + + it 'returns grouping_legal_type on the groupement counterpart once lots have been assigned' do + allow(FeatureFlags::Groupement).to receive(:enabled?).and_return(true) + siret = '73282932000074' + solo = create(:market_application, public_market:, siret:, application_mode: :solo) + groupement = create(:market_application, public_market:, siret:, application_mode: :groupement) + lot = create(:lot, public_market:) + groupement.lots << lot create(:grouping, public_market:, mandataire_market_application: groupement, legal_type: nil) expect(solo.next_required_wizard_step).to eq([groupement, :grouping_legal_type]) From b0b37b449dcda517896c1d2b9bcf2b9a5b6fe35a Mon Sep 17 00:00:00 2001 From: Camille Regnault Date: Wed, 19 Aug 2026 14:29:02 +0200 Subject: [PATCH 10/15] =?UTF-8?q?feat:=20ajoute=20l'interactor=20de=20r?= =?UTF-8?q?=C3=A9partition=20des=20lots=20seul/groupement=20(FAS-561)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Candidate::SetLotSelectionModes répartit les lots choisis par le mandataire entre sa candidature solo et sa candidature groupement, en validant qu'au moins un lot est affecté à chaque mode requis (seul+groupement en mixte, groupement seul en mode groupement pur). Échoue proprement si la candidature groupement est introuvable plutôt que de lever une exception. --- .../candidate/set_lot_selection_modes.rb | 60 ++++++++ config/locales/fr.yml | 3 + .../candidate/set_lot_selection_modes_spec.rb | 145 ++++++++++++++++++ 3 files changed, 208 insertions(+) create mode 100644 app/interactors/candidate/set_lot_selection_modes.rb create mode 100644 spec/interactors/candidate/set_lot_selection_modes_spec.rb diff --git a/app/interactors/candidate/set_lot_selection_modes.rb b/app/interactors/candidate/set_lot_selection_modes.rb new file mode 100644 index 00000000..29b6bdb4 --- /dev/null +++ b/app/interactors/candidate/set_lot_selection_modes.rb @@ -0,0 +1,60 @@ +# frozen_string_literal: true + +module Candidate + class SetLotSelectionModes < ApplicationInteractor + delegate :market_application, :lot_modes, to: :context + + def call + assign_applications + + return fail_groupement_application_not_found if groupement_application.blank? + return fail_invalid_lot_ids unless valid_lot_ids? + return fail_incomplete_selection unless selection_complete? + + ActiveRecord::Base.transaction do + solo_application&.update!(lot_ids: solo_lot_ids) + groupement_application.update!(lot_ids: groupement_lot_ids) + end + end + + private + + delegate :solo_application, :groupement_application, to: :context + + def assign_applications + context.solo_application = market_application.solo? ? market_application : market_application.solo_counterpart + context.groupement_application = market_application.groupement? ? market_application : market_application.groupement_counterpart + end + + def solo_lot_ids + lot_modes.select { |_id, mode| mode.to_s == 'solo' }.keys.map(&:to_i) + end + + def groupement_lot_ids + lot_modes.select { |_id, mode| mode.to_s == 'groupement' }.keys.map(&:to_i) + end + + def selection_complete? + return groupement_lot_ids.any? if solo_application.blank? + + solo_lot_ids.any? && groupement_lot_ids.any? + end + + def valid_lot_ids? + known_ids = market_application.public_market.lots.pluck(:id) + lot_modes.keys.map(&:to_i).all? { |id| known_ids.include?(id) } + end + + def fail_groupement_application_not_found + context.fail!(errors: { base: [I18n.t('candidate.validations.groupement_application_not_found')] }) + end + + def fail_invalid_lot_ids + context.fail!(errors: { lot_ids: [I18n.t('candidate.validations.lot_ids_invalid')] }) + end + + def fail_incomplete_selection + context.fail!(errors: { base: [I18n.t('candidate.validations.lot_selection_mode_incomplete')] }) + end + end +end diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 80a09fcb..a0b0d5e4 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -715,6 +715,9 @@ fr: grouping_member_not_found: "Ce co-traitant n'a pas été trouvé dans le groupement" grouping_member_already_invited: "Ce co-traitant a déjà reçu son invitation, il ne peut plus être retiré" no_co_traitant: "Veuillez ajouter au moins un co-traitant avant de continuer" + lot_ids_invalid: "Un ou plusieurs lots sélectionnés n'appartiennent pas à ce marché" + lot_selection_mode_incomplete: "Vous devez sélectionner au moins un lot \"Seul\" et un lot \"En groupement\" pour continuer." + groupement_application_not_found: "Aucune candidature en groupement trouvée" request_magic_link: no_application_found: "Aucune candidature trouvée pour ce numéro SIRET" no_market_context: "Veuillez accéder à Passe Marché depuis votre plateforme de marchés publics" diff --git a/spec/interactors/candidate/set_lot_selection_modes_spec.rb b/spec/interactors/candidate/set_lot_selection_modes_spec.rb new file mode 100644 index 00000000..31773e2e --- /dev/null +++ b/spec/interactors/candidate/set_lot_selection_modes_spec.rb @@ -0,0 +1,145 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Candidate::SetLotSelectionModes, type: :interactor do + let(:editor) { create(:editor) } + let(:public_market) { create(:public_market, :completed, editor:) } + let(:siret) { '73282932000074' } + let(:lot1) { create(:lot, public_market:) } + let(:lot2) { create(:lot, public_market:) } + + before do + allow(SiretValidator).to receive(:valid?).and_return(true) + end + + describe '.call' do + context 'in mixte mode (solo and groupement counterpart exist)' do + let!(:solo_application) { create(:market_application, public_market:, siret:, application_mode: :solo) } + let!(:groupement_application) { create(:market_application, public_market:, siret:, application_mode: :groupement) } + + it 'assigns each lot to the matching application' do + result = described_class.call( + market_application: solo_application, + lot_modes: { lot1.id.to_s => 'solo', lot2.id.to_s => 'groupement' } + ) + + expect(result).to be_success + expect(solo_application.reload.lots).to contain_exactly(lot1) + expect(groupement_application.reload.lots).to contain_exactly(lot2) + end + + it 'leaves a lot unassigned when its mode is none' do + create(:lot, public_market:) + + result = described_class.call( + market_application: solo_application, + lot_modes: { lot1.id.to_s => 'solo', lot2.id.to_s => 'groupement' } + ) + + expect(result).to be_success + expect(solo_application.reload.lots + groupement_application.reload.lots).to contain_exactly(lot1, lot2) + end + + it 'replaces the previous selection on resubmission' do + solo_application.lots << lot1 + groupement_application.lots << lot2 + + result = described_class.call( + market_application: solo_application, + lot_modes: { lot1.id.to_s => 'groupement', lot2.id.to_s => 'solo' } + ) + + expect(result).to be_success + expect(solo_application.reload.lots).to contain_exactly(lot2) + expect(groupement_application.reload.lots).to contain_exactly(lot1) + end + + it 'fails when no lot is set to solo' do + result = described_class.call( + market_application: solo_application, + lot_modes: { lot1.id.to_s => 'groupement', lot2.id.to_s => 'groupement' } + ) + + expect(result).to be_failure + expect(result.errors[:base]).to be_present + end + + it 'fails when no lot is set to groupement' do + result = described_class.call( + market_application: solo_application, + lot_modes: { lot1.id.to_s => 'solo', lot2.id.to_s => 'solo' } + ) + + expect(result).to be_failure + expect(result.errors[:base]).to be_present + end + + it 'does not change either application when validation fails' do + solo_application.lots << lot1 + + result = described_class.call( + market_application: solo_application, + lot_modes: { lot1.id.to_s => 'solo', lot2.id.to_s => 'solo' } + ) + + expect(result).to be_failure + expect(solo_application.reload.lots).to contain_exactly(lot1) + end + end + + context 'in groupement-only mode (no solo counterpart)' do + let!(:groupement_application) { create(:market_application, public_market:, siret:, application_mode: :groupement) } + + it 'assigns lots set to groupement and succeeds' do + result = described_class.call( + market_application: groupement_application, + lot_modes: { lot1.id.to_s => 'groupement', lot2.id.to_s => 'none' } + ) + + expect(result).to be_success + expect(groupement_application.reload.lots).to contain_exactly(lot1) + end + + it 'fails when no lot is set to groupement' do + result = described_class.call( + market_application: groupement_application, + lot_modes: { lot1.id.to_s => 'none', lot2.id.to_s => 'none' } + ) + + expect(result).to be_failure + expect(result.errors[:base]).to be_present + end + end + + context 'when called on a solo application with no groupement counterpart' do + let!(:solo_application) { create(:market_application, public_market:, siret:, application_mode: :solo) } + + it 'fails instead of raising' do + result = described_class.call( + market_application: solo_application, + lot_modes: { lot1.id.to_s => 'groupement' } + ) + + expect(result).to be_failure + expect(result.errors[:base]).to be_present + end + end + + context 'with an unknown lot id' do + let!(:groupement_application) { create(:market_application, public_market:, siret:, application_mode: :groupement) } + + it 'fails' do + other_market_lot = create(:lot) + + result = described_class.call( + market_application: groupement_application, + lot_modes: { other_market_lot.id.to_s => 'groupement' } + ) + + expect(result).to be_failure + expect(result.errors[:lot_ids]).to be_present + end + end + end +end From 28e5baa19bea99b8ad72c0ba3d3e4c362e217638 Mon Sep 17 00:00:00 2001 From: Camille Regnault Date: Wed, 19 Aug 2026 14:29:19 +0200 Subject: [PATCH 11/15] feat: ajoute le presenter du choix de mode par lot (FAS-561) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Candidate::LotSelectionModePresenter expose le mode actuel de chaque lot (seul/en groupement/ne pas répondre) en tenant compte des deux candidatures du mandataire, avec pré-positionnement par défaut sur "en groupement". mode_for résout un hash lot_id → mode précalculé une seule fois plutôt que de requêter les associations lot par lot. lots_by_type_sorted est centralisé sur PublicMarket et réutilisé par MarketApplicationPresenter, qui dupliquait la même requête. --- app/models/public_market.rb | 4 + .../candidate/lot_selection_mode_presenter.rb | 46 ++++++++++ .../market_application_presenter.rb | 4 +- .../lot_selection_mode_presenter_spec.rb | 92 +++++++++++++++++++ 4 files changed, 143 insertions(+), 3 deletions(-) create mode 100644 app/presenters/candidate/lot_selection_mode_presenter.rb create mode 100644 spec/presenters/candidate/lot_selection_mode_presenter_spec.rb diff --git a/app/models/public_market.rb b/app/models/public_market.rb index 1fecfe49..82fef7e0 100644 --- a/app/models/public_market.rb +++ b/app/models/public_market.rb @@ -36,6 +36,10 @@ def multi_type_lots? effective_lot_market_types.size > 1 end + def lots_by_type_sorted + lots.ordered.includes(:market_type, :platform_market_type).group_by(&:effective_market_type) + end + def effective_market_type_codes lot_codes = effective_lot_market_types.map(&:code) (market_type_codes + lot_codes).uniq diff --git a/app/presenters/candidate/lot_selection_mode_presenter.rb b/app/presenters/candidate/lot_selection_mode_presenter.rb new file mode 100644 index 00000000..77c355de --- /dev/null +++ b/app/presenters/candidate/lot_selection_mode_presenter.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true + +module Candidate + class LotSelectionModePresenter + include LotLabelConcern + + def initialize(market_application) + @market_application = market_application + @solo_application = market_application.solo? ? market_application : market_application.solo_counterpart + @groupement_application = market_application.groupement? ? market_application : market_application.groupement_counterpart + end + + def requires_solo_and_groupement? + @solo_application.present? + end + + def lots_by_type_sorted + @lots_by_type_sorted ||= public_market.lots_by_type_sorted + end + + def mode_for(lot) + mode_by_lot_id.fetch(lot.id) { default_mode_for } + end + + private + + attr_reader :market_application + + def public_market + @public_market ||= market_application.public_market + end + + def mode_by_lot_id + @mode_by_lot_id ||= begin + modes = {} + @solo_application&.lot_ids&.each { |id| modes[id] = 'solo' } + @groupement_application.lot_ids.each { |id| modes[id] = 'groupement' } + modes + end + end + + def default_mode_for + mode_by_lot_id.any? ? 'none' : 'groupement' + end + end +end diff --git a/app/presenters/market_application_presenter.rb b/app/presenters/market_application_presenter.rb index 4773ca5d..651722e7 100644 --- a/app/presenters/market_application_presenter.rb +++ b/app/presenters/market_application_presenter.rb @@ -98,9 +98,7 @@ def selected_lot_types end def lots_by_type_sorted - @lots_by_type_sorted ||= public_market.lots.ordered - .includes(:market_type, :platform_market_type) - .group_by(&:effective_market_type) + @lots_by_type_sorted ||= public_market.lots_by_type_sorted end def selected_lots diff --git a/spec/presenters/candidate/lot_selection_mode_presenter_spec.rb b/spec/presenters/candidate/lot_selection_mode_presenter_spec.rb new file mode 100644 index 00000000..388816fd --- /dev/null +++ b/spec/presenters/candidate/lot_selection_mode_presenter_spec.rb @@ -0,0 +1,92 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe Candidate::LotSelectionModePresenter do + subject(:presenter) { described_class.new(market_application) } + + let(:editor) { create(:editor) } + let(:public_market) { create(:public_market, :completed, editor:) } + let(:siret) { '73282932000074' } + let(:lot1) { create(:lot, public_market:) } + let(:lot2) { create(:lot, public_market:) } + + before do + allow(SiretValidator).to receive(:valid?).and_return(true) + lot1 + lot2 + end + + describe '#requires_solo_and_groupement?' do + context 'when a solo counterpart exists (mixte mode)' do + let!(:solo_application) { create(:market_application, public_market:, siret:, application_mode: :solo) } + let(:market_application) { create(:market_application, public_market:, siret:, application_mode: :groupement) } + + it 'returns true' do + expect(presenter.requires_solo_and_groupement?).to be true + end + end + + context 'when no solo counterpart exists (groupement only)' do + let(:market_application) { create(:market_application, public_market:, siret:, application_mode: :groupement) } + + it 'returns false' do + expect(presenter.requires_solo_and_groupement?).to be false + end + end + end + + describe '#mode_for' do + context 'in mixte mode' do + let!(:solo_application) { create(:market_application, public_market:, siret:, application_mode: :solo) } + let(:market_application) { create(:market_application, public_market:, siret:, application_mode: :groupement) } + + it 'defaults to groupement when no lot has been assigned yet' do + expect(presenter.mode_for(lot1)).to eq('groupement') + expect(presenter.mode_for(lot2)).to eq('groupement') + end + + it 'returns solo for a lot assigned to the solo application' do + solo_application.lots << lot1 + + expect(presenter.mode_for(lot1)).to eq('solo') + end + + it 'returns groupement for a lot assigned to the groupement application' do + market_application.lots << lot1 + + expect(presenter.mode_for(lot1)).to eq('groupement') + end + + it 'returns none for a lot assigned to neither once a selection exists' do + solo_application.lots << lot1 + + expect(presenter.mode_for(lot2)).to eq('none') + end + end + + context 'in groupement-only mode' do + let(:market_application) { create(:market_application, public_market:, siret:, application_mode: :groupement) } + + it 'defaults to groupement when no lot has been assigned yet' do + expect(presenter.mode_for(lot1)).to eq('groupement') + end + + it 'returns none for a lot left unassigned once a selection exists' do + market_application.lots << lot1 + + expect(presenter.mode_for(lot2)).to eq('none') + end + end + end + + describe '#lots_by_type_sorted' do + let(:market_application) { create(:market_application, public_market:, siret:, application_mode: :groupement) } + + it 'groups the public market lots by their effective market type' do + grouped = presenter.lots_by_type_sorted + + expect(grouped.values.flatten).to contain_exactly(lot1, lot2) + end + end +end From cbde53e7cb45577096d26cb09173b6eb58cd6f1b Mon Sep 17 00:00:00 2001 From: Camille Regnault Date: Wed, 19 Aug 2026 14:29:48 +0200 Subject: [PATCH 12/15] =?UTF-8?q?feat:=20ajoute=20l'=C3=A9cran=20de=20s?= =?UTF-8?q?=C3=A9lection=20du=20mode=20de=20r=C3=A9ponse=20par=20lot=20(FA?= =?UTF-8?q?S-561)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Nouvelle étape lot_selection_mode dans le wizard groupement : le mandataire choisit pour chaque lot du marché s'il répond seul, en groupement ou pas du tout, avec une action de masse par typologie et un bouton Continuer désactivé tant que la répartition n'est pas valide. counterpart_next_wizard_step_path délègue à MarketApplication#next_required_wizard_step pour déterminer la prochaine étape requise côté groupement, plutôt que de dupliquer la liste des prédicats de step — ce qui garantit que la navigation entre solo et groupement (retour sur l'écran de choix du mode en lecture seule, puis Continuer) passe bien par l'étape de sélection des lots quand elle est requise. --- app/assets/stylesheets/application.css | 163 ++++++++++++++++++ .../candidate/grouping_wizard_controller.rb | 36 +++- .../lot_selection_mode_controller.js | 32 ++++ .../lot_selection_mode.html.erb | 120 +++++++++++++ config/locales/fr.yml | 19 ++ 5 files changed, 361 insertions(+), 9 deletions(-) create mode 100644 app/javascript/controllers/lot_selection_mode_controller.js create mode 100644 app/views/candidate/grouping_wizard/lot_selection_mode.html.erb diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 63216709..ec25143d 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1066,3 +1066,166 @@ #grouping_members_table tbody tr { background-color: var(--background-default-grey, #fff) !important; } + +.lot-selection-rc-notice { + display: flex; + align-items: stretch; + background-color: var(--background-alt-blue-france, #f5f5fe); +} + +.lot-selection-rc-notice__icon { + flex-shrink: 0; + display: flex; + align-items: flex-start; + padding: 1rem 0.5rem; + background-color: var(--background-flat-info, #0063cb); + color: var(--text-inverted-grey, #fff); +} + +.lot-selection-rc-notice__content { + padding: 1rem; +} + +.lot-selection-rc-notice__title { + font-weight: 700; + font-size: 1.25rem; + line-height: 1.75rem; + margin: 0 0 0.25rem; + color: var(--text-title-grey, #161616); +} + +.lot-selection-rc-notice__text { + margin: 0; + font-size: 1rem; + color: var(--text-default-grey, #3a3a3a); +} + +.lot-selection-mode-banner { + display: flex; + align-items: center; + gap: 0.5rem; + margin: 0; + font-size: 0.875rem; + color: var(--text-default-grey, #3a3a3a); +} + +.lot-selection-mode-bulk { + display: flex; + align-items: center; + gap: 0.5rem; + flex-wrap: nowrap; + white-space: nowrap; +} + +.lot-selection-mode-bulk__select { + appearance: none; + background-color: var(--background-default-grey, #fff); + border: 1px solid var(--border-default-grey, #ddd); + color: var(--text-action-high-blue-france, #000091); + font-size: 0.875rem; + font-weight: 500; + padding: 0.25rem 1.75rem 0.25rem 0.75rem; + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 24 24' fill='%23000091'%3E%3Cpath d='M12 15.5l-6-6 1.4-1.4L12 12.7l4.6-4.6L18 9.5z'/%3E%3C/svg%3E"); + background-repeat: no-repeat; + background-position: right 0.5rem center; +} + +.lot-mode-choices { + display: inline-flex; + border: 1px solid var(--border-default-grey); + border-radius: 0.25rem; +} + +.lot-mode-choice__input { + position: absolute; + opacity: 0; + width: 1px; + height: 1px; +} + +.lot-mode-choice__label { + display: inline-block; + padding: 0.25rem 0.75rem; + margin: -1px; + border: 1px solid transparent; + border-radius: 0.25rem; + cursor: pointer; + font-size: 0.875rem; + font-weight: 500; + line-height: 1.5rem; + white-space: nowrap; + color: var(--text-action-high-grey); +} + +.lot-mode-choice__input:checked + .lot-mode-choice__label { + border-color: var(--border-action-high-blue-france, #000091); + color: var(--text-action-high-blue-france, #000091); +} + +.lot-mode-choice__input:focus-visible + .lot-mode-choice__label { + outline: 2px solid var(--border-action-high-blue-france); + outline-offset: -2px; +} + +.lot-selection-mode-section__header { + padding-bottom: 1rem; + display: flex; + justify-content: space-between; + align-items: center; + flex-wrap: wrap; + gap: 0.5rem; +} + +.lot-selection-mode-group__title { + display: flex; + align-items: center; + gap: 0.5rem; +} + +.lot-selection-mode-group__title-text { + margin: 0; + font-weight: 700; + font-size: 1.25rem; + line-height: 2rem; + color: var(--text-title-grey, #000); +} + +.lot-selection-mode-group__badge .market-type-badge { + border-radius: 1rem; + padding: 0.375rem 0.75rem; + align-items: center; +} + +.lot-selection-mode-group__badge .market-type-badge img { + width: 18px; + height: 18px; + vertical-align: middle; +} + +.lot-selection-mode-table { + width: 100%; + border-collapse: collapse; + background-color: var(--background-default-grey, #fff); + border: 1px solid var(--border-default-grey, #ddd); +} + +.lot-selection-mode-table th, +.lot-selection-mode-table td { + border-bottom: 1px solid var(--border-default-grey, #ddd); + padding: 0.75rem 1rem; + text-align: left; + font-size: 0.875rem; + vertical-align: middle; +} + +.lot-selection-mode-table th { + font-weight: 700; + color: var(--text-default-grey, #3a3a3a); + background-color: var(--background-alt-grey, #f6f6f6); + padding-top: 1rem; + padding-bottom: 1rem; +} + +.lot-selection-mode-table td:last-child { + text-align: right; +} diff --git a/app/controllers/candidate/grouping_wizard_controller.rb b/app/controllers/candidate/grouping_wizard_controller.rb index becc9545..476595a3 100644 --- a/app/controllers/candidate/grouping_wizard_controller.rb +++ b/app/controllers/candidate/grouping_wizard_controller.rb @@ -18,6 +18,7 @@ class GroupingWizardController < Candidate::ApplicationController def show case step when :application_mode then show_application_mode + when :lot_selection_mode then show_lot_selection_mode when :grouping_legal_type then show_grouping_legal_type when :grouping_composition then show_grouping_composition when :grouping_composition_confirmation then show_confirmation @@ -29,6 +30,7 @@ def show def update case step when :application_mode then update_application_mode + when :lot_selection_mode then update_lot_selection_mode when :grouping_legal_type then update_grouping_legal_type when :grouping_composition_confirmation then update_confirmation end @@ -61,11 +63,14 @@ def destroy_member private def set_steps - self.steps = if @market_application&.groupement? - %i[application_mode grouping_legal_type grouping_composition grouping_composition_confirmation] - else - %i[application_mode] - end + return self.steps = %i[application_mode] unless @market_application&.groupement? + + self.steps = [:application_mode, *lot_selection_mode_step, :grouping_legal_type, + :grouping_composition, :grouping_composition_confirmation] + end + + def lot_selection_mode_step + @market_application.public_market.lots.any? ? [:lot_selection_mode] : [] end def find_market_application @@ -105,10 +110,8 @@ def next_wizard_step_path(from_step) end def counterpart_next_wizard_step_path(counterpart) - return wizard_step_path(counterpart, :grouping_legal_type) if counterpart.grouping_legal_type_choice_required? - return wizard_step_path(counterpart, :grouping_composition) if counterpart.grouping_composition_choice_required? - - finish_wizard_path + _target, step = counterpart.next_required_wizard_step + step ? wizard_step_path(counterpart, step) : finish_wizard_path end def wizard_step_path(market_application, step) @@ -158,6 +161,21 @@ def already_mandataire_elsewhere? .exists? end + # --- lot_selection_mode step --- + + def show_lot_selection_mode = @presenter = Candidate::LotSelectionModePresenter.new(@market_application) + + def update_lot_selection_mode + result = Candidate::SetLotSelectionModes.call(market_application: @market_application, lot_modes: lot_modes_param) + return redirect_to(next_wizard_step_path(:lot_selection_mode)) if result.success? + + @presenter = Candidate::LotSelectionModePresenter.new(@market_application) + @errors = result.errors + render_wizard(nil, status: :unprocessable_content) + end + + def lot_modes_param = params.fetch(:lot_modes, {}).permit!.to_h + # --- grouping_legal_type step --- def show_grouping_legal_type diff --git a/app/javascript/controllers/lot_selection_mode_controller.js b/app/javascript/controllers/lot_selection_mode_controller.js new file mode 100644 index 00000000..2d6eca7f --- /dev/null +++ b/app/javascript/controllers/lot_selection_mode_controller.js @@ -0,0 +1,32 @@ +import { Controller } from "@hotwired/stimulus" + +export default class extends Controller { + static targets = ["radio", "submitButton", "section"] + static values = { requiresBoth: Boolean } + + connect() { + this.recompute() + } + + applyBulk(event) { + const mode = event.target.value + if (!mode) return + + const section = event.target.closest("[data-lot-selection-mode-target='section']") + section.querySelectorAll("[data-lot-selection-mode-target='radio']").forEach(radio => { + if (radio.value === mode) radio.checked = true + }) + + this.recompute() + } + + recompute() { + const checked = this.radioTargets.filter(radio => radio.checked) + const hasGroupement = checked.some(radio => radio.value === "groupement") + const hasSolo = checked.some(radio => radio.value === "solo") + + const complete = this.requiresBothValue ? hasSolo && hasGroupement : hasGroupement + + this.submitButtonTargets.forEach(btn => { btn.disabled = !complete }) + } +} diff --git a/app/views/candidate/grouping_wizard/lot_selection_mode.html.erb b/app/views/candidate/grouping_wizard/lot_selection_mode.html.erb new file mode 100644 index 00000000..1c79e658 --- /dev/null +++ b/app/views/candidate/grouping_wizard/lot_selection_mode.html.erb @@ -0,0 +1,120 @@ +<% content_for :title, t('candidate.lot_selection_modes.title') %> + +
+

<%= t('candidate.lot_selection_modes.title') %>

+

+ <%= t(@presenter.requires_solo_and_groupement? ? 'candidate.lot_selection_modes.subtitle_mixte' : 'candidate.lot_selection_modes.subtitle_groupement') %> +

+ +
+
+ +
+
+

<%= t('candidate.lot_selection_modes.rc_notice_title') %>

+

+ <%= t('candidate.lot_selection_modes.rc_notice_body') %> + <%= link_to t('candidate.lot_selection_modes.rc_notice_link'), '#', + class: "fr-link fr-link--icon-right fr-icon-external-link-line", + target: "_blank", rel: "noopener" %> +

+
+
+ + <% if @errors.present? %> + + <% end %> + + <%= form_with url: wizard_path, method: :patch do %> + <% @presenter.lots_by_type_sorted.each do |market_type, type_lots| %> +
+
+
+

+ <%= t('candidate.lot_selection_modes.group_title_prefix') %> +

+
+ <% if market_type %> + <%= market_type_badge_tag(market_type.code, t("market_types.#{market_type.code}", default: market_type.code.humanize)) %> + <% else %> + <%= market_type_badge_tag(nil, t('candidate.lot_selection.lots_count', count: type_lots.size)) %> + <% end %> +
+
+ +
+ <%= t('candidate.lot_selection_modes.apply_to_typology') %> + +
+
+ + + + + + + + + + + <% type_lots.each do |lot| %> + + + + + + <% end %> + +
<%= t('candidate.lot_selection_modes.lot_column_header') %><%= t('candidate.lot_selection_modes.name_column_header') %>
<%= t('candidate.lot_selection_modes.lot_number', number: lot.position) %><%= lot.name %> +
+ <% %w[solo groupement none].each do |mode| %> + <% next if mode == 'solo' && !@presenter.requires_solo_and_groupement? %> + + <%= radio_button_tag "lot_modes[#{lot.id}]", mode, @presenter.mode_for(lot) == mode, + id: "lot_mode_#{lot.id}_#{mode}", + class: "lot-mode-choice__input", + data: { lot_selection_mode_target: "radio", action: "change->lot-selection-mode#recompute" } %> + <%= label_tag "lot_mode_#{lot.id}_#{mode}", t("candidate.lot_selection_modes.#{mode}"), + class: "lot-mode-choice__label" %> + + <% end %> +
+
+
+ <% end %> + + <% if @presenter.requires_solo_and_groupement? %> +

+ + <%= t('candidate.lot_selection_modes.banner_text') %> +

+ <% end %> + +
+ <%= link_to t('candidate.lot_selection_modes.back'), + previous_wizard_path(readonly: true), + class: "fr-btn fr-btn--secondary fr-icon-arrow-left-line fr-btn--icon-left" %> + <%= button_tag t('candidate.lot_selection_modes.continue'), + type: "submit", + class: "fr-btn fr-icon-arrow-right-line fr-btn--icon-right", + data: { lot_selection_mode_target: "submitButton" } %> +
+ <% end %> +
diff --git a/config/locales/fr.yml b/config/locales/fr.yml index a0b0d5e4..99c4a0b9 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -701,6 +701,25 @@ fr: how_it_works_title: "Comment ça fonctionne" how_it_works_step_1: "Complétez le formulaire de candidature" how_it_works_step_2: "Soumettez votre candidature (vous pouvez soumettre même si toutes les informations n'ont pas été complétées)" + lot_selection_modes: + title: "Sélectionnez les lots pour la candidature" + subtitle_mixte: "Sélectionnez les lots auxquels vous allez candidater seul ou en groupement." + subtitle_groupement: "Sélectionnez les lots auxquels le groupement va candidater." + rc_notice_title: "En cas de doute, consultez le règlement de consultation" + rc_notice_body: "Votre acheteur a peut-être indiqué des règles concernant la gestion des lots dans le règlement de consultation, consultez le" + rc_notice_link: "via ce lien" + group_title_prefix: "Pour les lots de type" + apply_to_typology: "Appliquer à toute la typologie :" + apply_to_typology_placeholder: "Choisissez une option" + solo: "Seul" + groupement: "En groupement" + none: "Ne pas répondre" + lot_column_header: "Lot" + name_column_header: "Nom du lot" + lot_number: "Lot %{number}" + banner_text: "Vous devez sélectionner au moins un lot \"Seul\" et un lot \"En groupement\" pour continuer." + back: "Précédent" + continue: "Continuer" validations: siret_blank: "Veuillez renseigner votre numéro de SIRET" siret_invalid: "Le numéro de SIRET saisi est invalide" From f3fb82c88a40b8bb9a8409ed2bc3a340643c28e4 Mon Sep 17 00:00:00 2001 From: Camille Regnault Date: Wed, 19 Aug 2026 14:29:55 +0200 Subject: [PATCH 13/15] =?UTF-8?q?test:=20ajoute=20les=20sc=C3=A9narios=20c?= =?UTF-8?q?ucumber=20du=20choix=20de=20mode=20par=20lot=20(FAS-561)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Couvre l'affichage des options selon le mode candidat, le blocage du bouton Continuer tant qu'au moins un lot seul et un lot groupement (ou un lot groupement en mode groupement pur) ne sont pas choisis, le pré-positionnement par défaut, le regroupement par typologie, l'action de masse, la navigation avant/arrière dans le wizard, et la navigation en mode mixte depuis l'écran de choix du mode en lecture seule côté solo. --- features/lot_selection_mode.feature | 104 ++++++++++++++++++ .../lot_selection_mode_steps.rb | 58 ++++++++++ 2 files changed, 162 insertions(+) create mode 100644 features/lot_selection_mode.feature create mode 100644 features/step_definitions/lot_selection_mode_steps.rb diff --git a/features/lot_selection_mode.feature b/features/lot_selection_mode.feature new file mode 100644 index 00000000..e75b3cc8 --- /dev/null +++ b/features/lot_selection_mode.feature @@ -0,0 +1,104 @@ +Feature: Mandataire selects lots and their response mode + + As a mandataire candidate + I want to choose, for each lot, whether I apply alone, as part of the groupement, or not at all + So that mixed scenarios are covered + + Background: + Given the groupement feature flag is enabled + And a multi-type public market with lots exists + And a candidate starts a new application for the multi-type market + + @javascript + Scenario: Mandataire in mixte mode sees the three options per lot + When I choose the candidacy mode "mixte" + Then I should see "Sélectionnez les lots pour la candidature" + And each lot should offer the options "Seul", "En groupement" and "Ne pas répondre" + + @javascript + Scenario: Mandataire in groupement-only mode sees only two options per lot + When I choose the candidacy mode "groupement" + Then each lot should offer the options "En groupement" and "Ne pas répondre" + And the lot option "Seul" should not be visible + + @javascript + Scenario: All lots are pre-selected on En groupement by default + When I choose the candidacy mode "groupement" + Then every lot should be set to "En groupement" + + @javascript + Scenario: Continue button is disabled until at least one solo and one groupement lot are set in mixte mode + When I choose the candidacy mode "mixte" + And I set lot "Lot 1 - Gros œuvre" to "solo" + And I set lot "Lot 2 - Charpente" to "solo" + And I set lot "Lot 3 - Prestations SI" to "solo" + Then the "Continuer" button should be disabled + When I set lot "Lot 3 - Prestations SI" to "groupement" + Then the "Continuer" button should be enabled + + @javascript + Scenario: Continue button is disabled until at least one lot is set to groupement in groupement-only mode + When I choose the candidacy mode "groupement" + And I set lot "Lot 1 - Gros œuvre" to "none" + And I set lot "Lot 2 - Charpente" to "none" + And I set lot "Lot 3 - Prestations SI" to "none" + Then the "Continuer" button should be disabled + When I set lot "Lot 3 - Prestations SI" to "groupement" + Then the "Continuer" button should be enabled + + @javascript + Scenario: The mixed mode banner is shown in mixte mode + When I choose the candidacy mode "mixte" + Then I should see "Vous devez sélectionner au moins un lot" + + @javascript + Scenario: The mixed mode banner is not shown in groupement-only mode + When I choose the candidacy mode "groupement" + Then I should not see "Vous devez sélectionner au moins un lot" + + @javascript + Scenario: Lots are grouped by typology + When I choose the candidacy mode "groupement" + Then I should see a section for the lot typology "works" + And I should see a section for the lot typology "services" + + @javascript + Scenario: Applying a mode to a whole typology updates every lot of that section + When I choose the candidacy mode "groupement" + And I apply "Ne pas répondre" to the typology "works" + Then every lot of the typology "works" should be set to "Ne pas répondre" + And every lot of the typology "services" should be set to "En groupement" + + @javascript + Scenario: A lot can be adjusted individually after a bulk action without affecting the others + When I choose the candidacy mode "groupement" + And I apply "Ne pas répondre" to the typology "works" + And I set lot "Lot 1 - Gros œuvre" to "groupement" + Then lot "Lot 1 - Gros œuvre" should be set to "En groupement" + And lot "Lot 2 - Charpente" should be set to "Ne pas répondre" + + @javascript + Scenario: Mandataire submits the lot selection and reaches the grouping legal type step + When I choose the candidacy mode "groupement" + And I set lot "Lot 1 - Gros œuvre" to "groupement" + And I click on "Continuer" + Then I should be on the grouping legal type step + + @javascript + Scenario: Mandataire goes back from the grouping legal type step to review the lot selection + When I choose the candidacy mode "groupement" + And I set lot "Lot 1 - Gros œuvre" to "groupement" + And I click on "Continuer" + And I should be on the grouping legal type step + And I click on "Précédent" + Then I should see "Sélectionnez les lots pour la candidature" + And lot "Lot 1 - Gros œuvre" should be set to "En groupement" + + @javascript + Scenario: Mandataire in mixte mode still reaches lot selection when revisiting the read-only candidacy mode from the solo side + When I choose the candidacy mode "mixte" + Then I should see "Sélectionnez les lots pour la candidature" + When I visit the read-only candidacy mode step of the solo application + Then I should see "Comment souhaitez-vous candidater ?" + When I click on "Continuer" + Then I should see "Sélectionnez les lots pour la candidature" diff --git a/features/step_definitions/lot_selection_mode_steps.rb b/features/step_definitions/lot_selection_mode_steps.rb new file mode 100644 index 00000000..879705b4 --- /dev/null +++ b/features/step_definitions/lot_selection_mode_steps.rb @@ -0,0 +1,58 @@ +# frozen_string_literal: true + +When('I set lot {string} to {string}') do |lot_name, mode| + lot = Lot.find_by!(name: lot_name) + find("label[for='lot_mode_#{lot.id}_#{mode}']").click +end + +When('I visit the read-only candidacy mode step of the solo application') do + solo_application = @market_application.solo_counterpart || @market_application + visit grouping_wizard_step_candidate_market_application_path(solo_application.identifier, :application_mode, readonly: true) +end + +When('I apply {string} to the typology {string}') do |label, market_type_code| + section = find('.lot-selection-mode-group', text: I18n.t("market_types.#{market_type_code}")) + within(section) { find('option', text: label).select_option } +end + +Then('each lot should offer the options {string}, {string} and {string}') do |*labels| + labels.each { |label| expect(page).to have_css('.lot-mode-choice__label', text: label) } +end + +Then('each lot should offer the options {string} and {string}') do |first_label, second_label| + expect(page).to have_css('.lot-mode-choice__label', text: first_label) + expect(page).to have_css('.lot-mode-choice__label', text: second_label) +end + +Then('the lot option {string} should not be visible') do |label| + expect(page).not_to have_css('.lot-mode-choice__label', text: label) +end + +Then('every lot should be set to {string}') do |label| + mode = mode_key_for_label(label) + page.all("input[name^='lot_modes'][value='#{mode}']").each do |radio| + expect(radio).to be_checked + end +end + +Then('lot {string} should be set to {string}') do |lot_name, label| + lot = Lot.find_by!(name: lot_name) + mode = mode_key_for_label(label) + expect(page).to have_css("#lot_mode_#{lot.id}_#{mode}:checked", visible: :all) +end + +Then('every lot of the typology {string} should be set to {string}') do |market_type_code, label| + mode = mode_key_for_label(label) + market_type = MarketType.find_by!(code: market_type_code) + Lot.where(market_type:).or(Lot.where(platform_market_type: market_type)).each do |lot| + expect(page).to have_css("#lot_mode_#{lot.id}_#{mode}:checked", visible: :all) + end +end + +Then('I should see a section for the lot typology {string}') do |market_type_code| + expect(page).to have_css('.lot-selection-mode-group', text: I18n.t("market_types.#{market_type_code}")) +end + +def mode_key_for_label(label) + %w[solo groupement none].find { |mode| I18n.t("candidate.lot_selection_modes.#{mode}") == label } +end From ec896b9763e19b4661d401474bcca38ef029a553 Mon Sep 17 00:00:00 2001 From: Camille Regnault Date: Wed, 19 Aug 2026 14:30:16 +0200 Subject: [PATCH 14/15] =?UTF-8?q?refactor:=20supprime=20errors=5Ffrom,=20r?= =?UTF-8?q?=C3=A9impl=C3=A9mentation=20de=20errors.to=5Fhash=20natif?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit errors_from était dupliquée dans 5 interactors et ne faisait que reproduire ActiveModel::Errors#to_hash. Remplace tous les appels par la méthode Rails native. --- app/interactors/candidate/add_grouping_member.rb | 8 +------- .../candidate/create_applications_for_mode.rb | 12 +++--------- app/interactors/candidate/set_grouping_legal_type.rb | 8 +------- app/interactors/create_market_application.rb | 8 +------- app/interactors/create_public_market.rb | 8 +------- 5 files changed, 7 insertions(+), 37 deletions(-) diff --git a/app/interactors/candidate/add_grouping_member.rb b/app/interactors/candidate/add_grouping_member.rb index 97f243a1..a2280958 100644 --- a/app/interactors/candidate/add_grouping_member.rb +++ b/app/interactors/candidate/add_grouping_member.rb @@ -34,7 +34,7 @@ def create_member member = grouping.grouping_members.new(role: :co_traitant, siret:, email:, company_name: fetch_company_name) return context.grouping_member = member if member.save - context.fail!(errors: errors_from(member)) + context.fail!(errors: member.errors.to_hash) end def fetch_company_name @@ -68,11 +68,5 @@ def fail_email_blank def fail_email_invalid context.fail!(errors: { email: [I18n.t('candidate.validations.email_invalid')] }) end - - def errors_from(record) - record.errors.each_with_object({}) do |error, hash| - (hash[error.attribute] ||= []) << error.message - end - end end end diff --git a/app/interactors/candidate/create_applications_for_mode.rb b/app/interactors/candidate/create_applications_for_mode.rb index 964c48a1..6dea9d97 100644 --- a/app/interactors/candidate/create_applications_for_mode.rb +++ b/app/interactors/candidate/create_applications_for_mode.rb @@ -28,20 +28,20 @@ def dispatch_mode end def set_solo - return context.fail!(errors: errors_from(market_application)) unless market_application.update(application_mode: :solo) + return context.fail!(errors: market_application.errors.to_hash) unless market_application.update(application_mode: :solo) context.market_application = market_application end def set_groupement - return context.fail!(errors: errors_from(market_application)) unless market_application.update(application_mode: :groupement) + return context.fail!(errors: market_application.errors.to_hash) unless market_application.update(application_mode: :groupement) context.market_application = market_application create_grouping(market_application) end def set_mixte - return context.fail!(errors: errors_from(market_application)) unless market_application.update(application_mode: :solo) + return context.fail!(errors: market_application.errors.to_hash) unless market_application.update(application_mode: :solo) create_groupement_counterpart end @@ -95,11 +95,5 @@ def uniqueness_error?(member) def fail_already_mandataire context.fail!(errors: { application_mode: [I18n.t('candidate.validations.already_mandataire')] }) end - - def errors_from(record) - record.errors.each_with_object({}) do |error, hash| - (hash[error.attribute] ||= []) << error.message - end - end end end diff --git a/app/interactors/candidate/set_grouping_legal_type.rb b/app/interactors/candidate/set_grouping_legal_type.rb index ae9a9cb4..e6c0d72d 100644 --- a/app/interactors/candidate/set_grouping_legal_type.rb +++ b/app/interactors/candidate/set_grouping_legal_type.rb @@ -17,7 +17,7 @@ def call def update_legal_type return if context.grouping.update(legal_type:) - context.fail!(errors: errors_from(context.grouping)) + context.fail!(errors: context.grouping.errors.to_hash) end def find_grouping @@ -35,11 +35,5 @@ def fail_grouping_not_found def fail_legal_type_invalid context.fail!(errors: { legal_type: [I18n.t('candidate.validations.legal_type_invalid')] }) end - - def errors_from(record) - record.errors.each_with_object({}) do |error, hash| - (hash[error.attribute] ||= []) << error.message - end - end end end diff --git a/app/interactors/create_market_application.rb b/app/interactors/create_market_application.rb index 28daf7dd..acd37470 100644 --- a/app/interactors/create_market_application.rb +++ b/app/interactors/create_market_application.rb @@ -35,13 +35,7 @@ def create_new_application if application.save context.market_application = application else - context.fail!(errors: errors_from(application)) - end - end - - def errors_from(record) - record.errors.each_with_object({}) do |error, hash| - (hash[error.attribute] ||= []) << error.message + context.fail!(errors: application.errors.to_hash) end end end diff --git a/app/interactors/create_public_market.rb b/app/interactors/create_public_market.rb index a892247e..395a3019 100644 --- a/app/interactors/create_public_market.rb +++ b/app/interactors/create_public_market.rb @@ -12,7 +12,7 @@ def call context.public_market = market FetchPublicMarketBuyerNameJob.perform_later(market.id) else - context.fail!(errors: errors_from(market)) + context.fail!(errors: market.errors.to_hash) end end @@ -36,10 +36,4 @@ def market_type_for_lot(lot_type_code) code = lot_type_code.presence || params[:market_type_codes]&.first MarketType.find_by(code:) end - - def errors_from(record) - record.errors.each_with_object({}) do |error, hash| - (hash[error.attribute] ||= []) << error.message - end - end end From 33988ec2ba7e07fed0b40f5f6ac592e775e76ce8 Mon Sep 17 00:00:00 2001 From: Camille Regnault Date: Wed, 19 Aug 2026 16:19:17 +0200 Subject: [PATCH 15/15] =?UTF-8?q?fix:=20stabilise=20le=20sc=C3=A9nario=20d?= =?UTF-8?q?e=20reconnexion=20avant=20choix=20du=20type=20de=20groupement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ajoute un point de synchronisation entre le choix du mode de candidature et la reconnexion via magic link : sans lui, Capybara/Selenium pouvait revisiter le lien avant que la requête de soumission du mode ne soit complètement traitée côté serveur, provoquant un scénario flaky préexistant (indépendant de FAS-561). --- features/grouping_legal_type.feature | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/features/grouping_legal_type.feature b/features/grouping_legal_type.feature index c54fe3c2..972cfb8f 100644 --- a/features/grouping_legal_type.feature +++ b/features/grouping_legal_type.feature @@ -42,7 +42,8 @@ Feature: Mandataire defines the grouping legal type Scenario: Candidate logs in again before choosing the legal type When I visit the magic link And I choose the candidacy mode "groupement" - And I visit the magic link + Then I should see "Le type de groupement" + When I visit the magic link Then I should be on the grouping legal type step @javascript