Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ETQ Administrateur, si j'oublie de renseigner le SIRET de mon service, je souhaite recevoir un message d'erreur explicite pour m'alerter. #10839

Merged
merged 1 commit into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/models/procedure.rb
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ def missing_steps
result << :service
end

if service_test?
if service_siret_test?
result << :service
end

Expand Down Expand Up @@ -710,7 +710,7 @@ def missing_zones?
end
end

def service_test?
def service_siret_test?
service&.siret == Service::SIRET_TEST
end

Expand Down
1 change: 1 addition & 0 deletions app/models/service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class Service < ApplicationRecord
validates :nom, uniqueness: { scope: :administrateur, message: 'existe déjà' }
validates :organisme, presence: { message: 'doit être renseigné' }, allow_nil: false
validates :siret, siret_format: true
validates :siret, comparison: { other_than: SIRET_TEST, message: "n'est pas valide" }, on: :update
validates :type_organisme, presence: { message: 'doit être renseigné' }, allow_nil: false
validates :email, presence: { message: 'doit être renseigné' }, allow_nil: false
validates :telephone, phone: { possible: true, allow_blank: true }
Expand Down
4 changes: 2 additions & 2 deletions app/views/administrateurs/procedures/publication.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
%li= link_to("des instructeurs", admin_procedure_groupe_instructeur_path(@procedure, @procedure.defaut_groupe_instructeur))
- if @procedure.service.nil?
%li= link_to("un service", admin_services_path(procedure_id: @procedure))
- if @procedure.service_test?
%li= link_to("un service valide", admin_services_path(procedure_id: @procedure))
- if @procedure.service_siret_test?
%li= link_to("un service avec un SIRET valide", admin_services_path(procedure_id: @procedure))
= link_to t('.back_to_procedure'), admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--secondary fr-btn--icon-left fr-icon-arrow-go-back-line fr-mt-2w'

- else
Expand Down
9 changes: 9 additions & 0 deletions spec/models/service_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,15 @@
end
end

describe 'validation on update' do
subject { create(:service) }

it 'should not allow to have a test siret' do
subject.siret = Service::SIRET_TEST
expect(subject).not_to be_valid
end
end

describe "etablissement adresse & geo coordinates" do
subject { create(:service, etablissement_lat: latitude, etablissement_lng: longitude, etablissement_infos: etablissement_infos) }

Expand Down
Loading